Tobias Schultze [Fri, 22 Feb 2013 13:58:36 +0000]
removed parameter from url_encode filter
the filter now only uses the more appropriate rawurlencode() which is also more consistent with the escape('url') filter
Fabien Potencier [Mon, 26 May 2014 00:01:07 +0000]
updated CHANGELOG
Fabien Potencier [Mon, 26 May 2014 00:00:46 +0000]
bug #1370 Fixed inheritance in a 'use'-hierarchy (hason)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Fixed inheritance in a 'use'-hierarchy
Fixes #1365
Commits
-------
9e0907e Fixed inheritance in a 'use'-hierarchy
Fabien Potencier [Sun, 25 May 2014 23:57:56 +0000]
updated CHANGELOG
Fabien Potencier [Sun, 25 May 2014 23:57:06 +0000]
bug #1382 Added isSandbox check around the __toString check in Sandbox extension (Scott Smith, smitherz82)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Added isSandbox check around the __toString check in Sandbox extension
The `__toString` policy check currently still happens when the sandbox is disabled
Commits
-------
3ce4202 Added test for sandbox __toString when not enabled
8dfa432 Added isSandbox check around the __toString check
Fabien Potencier [Sun, 25 May 2014 23:56:03 +0000]
minor #1403 Refactor namespace/shortname parsing into own method (anlutro)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Refactor namespace/shortname parsing into own method
I've written a custom file loader in order for the namespace syntax to match across different resource loading classes. To achieve this I have to replace the loadTemplate method, which includes a lot of logic. While this logic may not be likely to change anytime soon, I'd feel better if the namespace parsing was extracted into its own method so I can replace just that bit.
Commits
-------
9dd3bb8 Refactor namespace/shortname parsing into own method
Fabien Potencier [Sun, 25 May 2014 23:53:41 +0000]
minor #1409 Update json_encode.rst (matthieuprat)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Update json_encode.rst
Commits
-------
1b3ac0a Update json_encode.rst
Fabien Potencier [Sun, 25 May 2014 23:53:14 +0000]
minor #1413 [Doc]Put the return of the split filter in a variable (n1c01a5)
This PR was squashed before being merged into the 1.15-dev branch (closes #1413).
Discussion
----------
[Doc]Put the return of the split filter in a variable
Commits
-------
0e228c7 [Doc]Put the return of the split filter in a variable
Wagner Nicolas [Sat, 24 May 2014 12:53:52 +0000]
[Doc]Put the return of the split filter in a variable
Matthieu Prat [Thu, 22 May 2014 18:35:52 +0000]
Update json_encode.rst
Andreas Lutro [Fri, 16 May 2014 08:08:10 +0000]
Refactor namespace/shortname parsing into own method
Allows you to more easily create a custom file loader with a custom
namespace syntax.
Fabien Potencier [Wed, 21 May 2014 01:15:25 +0000]
minor #1406 Improve the description of the 'same as' test (adamelso)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Improve the description of the 'same as' test
This description of the `same as` test is based on the description in the docblock for `Twig_Node_Expression_Test_Sameas`. It reads better than the one currently used in the docs.
Commits
-------
e4b7db1 Improve the description of the 'same as' test
Adam Elsodaney [Tue, 20 May 2014 14:02:48 +0000]
Improve the description of the 'same as' test
This description of the 'same as' test is based on the description in the docblock for Twig_Node_Expression_Test_Sameas. It reads better than the one currently used in the docs.
Fabien Potencier [Thu, 15 May 2014 19:43:48 +0000]
minor #1401 [Twig][Tests][Fixtures][filters] Added empty string tests for "first" and "last" filters (ureimers)
This PR was squashed before being merged into the 1.15-dev branch (closes #1401).
Discussion
----------
[Twig][Tests][Fixtures][filters] Added empty string tests for "first" and "last" filters
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | none
| License | MIT
This was already fixed with with https://github.com/fabpot/Twig/commit/
6003ae43b92cfa7e1ddec17262733355e0bf435a but to make sure there won't be any regression bugs in the future. This is an edge case but the first and the last element of an empty string are empty strings too.
Before the above mentioned PR this threw a notice `Uninitialized string offset: 0`.
Commits
-------
0db5c31 [Twig][Tests][Fixtures][filters] Added empty string tests for "first" and "last" filters
Ulf [Thu, 15 May 2014 18:06:18 +0000]
[Twig][Tests][Fixtures][filters] Added empty string tests for "first" and "last" filters
Fabien Potencier [Wed, 14 May 2014 11:51:43 +0000]
minor #1399 Fixed typo (WouterJ)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Fixed typo
Commits
-------
49de7a6 Fixed typo
Wouter J [Wed, 14 May 2014 09:53:45 +0000]
Fixed typo
Fabien Potencier [Mon, 12 May 2014 14:45:21 +0000]
added some missing tests
Fabien Potencier [Mon, 12 May 2014 14:36:16 +0000]
minor #1398 Remove unused constructor arguments (rybakit)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Remove unused constructor arguments
There are no line & tag arguments in `Twig_Node_Module::__construct()`.
Commits
-------
5b5741a Remove unused constructor arguments
Eugene Leonovich [Mon, 12 May 2014 14:12:37 +0000]
Remove unused constructor arguments
There are no `line` and `nodeTag` arguments in `Twig_Node_Module::__construct()`
Fabien Potencier [Mon, 5 May 2014 08:48:03 +0000]
fixed markpu
Fabien Potencier [Mon, 5 May 2014 08:32:59 +0000]
removed beta versions for PEAR in the docs
Fabien Potencier [Mon, 5 May 2014 08:29:57 +0000]
added a note about PEAR deprecation in the docs
Fabien Potencier [Tue, 29 Apr 2014 17:01:20 +0000]
minor #1392 Update internals.rst (ahsio)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Update internals.rst
Fixed typo (Bad escaping strategy).
Commits
-------
d0de473 Fixed typo (escaping strategy).
Ahmed Siouani [Tue, 29 Apr 2014 15:56:23 +0000]
Fixed typo (escaping strategy).
Fabien Potencier [Wed, 23 Apr 2014 20:31:20 +0000]
minor #1389 Move method so it's only called when necessary (Tobion)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Move method so it's only called when necessary
Small performance improvement for getAttribute
Commits
-------
a28e0f1 Move method so it's only called when necessary
Tobias Schultze [Wed, 23 Apr 2014 19:58:07 +0000]
Move method so it's only called when necessary
Fabien Potencier [Wed, 23 Apr 2014 18:34:55 +0000]
minor #1383 Consistency (fabpot)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Consistency
Commits
-------
365feec made usage of return; instead of return null;
81699ca made types consistent with the ones of Hack
Fabien Potencier [Wed, 16 Apr 2014 07:47:36 +0000]
made usage of return; instead of return null;
Fabien Potencier [Wed, 16 Apr 2014 07:47:00 +0000]
made types consistent with the ones of Hack
Fabien Potencier [Tue, 15 Apr 2014 20:49:49 +0000]
minor #1375 Fix typo: filters => filter (ifdattic)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Fix typo: filters => filter
Commits
-------
a8a1f12 Fix typo: filters => filter
Scott Smith [Tue, 15 Apr 2014 18:03:53 +0000]
Added test for sandbox __toString when not enabled
Scott Smith [Tue, 15 Apr 2014 16:21:28 +0000]
Added isSandbox check around the __toString check
Andrew M [Sun, 6 Apr 2014 17:55:25 +0000]
Fix typo: filters => filter
Fabien Potencier [Sun, 30 Mar 2014 17:23:57 +0000]
minor #1372 Fix typo: providing => provided (ifdattic)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Fix typo: providing => provided
Commits
-------
2511617 Fix typo: providing => provided
Andrew M. [Sun, 30 Mar 2014 15:43:22 +0000]
Fix typo: providing => provided
Martin Hasoň [Mon, 24 Mar 2014 05:05:09 +0000]
Fixed inheritance in a 'use'-hierarchy
Fabien Potencier [Sat, 15 Mar 2014 10:50:05 +0000]
updated CHANGELOG
Fabien Potencier [Sat, 15 Mar 2014 10:49:13 +0000]
bug #1361 Fixed recursively calling blocks in templates with inheritance (hason)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Fixed recursively calling blocks in templates with inheritance
Replaces #1321
Fixes KnpLabs/KnpMenu#136 and KnpLabs/KnpMenu#119
Commits
-------
efb7b47 Add "broken" block inheritance test case
ef98ea2 Fixed recursively calling blocks in templates with inheritance
Fabien Potencier [Fri, 14 Mar 2014 12:36:54 +0000]
minor #1355 Update CHANGELOG - New update will be in 2014 (PieterWaegeman)
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
Adrien Brault [Thu, 23 Jan 2014 23:18:05 +0000]
Add "broken" block inheritance test case
Martin Hasoň [Thu, 13 Mar 2014 11:23:25 +0000]
Fixed recursively calling blocks in templates with inheritance
Pieter Waegeman [Thu, 6 Mar 2014 21:55:14 +0000]
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.
Fabien Potencier [Mon, 24 Feb 2014 15:39:56 +0000]
minor #1327 Update templates.rst (granitegreg)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Update templates.rst
Fixed typo (missing word).
Commits
-------
e278aee Update templates.rst
Fabien Potencier [Mon, 24 Feb 2014 15:39:24 +0000]
minor #1336 Added additional example to min/max doc (c33s)
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
Julian [Sun, 26 Jan 2014 23:35:05 +0000]
Added additional example to min/max doc
Fabien Potencier [Mon, 24 Feb 2014 15:38:38 +0000]
minor #1344 Fixed a number of grammatical errors and the like (jegesh)
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
Fabien Potencier [Mon, 24 Feb 2014 15:37:20 +0000]
minor #1345 Fixed 1.15.1 changelog date (XWB)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Fixed 1.15.1 changelog date
Commits
-------
1b98da7 Fixed 1.15.1 changelog date
Karel [Mon, 24 Feb 2014 13:53:47 +0000]
Fixed 1.15.1 changelog date
Yaakov Gesher [Mon, 24 Feb 2014 12:42:30 +0000]
Fixed a number of grammatical errors and the like
Fabien Potencier [Thu, 13 Feb 2014 21:54:38 +0000]
minor #1339 Update intro.rst (Carpetsmoker)
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
Martin Tournoij [Thu, 13 Feb 2014 21:05:06 +0000]
Update intro.rst
Quote the shell command, since it contains an asterisk (*).
Fabien Potencier [Thu, 13 Feb 2014 10:36:05 +0000]
bumped version to 1.15.2-DEV
Fabien Potencier [Thu, 13 Feb 2014 10:19:29 +0000]
prepared the 1.15.1 release
Fabien Potencier [Thu, 13 Feb 2014 10:11:56 +0000]
bug #1338 Fixed fetching of a property defined but not initialized in C extension (tucksaun)
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
Tugdual Saunier [Thu, 13 Feb 2014 09:35:20 +0000]
Fixed fetching of a property defined but not initialized in C extension, fixed #1337
Fabien Potencier [Mon, 10 Feb 2014 07:40:03 +0000]
simplified composer.json
Fabien Potencier [Mon, 10 Feb 2014 07:37:57 +0000]
minor #1330 remove authors file and add more information to composer.json (Tobion)
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
Tobias Schultze [Fri, 31 Jan 2014 17:04:14 +0000]
remove authors file and add more information to composer.json
Fabien Potencier [Fri, 31 Jan 2014 15:13:11 +0000]
minor #1329 added test for accessing xml attributes (Tobion)
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
Tobias Schultze [Fri, 31 Jan 2014 14:53:51 +0000]
added test for accessing xml attributes
Greg McAvoy-Jensen [Thu, 30 Jan 2014 00:01:00 +0000]
Update templates.rst
Fixed typo (missing word).
Fabien Potencier [Wed, 29 Jan 2014 08:45:07 +0000]
added a note about how to check for dynamic attribute existence in the docs
Fabien Potencier [Tue, 28 Jan 2014 06:09:19 +0000]
minor #1319 Simplified Twig_Autoloader (hason)
This PR was merged into the 1.15-dev branch.
Discussion
----------
Simplified Twig_Autoloader
Commits
-------
94fff30 Simplified Twig_Autoloader
Fabien Potencier [Tue, 28 Jan 2014 06:07:56 +0000]
minor #1324 Minor pedantic variable definition fixes (jwatzman)
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
Josh Watzman [Mon, 27 Jan 2014 23:59:47 +0000]
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.
Fabien Potencier [Fri, 24 Jan 2014 15:03:15 +0000]
minor #1323 Added a more clear example in the cycle() docs (brandonkelly)
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
Brandon Kelly [Fri, 24 Jan 2014 12:27:48 +0000]
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.
Martin Hasoň [Thu, 23 Jan 2014 11:07:16 +0000]
Simplified Twig_Autoloader
Fabien Potencier [Wed, 8 Jan 2014 07:21:28 +0000]
updated LICENSE years
Fabien Potencier [Sun, 5 Jan 2014 16:48:49 +0000]
minor #1303 Improved exception message for accessing object (without ArrayAccess) as array (hason)
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
Fabien Potencier [Sun, 5 Jan 2014 16:46:03 +0000]
removed HHVM from the allowed failures
Fabien Potencier [Sun, 5 Jan 2014 16:41:06 +0000]
minor #1312 made some minor tweaks to PHPUnit assertions (fabpot)
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
Fabien Potencier [Sun, 5 Jan 2014 16:24:50 +0000]
made some minor tweaks to PHPUnit assertions
Fabien Potencier [Sun, 5 Jan 2014 00:05:42 +0000]
bug #1311 fixed the conversion of the special '0000-00-00 00:00' date (fabpot)
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
Fabien Potencier [Sat, 4 Jan 2014 23:37:22 +0000]
fixed the conversion of the special '0000-00-00 00:00' date
Martin Hasoň [Mon, 30 Dec 2013 09:06:46 +0000]
Improved exception message for accessing object without ArrayAccess as array
Fabien Potencier [Fri, 27 Dec 2013 14:37:02 +0000]
fixed Filesystem::exists() to normalize the template name before checking the cache
Fabien Potencier [Fri, 27 Dec 2013 14:35:40 +0000]
minor #1284 Simple enhancement for easy overloading (arnapou)
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
Arnaud Buathier [Tue, 3 Dec 2013 09:10:53 +0000]
Simple enhancement for easy overloading
Fabien Potencier [Fri, 27 Dec 2013 14:27:14 +0000]
minor #1290 [Docs] Fix example: space missing between concatenated strings (GromNaN)
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
Fabien Potencier [Fri, 27 Dec 2013 14:21:16 +0000]
Revert "merged branch javer/hhvm-array-traversable (PR #1192)"
This reverts commit
0d97eb95288c6f08d5c46e9aa5706f2341a34e29, reversing
changes made to
4fcaf0c5fc91435cf625c20c0ecbd29c4f8b25a1.
This change is not needed anymore as HHVM has been fixed as of 2.3.0.
Fabien Potencier [Fri, 27 Dec 2013 14:13:51 +0000]
fixed Travis config to allow HHVM to fail
Fabien Potencier [Fri, 27 Dec 2013 14:12:46 +0000]
minor #1294 Add HHVM to build matrix (ptarjan)
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
Paul Tarjan [Fri, 13 Dec 2013 19:31:03 +0000]
Add HHVM to build matrix
Fabien Potencier [Tue, 10 Dec 2013 10:23:00 +0000]
minor #1291 Fixed rendering of ``-3`` (ureimers)
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``
ureimers [Tue, 10 Dec 2013 10:19:22 +0000]
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.
Jérôme Tamarelle [Sat, 7 Dec 2013 19:09:53 +0000]
Fix doc example: space missing between concatenated strings
Fabien Potencier [Fri, 6 Dec 2013 15:28:39 +0000]
bug #1288 added an error message when trying to import an undefined block from a trait (fabpot)
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 [Fri, 6 Dec 2013 10:06:49 +0000]
added an error message when trying to import an undefined block from a trait
Fabien Potencier [Fri, 6 Dec 2013 08:13:22 +0000]
bumped version to 1.15.1-DEV
Fabien Potencier [Fri, 6 Dec 2013 07:47:10 +0000]
prepared the 1.15.0 release
Fabien Potencier [Tue, 3 Dec 2013 14:16:16 +0000]
fixed markup
Fabien Potencier [Tue, 3 Dec 2013 14:08:30 +0000]
feature #1286 Adding ignoreStrictCheck option for call_user_func_array, if throwing exception (fabpot)
This PR was merged into the master branch.
Discussion
----------
Adding ignoreStrictCheck option for call_user_func_array, if throwing exception
Same as #1236 with added unit tests and C extension support (to come).
"I experienced the issue when using FuelPHP's ORM with EAV containers. When I tried to reference a property that was not defined I expected to get null, but instead the whole application stopped because an exception was thrown in the ORM, that no such function is present.
I couldn't find other possible exception that could be thrown when this function is called, so I assumed it's safe to take the ignoreStrictCheck into consideration here."
Commits
-------
1abf5d9 [ext] Mirroring PHP change for call_user_func_array, see #1286
9ab290b added tests for exceptions thrown in __call()
c711d37 Adding ignoreStrictCheck option for call_user_func_array, if throwing exception
Tugdual Saunier [Tue, 3 Dec 2013 13:40:20 +0000]
[ext] Mirroring PHP change for call_user_func_array, see #1286
Fabien Potencier [Tue, 3 Dec 2013 12:58:35 +0000]
added tests for exceptions thrown in __call()
Fabien Potencier [Tue, 3 Dec 2013 13:05:12 +0000]
feature #1277 Added min and max function (lyrixx)
This PR was merged into the master branch.
Discussion
----------
Added min and max function
usefull for pagination
Commits
-------
6aa06de Added min and max function
Barta Tamás [Wed, 16 Oct 2013 20:49:43 +0000]
Adding ignoreStrictCheck option for call_user_func_array, if throwing exception
Grégoire Pineau [Sat, 23 Nov 2013 04:00:49 +0000]
Added min and max function
Fabien Potencier [Tue, 3 Dec 2013 12:41:51 +0000]
fixed typo