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

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  tweaked twig_to_array
This commit is contained in:
Fabien Potencier
2019-04-11 08:51:43 +02:00
parent 4312401e49 f33659865e
commit 7aced51445
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Node/WithNode.php
+2 -6
View File
@@ -40,18 +40,14 @@ class WithNode extends Node
->write(sprintf('$%s = ', $varsName))
->subcompile($this->getNode('variables'))
->raw(";\n")
->write(sprintf("if (\$%s instanceof \\Traversable) {\n", $varsName))
->indent()
->write(sprintf("\$%s = iterator_to_array(\$%s);\n", $varsName, $varsName))
->outdent()
->write("}\n")
->write(sprintf("if (!is_array(\$%s)) {\n", $varsName))
->write(sprintf("if (!twig_test_iterable(\$%s)) {\n", $varsName))
->indent()
->write("throw new RuntimeError('Variables passed to the \"with\" tag must be a hash.', ")
->repr($this->getTemplateLine())
->raw(", \$this->source);\n")
->outdent()
->write("}\n")
->write(sprintf("\$%s = twig_to_array(\$%s);\n", $varsName, $varsName))
;
if ($this->getAttribute('only')) {