Commit Graph

4393 Commits

Author SHA1 Message Date
Fabien Potencier 5e3747f769 Merge branch '1.x' into 2.x
* 1.x:
  fixed compat with NodeInterface
2019-04-12 12:40:40 +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 c576797ebc simplified code 2019-04-12 12:19:21 +02:00
Fabien Potencier a6dd76d5a0 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
2019-04-12 12:18:52 +02:00
Fabien Potencier 243024d4e8 fixed CS 2019-04-12 12:16:59 +02:00
Fabien Potencier 95b8ac3501 fixed bad merge 2019-04-12 12:16:31 +02:00
Fabien Potencier 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
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 ed9f14db9b Merge branch '1.x' into 2.x
* 1.x:
  removed obsolete comment
2019-04-12 09:39:36 +02:00
Fabien Potencier 6f7342e8cb removed obsolete comment 2019-04-12 09:36:44 +02:00
Fabien Potencier 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
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 71a769afdf revert 1.x merge 2019-04-11 12:09:41 +02:00
Fabien Potencier ebbac72097 Merge branch '1.x' into 2.x
* 1.x:
  fixed compat with PHP 5
2019-04-11 12:09:17 +02:00
Fabien Potencier d0a3c239e2 fixed compat with PHP 5 2019-04-11 12:09:12 +02:00
Fabien Potencier 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
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 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
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 7aced51445 Merge branch '1.x' into 2.x
* 1.x:
  tweaked twig_to_array
2019-04-11 08:51:43 +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 4312401e49 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
2019-04-08 13:04:15 +02:00
Fabien Potencier b523515682 fixed CS 2019-04-08 13:03:33 +02:00
Fabien Potencier 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 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 67ffbe5b7e Merge branch '1.x' into 2.x
* 1.x:
  fixed "include" with "ignore missing" when an error loading occurs in the included template (again)
  fixed "include" with "ignore missing" when an error loading occurs in the included template
2019-04-06 16:41:57 +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 28b0a280d3 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
2019-04-05 19:10:57 +02:00
Fabien Potencier 22abafb081 fixed CS 2019-04-05 19:09:58 +02:00
Fabien Potencier cef61a0cad Merge branch '1.x' into 2.x
* 1.x:
  added support for a new whitespace trimming option
  made Lexer regexes more readable
  simplified Lexer regexes
2019-04-03 16:42:51 +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 b01c0cd6db added some missing docs 2019-04-03 16:07:17 +02:00
Fabien Potencier c844cdbe64 fixed CS 2019-04-03 16:07:17 +02:00
Fabien Potencier 31912ab74d feature #2056 Add the column filter (willrowe)
This PR was merged into the 2.x branch.

Discussion
----------

Add the `column` filter

This adds a `column` filter that uses the [`array_column`](http://us2.php.net/manual/en/function.array-column.php) function added in PHP 5.5. Test included.

Commits
-------

48ae9d9c Add the `column` filter
2019-04-03 15:58:12 +02:00
Fabien Potencier 9acd647214 bumped version to 2.8 2019-04-03 15:57:27 +02:00
Fabien Potencier c18bcb27a4 Merge branch '1.x' into 2.x
* 1.x:
  bumped version to 1.39
2019-04-03 15:56:57 +02:00