Commit Graph

3703 Commits

Author SHA1 Message Date
Fabien Potencier 5ac239ca4f tweaked the doc 2019-04-27 15:54:47 +01:00
Fabien Potencier bf3781c9c1 feature #2981 Allow Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning) (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Allow Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning)

Commits
-------

f297b52f allowed Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning)
2019-04-26 11:38:36 +02:00
Fabien Potencier 08f57ca7a8 minor #2983 Add Parser typehint (ruudk)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2983).

Discussion
----------

Add Parser typehint

This makes it easier to work with.

Commits
-------

9ead7df1 Add Parser typehint
2019-04-26 11:36:53 +02:00
Ruud Kamphuis 9ead7df1c0 Add Parser typehint 2019-04-26 11:36:48 +02:00
Fabien Potencier 6d6fe61629 minor #2982 Tweak doc markup (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak doc markup

Commits
-------

fa836ddf tweaked doc markup
2019-04-25 12:16:24 +02:00
Fabien Potencier fa836ddfea tweaked doc markup 2019-04-25 12:14:46 +02:00
Fabien Potencier 6578035968 minor #2980 Tweak escape docs (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak escape docs

Commits
-------

fb68f487 tweaked escape docs
2019-04-25 12:13:47 +02:00
Fabien Potencier fb68f487ce tweaked escape docs 2019-04-25 12:07:29 +02:00
Fabien Potencier f297b52f36 allowed Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning) 2019-04-25 10:43:59 +02:00
Fabien Potencier eed9c5fb87 removed obsolete comments 2019-04-25 07:57:20 +02:00
Fabien Potencier 321c9a855c fixed typo 2019-04-24 19:36:33 +02:00
Fabien Potencier 31a28fcb8f fixed docs 2019-04-24 19:36:11 +02:00
Fabien Potencier 5adb9ea867 removed die() 2019-04-24 19:34:40 +02:00
Fabien Potencier a0bcf59d66 feature #2977 Add the apply tag (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add the apply tag

The `apply` tag replaces the `filter` tag to be able to fix #2929 without a BC break. The two tags do the same thing except that the `apply` tag does not create a new scope.

Commits
-------

619bc12f added the apply tag
2019-04-24 19:32:53 +02:00
Fabien Potencier 619bc12f62 added the apply tag 2019-04-24 17:20:47 +02:00
Fabien Potencier f497913961 fixed CS 2019-04-24 17:00:49 +02:00
Fabien Potencier bf6e73d9be minor #2976 Typo in TemplateWrapper::getTemplateName() method name (yceruto)
This PR was merged into the 1.x branch.

Discussion
----------

Typo in TemplateWrapper::getTemplateName() method name

Commits
-------

c9a1cb02 Update TemplateWrapper.php
2019-04-24 16:13:39 +02:00
Yonel Ceruto c9a1cb02d5 Update TemplateWrapper.php 2019-04-24 09:50:53 -04:00
Fabien Potencier a6ec023c09 bumped version to 1.40 2019-04-24 15:19:52 +02:00
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