This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes#2598).
Discussion
----------
Update advanced.rst
I noticed that the rot13Provider wasn't called correctly as it was trying to access a local variable instead of calling $this
Commits
-------
b42fd643 Update advanced.rst
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes#2586).
Discussion
----------
Environment::resolveTemplate now accepts instances of TemplateWrapper
The [documentation on the include function](https://twig.symfony.com/doc/2.x/functions/include.html) states (on the template expression):
> And if the expression evaluates to a Twig_Template or a Twig_TemplateWrapper instance, Twig will use it directly […]
This is currently broken, as `twig_include` [relies on `resolveTemplate`](https://github.com/twigphp/Twig/blob/31b577863b5ae8d19e2cefd174e95a433f16491f/lib/Twig/Extension/Core.php#L1304), which doesn't handle instances of `TemplateWrapper`. This PR fixes that.
For the sake of completeness: the `include` tag doesn't have this problem, as it relies on the `loadTemplate` method of the `Template` class which _does_ handle this case.
Commits
-------
78a4f2fb Environment::resolveTemplate now accepts instances of TemplateWrapper
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes#2562).
Discussion
----------
Change typo in documentation
In example of use for test_iterable function there is a typo
Commits
-------
8607f13d Change typo in documentation
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes#2570).
Discussion
----------
fix grammar
Commits
-------
d4309898 fix grammar
This PR was merged into the 1.x branch.
Discussion
----------
Fix PHP 5.3 Travis build
PHP 5.3 is only supported on Debian Precise.
Commits
-------
3a45bd48 Fix PHP 5.3 build
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes#2557).
Discussion
----------
add throws tags doc block for Twig_Environment:load
On an internal project review we noticed that `\Twig_Environment::load` is not providing throw tags. As this method is just a proxy for `\Twig_Environment::loadTemplate` which itself is _internal_ we had some discussion around.
this PR provides same throw tags as _loadTemplate_. Maybe this helps to understand code usage
Commits
-------
882c7aab add throws tags doc block for Twig_Environment:load
This PR was merged into the 1.x branch.
Discussion
----------
Added pssibility to reset the profiler
In order to implement symfony/symfony#18244 properly, I needed the ability to reset a Twig profile.
Commits
-------
ea922bb6 Added pssibility to reset the profiler.
This PR was merged into the 1.x branch.
Discussion
----------
Ensure that the "use" TokenParser returns a node instance
Alternative to #2539, fixes#2538.
Commits
-------
421d8722 ensured that the use TokenParser returns a node instance
This PR was squashed before being merged into the 1.x branch (closes#2544).
Discussion
----------
simplified tests as min version if now 5.3.3
fixes#2526
Commits
-------
a3548a6e fixed CS
90a07d16 simplified tests as min version if now 5.3.3
This PR was submitted for the 2.x branch but it was squashed and merged into the 1.x branch instead (closes#2536).
Discussion
----------
show how to use a variable as hash map key
currently the documentation does not explain how it's possible to use a variable as key in a hash map
Commits
-------
ef6c9505 show how to use a variable as hash map key
This PR was merged into the 1.x branch.
Discussion
----------
Throw exception on circular reference detection
Out-the-box this isn't common... but into Symfony framework this kind of issue can happen frequently when we're overriding a template from third-party bundle (see main issue https://github.com/symfony/symfony/issues/17557)
```twig
{# app/Resources/AcmeBlogBundle/views/Blog/index.html.twig #}
{% extends '@AcmeBlog/Blog/index.html.twig' %}
{% block title 'New Title' %}
```
This exception avoids inifite loop or maximum execution time for this case, by detecting a recursive loading when a template extends from itself, thinking to override the parent template which has the same namespace + template name.
Commits
-------
074e1fbe Throw exception on circular reference detection
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes#2531).
Discussion
----------
Update .travis.yml to deal with missing xdebug config
lets see if this fixes the nightly test
Commits
-------
1097685b Update .travis.yml
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes#2515).
Discussion
----------
Update internals.rst
Missing an opening paren
Commits
-------
b8967bd3 Update internals.rst
This PR was merged into the 1.x branch.
Discussion
----------
Fix deprecation when using Twig_Profiler_Dumper_Html
Commits
-------
aebec7d8 fixed deprecation when using Twig_Profiler_Dumper_Html
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes#2512).
Discussion
----------
Issue in documentation for twig number formatter
The explaination below my change is correct. Just the output is not correct
Commits
-------
54f0f7ae Create number_format.rst
This PR was merged into the 1.x branch.
Discussion
----------
Add support for runtime loaders to IntegrationTestCase
Adds the ability to provide runtime loaders in `IntegrationTestCase`. Otherwise, there's no way to test extensions that use them.
Fixes#2492
Commits
-------
ff96b34a Add support for runtime loaders to IntegrationTestCase
This PR was merged into the 1.x branch.
Discussion
----------
Move class_exists() at the bottom of files
Fixes#2503Closes#2506
Commits
-------
95e912b0 Move class_exists() at the bottom of files
Miguel Piedrafita
Fabien Potencier
Peter Fisher
Victor Welling
Asier Ramos
Chris Wright
Christian Schmidt
Daniel Espendiller
Alexander M. Turek
Tobias Olry
Grégoire Pineau
Yonel Ceruto
SpacePossum
Steven Pribilinskiy
simsim2006
Edi Modrić
Nicolas Grekas