Commit Graph

7732 Commits

Author SHA1 Message Date
Fabien Potencier fb68f487ce tweaked escape docs 2019-04-25 12:07:29 +02:00
Fabien Potencier 63cb4ebaf8 Merge branch '2.x' into 3.x
* 2.x:
  added missing items in the CHANGELOG
  removed obsolete comments
2019-04-25 11:48:46 +02:00
Fabien Potencier e36a538c0c added missing items in the CHANGELOG 2019-04-25 11:45:59 +02:00
Fabien Potencier a729716375 Merge branch '1.x' into 2.x
* 1.x:
  removed obsolete comments
2019-04-25 11:42:18 +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 829cb71788 removed InitRuntimeInterface and RuntimeExtensionInterface 2019-04-25 08:39:40 +02:00
Fabien Potencier eed9c5fb87 removed obsolete comments 2019-04-25 07:57:20 +02:00
Fabien Potencier f84c21fae5 feature #2979 Remove the deprecated filter tag (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Remove the deprecated filter tag

Commits
-------

d475a92c removed the deprecated filter tag
2019-04-24 21:12:24 +02:00
Fabien Potencier d475a92c83 removed the deprecated filter tag 2019-04-24 21:03:27 +02:00
Fabien Potencier f1070b1f55 Merge branch '2.x' into 3.x
* 2.x:
  deprecated the filter tag
  fixed bad merge
  fixed docs
  fixed typo
  fixed docs
  removed die()
  added the apply tag
2019-04-24 20:59:10 +02:00
Fabien Potencier 88e72ee1f2 feature #2978 Deprecate the filter tag in favor of the new apply tag (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Deprecate the filter tag in favor of the new apply tag

Commits
-------

776e32bc deprecated the filter tag
2019-04-24 20:58:37 +02:00
Fabien Potencier 776e32bc7a deprecated the filter tag 2019-04-24 20:55:30 +02:00
Fabien Potencier 8f8c0c3d10 fixed bad merge 2019-04-24 19:43:49 +02:00
Fabien Potencier 5dc4f198b2 fixed docs 2019-04-24 19:38:21 +02:00
Fabien Potencier d7714a6b15 Merge branch '1.x' into 2.x
* 1.x:
  fixed typo
  fixed docs
2019-04-24 19:36:44 +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 86b4c99fcb Merge branch '1.x' into 2.x
* 1.x:
  removed die()
2019-04-24 19:35:11 +02:00
Fabien Potencier 5adb9ea867 removed die() 2019-04-24 19:34:40 +02:00
Fabien Potencier f9bc780a62 Merge branch '1.x' into 2.x
* 1.x:
  added the apply tag
2019-04-24 19:34:20 +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 3b6728c5f9 Merge branch '2.x' into 3.x
* 2.x:
  fixed CS
  bumped version to 2.9
  Update TemplateWrapper.php
  bumped version to 1.40
2019-04-24 17:25:27 +02:00
Fabien Potencier a560bfb98f Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
  Update TemplateWrapper.php
  bumped version to 1.40
2019-04-24 17:24:15 +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 1047421df5 bumped version to 2.9 2019-04-24 16:59:53 +02:00
Fabien Potencier b5b3817f7a feature #2974 Remove FilesystemLoader::findTemplate() false return value (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Remove FilesystemLoader::findTemplate() false return value

Commits
-------

fc5d4e7b removed obsolete feature
2019-04-24 16:18:31 +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 816e1ec447 minor #2975 Refactor the with node to avoid leaking the parent scope to the template (stof)
This PR was merged into the 3.x branch.

Discussion
----------

Refactor the with node to avoid leaking the parent scope to the template

This is a small BC break for anyone relying on the fact that the `_parent` variable could be used to access (and replace) the parent scope. See https://github.com/twigphp/Twig/pull/2246#discussion_r93816236

Commits
-------

8e63f6ef Refactor the with node to avoid leaking the parent scope to the template
2019-04-24 15:32:39 +02:00
Fabien Potencier a6ec023c09 bumped version to 1.40 2019-04-24 15:19:52 +02:00
Christophe Coevoet 8e63f6ef3e Refactor the with node to avoid leaking the parent scope to the template 2019-04-24 15:13:25 +02:00
Fabien Potencier 49b3d73491 Merge branch '2.x' into 3.x
* 2.x:
  removed obsolete PHPUnit config
2019-04-24 15:11:11 +02:00
Fabien Potencier 9381c85f91 Merge branch '1.x' into 2.x
* 1.x:
  removed obsolete PHPUnit config
2019-04-24 15:11:02 +02:00
Fabien Potencier fb6540ce8f removed obsolete PHPUnit config 2019-04-24 15:10:56 +02:00
Fabien Potencier fc5d4e7b7a removed obsolete feature 2019-04-24 15:06:29 +02:00
Fabien Potencier 2be8b86596 Merge branch '2.x' into 3.x
* 2.x:
  added some notes in deprecated doc
  allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)
2019-04-24 15:02:27 +02:00
Fabien Potencier a718842015 added some notes in deprecated doc 2019-04-24 15:01:32 +02:00
Fabien Potencier d201b957f6 Merge branch '1.x' into 2.x
* 1.x:
  allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)
2019-04-24 15:01:24 +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 642d78b251 minor #2972 Remove obsolete code (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Remove obsolete code

Commits
-------

d10c0c33 removed obsolete code
2019-04-23 19:35:42 +02:00
Fabien Potencier d10c0c33d3 removed obsolete code 2019-04-23 19:22:21 +02:00
Fabien Potencier 795c16882e updated CHANGELOG for 3.0 2019-04-23 19:16:36 +02:00
Fabien Potencier e396bc7801 feature #2969 Make Template::getSourceContext() abstract (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Make Template::getSourceContext() abstract

As the implementation is always provided by ModuleNode.

Commits
-------

b3498de4 made Template::getSourceContext() abstract
2019-04-23 19:09:19 +02:00
Fabien Potencier b3498de45c made Template::getSourceContext() abstract 2019-04-23 18:39:08 +02:00
Fabien Potencier e5d0c080f9 removed obsolete SandboxedPrintNode 2019-04-23 18:36:59 +02:00
Fabien Potencier 73f5b8115b removed dead code 2019-04-23 18:36:23 +02:00
Fabien Potencier 592ab0376e feature #2965 Change false to null to allow for type hinting (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Change false to null to allow for type hinting

Commits
-------

75333805 changed false to null to allow for type hinting
2019-04-23 18:34:47 +02:00
Fabien Potencier e422dbff02 feature #2968 Various removals (fabpot)
This PR was squashed before being merged into the 3.x branch (closes #2968).

Discussion
----------

Various removals

Each commit is a "simple" removal of an obsolete feature.

Commits
-------

802646aa removed Template::__toString()
02767df5 removed block definition nested in non-capturing nodes
2fa26d6f removed Parser::isReservedMacroName()
12972d00 removed obsolete OPTIMIZE_VAR_ACCESS const
5b1aad86 removed remaining code supporting PSR-0 class names
7fb5fb44 simplified code
85fc1eff removed the possibility to pass a Template to Environment::load()
2019-04-23 18:33:21 +02:00