Commit Graph

21 Commits

Author SHA1 Message Date
Fabien Potencier 9ca7fb8799 Merge branch '2.x' into 3.x
* 2.x:
  Fix support for named closures
2022-05-15 08:11:13 +02:00
Nicolas Grekas 163f07400a Fix support for named closures 2022-05-13 17:01:54 +02: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 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 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 a95ec00440 Merge branch '2.x' into 3.x
* 2.x:
  Fix ambiguous syntax parsing
2020-02-21 08:37:36 +01:00
Fabien Potencier 0686ccf278 Merge branch '1.x' into 2.x
* 1.x:
  Fix ambiguous syntax parsing
2020-02-21 08:37:29 +01:00
Fabien Potencier 5724cbeddf Fix ambiguous syntax parsing 2020-02-21 08:31:42 +01:00
Fabien Potencier 41ab8b9699 Merge branch '2.x' into 3.x
* 2.x:
  moved the HTML extension to an external Composer package
2019-08-10 07:48:25 +02:00
Fabien Potencier 59bb9d1033 moved the HTML extension to an external Composer package 2019-08-08 18:10:45 +02:00
Fabien Potencier 52c633a7be Merge branch '2.x' into 3.x
* 2.x:
  fixed the "empty" test on Traversable instances
  avoid confusion between .. and ..
  fixed phpdocs
  fixed CHANGELOG
  moved css_class function to html_classes filter
  Added support for `css_class` function
  added missing docs
  fixed wrong registration
  added the data_uri filter
  bumped version
  Update CoreExtension.php
2019-08-07 17:09:29 +02:00
Fabien Potencier 220e75065a added the data_uri filter 2019-08-07 14:42:44 +02:00
Fabien Potencier 6823b64cad moved test under tests/ 2019-06-30 14:56:12 +02:00
Fabien Potencier 1e3bb75010 moved test under tests/ 2019-06-30 14:51:54 +02:00
Fabien Potencier 22a1317249 moved tests under tests/ 2019-06-30 14:48:27 +02:00