This PR was merged into the 1.15-dev branch.
Discussion
----------
Update CHANGELOG - New update will be in 2014
Since time travel isn't invented yet, the next update will (hopefully) take place in 2014, not in 2013.
Commits
-------
3b4cd96 Update CHANGELOG - New update will be in 2014
This PR was squashed before being merged into the 1.15-dev branch (closes#1336).
Discussion
----------
Added additional example to min/max doc
* fixed typo in the word "four"
* added an additional example with letters
Commits
-------
b709577 Added additional example to min/max doc
This PR was merged into the 1.15-dev branch.
Discussion
----------
Fixed a number of grammatical errors and the like
Commits
-------
e2f0b2e Fixed a number of grammatical errors and the like
This PR was merged into the 1.15-dev branch.
Discussion
----------
Update intro.rst
Very minor issue: quote the shell command, since it contains an asterisk (*)
Commits
-------
d73d612 Update intro.rst
This PR was merged into the 1.15-dev branch.
Discussion
----------
Fixed fetching of a property defined but not initialized in C extension
This PR fixed#1337
Commits
-------
6e800d8 Fixed fetching of a property defined but not initialized in C extension, fixed#1337
This PR was merged into the 1.15-dev branch.
Discussion
----------
remove authors file and add more information to composer.json
I think the authors file is not needed. Also it was mentioned in the license file but it is not required to redistribute it, making it useless.
Also I updated the composer.json with more information and added the "Twig Team" as all contributors.
Commits
-------
3cc3813 remove authors file and add more information to composer.json
This PR was merged into the 1.15-dev branch.
Discussion
----------
added test for accessing xml attributes
Closes#1328
Commits
-------
bdbc56d added test for accessing xml attributes
This PR was merged into the 1.15-dev branch.
Discussion
----------
Minor pedantic variable definition fixes
Fixes a couple pedantic issues with variables not always being defined and
passing a couple unused variables to error handling functions.
Commits
-------
83dd42e Minor pedantic variable definition fixes
This PR was merged into the 1.15-dev branch.
Discussion
----------
Added a more clear example in the cycle() docs
We've receive a lot of feedback that the examples for the cycle() tag could be better, so I figured I'd contribute one.
The previous example was potentially misleading if you were focussed on the actual numbers (0 is even, not odd! etc.), and 99% of the time you’re going to be passing loop.index0 into cycle, so I felt that should be included in the example.
I realize that this one requires a little additional setup, but I think the fact that it's a real-world example makes it worth it.
Commits
-------
8958565 Added a more clear example in the cycle() docs
The previous one was potentially misleading if you were focussed on the actual numbers (0 is even, not odd! etc.), and 99% of the time you’re going to be passing loop.index0 into cycle, so I felt that should be included in the example.
This PR was merged into the 1.15-dev branch.
Discussion
----------
Improved exception message for accessing object (without ArrayAccess) as array
Commits
-------
770712b Improved exception message for accessing object without ArrayAccess as array
This PR was merged into the 1.15-dev branch.
Discussion
----------
made some minor tweaks to PHPUnit assertions
Commits
-------
e5e2a01 made some minor tweaks to PHPUnit assertions
This PR was merged into the 1.15-dev branch.
Discussion
----------
fixed the conversion of the special '0000-00-00 00:00' date
This PR reverts #1234 and add supports for PHP 5.5 is a simpler way. This also fixes#1241 and closes#1242.
Commits
-------
9b95570 fixed the conversion of the special '0000-00-00 00:00' date
This PR was squashed before being merged into the 1.15-dev branch (closes#1284).
Discussion
----------
Simple enhancement for easy overloading
More consistent algorithm which allow people to easily overload normalize method to their needs.
Commits
-------
87d4f08 Simple enhancement for easy overloading
This PR was merged into the 1.15-dev branch.
Discussion
----------
[Docs] Fix example: space missing between concatenated strings
The expression `'Hello'~'Fabien'` produces `'HelloFabien'`, not `'Hello Fabien'`. I've just added a space after `'Hello'`.
Commits
-------
d6e0357 Fix doc example: space missing between concatenated strings
This PR was squashed before being merged into the 1.15-dev branch (closes#1294).
Discussion
----------
Add HHVM to build matrix
Now that HHVM can run your project, lets keep it that way
Commits
-------
e03b05e Add HHVM to build matrix
This PR was merged into the master branch.
Discussion
----------
Fixed rendering of ``-3``
The missing space between "``-3``" and "(this is just syntactic[...])" led to the ``-3`` being rendered wrong. The parser must've ignored the closing "``" when it was directly followed by a non-space character.
Commits
-------
d8ea1b1 Fixed rendering of ``-3``
The missing space between "``-3``" and "(this is just syntactic[...])" led to the ``-3`` being rendered wrong. The parser must've ignored the closing "``" when it was directly followed by a non-space character.
This PR was merged into the master branch.
Discussion
----------
added an error message when trying to import an undefined block from a trait
Commits
-------
a2c6db7 added an error message when trying to import an undefined block from a trait
Fabien Potencier
Pieter Waegeman
Julian
Karel
Yaakov Gesher
Martin Tournoij
Tugdual Saunier
Tobias Schultze
Greg McAvoy-Jensen
Josh Watzman
Brandon Kelly
Martin Hasoň
Arnaud Buathier
Paul Tarjan
ureimers
Jérôme Tamarelle