* 2.x:
removed docs about overloading
bumped version to 2.11.2-DEV
prepared the 2.11.1 release
bumped version to 1.42.2-DEV
prepared the 1.42.1 release
added a doc note
updated CHANGELOG
This PR was merged into the 1.x branch.
Discussion
----------
Add support for "Twig\Markup" instances in the "in" test (again)
Commits
-------
2218cfe2 added support for "Twig\Markup" instances in the "in" test (again)
This PR was squashed before being merged into the 2.x branch (closes#3046).
Discussion
----------
Fixed: Endless loop if more than one parent without the macro exists
Hi @fabpot
I made a quick fix for the parent macro method call fix you did for me in #3042. Your code works in case the direct parent has the macro. But if there is a longer hierarchy and the looked for macro is in a parent template +1 it runs into an endless loop because the `->getParent()` method is always called on `$template` but never the newer `$parent`.
Best
Commits
-------
44970833 Fixed: Endless loop if more than one parent without the macro exists
This PR was submitted for the 2.x branch but it was squashed and merged into the 1.x branch instead (closes#3047).
Discussion
----------
Update the documentation for newly added features
The `map`, `filter` and `reduce` functions were added in Twig 1.41 and 2.10, but the documentation for `map` and `reduce` did not contain the information in which 2.x version these functions were added.
This minor PR fixes this.
Commits
-------
bf518d2c Update the documentation for newly added features
This PR was merged into the 1.x branch.
Discussion
----------
Allow string operators as variables names in assignments
closes#3041
Commits
-------
5835c234 allowed string operators as variables names in assignments
* 2.x:
added more tests
fixed macro inheritance
moved a test
added some tests
bumped version to 2.11.1-DEV
prepared the 2.11.0 release
bumped version to 1.42.1-DEV
prepared the 1.42.0 release
Use v5.0 of the phpunit bridge
This PR was merged into the 1.x branch.
Discussion
----------
Use v5.0 of the phpunit bridge
Not critical but still better IMHO :)
Commits
-------
2e6f74af Use v5.0 of the phpunit bridge
This PR was squashed before being merged into the 2.x branch (closes#3025).
Discussion
----------
Add the possibility to register classes/interface as being safe
closes#2548
To avoid a too big performance impact on the escaper, we aggressively cache the safe classes, which means that changing the. configuration at runtime is not possible (and having different ones on 2 Twig instances is not possible either, this is really *globally* configured).
Commits
-------
fe6503fe -
b18733bc added the possibility to register classes/interfaces as being safe for the escaper
Fabien Potencier
Savas Ziplies
Alex
Nicolas Grekas
Yonel Ceruto
