Fabien Potencier [Fri, 1 Aug 2014 15:28:52 +0000]
bug #1452 Fixed 'starts with' operator for empty needle (hason)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Fixed 'starts with' operator for empty needle
Fixes #1432
Commits
-------
790305a Fixed 'starts with' operator for empty needle
Martin Hasoň [Fri, 11 Jul 2014 08:37:09 +0000]
Fixed 'starts with' operator for empty needle
Fabien Potencier [Fri, 1 Aug 2014 07:38:44 +0000]
added more docs for the if tag
Fabien Potencier [Fri, 1 Aug 2014 07:16:32 +0000]
fixed the attribute() function when passing a variable for the arguments
Fabien Potencier [Thu, 31 Jul 2014 13:21:40 +0000]
minor #1465 Some minor cleanup (JeroenDeDauw)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Some minor cleanup
Commits
-------
e6da6bb Restore unused var
d8e1077 Get rid of naming clash
3e50672 Remove unused local vars
291141f Remove unused var
9921554 Fix type hint
1d2b877 Fix type hint
Fabien Potencier [Thu, 31 Jul 2014 13:20:45 +0000]
minor #1462 Simplified Twig_Node_Include (hason)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Simplified Twig_Node_Include
Commits
-------
632fe90 Simplified Twig_Node_Include
Fabien Potencier [Thu, 31 Jul 2014 11:15:54 +0000]
minor #1458 Add variables types in error message of twig_array_merge (inalgnu)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Add variables types in error message of twig_array_merge
Commits
-------
ea6676d add variables types in error message of twig_array_merge
jeroendedauw [Thu, 31 Jul 2014 10:30:50 +0000]
Restore unused var
jeroendedauw [Wed, 30 Jul 2014 20:49:24 +0000]
Get rid of naming clash
Static code analysis tool did not like this.
Looks like it was wrong before. Tests unchanged though.
jeroendedauw [Wed, 30 Jul 2014 21:27:25 +0000]
Remove unused local vars
jeroendedauw [Wed, 30 Jul 2014 20:42:59 +0000]
Remove unused var
jeroendedauw [Wed, 30 Jul 2014 20:53:20 +0000]
Fix type hint
In PHPStorm the inferred type was 'A'
jeroendedauw [Wed, 30 Jul 2014 21:28:53 +0000]
Fix type hint
PHPStorm wrongly inferred the type 'Unicode'
Martin Hasoň [Wed, 30 Jul 2014 21:27:46 +0000]
Simplified Twig_Node_Include
Inal DJAFAR [Wed, 30 Jul 2014 15:36:49 +0000]
add variables types in error message of twig_array_merge
Fabien Potencier [Tue, 29 Jul 2014 11:54:16 +0000]
minor #1457 Fixed the `matches` operator code example (brandonkelly)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Fixed the `matches` operator code example
A customer just pointed out that your `matches` operator code example wasn't working for them, and it ended up being because its backslashes themselves needed to be escaped by additional backslashes. (I've verified this.)
While I was editing it, I also switched to forwardslash delimiters on the regex, since those are much more commonly used than curly brackets. (I hadn't even been aware that curly brackets are allowed.) To back that assertion up, [PHP's official preg_quote() docs](http://php.net/manual/en/function.preg-quote.php) state:
> The `/` is the most commonly used delimiter.
Commits
-------
33dcbc8 Fixed the `matches` operator code example
Brandon Kelly [Mon, 28 Jul 2014 18:33:46 +0000]
Fixed the `matches` operator code example
It wasn't working because the backslashes themselves needed to be escaped by additional backslashes. Also switched to using forwardslashes for the regex delimiters rather than curly brackets.
Fabien Potencier [Mon, 28 Jul 2014 13:12:00 +0000]
bug #1453 Fix for mb function overload mb_substr acting different (1emming)
This PR was squashed before being merged into the 1.16-dev branch (closes #1453).
Discussion
----------
Fix for mb function overload mb_substr acting different
When bug hunting https://github.com/fabpot/Twig/issues/1428 I ran into an issue.
I started out by changing my `php.ini` for the `cli` enviroment, I've added:
`mbstring.func_overload = 2`
Later I tested with adding and removing:
`mbstring.internal_encoding = 'UTF-8'`
It turns out `mb_substr` returns `false` and not `''` when doing something like this:
```php
$item = '';
$start = -1;
$length = 1;
$charset = 'UTF-8';
$a = mb_substr($item, $start, $length, $charset);
var_dump($a);
die;
```
I'm not sure this will fix 1428 since I don't have enough information for this, but this PR should at least fix one issue.
Commits
-------
214fe52 Fix for mb function overload mb_substr acting different
1emming [Sun, 27 Jul 2014 15:37:04 +0000]
Fix for mb function overload mb_substr acting different
Fabien Potencier [Tue, 8 Jul 2014 13:46:25 +0000]
fixed some typos
Fabien Potencier [Tue, 8 Jul 2014 13:44:12 +0000]
minor #1333 Added disambiguation on using raw in expressions (OwlyCode)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Added disambiguation on using raw in expressions
I recently got in trouble using the ``raw`` filter in a ternary, leading to a value being escaped and me not expecting it. The code was :
```
{{ foo|striptags|length > 250 ? foo|striptags|slice(0, 250) ~ '...' : foo|raw }}
```
When foo's length was under 250 characters, the result of this expression was escaped. Here is the updated documentation to explain why.
Commits
-------
cec2b57 Added disambiguation on using raw in expressions
Fabien Potencier [Tue, 8 Jul 2014 13:42:48 +0000]
minor #1431 Typo in deprecated.rst (barryvdh)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Typo in deprecated.rst
Commits
-------
06ca7f9 Typo in deprecated.rst
Fabien Potencier [Mon, 7 Jul 2014 12:54:10 +0000]
bumped version to 1.16.1-DEV
Barry vd. Heuvel [Sat, 5 Jul 2014 12:50:30 +0000]
Typo in deprecated.rst
Fabien Potencier [Sat, 5 Jul 2014 12:19:05 +0000]
prepared the 1.16.0 release
Fabien Potencier [Sat, 5 Jul 2014 12:08:19 +0000]
replaced deprecated divisibleby by divisible by in tests
Fabien Potencier [Sat, 5 Jul 2014 12:06:29 +0000]
replaced deprecated sameas by same as in tests
Fabien Potencier [Sat, 5 Jul 2014 12:03:33 +0000]
fixed some deprecation notices
Fabien Potencier [Sat, 5 Jul 2014 11:37:05 +0000]
fixed the deprecated docs about PEAR
Fabien Potencier [Sat, 5 Jul 2014 11:16:15 +0000]
fixed potential exception
Fabien Potencier [Sat, 5 Jul 2014 09:31:17 +0000]
minor #1426 Add 'PHP-twig for atom' package to IDEs support (zoltanradics)
This PR was squashed before being merged into the 1.16-dev branch (closes #1426).
Discussion
----------
Add 'PHP-twig for atom' package to IDEs support
Since Atom.io editor is growing, i would add this package to the list for people who would like to edit Twig in Atom.
Commits
-------
c90d469 Add 'PHP-twig for atom' package to IDEs support
Zoltan Radics [Fri, 27 Jun 2014 22:14:31 +0000]
Add 'PHP-twig for atom' package to IDEs support
Fabien Potencier [Fri, 20 Jun 2014 07:26:46 +0000]
minor #1422 Update slice.rst (1emming)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Update slice.rst
Please state that Twig `slice` is multi-byte safe since it uses `mb_substr` :)
Commits
-------
87165e7 Update slice.rst
Seb Minderhoud [Thu, 19 Jun 2014 07:49:36 +0000]
Update slice.rst
Fabien Potencier [Mon, 26 May 2014 15:15:28 +0000]
added a note in the docs about the fact that installing the C ext is optional
Fabien Potencier [Mon, 26 May 2014 00:34:04 +0000]
feature #1390 fixed url_encode when raw is false and URL is an array (Tobion, fabpot)
This PR was merged into the 1.16-dev branch.
Discussion
----------
fixed url_encode when raw is false and URL is an array
alternative for #1388
Commits
-------
1930600 fixed url_encode when raw is false and URL is an array
49ba6b4 removed parameter from url_encode filter
Fabien Potencier [Fri, 25 Apr 2014 11:33:19 +0000]
fixed url_encode when raw is false and URL is an array
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
Tristan Maindron [Thu, 6 Feb 2014 16:32:36 +0000]
Added disambiguation on using raw in expressions
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).