geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 20:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

undeprecated _self

Browse Source
This commit is contained in:
Fabien Potencier
2016-01-16 06:30:27 +01:00
parent 934f6f0093
commit b490e6594f
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -1,5 +1,6 @@
* 1.23.2 (2015-XX-XX) * 1.23.2 (2015-XX-XX)
* undeprecated _self (should only be used to get the template name, not the template instance)
* added versions in deprecated messages * added versions in deprecated messages
* made file cache tolerant for trailing (back)slashes on directory configuration * made file cache tolerant for trailing (back)slashes on directory configuration
* deprecated unused Twig_Node_Expression_ExtensionReference class * deprecated unused Twig_Node_Expression_ExtensionReference class
doc/deprecated.rst
+5 -3
View File
@@ -144,9 +144,11 @@ Globals
or the extensions have been initialized is not possible anymore (but or the extensions have been initialized is not possible anymore (but
changing the value of an already registered global is possible). changing the value of an already registered global is possible).
* As of Twig 1.x, the ``_self`` global variable is deprecated except for usage * As of Twig 1.x, using the ``_self`` global variable to get access to the
in the ``from`` and the ``import`` tags. In Twig 2.0, ``_self`` is not current ``Twig_Template`` instance is deprecated; most usages only need the
exposed anymore but still usable in the ``from`` and the ``import`` tags. current template name, which will continue to work in Twig 2.0. In Twig 2.0,
``_self`` returns the current template name instead of the current
``Twig_Template`` instance.
Miscellaneous Miscellaneous
------------- -------------
doc/templates.rst
+1 -1
View File
@@ -127,7 +127,7 @@ Global Variables
The following variables are always available in templates: The following variables are always available in templates:
* ``_self``: references the current template (deprecated since Twig 1.20); * ``_self``: references the current template;
* ``_context``: references the current context; * ``_context``: references the current context;
* ``_charset``: references the current charset. * ``_charset``: references the current charset.
lib/Twig/Node/Expression/Name.php
-8
View File
@@ -30,19 +30,11 @@ class Twig_Node_Expression_Name extends Twig_Node_Expression
if ($this->getAttribute('is_defined_test')) { if ($this->getAttribute('is_defined_test')) {
if ($this->isSpecial()) { if ($this->isSpecial()) {
if ('_self' === $name) {
@trigger_error(sprintf('Global variable "_self" is deprecated since version 1.21 in %s at line %d', '?', $this->getLine()), E_USER_DEPRECATED);
}
$compiler->repr(true); $compiler->repr(true);
} else { } else {
$compiler->raw('array_key_exists(')->repr($name)->raw(', $context)'); $compiler->raw('array_key_exists(')->repr($name)->raw(', $context)');
} }
} elseif ($this->isSpecial()) { } elseif ($this->isSpecial()) {
if ('_self' === $name) {
@trigger_error(sprintf('Global variable "_self" is deprecated since version 1.21 in %s at line %d', '?', $this->getLine()), E_USER_DEPRECATED);
}
$compiler->raw($this->specialVars[$name]); $compiler->raw($this->specialVars[$name]);
} elseif ($this->getAttribute('always_defined')) { } elseif ($this->getAttribute('always_defined')) {
$compiler $compiler