d8cb0f9764
deprecated the 3rd argument of Sandbox error classes
2019-04-16 18:43:11 +02:00
1119616c20
fixed CS
2019-04-16 18:42:58 +02:00
6b1a1baaff
fixed phpdoc
2019-04-16 18:42:27 +02:00
a43bf24f9d
feature #2940 Deprecate passing a 4th and 5th arguments to the Sandbox exception classes (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Deprecate passing a 4th and 5th arguments to the Sandbox exception classes
Commits
-------
5312086b
2019-04-16 18:16:04 +02:00
5312086b2d
deprecated passing a 4th and 5th arguments to the Sandbox exception classes
2019-04-16 18:13:03 +02:00
d15d794edf
fixed bad merge
2019-04-16 17:49:34 +02:00
a90d984587
Merge branch '1.x' into 2.x
...
* 1.x:
fixed various small bugs
bumped version to 1.39.1-DEV
prepared the 1.39.0 release
2019-04-16 17:41:34 +02:00
072c628620
minor #2939 Fix various small bugs (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix various small bugs
Commits
-------
d2cd4d9c
2019-04-16 17:39:42 +02:00
d2cd4d9cfa
fixed various small bugs
2019-04-16 17:33:43 +02:00
21a15a505f
feature #2937 Deprecate Node::setTemplateName() (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Deprecate Node::setTemplateName()
Commits
-------
71bc632a
2019-04-16 17:09:07 +02:00
71bc632ab2
deprecated Node::setTemplateName()
2019-04-16 14:41:14 +02:00
330b524733
bumped version to 2.8.1-DEV
2019-04-16 14:36:57 +02:00
26517b0e87
prepared the 2.8.0 release
2019-04-16 14:36:25 +02:00
f8b076b949
bumped version to 1.39.1-DEV
2019-04-16 14:35:41 +02:00
44890db076
prepared the 1.39.0 release
2019-04-16 14:35:10 +02:00
552d1623ab
updated CHANGELOG
2019-04-16 07:48:14 +02:00
c05cdddb36
Merge branch '1.x' into 2.x
...
* 1.x:
updated CHANGELOG
2019-04-16 07:47:52 +02:00
1f82f22899
updated CHANGELOG
2019-04-16 07:47:43 +02:00
5e3747f769
Merge branch '1.x' into 2.x
...
* 1.x:
fixed compat with NodeInterface
2019-04-12 12:40:40 +02:00
baec10e850
bug #2936 Fix compat with NodeInterface (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix compat with NodeInterface
/cc @stof
Commits
-------
701d8af6
2019-04-12 12:40:04 +02:00
701d8af675
fixed compat with NodeInterface
2019-04-12 12:39:38 +02:00
c576797ebc
simplified code
2019-04-12 12:19:21 +02:00
a6dd76d5a0
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
2019-04-12 12:18:52 +02:00
243024d4e8
fixed CS
2019-04-12 12:16:59 +02:00
95b8ac3501
fixed bad merge
2019-04-12 12:16:31 +02:00
1c80fa7205
Merge branch '1.x' into 2.x
...
* 1.x:
added more tests
added missing hints in some runtime exceptions
2019-04-12 12:08:49 +02:00
9de6b325e9
feature #2935 Add missing hints in some runtime exceptions (fabpot)
...
This PR was squashed before being merged into the 1.x branch (closes #2935 ).
Discussion
----------
Add missing hints in some runtime exceptions
Commits
-------
094df799d4db9153
2019-04-12 11:47:47 +02:00
094df799be
added more tests
2019-04-12 10:55:26 +02:00
d4db91535d
added missing hints in some runtime exceptions
2019-04-12 10:29:05 +02:00
ed9f14db9b
Merge branch '1.x' into 2.x
...
* 1.x:
removed obsolete comment
2019-04-12 09:39:36 +02:00
6f7342e8cb
removed obsolete comment
2019-04-12 09:36:44 +02:00
253f3e8e88
Merge branch '1.x' into 2.x
...
* 1.x:
made escaping on ternary expressions more fine-grained
2019-04-11 21:10:58 +02:00
11afd511ce
feature #2934 Make escaping on ternary expressions more fine-grained (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Make escaping on ternary expressions more fine-grained
closes #2146
closes #449
closes #539
closes #1174
closes #1320
closes #1739
closes #1333
Commits
-------
dfa94113
2019-04-11 21:09:58 +02:00
dfa9411310
made escaping on ternary expressions more fine-grained
2019-04-11 17:26:15 +02:00
71a769afdf
revert 1.x merge
2019-04-11 12:09:41 +02:00
ebbac72097
Merge branch '1.x' into 2.x
...
* 1.x:
fixed compat with PHP 5
2019-04-11 12:09:17 +02:00
d0a3c239e2
fixed compat with PHP 5
2019-04-11 12:09:12 +02:00
cf98f334e8
Merge branch '1.x' into 2.x
...
* 1.x:
added the possibility to give a nice name to string templates
added the possibility to give a nice name to string templates
2019-04-11 09:58:10 +02:00
70b4a566ae
feature #2931 Starting to implement https://github.com/twigphp/Twig/issues/2930 (ThomasLandauer, fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Starting to implement https://github.com/twigphp/Twig/issues/2930
See https://github.com/twigphp/Twig/issues/2930
Commits
-------
d7e2e54140fd7c4f
2019-04-11 09:57:17 +02:00
d7e2e5418c
added the possibility to give a nice name to string templates
2019-04-11 09:55:43 +02:00
40fd7c4f86
added the possibility to give a nice name to string templates
2019-04-11 09:55:26 +02:00
c6ba9c77c4
Merge branch '1.x' into 2.x
...
* 1.x:
fixed the "with" behavior to always include the globals
2019-04-11 09:38:25 +02:00
823299d212
bug #2933 Fix the "with" behavior to always include the globals (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix the "with" behavior to always include the globals
closes #2377
Commits
-------
5db54551
2019-04-11 09:37:48 +02:00
7aced51445
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked twig_to_array
2019-04-11 08:51:43 +02:00
f33659865e
minor #2932 Tweak twig_to_array (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak twig_to_array
I've change `twig_to_array()` to **not** cast to an array. That should not be a problem as we almost always call `twig_test_iterable()` before calling `twig_to_array()` and for the cases where it was not done, the PHP code would not work anyway.
follow-up to #2901 and #2909 , /cc @thewilkybarkid
Commits
-------
8dd8d0dc
2019-04-11 08:50:47 +02:00
5db545514e
fixed the "with" behavior to always include the globals
2019-04-10 21:47:39 +02:00
8dd8d0dcb5
tweaked twig_to_array
2019-04-10 21:19:08 +02:00
4312401e49
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
2019-04-08 13:04:15 +02:00
b523515682
fixed CS
2019-04-08 13:03:33 +02:00
74c8297592
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
Disable xdebug var_dump overload for tests
Prepare for the new serialization mechanism
2019-04-07 18:41:26 +02:00
Fabien Potencier
Thomas Landauer