1a3dc0aab0
Merge branch '1.x' into 2.x
...
* 1.x:
fixed end of constructor node logic
2019-06-06 10:08:52 +02:00
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
2019-06-06 10:08:39 +02:00
8a29b42df9
fixed end of constructor node logic
2019-06-06 10:03:25 +02:00
5f517f0b80
bumped version to 2.11.3-DEV
2019-06-05 13:17:48 +02:00
84a463403d
prepared the 2.11.2 release
2019-06-05 13:17:07 +02:00
95212c93e8
bug #3054 Fix typo (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix typo
closes #3051
Commits
-------
57c51301
2019-06-05 13:12:51 +02:00
57c51301c9
fixed macro auto-import
2019-06-05 13:11:42 +02:00
5a1e33d72f
fix CS
2019-06-05 05:43:05 +02:00
32525abad1
Merge branch '1.x' into 2.x
...
* 1.x:
fix CS
2019-06-05 05:43:01 +02:00
f4c2b1a885
fix CS
2019-06-05 05:38:38 +02:00
09c6116938
bumped version to 2.12
2019-06-05 05:13:06 +02:00
0ae533dfe3
Merge branch '1.x' into 2.x
...
* 1.x:
removed docs about overloading
bumped version to 1.42.2-DEV
prepared the 1.42.1 release
2019-06-04 18:39:18 +02:00
d4424dd4b4
minor #3052 Remove docs about overloading (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Remove docs about overloading
Commits
-------
18e37286
2019-06-04 18:38:02 +02:00
18e3728682
removed docs about overloading
2019-06-04 17:49:11 +02:00
3cd635bf91
bumped version to 2.11.2-DEV
2019-06-04 13:33:20 +02:00
0418e17113
prepared the 2.11.1 release
2019-06-04 13:32:47 +02:00
e0ee3b5e44
bumped version to 1.42.2-DEV
2019-06-04 13:31:48 +02:00
6713476037
prepared the 1.42.1 release
2019-06-04 13:31:08 +02:00
26a0e265bf
minor #3050 Add a doc note (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add a doc note
closes #3045
Commits
-------
ee7be2e1
2019-06-04 10:53:43 +02:00
ee7be2e187
added a doc note
2019-06-04 10:53:04 +02:00
eb9a3e245e
updated CHANGELOG
2019-06-03 18:44:27 +02:00
43bc74a7d0
Merge branch '1.x' into 2.x
...
* 1.x:
added support for "Twig\Markup" instances in the "in" test (again)
2019-06-03 18:38:09 +02:00
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
2019-06-03 18:37:40 +02:00
2218cfe26b
added support for "Twig\Markup" instances in the "in" test (again)
2019-06-03 18:20:29 +02:00
5d70ff2ac2
Merge branch '1.x' into 2.x
...
* 1.x:
Update the documentation for newly added features
2019-06-03 15:30:58 +02:00
25cc3e418a
bug #3046 Fixed: Endless loop if more than one parent without the macro exists (nea)
...
This PR was squashed before being merged into the 2.x branch (closes #3046 ).
Discussion
----------
Fixed: Endless loop if more than one parent without the macro exists
Hi @fabpot
I made a quick fix for the parent macro method call fix you did for me in #3042 . Your code works in case the direct parent has the macro. But if there is a longer hierarchy and the looked for macro is in a parent template +1 it runs into an endless loop because the `->getParent()` method is always called on `$template` but never the newer `$parent`.
Best
Commits
-------
44970833
2019-06-03 15:30:29 +02:00
4497083325
Fixed: Endless loop if more than one parent without the macro exists
2019-06-03 15:30:23 +02:00
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
2019-06-03 15:28:34 +02:00
bf518d2cca
Update the documentation for newly added features
2019-06-03 15:28:27 +02:00
0840c7902b
updated CHANGELOG
2019-06-03 12:43:00 +02:00
3fde1536d3
Merge branch '1.x' into 2.x
...
* 1.x:
allowed string operators as variables names in assignments
2019-06-03 12:15:17 +02:00
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
2019-06-03 12:13:56 +02:00
5835c2344f
allowed string operators as variables names in assignments
2019-06-03 11:58:56 +02:00
96b25fdccf
added more tests
2019-06-03 11:22:45 +02:00
cd8cfd83e7
bug #3043 Fix macro inheritance (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix macro inheritance
closes #3042
Commits
-------
21ecf010
2019-06-03 11:19:26 +02:00
21ecf010a3
fixed macro inheritance
2019-06-03 11:11:17 +02:00
23fb803e5b
Merge branch '1.x' into 2.x
...
* 1.x:
moved a test
2019-06-03 10:47:45 +02:00
a42e02dd90
moved a test
2019-06-03 10:47:32 +02:00
537c05039e
Merge branch '1.x' into 2.x
...
* 1.x:
added some tests
bumped version to 1.42.1-DEV
prepared the 1.42.0 release
Use v5.0 of the phpunit bridge
2019-06-03 10:38:34 +02:00
1f0f92b30e
added some tests
2019-06-03 10:37:26 +02:00
0a5d8cf037
bumped version to 2.11.1-DEV
2019-05-31 08:22:20 +02:00
c344879ae5
prepared the 2.11.0 release
2019-05-31 08:21:42 +02:00
0a63973675
bumped version to 1.42.1-DEV
2019-05-31 08:20:41 +02:00
2983fcf2e2
prepared the 1.42.0 release
2019-05-31 08:20:05 +02:00
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
2019-05-28 17:27:45 +02:00
2e6f74af57
Use v5.0 of the phpunit bridge
2019-05-28 16:57:04 +02:00
988b34b744
minor #3031 Add missing template name and line no to some deprecation messages (yceruto)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add missing template name and line no to some deprecation messages
before:
after:
Commits
-------
8cd300f5
2019-05-28 15:00:43 +02:00
8cd300f5a5
Add missing template name and line no to some deprecation messages
2019-05-28 08:49:56 -04:00
0ee2361739
Merge branch '1.x' into 2.x
...
* 1.x:
Fix typo in filter doc
2019-05-28 12:28:06 +02:00
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
2019-05-28 12:27:49 +02:00
Fabien Potencier
Savas Ziplies
Alex
Nicolas Grekas
Yonel Ceruto
