try to use different partial block id to prevent different partialblo…

…ck issue
zordius · Feb 1, 2016 · 9546854 · 9546854
1 parent eea05ef
commit 9546854
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 3 deletions.
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -124,6 +124,7 @@ public static function composePHPRender($context, $code) {
         'scopes' => array(),
         'sp_vars' => isset(\$options['data']) ? array_merge(array('root' => \$in), \$options['data']) : array('root' => \$in),
         'blparam' => array(),
+        'partialid' => 0,
         'runtime' => '{$context['runtime']}',
     );
     {$context['renderex']}
@@ -341,6 +342,7 @@ protected static function compileToken(&$context, $info) {
      */
     public static function partial(&$context, $vars) {
         Parser::getBlockParams($vars);
+        $pid = Parser::getPartialBlock($vars);
         $p = array_shift($vars);
         if ($context['flags']['runpart']) {
             if (!isset($vars[0])) {
@@ -354,7 +356,7 @@ public static function partial(&$context, $vars) {
                 $p = "'$p[0]'";
             }
             $sp = $context['tokens']['partialind'] ? ", '{$context['tokens']['partialind']}'" : '';
-            return $context['ops']['seperator'] . static::getFuncName($context, 'p', $tag) . "\$cx, $p, $v[0]$sp){$context['ops']['seperator']}";
+            return $context['ops']['seperator'] . static::getFuncName($context, 'p', $tag) . "\$cx, $p, $v[0],$pid$sp){$context['ops']['seperator']}";
         }
         return isset($context['usedPartial'][$p[0]]) ? "{$context['ops']['seperator']}'" . Partial::compileStatic($context, $p[0]) . "'{$context['ops']['seperator']}" : $context['ops']['seperator'];
     }

diff --git a/src/Context.php b/src/Context.php
@@ -116,6 +116,7 @@ public static function create($options) {
                 'delimiter' => 0,
                 'subexp' => 0,
                 'rawblock' => 0,
+                'pblock' => 0,
                 'lookup' => 0,
                 'log' => 0,
             ),
@@ -217,6 +218,7 @@ protected static function updateHelperTable(&$context, $options, $tname = 'helpe
      */
     public static function merge(&$context, $tmp) {
         $context['error'] = $tmp['error'];
+        $context['partials'] = $tmp['partials'];
         $context['partialCode'] = $tmp['partialCode'];
         $context['partialStack'] = $tmp['partialStack'];
         $context['usedCount'] = $tmp['usedCount'];

diff --git a/src/Parser.php b/src/Parser.php
@@ -30,9 +30,27 @@ class Parser extends Token
 {
     // Compile time error handling flags
     const BLOCKPARAM = 9999;
+    const PARTIALBLOCK = 9998;
     const LITERAL = -1;
     const SUBEXP = -2;
 
+    /**
+     * Get partial block id and fix the variable list
+     *
+     * @param array<boolean|integer|array> $vars parsed token
+     *
+     * @return integer Return partial block id
+     *
+     */
+    public static function getPartialBlock(&$vars) {
+        if (isset($vars[static::PARTIALBLOCK])) {
+            $id = $vars[static::PARTIALBLOCK];
+            unset($vars[static::PARTIALBLOCK]);
+            return $id;
+        }
+        return 0;
+    }
+
     /**
      * Get block params and fix the variable list
      *

diff --git a/src/Partial.php b/src/Partial.php
@@ -96,6 +96,9 @@ protected static function prePartial(&$context, $tmpl, &$name) {
      * @return string|null $content partial content
      */
     public static function resolve(&$context, &$name) {
+        if ($name === '@partial-block') {
+            $name = "@partial-block{$context['usedFeature']['pblock']}";
+        }
         if (isset($context['partials'][$name])) {
             return static::prePartial($context, $context['partials'][$name], $name);
         }

diff --git a/src/Runtime.php b/src/Runtime.php
@@ -480,12 +480,18 @@ public static function m($cx, $a, $b) {
      * @return string The rendered string of the partial
      *
      */
-    public static function p($cx, $p, $v, $sp = '') {
+    public static function p($cx, $p, $v, $pid, $sp = '') {
+        if ($p === '@partial-block') {
+            $p = "$p" . ($pid || $cx['partialid']);
+        }
+
         if (!isset($cx['partials'][$p])) {
             static::err($cx, "Can not find partial named as '$p' !!");
             return '';
         }
 
+        $cx['partialid'] = $pid;
+
         return call_user_func($cx['partials'][$p], $cx, static::m($cx, $v[0][0], $v[1]), $sp);
     }
 

diff --git a/src/Validator.php b/src/Validator.php
@@ -175,6 +175,7 @@ protected static function operator($operator, &$context, &$vars) {
             case '#>':
                 static::pushLeft($context);
                 $context['stack'][] = count($context['parsed'][0]);
+                $vars[Parser::PARTIALBLOCK] = ++$context['usedFeature']['pblock'];
                 static::pushStack($context, '#>', $vars);
                 array_unshift($context['partialblock'], '');
                 return static::partial($context, $vars);
@@ -277,7 +278,10 @@ protected static function partialBlock(&$context, $vars) {
                 if (static::blockEnd($context, $vars, '#>') !== null) {
                     $c = $context['stack'][count($context['stack']) - 4];
                     $found = Partial::resolve($context, $vars[0][0]) !== null;
-                    $v = $found ? '@partial-block' : $vars[0][0];
+                    $v = $found ? "@partial-block{$context['usedFeature']['pblock']}" : "{$vars[0][0]}";
+                    if ($found) {
+                        $context['partials'][$v] = $context['partialblock'][0];
+                    }
                     $context['usedPartial'][$v] = $context['partialblock'][0];
                     Partial::compileDynamic($context, $v);
                     if ($found) {

diff --git a/tests/usageTest.php b/tests/usageTest.php
@@ -38,6 +38,7 @@ public function compileProvider()
             'delimiter' => 0,
             'subexp' => 0,
             'rawblock' => 0,
+            'pblock' => 0,
             'lookup' => 0,
             'log' => 0,
         );