makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/twig] Fix begin loops & subloops

Browse source 
PHPBB3-11598
This commit is contained in:
Nathaniel Guse 2013-06-15 11:20:10 -05:00
parent 8561e187f0
commit c5db8be580
2 changed files with 53 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
phpBB/includes/template/twig/node/begin.php
View file

@ -30,48 +30,59 @@ class phpbb_template_twig_node_begin extends Twig_Node
*/ */
public function compile(Twig_Compiler $compiler) public function compile(Twig_Compiler $compiler)
{ {
$compiler->addDebugInfo($this);
$compiler $compiler
->write("if (!isset(\$loops)) {\n") // name -> loop name
// local context -> parent template variable context
// global context -> global template variable context
// variable chain -> full chain of variables to output template vars properly in subloops
// e.g. [foo][bar][foobar]
// current chain location -> current location in subloop
// e.g. [foobar] of [foo][bar]
->write("\$iterator = function (\$name, \$local_context, \$global_context, &\$variable_chain, &\$current_chain_location) {\n")
->indent() ->indent()
->write("\$loops = array();") //->write("var_dump(\$name, \$local_context);\n")
->write("\$nestingLevel = 0;") // Try to find the loop in the
// local context (child of local context passed, in case of a child loop)
// global context (root template var)
->write("if (isset(\$local_context[\$name])) {\n")
->indent()
->write("\$local_context = \$local_context[\$name];\n")
->outdent()
->write("}\n")
->write("else if (isset(\$global_context[\$name])) {\n")
->indent()
->write("\$local_context = \$global_context[\$name];\n")
->outdent()
->write("} else { return; }\n")
->write("if (!is_array(\$local_context) || empty(\$local_context)) { return; }\n")
->write("foreach (\$local_context as \$for_context) {\n")
->indent()
// Some hackish stuff for Twig to properly subcompile
->write("\$current_chain_location[\$name] = \$for_context;\n")
->write("\$context = array_merge(\$global_context, \$variable_chain);\n")
// Children
->subcompile($this->getNode('body'))
->outdent()
->write("}\n")
->outdent() ->outdent()
->write("}\n") ->write("};\n")
->write("\$loops[\$nestingLevel] = array();\n") ->write("if (isset(\$global_context)) {\n")
;
if (null !== $this->getNode('else')) {
$compiler->write("\$loops[\$nestingLevel]['iterated'] = false;\n");
}
$compiler
->write("if (isset(\$context['loop']['" . $this->getAttribute('beginName') . "'])) {")
->write("foreach (\$context['loop']['". $this->getAttribute('beginName'). "'] as \$" . $this->getAttribute('beginName') . ") {")
->write("\$context['". $this->getAttribute('beginName'). "'] = \$" . $this->getAttribute('beginName') . ";")
->indent() ->indent()
; // We are already inside an anonymous function
->write("\$iterator('" . $this->getAttribute('beginName') . "', \$for_context, \$global_context, \$variable_chain, \$current_chain_location[\$name]);\n")
$compiler->subcompile($this->getNode('body')); ->outdent()
->write("} else {\n")
if (null !== $this->getNode('else')) { ->indent()
$compiler->write("\$loops[\$nestingLevel]['iterated'] = true;\n"); // We are not inside the anonymous function (first level)
} ->write("\$variable_chain = array();\n")
->write("\$current_chain_location = array();\n")
$compiler ->write("\$iterator('" . $this->getAttribute('beginName') . "', array(), \$context, \$variable_chain, \$variable_chain);\n")
->outdent() ->outdent()
->write("}}\n") ->write("}\n");
;
if (null !== $this->getNode('else')) {
$compiler
->write("if (!\$loops[\$nestingLevel]['iterated']) {\n")
->indent()
->subcompile($this->getNode('else'))
->outdent()
->write("}\n")
;
}
$compiler->write("\$nestingLevel--;\n");
} }
} }

6
phpBB/includes/template/twig/twig.php
View file

@ -414,13 +414,11 @@ class phpbb_template_twig implements phpbb_template
$vars = array_merge( $vars = array_merge(
$vars, $vars,
$this->context->get_rootref(), $this->context->get_rootref(),
array( $this->context->get_tpldata()
'loop' => $this->context->get_tpldata(),
)
); );
// cleanup // cleanup
unset($vars['loop']['.']); unset($vars['.']);
return $vars; return $vars;
} }