This PR was merged into the 1.x branch.
Discussion
----------
Add TemplateWrapper::getTemplateName()
closes#2892
Commits
-------
861066e5 added TemplateWrapper::getTemplateName()
This PR was merged into the 1.x branch.
Discussion
----------
Force loading class aliases used in typehints
Fixes#2886
Commits
-------
65c05591 force loading class aliases used in typehints
This PR was merged into the 1.x branch.
Discussion
----------
Fix security issue in the sandbox
Commits
-------
eac54229 fixed security issue in the sandbox
* 1.x:
fixed batch filter clobbers array keys when fill parameter is used
added preserveKeys support for the batch filter
removed dead code
fixed "embed" support when used from "template_from_string"
fixed CS
This PR was squashed before being merged into the 1.x branch (closes#2884).
Discussion
----------
Fix "batch filter clobbers array keys when fill parameter is used "
closes#2568
Commits
-------
750cb237 fixed batch filter clobbers array keys when fill parameter is used
ede9a604 added preserveKeys support for the batch filter
This PR was merged into the 1.x branch.
Discussion
----------
Fix "embed" support when used from "template_from_string"
closes#2761
Commits
-------
92a63e0c fixed "embed" support when used from "template_from_string"
This PR was squashed before being merged into the 2.x branch (closes#2881).
Discussion
----------
Environment class cleanup
Commits
-------
b5da9b5a deprecated passing a Twig\Template to load()/resolveTemplate()
a4476dfc updated docs
d9b91a25 added the possibility to pass a TemplateWrapper to Twig\Environment::load()
714360d6 marked Twig\Environment::getTemplateClass() as internal
This PR was squashed before being merged into the 1.x branch (closes#2882).
Discussion
----------
Environment class cleanup 1.x
Commits
-------
8ab10798 simplified code
e2103c87 use load() instead of loadTemplate() in tests
c82d7dca added the possibility to pass a TemplateWrapper to Twig\Environment::load()
This PR was squashed before being merged into the 1.x branch (closes#2879).
Discussion
----------
Try to avoid guessing template info on errors
Right now, for syntax errors triggered in a Node, we guess the template line and source, but we then try to set the information in the Parser class. This PR avoids the guessing as it's slow.
Commits
-------
69c0539c removed -2 magic number
2389faea tried to avoid guessing template info on errors
Fabien Potencier
Christophe Coevoet