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

fixed bad merge

Browse Source
This commit is contained in:
Fabien Potencier
2019-04-12 12:08:53 +02:00
parent 1c80fa7205
commit 95b8ac3501
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Error/Error.php
+1 -1
View File
@@ -77,7 +77,7 @@ class Error extends \Exception
}
$this->lineno = $lineno;
$this->filename = $name;
$this->name = $name;
$this->rawMessage = $message;
$this->updateRepr();
}
src/Node/ModuleNode.php
+4 -4
View File
@@ -202,7 +202,7 @@ class ModuleNode extends Node
->raw(");\n")
;
$node = $node = $trait->getNode('template');
$node = $trait->getNode('template');
$compiler
->addDebugInfo($node)
->write(sprintf("if (!\$_trait_%s->isTraitable()) {\n", $i))
@@ -211,7 +211,7 @@ class ModuleNode extends Node
->subcompile($trait->getNode('template'))
->raw(".'\" cannot be used as a trait.', ")
->repr($node->getTemplateLine())
->raw(", \$this->getSourceContext());\n")
->raw(", \$this->source);\n")
->outdent()
->write("}\n")
->write(sprintf("\$_trait_%s_blocks = \$_trait_%s->getBlocks();\n\n", $i, $i))
@@ -227,9 +227,9 @@ class ModuleNode extends Node
->string($key)
->raw(' is not defined in trait ')
->subcompile($trait->getNode('template'))
->raw(".'), ")
->raw(".', ")
->repr($node->getTemplateLine())
->raw(", \$this->getSourceContext());\n")
->raw(", \$this->source);\n")
->outdent()
->write("}\n\n")
src/Node/Node.php
+1 -3
View File
@@ -185,9 +185,7 @@ class Node implements \Countable, \IteratorAggregate
{
$this->sourceContext = $source;
foreach ($this->nodes as $node) {
if (null !== $node) {
$node->setSourceContext($source);
}
$node->setSourceContext($source);
}
}