This PR was squashed before being merged into the master branch (closes#1258).
Discussion
----------
Fix twig_first and twig_last filters for UTF8 multibyte strings
After string is sliced we already have the right result with a first/last letter for UTF8 string.
Commits
-------
6003ae4 Fix twig_first and twig_last filters for UTF8 multibyte strings
This PR was merged into the master branch.
Discussion
----------
added a source function to include the content of a template without rendering it
Replaces #1230.
There is one question about the implementation: Should the content be considered safe (which is the current implementation)?
Commits
-------
dff7d2c added a source function to include the content of a template without rendering it
This PR was squashed before being merged into the master branch (closes#1256).
Discussion
----------
Fixed C extension sandbox behavior
fixes#1254
Commits
-------
40bba0e Fixed C extension sandbox behavior
This PR was merged into the master branch.
Discussion
----------
fixed error filename/line when an error occurs in an included file
fixed#1141
Commits
-------
ba0bf63 refactored some tests
1cdc913 fixed error filename/line when an error occurs in an included file
de985a8 failing test
This PR was merged into the master branch.
Discussion
----------
allowed tests to be made of 1 or 2 words
Commits
-------
52c952c allowed tests to be made of 1 or 2 words
This PR was merged into the master branch.
Discussion
----------
allowed operators that contain whitespaces to have more than one whitespace
Commits
-------
724dc61 allowed operators that contain whitespaces to have more than one whitespace
To be able to cover all cases, we need to catch the exception when we
know the execution context (the block being rendered). The only
possibility is to actually try/catch exceptions in the displayBlock()
method directly.
This PR was merged into the master branch.
Discussion
----------
Fixed minor typo "base" into "based" line 67
Commits
-------
08282d3 Fixed minor typo "base" into "based" line 67
This PR was merged into the master branch.
Discussion
----------
made it possible to use named operators as variables
Commits
-------
8d805aa made it possible to use named operators as variables
This PR was squashed before being merged into the master branch (closes#1231).
Discussion
----------
fix phpdoc for environment, lexer and parser
First commit fixes several phpdocs <del>and also an instanceof check</del>.
The second commit changes an exception from Runtime to Syntax because it doesn't make sense to throw runtime exception during compilation. It also makes it consistent with all the rest (lexer, parser, compiler classes).
Commits
-------
cc5f3c4 fix phpdoc for environment, lexer and parser
This PR was squashed before being merged into the master branch (closes#1234).
Discussion
----------
Added support DateTimeInterface (PHP 5.5) if available
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | new BSD
| Doc PR |
Commits
-------
ca61fac Added support DateTimeInterface (PHP 5.5) if available
This PR was merged into the master branch.
Discussion
----------
Do not repeat dirname function execution in writing cache files
Commits
-------
a9870f4 Do not repeat dirname function execution in writing cache files
This PR was merged into the master branch.
Discussion
----------
Update grammar of internals.rst
Fabien,
Here are some changes that I think help the Internals docs page read easier.
Commits
-------
6c80601 Update grammar of internals.rst
This PR was merged into the master branch.
Discussion
----------
Macros changes removal
This PR reverts the changes made to macros in 1.14.
The initial PR looked massive and I was not comfortable with the changes, but I merged it anyways. But the latest PR about fixes some bugs in the implementation -- and adding some more changes (#1213) really scares me.
So, instead of continuing doing big changes, I prefer to revert everything for now, release 1.14 and give more time for these changes to mature and eventually be merged again.
Commits
-------
74586e9 Revert "merged branch hason/macros (PR #1139)"
bf40fa3 Revert "updated CHANGELOG"
c3e05f3 Revert "added an exception when a macro re-uses the same argument name twice"
524e406 Revert "renamed an internal variable"
60b575f Revert "fixed some unit tests"
This reverts commit 03926034c4, reversing
changes made to 730aa25bed.
Conflicts:
CHANGELOG
doc/tags/macro.rst
doc/templates.rst
lib/Twig/ExpressionParser.php
Fabien Potencier
Kirill chEbba Chebunin
Tugdual Saunier
Kris Wallsmith
annesosensio
Karl Horky
Tobias Schultze
hidenorigoto
deguif
glutamatt
Steve Oliver