Commit Graph

3648 Commits

Author SHA1 Message Date
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 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
Evgeniy Koval a07b5ea008 Update json_encode.rst 2019-03-28 15:54:38 +01:00
Fabien Potencier 96f5b560ea minor #2918 Add spaceless filter to the docs index (mbabker)
This PR was merged into the 1.x branch.

Discussion
----------

Add spaceless filter to the docs index

Commits
-------

57beae46 Add spaceless filter to the index
2019-03-25 19:44:39 +01:00
Michael Babker 57beae460b Add spaceless filter to the index 2019-03-25 13:16:17 -05:00
Fabien Potencier f0c868c4d9 bug #2916 fix major version in Environment (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

fix major version in Environment

Commits
-------

cee29710 fix major version in Environment
2019-03-25 12:50:15 +01:00
Christian Flothmann cee2971024 fix major version in Environment 2019-03-25 12:40:05 +01:00
Fabien Potencier 37d4180766 bumped version to 1.38.5-DEV 2019-03-23 15:27:48 +01:00
Fabien Potencier 7732e9e701 prepared the 1.38.4 release v1.38.4 2019-03-23 15:27:19 +01:00
Fabien Potencier cdcef195e9 bug #2913 Fix CheckToStringNode implementation (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix CheckToStringNode implementation

closes #2908

Commits
-------

e24f796b fixed CheckToStringNode implementation
2019-03-23 14:43:36 +01:00
Fabien Potencier e24f796b83 fixed CheckToStringNode implementation 2019-03-23 14:43:02 +01:00
Fabien Potencier 4f77fd5b48 minor #2912 Refactor the implementation of dump() (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Refactor the implementation of dump()

Commits
-------

243021e6 refactored the implementation of dump()
2019-03-23 14:32:18 +01:00
Fabien Potencier 243021e690 refactored the implementation of dump() 2019-03-23 14:27:39 +01:00
Fabien Potencier deab8a7745 bumped version to 1.38.4-DEV 2019-03-21 15:50:42 +01:00
Fabien Potencier 5df0ef0ca2 prepared the 1.38.3 release v1.38.3 2019-03-21 15:50:13 +01:00
Fabien Potencier 01f39731da feature #2909 Allow Traversable objects to be used in the with keyword of the include and embed tags (thewilkybarkid)
This PR was squashed before being merged into the 1.x branch (closes #2909).

Discussion
----------

Allow Traversable objects to be used in the with keyword of the include and embed tags

Same as #2901 but for `include` and `embed`.

Commits
-------

068306fe Allow Traversable objects to be used in the with keyword of the include and embed tags
2019-03-21 15:27:58 +01:00
Chris Wilkinson 068306feb9 Allow Traversable objects to be used in the with keyword of the include and embed tags 2019-03-21 15:27:53 +01:00
Fabien Potencier 6cd3a72f26 fixed phpunit configuration 2019-03-20 19:20:34 +01:00
Fabien Potencier 828e82d07b removed debug code 2019-03-20 19:20:25 +01:00
Fabien Potencier 02f8423a3a feature #2901 Allow Traversable objects to be used in the with tag (thewilkybarkid)
This PR was merged into the 1.x branch.

Discussion
----------

Allow Traversable objects to be used in the with tag

Currently `with` does an `in_array()` check, this allows `Traversable`~/`JsonSerializable`~ objects to be used as they can also contain a hash.

Commits
-------

572a2a09 Allow Traversable objects to be used in the with tag
2019-03-20 07:18:37 +01:00
Chris Wilkinson 572a2a09fd Allow Traversable objects to be used in the with tag 2019-03-19 14:21:09 +00:00
Fabien Potencier f0efbc5b20 fixed typo 2019-03-19 14:07:27 +01:00