Fix inline partials leaking out of an else block

Author: theodorejb

src/HelperOptions.php

@@ -71,14 +71,7 @@ public function fn(mixed $context = Scope::Use, mixed $data = null): string
             }
             return '';
         }
-        $cx = $this->cx;
-        // Save inlinePartials so that any {{#* inline}} partials registered inside the block body
-        // don't leak out after fn() returns. The spec requires inline partials to be
-        // block-scoped. PHP copy-on-write makes this assignment cheap when no inline partials are registered.
-        $savedInlinePartials = $cx->inlinePartials;
-        $ret = $this->invokeBlock($this->cb, $context, $data);
-        $cx->inlinePartials = $savedInlinePartials;
-        return $ret;
+        return $this->invokeBlock($this->cb, $context, $data);
     }
 
     public function inverse(mixed $context = Scope::Use, mixed $data = null): string
@@ -95,6 +88,10 @@ public function inverse(mixed $context = Scope::Use, mixed $data = null): string
     private function invokeBlock(\Closure $closure, mixed $context, mixed $data): string
     {
         $cx = $this->cx;
+        // Save inlinePartials so that any {{#* inline}} partials registered inside the block body
+        // don't leak out after it returns. The spec requires inline partials to be
+        // block-scoped. PHP copy-on-write makes this assignment cheap when no inline partials are registered.
+        $savedInlinePartials = $cx->inlinePartials;
         $scope = $this->scope;
         // Skip depths push when the caller explicitly passes the current scope (equivalent to
         // HBS.js options.fn(this) / options.inverse(this)), since the scope level isn't changing.
@@ -129,6 +126,7 @@ private function invokeBlock(\Closure $closure, mixed $context, mixed $data): st
         if ($savedFrame !== null) {
             $cx->frame = $savedFrame;
         }
+        $cx->inlinePartials = $savedInlinePartials;
         return $ret;
     }
 

tests/RegressionTest.php

@@ -240,10 +240,10 @@ public static function helperProvider(): array
 
             [
                 'desc' => 'LNC#114 - inverse block helpers',
-                'template' => '{{^myeach .}}OK:{{.}},{{else}}NOT GOOD{{/myeach}}',
+                'template' => '{{^myeach .}}bad:{{.}} {{else}}OK:{{.}} {{/myeach}}',
                 'helpers' => ['myeach' => $myEach],
-                'data' => [1, 'foo', 3, 'bar'],
-                'expected' => 'NOT GOODNOT GOODNOT GOODNOT GOOD',
+                'data' => [1, 3.5, 'foo', true, false, null],
+                'expected' => 'OK:1 OK:3.5 OK:foo OK:true OK:false OK: ',
             ],
 
             [
@@ -2073,6 +2073,11 @@ public static function sectionProvider(): array
                 'data' => ['section' => ['x' => 1]],
                 'expected' => 'INSIDEBEFORE',
             ],
+            [
+                'desc' => 'inline partials registered inside an else block do not leak out after the section ends',
+                'template' => '{{#* inline "p"}}BEFORE{{/inline}}{{#foo}}{{else}}{{#* inline "p"}}INSIDE{{/inline}}{{> p}}{{/foo}}{{> p}}',
+                'expected' => 'INSIDEBEFORE',
+            ],
         ];
     }