Commit Graph

3668 Commits

Author SHA1 Message Date
Fabien Potencier a83f7e855d added a note about escaping 2019-04-22 09:04:11 +02:00
Fabien Potencier 5c66e8d0d3 minor #2945 fix major version constant (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

fix major version constant

Commits
-------

57b0a8b9 fix major version constant
2019-04-18 12:30:56 +02:00
Christian Flothmann 57b0a8b935 fix major version constant 2019-04-18 09:50:46 +02:00
Fabien Potencier f54b53af03 fixed phpdoc 2019-04-16 21:16:04 +02:00
Fabien Potencier 7dcd04c83a fixed tpyo 2019-04-16 19:18:48 +02:00
Fabien Potencier c470d13d0e bumped version to 1.39.2-DEV 2019-04-16 19:13:45 +02:00
Fabien Potencier 23e7b6f0cf prepared the 1.39.1 release v1.39.1 2019-04-16 19:12:57 +02:00
Fabien Potencier bcb367fc07 bug #2943 Hotfix (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Hotfix

closes #2942

Commits
-------

a3fc6392 fixed EscaperNodeVisitor
2019-04-16 19:09:47 +02:00
Fabien Potencier a3fc63923a fixed EscaperNodeVisitor 2019-04-16 19:05:39 +02:00
Fabien Potencier 3f177464cc fixed CS 2019-04-16 19:00:14 +02:00
Fabien Potencier 072c628620 minor #2939 Fix various small bugs (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix various small bugs

Commits
-------

d2cd4d9c fixed various small bugs
2019-04-16 17:39:42 +02:00
Fabien Potencier d2cd4d9cfa fixed various small bugs 2019-04-16 17:33:43 +02:00
Fabien Potencier f8b076b949 bumped version to 1.39.1-DEV 2019-04-16 14:35:41 +02:00
Fabien Potencier 44890db076 prepared the 1.39.0 release v1.39.0 2019-04-16 14:35:10 +02:00
Fabien Potencier 1f82f22899 updated CHANGELOG 2019-04-16 07:47:43 +02:00
Fabien Potencier 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 fixed compat with NodeInterface
2019-04-12 12:40:04 +02:00
Fabien Potencier 701d8af675 fixed compat with NodeInterface 2019-04-12 12:39:38 +02:00
Fabien Potencier 243024d4e8 fixed CS 2019-04-12 12:16:59 +02:00
Fabien Potencier 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
-------

094df799 added more tests
d4db9153 added missing hints in some runtime exceptions
2019-04-12 11:47:47 +02:00
Fabien Potencier 094df799be added more tests 2019-04-12 10:55:26 +02:00
Fabien Potencier d4db91535d added missing hints in some runtime exceptions 2019-04-12 10:29:05 +02:00
Fabien Potencier 6f7342e8cb removed obsolete comment 2019-04-12 09:36:44 +02:00
Fabien Potencier 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 made escaping on ternary expressions more fine-grained
2019-04-11 21:09:58 +02:00
Fabien Potencier dfa9411310 made escaping on ternary expressions more fine-grained 2019-04-11 17:26:15 +02:00
Fabien Potencier d0a3c239e2 fixed compat with PHP 5 2019-04-11 12:09:12 +02:00
Fabien Potencier 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
-------

d7e2e541 added the possibility to give a nice name to string templates
40fd7c4f added the possibility to give a nice name to string templates
2019-04-11 09:57:17 +02:00
Fabien Potencier d7e2e5418c added the possibility to give a nice name to string templates 2019-04-11 09:55:43 +02:00
Thomas Landauer 40fd7c4f86 added the possibility to give a nice name to string templates 2019-04-11 09:55:26 +02:00
Fabien Potencier 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 fixed the "with" behavior to always include the globals
2019-04-11 09:37:48 +02:00
Fabien Potencier 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 tweaked twig_to_array
2019-04-11 08:50:47 +02:00
Fabien Potencier 5db545514e fixed the "with" behavior to always include the globals 2019-04-10 21:47:39 +02:00
Fabien Potencier 8dd8d0dcb5 tweaked twig_to_array 2019-04-10 21:19:08 +02:00
Fabien Potencier b523515682 fixed CS 2019-04-08 13:03:33 +02:00
Fabien Potencier 1724e42002 fixed CS 2019-04-07 18:41:19 +02:00
Fabien Potencier 2f6a04b6a0 minor #2927 Prepare for the new serialization mechanism (fancyweb)
This PR was merged into the 1.x branch.

Discussion
----------

Prepare for the new serialization mechanism

#eufossa

related to https://github.com/symfony/symfony/pull/30965

So we are future proof and it will prevent deprecations for https://github.com/symfony/symfony/issues/30304.

Almost future proof actually because the void return type cannot be added in 7.0. I guess we can see the minimum required PHP version here once 7.4 is out and see how we can handle compatibility 😕

Commits
-------

72d7abe1 Prepare for the new serialization mechanism
2019-04-07 18:39:19 +02:00
Fabien Potencier 495df6575a bug #2928 Disable xdebug var_dump overload for tests (fancyweb)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2928).

Discussion
----------

Disable xdebug var_dump overload for tests

#eufossa

This test template https://github.com/twigphp/Twig/blob/1.x/test/Twig/Tests/Fixtures/tags/sandbox/array.test depends on the `dump` Twig function that depends of `var_dump` PHP function.

If you have xdebug on your local machine, the default value of the `xdebug.overload_var_dump` setting is at `2`. That makes `var_dump` displays the file and the line number of where the `var_dump` was called, making the assertion fail.

Commits
-------

8edd9540 Disable xdebug var_dump overload for tests
2019-04-07 18:38:38 +02:00
fancyweb 8edd95409e Disable xdebug var_dump overload for tests 2019-04-07 18:38:33 +02:00
fancyweb 72d7abe11c Prepare for the new serialization mechanism 2019-04-07 14:53:54 +02:00
Fabien Potencier 15cde09784 bug #2926 Fix "include" with "ignore missing" when an error loading occurs in the included template (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2926).

Discussion
----------

Fix "include" with "ignore missing" when an error loading occurs in the included template

closes #2524

Commits
-------

8ea68e06 fixed "include" with "ignore missing" when an error loading occurs in the included template (again)
49725a1e fixed "include" with "ignore missing" when an error loading occurs in the included template
2019-04-06 16:34:47 +02:00
Fabien Potencier 8ea68e06e4 fixed "include" with "ignore missing" when an error loading occurs in the included template (again) 2019-04-06 16:10:33 +02:00
Fabien Potencier 49725a1e8e fixed "include" with "ignore missing" when an error loading occurs in the included template 2019-04-05 19:22:28 +02:00
Fabien Potencier 22abafb081 fixed CS 2019-04-05 19:09:58 +02:00
Fabien Potencier ea8f008c36 feature #2925 Whitespace improvements (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2925).

Discussion
----------

Whitespace improvements

This pull request introduces a new whitespace control modifier in addition to the `-` one. The new `~` modifier consume whitespace excluding newlines.

closes #2924, closes #1005, closes #1423, closes #1569, and many already closed ones.

Commits
-------

96eab472 added support for a new whitespace trimming option
7e3ec0fb made Lexer regexes more readable
591da368 simplified Lexer regexes
2019-04-03 16:39:43 +02:00
Fabien Potencier 96eab472d6 added support for a new whitespace trimming option 2019-04-03 11:34:18 +02:00
Fabien Potencier 7e3ec0fbee made Lexer regexes more readable 2019-04-03 11:24:31 +02:00
Fabien Potencier 591da36893 simplified Lexer regexes 2019-04-03 10:29:21 +02:00
Fabien Potencier 10cb211d93 bumped version to 1.39 2019-04-03 10:28:54 +02:00
Fabien Potencier 1a7fd6b8e8 bug #2923 Add Traversable support of length filter (SpacePossum)
This PR was squashed before being merged into the 1.x branch (closes #2923).

Discussion
----------

Add Traversable support of length filter

closes https://github.com/twigphp/Twig/issues/2922

Commits
-------

3a32f4a5 Add Traversable support of length filter
2019-04-02 17:17:39 +02:00
SpacePossum 3a32f4a58b Add Traversable support of length filter 2019-04-02 17:17:30 +02:00
Fabien Potencier 9d5676dea1 minor #2921 Update json_encode.rst (infinitely-young)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2921).

Discussion
----------

Update json_encode.rst

Commits
-------

a07b5ea0 Update json_encode.rst
2019-03-28 15:54:43 +01:00