geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-12 10:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed Twig_Node::getName() to Twig_Node::getTemplateName()

Browse Source
This commit is contained in:
Fabien Potencier
2016-10-19 14:40:55 -07:00
parent 63c2d08ddb
commit e231aa539f
12 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1 -1
View File
@@ -1,7 +1,7 @@
* 1.27.0 (2016-XX-XX)
* deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext()
* deprecated Twig_Node::getFilename() in favor of Twig_Node::getName()
* deprecated Twig_Node::getFilename() in favor of Twig_Node::getTemplateName()
* deprecated the "filename" escaping strategy (use "name" instead)
* added Twig_Source to hold information about the original template
* deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile() in favor of Twig_Error::getTemplateName() and Twig_Error::setTemplateName()
doc/deprecated.rst
+2 -2
View File
@@ -122,8 +122,8 @@ Nodes
* As of Twig 1.27, the ``filename`` attribute on ``Twig_Node_Module`` is
deprecated. Use ``getName()`` instead.
* As of Twig 1.27, the ``getFilename()`` method is deprecated, use
``getName()`` instead.
* As of Twig 1.27, the ``Twig_Node::getFilename()`` method is deprecated, use
``Twig_Node::getName()`` instead.
Interfaces
----------
lib/Twig/Compiler.php
+1 -1
View File
@@ -86,7 +86,7 @@ class Twig_Compiler implements Twig_CompilerInterface
if ($node instanceof Twig_Node_Module) {
// to be removed in 2.0
$this->filename = $node->getName();
$this->filename = $node->getTemplateName();
}
$node->compile($this);
lib/Twig/Node.php
+6 -6
View File
@@ -240,17 +240,17 @@ class Twig_Node implements Twig_NodeInterface
return new ArrayIterator($this->nodes);
}
public function setName($name)
public function setTemplateName($name)
{
$this->name = $name;
foreach ($this->nodes as $node) {
if (null !== $node) {
$node->setName($name);
$node->setTemplateName($name);
}
}
}
public function getName()
public function getTemplateName()
{
return $this->name;
}
@@ -260,9 +260,9 @@ class Twig_Node implements Twig_NodeInterface
*/
public function setFilename($name)
{
@trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use setName() instead.', E_USER_DEPRECATED);
@trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use setTemplateName() instead.', E_USER_DEPRECATED);
$this->setName($name);
$this->setTemplateName($name);
}
/**
@@ -270,7 +270,7 @@ class Twig_Node implements Twig_NodeInterface
*/
public function getFilename()
{
@trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getName() instead.', E_USER_DEPRECATED);
@trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateName() instead.', E_USER_DEPRECATED);
return $this->name;
}
lib/Twig/Node/Embed.php
+1 -1
View File
@@ -33,7 +33,7 @@ class Twig_Node_Embed extends Twig_Node_Include
->write('$this->loadTemplate(')
->string($this->getAttribute('name'))
->raw(', ')
->repr($this->getName())
->repr($this->getTemplateName())
->raw(', ')
->repr($this->getLine())
->raw(', ')
lib/Twig/Node/Import.php
+1 -1
View File
@@ -37,7 +37,7 @@ class Twig_Node_Import extends Twig_Node
->raw('$this->loadTemplate(')
->subcompile($this->getNode('expr'))
->raw(', ')
->repr($this->getName())
->repr($this->getTemplateName())
->raw(', ')
->repr($this->getLine())
->raw(')')
lib/Twig/Node/Include.php
+1 -1
View File
@@ -64,7 +64,7 @@ class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
->write('$this->loadTemplate(')
->subcompile($this->getNode('expr'))
->raw(', ')
->repr($this->getName())
->repr($this->getTemplateName())
->raw(', ')
->repr($this->getLine())
->raw(')')
lib/Twig/Node/Module.php
+4 -4
View File
@@ -51,14 +51,14 @@ class Twig_Node_Module extends Twig_Node
parent::__construct($nodes, array(
// source to be remove in 2.0
'source' => $this->source->getCode(),
// filename to be remove in 2.0 (use getName() instead)
// filename to be remove in 2.0 (use getTemplateName() instead)
'filename' => $this->source->getName(),
'index' => null,
'embedded_templates' => $embeddedTemplates,
), 1);
// populate the template name of all node children
$this->setName($this->source->getName());
$this->setTemplateName($this->source->getName());
}
public function setIndex($index)
@@ -154,7 +154,7 @@ class Twig_Node_Module extends Twig_Node
{
$compiler
->write("\n\n")
// if the filename contains */, add a blank to avoid a PHP parse error
// if the template name contains */, add a blank to avoid a PHP parse error
->write('/* '.str_replace('*/', '* /', $this->source->getName())." */\n")
->write('class '.$compiler->getEnvironment()->getTemplateClass($this->source->getName(), $this->getAttribute('index')))
->raw(sprintf(" extends %s\n", $compiler->getEnvironment()->getBaseTemplateClass()))
@@ -447,7 +447,7 @@ class Twig_Node_Module extends Twig_Node
->write(sprintf('%s = $this->loadTemplate(', $var))
->subcompile($node)
->raw(', ')
->repr($node->getName())
->repr($node->getTemplateName())
->raw(', ')
->repr($node->getLine())
->raw(");\n")
lib/Twig/NodeVisitor/Escaper.php
+1 -1
View File
@@ -34,7 +34,7 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Module) {
if ($env->hasExtension('Twig_Extension_Escaper') && $defaultStrategy = $env->getExtension('Twig_Extension_Escaper')->getDefaultStrategy($node->getName())) {
if ($env->hasExtension('Twig_Extension_Escaper') && $defaultStrategy = $env->getExtension('Twig_Extension_Escaper')->getDefaultStrategy($node->getTemplateName())) {
$this->defaultStrategy = $defaultStrategy;
}
$this->safeVars = array();
lib/Twig/TokenParser/Embed.php
+1 -1
View File
@@ -48,7 +48,7 @@ class Twig_TokenParser_Embed extends Twig_TokenParser_Include
$stream->expect(Twig_Token::BLOCK_END_TYPE);
return new Twig_Node_Embed($module->getName(), $module->getAttribute('index'), $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
return new Twig_Node_Embed($module->getTemplateName(), $module->getAttribute('index'), $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
}
public function decideBlockEnd(Twig_Token $token)
test/Twig/Tests/LegacyFixtures/autoescape/filename.legacy.test
+18
View File
@@ -0,0 +1,18 @@
--TEST--
"filename" autoescape strategy
--TEMPLATE--
{{ br -}}
{{ include('index.html.twig') -}}
{{ include('index.txt.twig') -}}
--TEMPLATE(index.html.twig)--
{{ br -}}
--TEMPLATE(index.txt.twig)--
{{ br -}}
--DATA--
return array('br' => '<br />')
--CONFIG--
return array('autoescape' => 'filename')
--EXPECT--
&lt;br /&gt;
&lt;br /&gt;
<br />
test/Twig/Tests/Node/ModuleTest.php
+1 -1
View File
@@ -25,7 +25,7 @@ class Twig_Tests_Node_ModuleTest extends Twig_Test_NodeTestCase
$this->assertEquals($blocks, $node->getNode('blocks'));
$this->assertEquals($macros, $node->getNode('macros'));
$this->assertEquals($parent, $node->getNode('parent'));
$this->assertEquals($source->getName(), $node->getName());
$this->assertEquals($source->getName(), $node->getTemplateName());
}
public function getTests()