* 1.x:
fixed edge case where tests would fail because of a cache issue
tweaked docs to avoid using an internal method in an example
deprecated Twig_Environment::clearTemplateCache()
fixed sandbox disabling when using the include function
Example about how to rename several blocks
fixed docs
Update batch filter docs with arguments
* 1.x:
updated CHANGELOG
reverted unexpected change
fixed previous merge
Organize and show value types
Added label for "Whitespace Control" section
Added note about case sensitivity of logic operators
Fixed CS
Fixed error guessing for nested templates
Travis no longer supports hhvm-nightly
fixed CS
Added an example for "and" on if statment
Updated exception messages for null vars in Twig_Template::getAttribute().
Use stubs for profiles. Fixes#1660
Conflicts:
doc/api.rst
This PR was merged into the 1.x branch.
Discussion
----------
Added note about case sensitivity of logic operators
Commits
-------
29986a9 Added note about case sensitivity of logic operators
* 1.x:
Fix two failed unit tests on Windows:
updated CHANGELOG
Reduce the name of the cache directories to 1 character
clean ups
bumped version to 1.18.2-DEV
prepared the 1.18.1 release
updated CHANGELOG
Cleanup API - make the compiler happy
Fixed memory leaks
tweaked docs about the C extension
removed an obsolete recipe
Conflicts:
CHANGELOG
doc/api.rst
doc/recipes.rst
ext/twig/php_twig.h
lib/Twig/Environment.php
lib/Twig/NodeTraverser.php
lib/Twig/Template.php
This PR was merged into the 1.17-dev branch.
Discussion
----------
added a profiler
This profiler allows to better understand what's going on when rendering templates. It should be used when debug is true only as it adds some overhead.
Here is a sample output in the text format:
```
main 567.04ms/100%
└ index 463.28ms/82%
└ base 463.24ms/82%
└ base::block(header)
└ index::block(content) 306.29ms/54%
│ └ included 50.18ms/9%
│ └ included 45.42ms/8%
│ └ included 35.42ms/6%
│ └ base::block(content) 104.97ms/19%
│ │ └ included 34.90ms/6%
│ └ included 35.84ms/6%
└ base::block(footer) 156.84ms/28%
└ included 38.96ms/7%
└ base::macro(foo)
```
You can also dump a profile in a Blackfire compatible format to [visualise the data as a graph](http://goo.gl/RwNGFH).
A profile is also a great way to be able to list all templates/blocks/macros that were used when rendering a template.
A PR on Symfony (symfony/symfony#13428) integrates this profiler in the Symfony web profiler to replace the current TimedTwigEngine and to add a new Twig panel.

Commits
-------
4408caa added a profiler
This PR was squashed before being merged into the 1.17-dev branch (closes#1565).
Discussion
----------
Update batch.rst
Commits
-------
403736f Update batch.rst
This PR was merged into the 1.16-dev branch.
Discussion
----------
Adding example with ``not`` for ``if``
I could not find an example with ``not``, so I added it here.
Commits
-------
4a75e40 Adding example with ``not`` for ``if``