303 Commits

Author SHA1 Message Date
Fabien Potencier c344879ae5 prepared the 2.11.0 release 2019-05-31 08:21:42 +02:00
Yonel Ceruto 8cd300f5a5 Add missing template name and line no to some deprecation messages 2019-05-28 08:49:56 -04:00
Fabien Potencier fe6503fe02 - 2019-05-21 16:09:37 +02:00
Fabien Potencier b18733bce0 added the possibility to register classes/interfaces as being safe for the escaper 2019-05-21 15:41:28 +02:00
Fabien Potencier 59d1d5d4b6 deprecated CoreExtension::setEscaper() and CoreExtension::getEscaper() in favor of the same methods on EscaperExtension 2019-05-21 09:01:26 +02:00
Fabien Potencier 3fcbc44205 Local macros auto-import 2019-05-18 15:49:29 +02:00
Fabien Potencier 5a56076659 fixed CS 2019-05-18 11:24:16 +02:00
Fabien Potencier 1153534aac added a better error message for unknown macros 2019-05-18 09:01:55 +02:00
Fabien Potencier 60ab3e7134 fixed CS 2019-05-18 06:15:39 +02:00
Fabien Potencier 84c698c99a simplified code 2019-05-18 06:10:53 +02:00
Fabien Potencier 347202d06b Merge branch '1.x' into 2.x
* 1.x:
  fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator
2019-05-18 06:08:10 +02:00
Fabien Potencier c2f685e16f fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator 2019-05-18 06:01:24 +02:00
Fabien Potencier 9fe3213d1b added support for macros on "is defined" tests 2019-05-17 18:04:15 +02:00
Fabien Potencier e138164015 macros imported "globally" in a template are now available in macros without re-importing them 2019-05-17 13:03:55 +02:00
Fabien Potencier 3d1e5f6493 bumped version to 2.11 2019-05-17 08:23:38 +02:00
Fabien Potencier 0f5a056968 bumped version to 1.42 2019-05-17 08:22:23 +02:00
Fabien Potencier c8d2cc3ae5 Merge branch '1.x' into 2.x
* 1.x:
  fixed typo
2019-05-17 08:14:40 +02:00
Fabien Potencier b086d4f4bb fixed typo 2019-05-17 08:14:31 +02:00
Fabien Potencier e9a09d90c3 Merge branch '1.x' into 2.x
* 1.x:
  fixed a PHP fatal error when calling a macro imported in the template in a nested block
2019-05-17 08:09:05 +02:00
Fabien Potencier 11353ce3a7 fixed a PHP fatal error when calling a macro imported in the template in a nested block 2019-05-17 08:04:06 +02:00
Fabien Potencier 73326f0ddc Merge branch '1.x' into 2.x
* 1.x:
  fixed a regression
2019-05-16 20:18:06 +02:00
Fabien Potencier bd1f9eb39b bug #3011 Fix a regression (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix a regression

Commits
-------

3c7602b9 fixed a regression
2019-05-16 20:17:10 +02:00
Fabien Potencier 3c7602b9da fixed a regression 2019-05-16 19:44:44 +02:00
Fabien Potencier e671f267ce Merge branch '1.x' into 2.x
* 1.x:
  made code more readable
2019-05-16 16:31:36 +02:00
Fabien Potencier 06670f3630 made code more readable 2019-05-16 16:30:26 +02:00
Fabien Potencier ad1d08a431 Merge branch '1.x' into 2.x
* 1.x:
  tweaked the error message when using extends in a block/macro
2019-05-16 16:16:50 +02:00
Fabien Potencier 70c1b3a2c2 tweaked the error message when using extends in a block/macro 2019-05-16 16:07:04 +02:00
Fabien Potencier b0f29468f0 simplified code 2019-05-16 14:16:39 +02:00
Fabien Potencier 10d1145ef6 Merge branch '1.x' into 2.x
* 1.x:
  fixed a PHP fatal error when calling a macro, imported in the template, in another macro
2019-05-16 14:16:01 +02:00
Fabien Potencier ba9b9681ca fixed a PHP fatal error when calling a macro, imported in the template, in another macro 2019-05-16 14:09:44 +02:00
Fabien Potencier b5ad4c36cf Merge branch '1.x' into 2.x
* 1.x:
  tweaked error messages
  fixed wrong error message on "import" and "from"
  bumped version to 1.41.1-DEV
  prepared the 1.41.0 release
2019-05-16 11:42:35 +02:00
Fabien Potencier 19164de77b tweaked error messages 2019-05-16 11:32:52 +02:00
Fabien Potencier 118462c16d fixed wrong error message on "import" and "from" 2019-05-16 11:17:43 +02:00
Fabien Potencier f597addf79 bumped version to 2.10.1-DEV 2019-05-14 14:04:22 +02:00
Fabien Potencier 5240e21982 prepared the 2.10.0 release 2019-05-14 14:03:52 +02:00
Fabien Potencier b03f07e961 bumped version to 1.41.1-DEV 2019-05-14 13:59:47 +02:00
Fabien Potencier 575cd50283 prepared the 1.41.0 release 2019-05-14 13:59:08 +02:00
Fabien Potencier 44f02b2242 fixed PHP 7.4 support 2019-05-14 11:44:36 +02:00
Fabien Potencier 2efd1c5515 Merge branch '1.x' into 2.x
* 1.x:
  fixed deprecation under PHP 7.4
  fixed PHP 7.4 support
  added PHP 7.4 in Travis config
2019-05-14 08:46:40 +02:00
Fabien Potencier f958bd1e86 fixed deprecation under PHP 7.4 2019-05-14 08:40:21 +02:00
Fabien Potencier 1fb0f9701d fixed PHP 7.4 support 2019-05-14 08:18:04 +02:00
Fabien Potencier ed3cbebe47 Merge branch '1.x' into 2.x
* 1.x:
  fixed support for IteratorAggregate in the filter filter
2019-05-10 08:47:07 +02:00
Fabien Potencier 084be27d77 fixed support for IteratorAggregate in the filter filter 2019-05-10 08:33:19 +02:00
Fabien Potencier 5d1d90ba53 deprecated "if" conditions on "for" tags 2019-05-09 15:20:13 +02:00
Fabien Potencier 00966f434f fixed CS 2019-05-09 13:27:48 +02:00
Fabien Potencier 5c484ce7eb Merge branch '1.x' into 2.x
* 1.x:
  added the key to the map and filter filters
  added support for iterators
  removed fn in front of arrow functions
  changed arrow syntax
  added "filter", "map", and "reduce" filters
  simplified code
  fixed CS
  fixed partial output leak when a PHP fatal error occurs
2019-05-09 13:25:49 +02:00
Fabien Potencier 5c15f897c7 added the key to the map and filter filters 2019-05-03 19:04:11 +02:00
Fabien Potencier 13274bbf97 added support for iterators 2019-05-03 18:15:56 +02:00
Fabien Potencier 175041e01b removed fn in front of arrow functions 2019-05-03 18:12:19 +02:00
Fabien Potencier dc2776359c changed arrow syntax 2019-05-03 17:09:12 +02:00