Commit Graph

3798 Commits

Author SHA1 Message Date
Fabien Potencier 2a293b6827 bug #3056 Fix end of constructor node logic (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix end of constructor node logic

Commits
-------

8a29b42d fixed end of constructor node logic
2019-06-06 10:08:39 +02:00
Fabien Potencier 8a29b42df9 fixed end of constructor node logic 2019-06-06 10:03:25 +02:00
Fabien Potencier f4c2b1a885 fix CS 2019-06-05 05:38:38 +02:00
Fabien Potencier d4424dd4b4 minor #3052 Remove docs about overloading (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Remove docs about overloading

Commits
-------

18e37286 removed docs about overloading
2019-06-04 18:38:02 +02:00
Fabien Potencier 18e3728682 removed docs about overloading 2019-06-04 17:49:11 +02:00
Fabien Potencier e0ee3b5e44 bumped version to 1.42.2-DEV 2019-06-04 13:31:48 +02:00
Fabien Potencier 6713476037 prepared the 1.42.1 release v1.42.1 2019-06-04 13:31:08 +02:00
Fabien Potencier ec55f5716e bug #3049 Add support for "Twig\Markup" instances in the "in" test (again) (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add support for "Twig\Markup" instances in the "in" test (again)

Commits
-------

2218cfe2 added support for "Twig\Markup" instances in the "in" test (again)
2019-06-03 18:37:40 +02:00
Fabien Potencier 2218cfe26b added support for "Twig\Markup" instances in the "in" test (again) 2019-06-03 18:20:29 +02:00
Fabien Potencier b7b5f1bac9 bug #3047 Update the documentation for newly added features (nexsja)
This PR was submitted for the 2.x branch but it was squashed and merged into the 1.x branch instead (closes #3047).

Discussion
----------

Update the documentation for newly added features

The `map`, `filter` and `reduce` functions were added in Twig 1.41 and 2.10, but the documentation for `map` and `reduce` did not contain the information in which 2.x version these functions were added.
This minor PR fixes this.

Commits
-------

bf518d2c Update the documentation for newly added features
2019-06-03 15:28:34 +02:00
Alex bf518d2cca Update the documentation for newly added features 2019-06-03 15:28:27 +02:00
Fabien Potencier 51f33f75f9 feature #3044 Allow string operators as variables names in assignments (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Allow string operators as variables names in assignments

closes #3041

Commits
-------

5835c234 allowed string operators as variables names in assignments
2019-06-03 12:13:56 +02:00
Fabien Potencier 5835c2344f allowed string operators as variables names in assignments 2019-06-03 11:58:56 +02:00
Fabien Potencier a42e02dd90 moved a test 2019-06-03 10:47:32 +02:00
Fabien Potencier 1f0f92b30e added some tests 2019-06-03 10:37:26 +02:00
Fabien Potencier 0a63973675 bumped version to 1.42.1-DEV 2019-05-31 08:20:41 +02:00
Fabien Potencier 2983fcf2e2 prepared the 1.42.0 release v1.42.0 2019-05-31 08:20:05 +02:00
Fabien Potencier bb20937d8c minor #3035 Use v5.0 of the phpunit bridge (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Use v5.0 of the phpunit bridge

Not critical but still better IMHO :)

Commits
-------

2e6f74af Use v5.0 of the phpunit bridge
2019-05-28 17:27:45 +02:00
Nicolas Grekas 2e6f74af57 Use v5.0 of the phpunit bridge 2019-05-28 16:57:04 +02:00
Fabien Potencier a79457eb9a minor #3032 Fix typo in filter doc (yceruto)
This PR was merged into the 1.x branch.

Discussion
----------

Fix typo in filter doc

Commits
-------

94064136 Fix typo in filter doc
2019-05-28 12:27:49 +02:00
Yonel Ceruto 940641364b Fix typo in filter doc 2019-05-27 09:59:11 -04:00
Fabien Potencier cca7007abd tweaked docs 2019-05-22 15:59:27 +02:00
Fabien Potencier 6b91b3b123 minor #3027 Add information for when filter filter was added in 2.x branch (YetiCGN)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3027).

Discussion
----------

Add information for when `filter` filter was added in 2.x branch

The current "versionadded" info can be confusing to developers, if they assume 2.9 > 1.41 and don't know that 1.x and 2.x branches are still developed simultaneously.

Commits
-------

a05da6db Add information for when `filter` filter was added in 2.x branch
2019-05-22 15:58:49 +02:00
Jörn Wagner a05da6dbbe Add information for when filter filter was added in 2.x branch
The current "versionadded" info can be confusing to developers, if they assume 2.9 > 1.41 and don't know that 1.x and 2.x branches are still developed simultaneously.
2019-05-22 15:58:42 +02:00
Fabien Potencier 571929f263 tweaked docs 2019-05-20 09:21:53 +02:00
Fabien Potencier 4425af25d2 minor #3024 doc(filter): add example of filter without for use (Kocal)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3024).

Discussion
----------

doc(filter): add example of `filter` without `for` use

First, thanks for #2996! :)

This PR add an example of `filter` usage without using a `for` loop, to prevend some misinterpretation to people.

At first read, I thought `filter` was only usable with `for` loop, but nope. In fact it iterates on the result produced by `filter`.

Commits
-------

847276a6 doc(filter): add example of `filter` without `for` use
2019-05-20 09:18:53 +02:00
Hugo Alliaume 847276a6b9 doc(filter): add example of filter without for use 2019-05-20 09:18:47 +02:00
Fabien Potencier 2a8fa63690 minor #3021 Simplify code (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Simplify code

Commits
-------

3ed9fae6 simplified code
2019-05-18 10:56:15 +02:00
Fabien Potencier 3ed9fae6fa simplified code 2019-05-18 10:50:41 +02:00
Fabien Potencier a0fea74c7a minor #3020 Tweak docs for macros (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak docs for macros

Commits
-------

53496d53 tweaked docs for macros
2019-05-18 10:42:02 +02:00
Fabien Potencier 53496d53d8 tweaked docs for macros 2019-05-18 10:33:25 +02:00
Fabien Potencier f31aa2185b fixed CS 2019-05-18 06:14:51 +02:00
Fabien Potencier d0c65c3a82 bug #3017 Fix the "filter" filter when the argument is \Traversable but does not implement \Iterator (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix the "filter" filter when the argument is \Traversable but does not implement \Iterator

close #3015, closes #3016

Commits
-------

c2f685e1 fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator
2019-05-18 06:06:26 +02:00
Fabien Potencier c2f685e16f fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator 2019-05-18 06:01:24 +02:00
Fabien Potencier d3dcd6d3c5 fixed typo 2019-05-17 14:20:59 +02:00
Fabien Potencier 4c19987663 minor #3006 update docs for for loop with conditional to reference filter filters (shieldo)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3006).

Discussion
----------

update docs for for loop with conditional to reference filter filters

I don't know if there needs to be the same emphasis for this case as there's no special syntax for this any more? This PR assumes the same emphasis.

Commits
-------

b905e023 update docs for for loop with conditional to reference filter filters
2019-05-17 14:19:56 +02:00
Douglas Greenshields b905e02333 update docs for for loop with conditional to reference filter filters 2019-05-17 14:19:50 +02:00
Fabien Potencier f74ce7190a added some tests 2019-05-17 08:38:57 +02:00
Fabien Potencier 0f5a056968 bumped version to 1.42 2019-05-17 08:22:23 +02:00
Fabien Potencier b086d4f4bb fixed typo 2019-05-17 08:14:31 +02:00
Fabien Potencier 62748c9559 bug #3013 Fix a PHP fatal error when calling a macro imported in the template in a nested block (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix a PHP fatal error when calling a macro imported in the template in a nested block

Commits
-------

11353ce3 fixed a PHP fatal error when calling a macro imported in the template in a nested block
2019-05-17 08:08:49 +02:00
Fabien Potencier 11353ce3a7 fixed a PHP fatal error when calling a macro imported in the template in a nested block 2019-05-17 08:04:06 +02:00
Fabien Potencier 8c80142ba3 fixed typo 2019-05-16 21:07:25 +02:00
Fabien Potencier 6b341104ec added some tests 2019-05-16 21:02:14 +02:00
Fabien Potencier bd1f9eb39b bug #3011 Fix a regression (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix a regression

Commits
-------

3c7602b9 fixed a regression
2019-05-16 20:17:10 +02:00
Fabien Potencier 3c7602b9da fixed a regression 2019-05-16 19:44:44 +02:00
Fabien Potencier 06670f3630 made code more readable 2019-05-16 16:30:26 +02:00
Fabien Potencier 0968176a05 bug #3010 Tweak the error message when using extends in a block/macro (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak the error message when using extends in a block/macro

Commits
-------

70c1b3a2 tweaked the error message when using extends in a block/macro
2019-05-16 16:16:26 +02:00
Fabien Potencier 70c1b3a2c2 tweaked the error message when using extends in a block/macro 2019-05-16 16:07:04 +02:00
Fabien Potencier 6315ea4786 bug #3009 Fix a PHP fatal error when calling a macro, imported in the template, in another macro (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix a PHP fatal error when calling a macro, imported in the template, in another macro

The current code iterates over all imported functions (traversing all the scopes). So, the macro was found at compilation time, but didn't work at runtime, leading to a PHP fatal error. Now, you get a proper exception at compilation time.

Commits
-------

ba9b9681 fixed a PHP fatal error when calling a macro, imported in the template, in another macro
2019-05-16 14:15:37 +02:00