Commit Graph

3684 Commits

Author SHA1 Message Date
Fabien Potencier fb6540ce8f removed obsolete PHPUnit config 2019-04-24 15:10:56 +02:00
Fabien Potencier 9bd6939f8e feature #2973 Allow Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning) (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Allow Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)

That will allow to type hint properly in Twig 3.0.

Commits
-------

5138cfd2 allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)
2019-04-24 14:57:38 +02:00
Fabien Potencier 5138cfd2d5 allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning) 2019-04-24 12:08:10 +02:00
Fabien Potencier 7d3f1bef48 minor #2957 Fix Parser contract for some implementations (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix Parser contract for some implementations

Commits
-------

fe6df56e fixed Parser contract for some implementations
2019-04-23 16:26:38 +02:00
Fabien Potencier fe6df56e91 fixed Parser contract for some implementations 2019-04-23 16:21:33 +02:00
Fabien Potencier df68cb0c28 refactored some test to ease changing them 2019-04-23 12:10:47 +02:00
Fabien Potencier ed4412f8a6 minor #2953 Tweak macro docs (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak macro docs

closes #2344

Error message were improved a while ago, and this PR makes the documentation clearer about the expectations.

Commits
-------

7446a6d8 tweaked macro docs
2019-04-23 08:53:48 +02:00
Fabien Potencier 7446a6d89f tweaked macro docs 2019-04-23 08:35:30 +02:00
Fabien Potencier 6e605bf1b5 bug #2952 Fix in test to support Twig_Markup instances (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix in test to support Twig_Markup instances

closes #1512 (extracted from #1768)

Commits
-------

8f00576e fixed in test to support Twig_Markup instances
2019-04-22 18:31:58 +02:00
Fabien Potencier 8f00576edb fixed in test to support Twig_Markup instances 2019-04-22 18:26:34 +02:00
Fabien Potencier 26ae57d2e9 bug #2951 Fix import macros from a template string (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix import macros from a template string

closes #2946

Commits
-------

f0c58854 fixed import macros from a template string
2019-04-22 18:01:27 +02:00
Fabien Potencier f0c58854a8 fixed import macros from a template string 2019-04-22 10:15:16 +02:00
Fabien Potencier 6e93c4d0c8 minor #2950 Add a note about escaping (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add a note about escaping

closes #2623, closes #2661

Commits
-------

a83f7e85 added a note about escaping
2019-04-22 09:08:02 +02:00
Fabien Potencier a83f7e855d added a note about escaping 2019-04-22 09:04:11 +02:00
Fabien Potencier 8e2f11d165 fixed doc (missing word) 2019-04-22 08:28:53 +02:00
Fabien Potencier 442aa216d6 bug #2949 Fix Lexer when using custom options containing the # char (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix Lexer when using custom options containing the # char

closes #2948

Commits
-------

7b5851fe fixed Lexer when using custom options containing the # char
2019-04-21 21:40:56 +02:00
Fabien Potencier 7b5851feeb fixed Lexer when using custom options containing the # char 2019-04-21 21:05:06 +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