Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a local $blocksContext for each parent render.

Browse Source 
... rather than a shared one per template / section / block that accidentally keeps old block context around.

Fixes #322
This commit is contained in:
Justin Hileman
2017-06-29 00:13:59 -07:00
parent 44baf86426
commit 09241edd52
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mustache/Compiler.php
+16 -12
View File
@@ -191,7 +191,6 @@ class Mustache_Compiler
{ {
$this->lambdaHelper = new Mustache_LambdaHelper($this->mustache, $context); $this->lambdaHelper = new Mustache_LambdaHelper($this->mustache, $context);
$buffer = \'\'; $buffer = \'\';
$blocksContext = array();
%s %s
return $buffer; return $buffer;
@@ -207,7 +206,6 @@ class Mustache_Compiler
public function renderInternal(Mustache_Context $context, $indent = \'\') public function renderInternal(Mustache_Context $context, $indent = \'\')
{ {
$buffer = \'\'; $buffer = \'\';
$blocksContext = array();
%s %s
return $buffer; return $buffer;
@@ -270,7 +268,7 @@ class Mustache_Compiler
return sprintf($this->prepare(self::BLOCK_VAR, $level), $id, $else); return sprintf($this->prepare(self::BLOCK_VAR, $level), $id, $else);
} }
const BLOCK_ARG = '$blocksContext[%s] = array($this, \'block%s\');'; const BLOCK_ARG = '%s => array($this, \'block%s\'),';
/** /**
* Generate Mustache Template inheritance block argument PHP source. * Generate Mustache Template inheritance block argument PHP source.
@@ -291,14 +289,13 @@ class Mustache_Compiler
$keystr = var_export($key, true); $keystr = var_export($key, true);
$id = var_export($id, true); $id = var_export($id, true);
return sprintf($this->prepare(self::BLOCK_ARG, 1), $id, $key); return sprintf($this->prepare(self::BLOCK_ARG, $level), $id, $key);
} }
const BLOCK_FUNCTION = ' const BLOCK_FUNCTION = '
public function block%s($context) public function block%s($context)
{ {
$indent = $buffer = \'\'; $indent = $buffer = \'\';%s
$blocksContext = array();%s
return $buffer; return $buffer;
} }
@@ -333,7 +330,6 @@ class Mustache_Compiler
private function section%s(Mustache_Context $context, $indent, $value) private function section%s(Mustache_Context $context, $indent, $value)
{ {
$buffer = \'\'; $buffer = \'\';
$blocksContext = array();
if (%s) { if (%s) {
$source = %s; $source = %s;
@@ -463,15 +459,20 @@ class Mustache_Compiler
} }
const PARENT = ' const PARENT = '
%s
if ($parent = $this->mustache->loadPartial(%s)) { if ($parent = $this->mustache->loadPartial(%s)) {
$context->pushBlockContext($blocksContext); $context->pushBlockContext(array(%s
));
$buffer .= $parent->renderInternal($context, $indent); $buffer .= $parent->renderInternal($context, $indent);
$context->popBlockContext(); $context->popBlockContext();
} }
'; ';
const PARENT_NO_CONTEXT = '
if ($parent = $this->mustache->loadPartial(%s)) {
$buffer .= $parent->renderInternal($context, $indent);
}
';
/** /**
* Generate Mustache Template inheritance parent call PHP source. * Generate Mustache Template inheritance parent call PHP source.
* *
@@ -486,11 +487,14 @@ class Mustache_Compiler
{ {
$realChildren = array_filter($children, array(__CLASS__, 'onlyBlockArgs')); $realChildren = array_filter($children, array(__CLASS__, 'onlyBlockArgs'));
if (empty($realChildren)) {
return sprintf($this->prepare(self::PARENT_NO_CONTEXT, $level), var_export($id, true));
}
return sprintf( return sprintf(
$this->prepare(self::PARENT, $level), $this->prepare(self::PARENT, $level),
$this->walk($realChildren, $level),
var_export($id, true), var_export($id, true),
var_export($indent, true) $this->walk($realChildren, $level + 1)
); );
} }