This PR was merged into the 1.x branch.
Discussion
----------
Escape __DIR__ in the test suite
Commits
-------
fa0213a9 Escape __DIR__ in the test suite
This PR was squashed before being merged into the 1.x branch (closes#3059).
Discussion
----------
Don't clear PHP buffer when an error occurs with debug=true
fixes#3058
Commits
-------
c910e71f Don't clear PHP buffer when an error occurs with debug=true
This PR was merged into the 2.x branch.
Discussion
----------
Fix macro auto-import when a template contains only macros
closes#3055
Commits
-------
197528f4 fixed macro auto-import when a template contains only macros
This PR was merged into the 1.x branch.
Discussion
----------
Fix end of constructor node logic
Commits
-------
8a29b42d fixed end of constructor node logic
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
Fabien Potencier
Grégoire Pineau
Tim van Dijen
Savas Ziplies
Alex