Fabien Potencier [Fri, 17 Oct 2014 12:53:44 +0000]
prepared the 1.16.2 release
Fabien Potencier [Thu, 16 Oct 2014 18:28:42 +0000]
updated CHANGELOG
Fabien Potencier [Thu, 16 Oct 2014 18:28:23 +0000]
Revert "bug #1470 Fixed "in" operator (hason)"
This reverts commit
5b172b5175e5985d144cc59985627d8820d32260, reversing
changes made to
0d0cdba3bb239efa20a0bd0c4a890a41d529d672.
Fabien Potencier [Thu, 16 Oct 2014 08:31:48 +0000]
minor #1546 [doc] [api.rst] Correct base template name (fabschurt)
This PR was merged into the 1.16-dev branch.
Discussion
----------
[doc] [api.rst] Correct base template name
The base template name used in $loader1 and $loader2 is actually "base.html", not "base.twig".
Commits
-------
882f44b Correct base template name
Fabien Potencier [Thu, 16 Oct 2014 08:29:01 +0000]
Revert "bug #1535 fixed negative number lexing (fabpot)"
This reverts commit
7bda3b61037fdfcae159b490053cfb3d0c5bc43f, reversing
changes made to
c86e621e09ffbfe9f7d082476fc01d32b1f759fb.
Conflicts:
CHANGELOG
Fabien Schurter [Thu, 16 Oct 2014 07:32:46 +0000]
Correct base template name
The base template name used in $loader1 and $loader2 is actually
"base.html", not "base.twig".
Fabien Potencier [Thu, 16 Oct 2014 06:05:34 +0000]
reordered doc index to match the website
Fabien Potencier [Thu, 16 Oct 2014 05:48:42 +0000]
fixed table format in docs
Fabien Potencier [Tue, 14 Oct 2014 18:25:48 +0000]
minor #1542 Update phpdoc for date filter/function (Tobion)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Update phpdoc for date filter/function
Commits
-------
7b4c537 Update phpdoc for date filter/function
Tobias Schultze [Tue, 14 Oct 2014 18:14:01 +0000]
Update phpdoc for date filter/function
Fabien Potencier [Tue, 14 Oct 2014 17:08:09 +0000]
updated CHANGELOG
Fabien Potencier [Tue, 14 Oct 2014 17:07:31 +0000]
bug #1449 Fixed the date filter's timezone not being set correctly with strings (gbouchez)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Fixed the date filter's timezone not being set correctly with strings
When the date filter is used on a string and the timezone argument is specified, the timezone is ignored because of this :
$date = new DateTime($date, $defaultTimezone);
if (false !== $timezone) {
$date->setTimezone($defaultTimezone);
}
Since the date is initialized with `$defaultTimezone` as its timezone, using `$date->setTimezone($defaultTimezone);` has no effect, and the date is displayed without changes since it is considered to already be from this timezone.
Might fix issue #1340
Commits
-------
44aaa5b Fixed the date filter's timezone not being set correctly with strings
Fabien Potencier [Tue, 14 Oct 2014 17:06:56 +0000]
added some failing tests
Fabien Potencier [Tue, 14 Oct 2014 16:19:19 +0000]
bug #1535 fixed negative number lexing (fabpot)
This PR was merged into the 1.16-dev branch.
Discussion
----------
fixed negative number lexing
Fixes #1368 and #1322.
I don't see it breaking BC as relying on the current way seems weird to me.
Commits
-------
bf541bf fixed negative number lexing
Fabien Potencier [Sat, 11 Oct 2014 22:26:35 +0000]
fixed negative number lexing
Fabien Potencier [Tue, 14 Oct 2014 15:59:33 +0000]
bug #1538 Fixed the support of 2-word tests without a custom node class (stof)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Fixed the support of 2-word tests without a custom node class
Fixes #1537
Commits
-------
0082e05 Fixed the support of 2-word tests without a custom node class
Christophe Coevoet [Tue, 14 Oct 2014 09:53:43 +0000]
Fixed the support of 2-word tests without a custom node class
Fabien Potencier [Tue, 14 Oct 2014 07:01:17 +0000]
simplifies Twig installation instructions
Fabien Potencier [Mon, 13 Oct 2014 12:33:18 +0000]
minor #1534 Delete license in twig extension (Tobion)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Delete license in twig extension
This file is outdated and does not seem useful as there is already a license in the root which covers also this.
Commits
-------
c8cd7f2 Delete license in twig extension
Fabien Potencier [Sat, 11 Oct 2014 22:29:52 +0000]
added missing tests
Tobias Schultze [Sat, 11 Oct 2014 20:49:11 +0000]
Delete license in twig extension
This file is outdated and does not seem useful as there is already a license in the root which covers also this.
Fabien Potencier [Sat, 11 Oct 2014 20:38:36 +0000]
fixed macros when using an argument named like a PHP super globa
Fabien Potencier [Sat, 11 Oct 2014 20:30:59 +0000]
made it clear that Twig_Loader_String must not be used by end users
Fabien Potencier [Sat, 11 Oct 2014 20:16:50 +0000]
updated CHANGELOG
Fabien Potencier [Sat, 11 Oct 2014 20:16:06 +0000]
fixed CS
Fabien Potencier [Sat, 11 Oct 2014 20:13:21 +0000]
bug #1533 Make date_modify work with DateTimeImmutable (globin)
This PR was squashed before being merged into the 1.16-dev branch (closes #1533).
Discussion
----------
Make date_modify work with DateTimeImmutable
Use the return value of `$date->modify` because `DateTimeImmutable::modify`
returns the modified object and does not modify the object modify was
called on.
Commits
-------
a5fe46f Make date_modify work with DateTimeImmutable
Robin Gloster [Sat, 11 Oct 2014 14:35:52 +0000]
Make date_modify work with DateTimeImmutable
Fabien Potencier [Sat, 11 Oct 2014 16:53:37 +0000]
added some more tests
Fabien Potencier [Fri, 10 Oct 2014 23:49:56 +0000]
updated CHANGELOG
Fabien Potencier [Fri, 10 Oct 2014 23:43:03 +0000]
feature #1443 optimize access to loop, key and value variables (linniksa)
This PR was merged into the 1.16-dev branch.
Discussion
----------
optimize access to loop, key and value variables
small optimization variable access (loop, key and value) inside for loop
Commits
-------
33ca8d1 optimize access to loop, key and value variables
Fabien Potencier [Fri, 10 Oct 2014 23:36:34 +0000]
fixed CS
Fabien Potencier [Fri, 10 Oct 2014 23:34:30 +0000]
updated CHANGELOG
Fabien Potencier [Fri, 10 Oct 2014 23:33:37 +0000]
bug #1521 Fix MB characters handling in split (1emming)
This PR was squashed before being merged into the 1.16-dev branch (closes #1521).
Discussion
----------
Fix MB characters handling in split
The PR fixes using multibyte characters in the ```split```-filter
Since I messed up the rebase of https://github.com/fabpot/Twig/pull/1446 I created a new PR.
Let me know if this something that is kind of wanted, thanks!
Commits
-------
8cde52d Fix MB characters handling in split
1emming [Fri, 3 Oct 2014 09:25:38 +0000]
Fix MB characters handling in split
Fabien Potencier [Fri, 10 Oct 2014 23:31:53 +0000]
fixed formatting in the docs
Fabien Potencier [Fri, 10 Oct 2014 23:29:15 +0000]
updated CHANGELOG
Fabien Potencier [Fri, 10 Oct 2014 23:28:34 +0000]
bug #1531 Fixed usage of LimitIterator (grachov)
This PR was squashed before being merged into the 1.16-dev branch (closes #1531).
Discussion
----------
Fixed usage of LimitIterator
When you want to get all items from the start position to the end, for `array_slice` you should pass `null` as the `length` argument, while for `LimitIterator` it should be `-1`.
Commits
-------
f76e67f Fixed usage of LimitIterator
Andrey Grachov [Fri, 10 Oct 2014 20:28:30 +0000]
Fixed usage of LimitIterator
Fabien Potencier [Fri, 10 Oct 2014 18:56:23 +0000]
bumped version to 1.16.2-DEV
Fabien Potencier [Fri, 10 Oct 2014 14:09:53 +0000]
prepared the 1.16.1 release
Fabien Potencier [Fri, 10 Oct 2014 13:58:27 +0000]
updated CHANGELOG
Fabien Potencier [Fri, 10 Oct 2014 13:57:57 +0000]
bug #1530 Improved error reporting in a sandboxed template (hason)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Improved error reporting in a sandboxed template
Commits
-------
58efc42 Improved error reporting in a sandboxed template
Fabien Potencier [Fri, 10 Oct 2014 13:47:26 +0000]
updated CHANGELOG
Fabien Potencier [Fri, 10 Oct 2014 13:46:25 +0000]
bug #1528 Fixed guessing a template info for exceptions (hason)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Fixed guessing a template info for exceptions
Commits
-------
42cd697 Fixed guessing a template info for exceptions
Fabien Potencier [Fri, 10 Oct 2014 13:40:19 +0000]
updated CHANGELOG
Fabien Potencier [Fri, 10 Oct 2014 13:38:59 +0000]
bug #1527 Fixed resetting debug info in compiler (hason)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Fixed resetting debug info in compiler
Commits
-------
0e7cec5 Fixed resetting debug info in compiler
Martin Hasoň [Fri, 10 Oct 2014 13:36:50 +0000]
Improved error reporting in a sandboxed template
Martin Hasoň [Fri, 10 Oct 2014 07:58:46 +0000]
Fixed guessing a template info for exceptions
Martin Hasoň [Fri, 10 Oct 2014 10:23:53 +0000]
Fixed resetting debug info in compiler
Fabien Potencier [Wed, 1 Oct 2014 17:51:59 +0000]
updated CHANGELOG
Fabien Potencier [Wed, 1 Oct 2014 17:50:35 +0000]
bug #1470 Fixed "in" operator (hason)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Fixed "in" operator
Commits
-------
9b6497f Fixed "in" operator
Fabien Potencier [Wed, 1 Oct 2014 17:13:04 +0000]
udpated CHANGELOG
Fabien Potencier [Wed, 1 Oct 2014 17:09:15 +0000]
feature #1503 Use LimitIterator on Iterable objects within the slice filter (Anthony Sterling)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Use LimitIterator on Iterable objects within the slice filter
Previously the `slice` filter would create an array of items if the subject to be sliced implemented Traversable, this PR instead passes the subject to LimitIterator first - but only if `$start` and `$length` are positive values as LimitIterator does not support the "n'th from end" behaviour.
Our use case is that we have an API client, which we pass to slice, that implements Traversable but lazy loads the items to be returned via an API when `Iterator::current()` is called. Here a quick example:-
```
{% for item in client.items | slice(0,5) %}
{{ item.name }}
{% endfor %}
<img src="/assets/useless-sodding-banner.jpg" />
{% for item in client.items | slice(5,10) %}
{{ item.name }}
{% endfor %}
```
Current behaviour would mean that the client would issue 15 requests to the API, 5 for the first block, and 10 for the second (but only return items 5 to 10). This PR means only 10 requests are made, 5 in each block.
I'd imagine this would lower memory usage too.
Commits
-------
fdddb1c Use LimitIterator on Iterable objects within the splice filter
Fabien Potencier [Wed, 1 Oct 2014 11:22:22 +0000]
fixed typo
Fabien Potencier [Wed, 1 Oct 2014 11:19:23 +0000]
deprecated Node::toXml()
Fabien Potencier [Wed, 1 Oct 2014 05:31:33 +0000]
minor #1509 Update convert_encoding.rst: wrong argument order (binarious)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Update convert_encoding.rst: wrong argument order
The arguments are in incorrect order. The first should be `to` and the second should be `from` - just like the text describes it.
Commits
-------
4e1d9a7 Update convert_encoding.rst
Fabien Potencier [Tue, 30 Sep 2014 17:44:16 +0000]
fixed some assertions
Fabien Potencier [Tue, 30 Sep 2014 17:40:30 +0000]
bug #1500 fix inconsistent response from twig_slice (rodnaph)
This PR was squashed before being merged into the 1.16-dev branch (closes #1500).
Discussion
----------
fix inconsistent response from twig_slice
twig_slice can return a boolean when slicing a string outside of its bounds and mbstring is not available. this would cause a knock-on error in twig_first/twig_last when calling current()
this (as suggested) adds a cast to emulate the behaviour of mb_substr for substr.
Commits
-------
c740060 fix inconsistent response from twig_slice
Rhodri Pugh [Mon, 8 Sep 2014 18:35:00 +0000]
fix inconsistent response from twig_slice
Fabien Potencier [Tue, 30 Sep 2014 17:37:32 +0000]
minor #1520 date() documentation correction (brandonkelly)
This PR was merged into the 1.16-dev branch.
Discussion
----------
date() documentation correction
The date() docs were incorrectly stating that the argument should be in a format supported by PHP’s [date()](http://php.net/manual/en/function.date.php) function. That’s true of the |date filter which is used to _format_ dates, but not the date() function, which is used to _create_ new dates.
I double-checked the code and whatever you pass into date() ultimately will get passed to a [DateTime constructor](http://php.net/manual/en/datetime.construct.php), which accepts an actual date string, formatted in one of PHP’s [date and time format](http://php.net/manual/en/datetime.formats.php), which is a different beast than the actual format definition string you might pass into PHP’s date() function.
Commits
-------
2f5a927 date() documentation correction
Brandon Kelly [Tue, 30 Sep 2014 17:07:37 +0000]
date() documentation correction
binarious [Mon, 22 Sep 2014 09:29:45 +0000]
Update convert_encoding.rst
The arguments were in incorrect order. The first should be `to` and the second should be `from` - just like the text describes it.
Anthony Sterling [Wed, 10 Sep 2014 14:32:22 +0000]
Use LimitIterator on Iterable objects within the splice filter
Fabien Potencier [Tue, 2 Sep 2014 14:08:17 +0000]
minor #1492 add PHP 5.6 to .travis.yml (sasezaki)
This PR was merged into the 1.16-dev branch.
Discussion
----------
add PHP 5.6 to .travis.yml
Commits
-------
ed7004b add PHP 5.6 to .travis.yml
kazusuke sasezaki [Thu, 28 Aug 2014 15:51:54 +0000]
add PHP 5.6 to .travis.yml
Fabien Potencier [Wed, 27 Aug 2014 09:26:36 +0000]
minor #1474 Update installation.rst (soatok)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Update installation.rst
Refer to PGP signature verification in the installation instructions for tarballs.
Commits
-------
3c48cb1 Update installation.rst
Fabien Potencier [Wed, 27 Aug 2014 09:25:58 +0000]
minor #1487 Added note about array_merge php function (pulzarraider)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Added note about array_merge php function
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
Just a small doc improvement.
Commits
-------
f712b8f Added note about array_merge php function
Fabien Potencier [Wed, 27 Aug 2014 09:24:21 +0000]
minor #1484 Delimit comment in template using correct syntax (johnberberich)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Delimit comment in template using correct syntax
Enclose the comment in '{# #}' instead of beginning line with '#'.
Commits
-------
4e1515c Delimit comment in template using correct syntax
Andrej Hudec [Sat, 23 Aug 2014 22:31:40 +0000]
Added note about array_merge php function
John Berberich [Fri, 22 Aug 2014 14:11:09 +0000]
Delimit comment in template using correct syntax
Enclose the comment in '{# #}' instead of beginning line with '#'.
Fabien Potencier [Wed, 6 Aug 2014 06:46:32 +0000]
minor #1475 Improved exception message while trying to access an attribute from an empty array (phansys, tucksaun)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Improved exception message while trying to access an attribute from an empty array
Rebased #1439 in master and updated twig extension
Commits
-------
759a77d [Ext] updating Twig extension for previous commit
15ce450 Improved exception message while trying to access an attribute from an empty array.
Tugdual Saunier [Tue, 5 Aug 2014 16:25:10 +0000]
[Ext] updating Twig extension for previous commit
Javier Spagnoletti [Wed, 9 Jul 2014 16:47:07 +0000]
Improved exception message while trying to access an attribute from an empty array.
Martin Hasoň [Mon, 4 Aug 2014 05:09:00 +0000]
Fixed "in" operator
Fabien Potencier [Tue, 5 Aug 2014 12:54:54 +0000]
updated CHANGELOG
Soatok [Tue, 5 Aug 2014 12:33:51 +0000]
Update installation.rst
Refer to PGP signature verification in the installation instructions for tarballs.
Fabien Potencier [Mon, 4 Aug 2014 19:55:24 +0000]
changed the way we check for HHVM
Fabien Potencier [Mon, 4 Aug 2014 19:54:18 +0000]
minor #1471 Fixed a test on hhvm (hason)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Fixed a test on hhvm
Commits
-------
0c169ce Fixed a test on hhvm
Martin Hasoň [Mon, 4 Aug 2014 09:47:26 +0000]
Fixed a test on hhvm
Fabien Potencier [Sun, 3 Aug 2014 08:10:53 +0000]
bug #1468 Fixed "starts with" a "ends with" operators for non-string arguments (hason)
This PR was merged into the 1.16-dev branch.
Discussion
----------
Fixed "starts with" a "ends with" operators for non-string arguments
Commits
-------
4c26981 Fixed "starts with" a "ends with" operators for non-string arguments
Martin Hasoň [Sat, 2 Aug 2014 15:11:21 +0000]
Fixed "starts with" a "ends with" operators for non-string arguments
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