geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-24 17:18:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,869 Commits 16 Branches 274 Tags
3fef888756cd97b3feb7d948e07b6f35d76ae6b0
Commit Graph

155 Commits

Author SHA1 Message Date
Fabien Potencier 3fef888756 Merge branch '2.x' into 3.x 
* 2.x:
  Add a test
  Added token type and value to error message
  Add phpdoc to SecurityPolicyInterface
 2022-03-25 09:18:59 +01:00
Fabien Potencier beea1a7c4a Add a test 2022-03-25 09:18:53 +01:00
Fabien Potencier 5aaf393a11 Remove legacy test 2022-03-25 09:10:15 +01:00
Fabien Potencier d6f9a4e7a2 Merge branch '2.x' into 3.x 
* 2.x:
  Fix custom escapers when using multiple Twig environments
  Rename variable
 2022-03-25 09:06:57 +01:00
Fabien Potencier 9c03ef0d21 Fix custom escapers when using multiple Twig environments 2022-03-25 08:56:44 +01:00
Fabien Potencier e33577f1be Merge branch '2.x' into 3.x 
* 2.x:
  do not reuse internally generated variable names during parsing
 2022-02-25 09:30:09 +01:00
Christian Flothmann 1411c454c1 do not reuse internally generated variable names during parsing 2022-02-24 17:25:50 +01:00
Fabien Potencier 9e5ca747b6 Merge branch '2.x' into 3.x 
* 2.x:
  Disallow non closures in `sort` filter when the sanbox mode is enabled
 2022-02-04 07:56:23 +01:00
Fabien Potencier 2eb3308055 Disallow non closures in sort filter when the sanbox mode is enabled 2022-02-04 07:52:21 +01:00
Fabien Potencier 5981815757 Merge branch '2.x' into 3.x 
* 2.x:
  Rename variables used in map method
  The deprecated null value for the method round has been changed to zero.
 2022-01-14 12:47:50 +01:00
v.arsentev 7d0e5d6a1e The deprecated null value for the method round has been changed to zero. 2022-01-11 16:12:44 +01:00
Fabien Potencier 1231fd4096 Merge branch '2.x' into 3.x 
* 2.x:
  Allow null for nl2br, striptags and format filters
 2022-01-03 17:03:55 +01:00
Ruud Kamphuis e9cd55def5 Allow null for nl2br, striptags and format filters 
Same as https://github.com/twigphp/Twig/pull/3617
 2022-01-03 14:28:28 +01:00
Fabien Potencier ec23eba2ad Merge branch '2.x' into 3.x 
* 2.x:
  Add 8.1 in tests
  Allow null when Twig expects a string
 2022-01-02 17:23:10 +01:00
Fabien Potencier 92bc110bcf Allow null when Twig expects a string 2022-01-02 16:05:53 +01:00
Fabien Potencier d97690ff37 Merge branch '2.x' into 3.x 
* 2.x:
  Use faster hash algorithm (xxh128) on PHP 8.1
 2021-12-16 11:54:25 -08:00
Jérôme TAMARELLE 4fcc6b1c47 Use faster hash algorithm (xxh128) on PHP 8.1 2021-12-15 06:29:16 +01:00
Fabien Potencier 464842c41f Merge branch '2.x' into 3.x 
* 2.x:
  Add explicit `@return` type next to `#[ReturnTypeWillChange]`
 2021-08-11 09:52:24 +02:00
Nicolas Grekas 1d0bab9d63 Add explicit @return type next to #[ReturnTypeWillChange] 2021-08-10 18:49:26 +02:00
Fabien Potencier d9ac797190 Merge branch '2.x' into 3.x 
* 2.x:
  Twig2 PHP 8.1 beta compatibility
 2021-07-29 09:09:30 +02:00
Alex Pott 98c2233e47 Twig2 PHP 8.1 beta compatibility 2021-07-28 09:49:43 +01:00
Fabien Potencier 5f20d4a362 Merge branch '2.x' into 3.x 
* 2.x:
  Explicitly specify the encoding for mb_ord in JS escaper
 2021-07-08 13:01:29 +02:00
Fabien Potencier feeaba3fea Merge branch '1.x' into 2.x 
* 1.x:
  Explicitly specify the encoding for mb_ord in JS escaper
 2021-07-08 13:01:04 +02:00
Oleg Stepanischev da24c9340e Explicitly specify the encoding for mb_ord in JS escaper 
Explicitly specify the encoding for mb_ord in JS escaper - fix
 2021-07-08 12:58:33 +02:00
Fabien Potencier ed29f0010f Merge branch '2.x' into 3.x 
* 2.x:
  Add ReturnTypeWillChange to JsonSerializable implementation
  Fix implicit flot to int casts
 2021-06-06 18:31:44 +02:00
Fabien Potencier 7926399e0a Merge branch '1.x' into 2.x 
* 1.x:
  Fix implicit flot to int casts
 2021-06-06 18:31:25 +02:00
Alexander M. Turek de9cd76d7c Fix implicit flot to int casts 2021-06-06 00:32:22 +02:00
Fabien Potencier 4e479f140e Merge branch '2.x' into 3.x 
* 2.x:
  Move Drupal test file to tests/
  fix file permissions
  Bump version
  Prepare the 2.14.6 release
  Bump version
  Prepare the 1.44.4 release
 2021-05-18 13:11:52 +02:00
Fabien Potencier 66fa6d37f7 Merge branch '1.x' into 2.x 
* 1.x:
  Move Drupal test file to tests/
  fix file permissions
  Bump version
  Prepare the 1.44.4 release
 2021-05-18 13:10:20 +02:00
Fabien Potencier 2fa8bce914 Move Drupal test file to tests/ 2021-05-18 13:09:01 +02:00
Fabien Potencier ad86c88359 Merge branch '2.x' into 3.x 
* 2.x:
  Update CHANGELOG
  Update CHANGELOG
  Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
 2021-05-16 14:07:50 +02:00
Fabien Potencier ceb4de0448 Merge branch '1.x' into 2.x 
* 1.x:
  Update CHANGELOG
  Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
 2021-05-16 14:07:24 +02:00
Fabien Potencier 124f10c27e Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)" 
This reverts commit 83f26e402b, reversing
changes made to f5d3c704df.
 2021-05-16 14:06:26 +02:00
Fabien Potencier fcbaa669ab Fix CS 2021-05-12 09:47:40 +02:00
Fabien Potencier 13e360972a Merge branch '2.x' into 3.x 
* 2.x:
  Fix CS
  Fix CS
  Migrate to the new PHP CS Fixer config file
  Fixing links
 2021-05-12 09:45:40 +02:00
Fabien Potencier 157fa56829 Merge branch '1.x' into 2.x 
* 1.x:
  Fix CS
  Migrate to the new PHP CS Fixer config file
 2021-05-12 09:27:30 +02:00
Fabien Potencier 59f3e8e5dc Fix CS 2021-05-12 09:19:37 +02:00
Fabien Potencier 680e42979a Merge branch '2.x' into 3.x 
* 2.x:
  Fix code for PHP 8.1
 2021-04-10 10:17:37 +02:00
Fabien Potencier 953974a7b3 Fix code for PHP 8.1 2021-04-10 10:14:28 +02:00
Fabien Potencier f1e0ebc18a Merge branch '2.x' into 3.x 
* 2.x:
  Fix: A template name cannot be an absolute path
 2021-04-07 17:57:57 +02:00
Fabien Potencier 02fe3a544c Merge branch '1.x' into 2.x 
* 1.x:
  Fix: A template name cannot be an absolute path
 2021-04-07 17:57:49 +02:00
Michael Voříšek 3a67fc7dc5 Fix: A template name cannot be an absolute path 2021-04-07 17:57:24 +02:00
Fabien Potencier 81751d6671 Add "registerUndefinedTokenParserCallback" 2020-12-31 09:12:48 +01:00
Fabien Potencier 22537dd1c4 Merge branch '2.x' into 3.x 
* 2.x:
  Fix small typo
  Fix: Typo
  Enhancement: Use GithubActions instead of Travis for tests
  Fix: DOCtor-RST build
  Enhancement: Use no_explicit_use_of_code_block_php rule
  Fix: Highlighting
  Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
  Enhancement: Use GithubActions instead of Travis for tests
  Fix `odd` not working for negative numbers
  Bump version to 2.14.2-DEV
  Prepare the 2.14.1 release
  Update CHANGELOG
  Bump version to 1.44.2-DEV
  Prepare the 1.44.1 release
 2020-11-05 18:38:00 +01:00
Fabien Potencier c2a264a91d Merge branch '1.x' into 2.x 
* 1.x:
  Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
  Enhancement: Use GithubActions instead of Travis for tests
  Fix `odd` not working for negative numbers
  Bump version to 1.44.2-DEV
  Prepare the 1.44.1 release
 2020-11-05 13:31:01 +01:00
Harry Bournis 53a3ccd2d2 Fix odd not working for negative numbers 2020-11-05 11:55:45 +01:00
Fabien Potencier 1327db55e9 Merge branch '2.x' into 3.x 
* 2.x:
  Update format_time.rst
  Fix "include(template_from_string())"
  Fix PHPUnit config
 2020-10-27 15:15:09 +01:00
Fabien Potencier 497f027cd4 Merge branch '1.x' into 2.x 
* 1.x:
  Fix "include(template_from_string())"
  Fix PHPUnit config
 2020-10-27 15:14:55 +01:00
Fabien Potencier df9c9f2165 Fix "include(template_from_string())" 2020-10-27 13:39:31 +01:00
Fabien Potencier df7471fed6 Merge branch '2.x' into 3.x 
* 2.x:
  Fix PHP 8 support
 2020-10-21 14:27:08 +02:00