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
This PR was merged into the master branch.
Discussion
----------
added the starts with, ends with, and matches operators
Adds three new operators:
* `ends with`
* `starts with`
* `matches`
I've not added the `contains` operator as it would be equivalent with the existing `in` one.
TODO:
* [x] add docs
* [x] fix on PHP 5.2.
Commits
-------
b66181d added the starts with, ends with, and matches operators
This PR was merged into the master branch.
Discussion
----------
Change wording of indentation coding standards
The documentation says to use indentation consistent with the main language of the **File**. But in a Twig template, that language is going to be Twig. This PR changes the wording to indicate that the indentation rules inside tags should be consistent with the main language of the **Project** Twig is being used within.
```
| Q | A
| ------------- | ---
| Doc fix? | yes
| New docs? | no
| Applies to | all
| Fixed tickets | none
```
Commits
-------
435e3b2 Update wording of the indentation coding standards documentation
09b58e1 Change wording of indentation coding standards
This PR was merged into the master branch.
Discussion
----------
[Doc] corrects number_format argument namming
last argument is for thousand separator not decimal
Commits
-------
fc1950d [Doc] corrects number_format argument namming
This PR was merged into the master branch.
Discussion
----------
fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy
fixes#896
Commits
-------
f27d4a1 fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy
This PR was merged into the master branch.
Discussion
----------
Refactored the installation docs
The idea is to get back a simple and straight to the point into chapter. As Composer is now the defacto standard to install PHP deps, I've moved everything related to the other installation methods in a new chapter.
Commits
-------
dd1ead2 tweaked intro chapter
a0efdc9 simplified the intro doc page
This PR was merged into the master branch.
Discussion
----------
Make Twig HHVM compatible
Work in progress
Commits
-------
7a7e8c5 removed a test that do not pass on hhvm as it is not able to compare DateTime objects properly
89779bc fixed a test on hhvm
f939ea6 skipped a test on hhvm
cbbcd89 fixed some tests as hhvm always returns false for ReflectionArgument::isOptional()
This PR was squashed before being merged into the master branch (closes#1202).
Discussion
----------
Missing doc details for building C extension on windows
Commits
-------
1a65132 Missing doc details for building C extension on windows
This PR was merged into the master branch.
Discussion
----------
added a way to add custom escaping strategies
This adds the possibility to define custom escapers that can be used with the `escape` filter.
That would close#1178 and #1177, but I'm not sure that this is a good idea.
What do you think?
Commits
-------
55f8b27 added a way to add custom escaping strategies
This PR was merged into the master branch.
Discussion
----------
Fixed somes issues from SensioLabsInsight
All others errors could be ignore IMHO
And the `Test` directory should be ignored in the project configuration
Commits
-------
e0da5cc Fixed somes issues from SensioLabsInsight
Fabien Potencier
Tobias Schultze
hidenorigoto
deguif
glutamatt
Steve Oliver
Nicolas Bastien
Mateusz Zakarczemny
Matthew Davis
Grégoire Pineau