Fix built-in helper context passed to inverse()

Author: theodorejb

src/HelperOptions.php

@@ -94,10 +94,10 @@ private function invokeBlock(Closure $closure, mixed $context, mixed $data): str
         // 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.
+        // Skip depths push when the caller explicitly passes the current scope (e.g. fn($options->scope)),
+        // equivalent to HBS.js options.fn(this) where the scope level isn't changing.
         $pushDepths = $context !== $scope;
-        $resolvedContext = $pushDepths ? ($context === Scope::Use ? $scope : $context) : $scope;
+        $resolvedContext = ($context === Scope::Use) ? $scope : $context;
         $outerFrame = null;
         $bpStack = null;
 

src/Runtime.php

@@ -35,7 +35,7 @@ public static function defaultHelpers(): array
                 $condition = $args[0] instanceof Closure ? $args[0]($options->scope) : $args[0];
                 return static::ifvar($condition, (bool) ($options->hash['includeZero'] ?? false))
                     ? $options->fn($options->scope)
-                    : $options->inverse();
+                    : $options->inverse($options->scope);
             },
             'unless' => static function (mixed ...$args): string {
                 if (count($args) !== 2) {
@@ -45,7 +45,7 @@ public static function defaultHelpers(): array
                 $options = $args[1];
                 $condition = $args[0] instanceof Closure ? $args[0]($options->scope) : $args[0];
                 return static::ifvar($condition, (bool) ($options->hash['includeZero'] ?? false))
-                    ? $options->inverse()
+                    ? $options->inverse($options->scope)
                     : $options->fn($options->scope);
             },
             'each' => static function (mixed $context, ?HelperOptions $options = null): string {
@@ -72,7 +72,7 @@ public static function defaultHelpers(): array
                 if (static::ifvar($context)) {
                     return $options->fn($context, ['blockParams' => [$context]]);
                 }
-                return $options->inverse();
+                return $options->inverse($options->scope);
             },
             'lookup' => static function (mixed $obj, string|int $key): mixed {
                 if (is_array($obj)) {
@@ -89,12 +89,12 @@ public static function defaultHelpers(): array
                 return '';
             },
             'helperMissing' => static function (mixed ...$args): mixed {
-                /** @var HelperOptions $options */
-                $options = end($args);
-                if (count($args) === 1 && !isset($options->fn)) {
+                if (count($args) === 1) {
                     // Bare variable lookup with no match — return null (mirrors HBS.js undefined).
                     return null;
                 }
+                /** @var HelperOptions $options */
+                $options = end($args);
                 throw new \Exception('Missing helper: "' . $options->name . '"');
             },
             'blockHelperMissing' => static function (mixed $context, HelperOptions $options): string {
@@ -105,7 +105,7 @@ public static function defaultHelpers(): array
                     return array_is_list($context) ? $options->iterate($context) : $options->fn($context);
                 }
                 if ($context === false || $context === null) {
-                    return $options->inverse();
+                    return $options->inverse($options->scope);
                 }
                 // true renders with the outer scope unchanged; any other truthy value becomes the new scope.
                 return $options->fn($context === true ? $options->scope : $context);

tests/RegressionTest.php

@@ -1380,6 +1380,16 @@ public static function builtInProvider(): array
                 'data' => ['name' => 'NoOne'],
                 'expected' => 'No, NoOne',
             ],
+            'with else branch: ../ at root has no parent' => [
+                'template' => '{{#with missing}}FOUND{{else}}{{../name}}{{/with}}',
+                'data' => ['name' => 'Root', 'missing' => null],
+                'expected' => '',
+            ],
+            'with else branch: ../ inside each resolves to actual parent' => [
+                'template' => '{{#each items}}{{#with missing}}FOUND{{else}}{{../name}}{{/with}}{{/each}}',
+                'data' => ['items' => [['name' => 'Item']], 'name' => 'Root', 'missing' => null],
+                'expected' => 'Root',
+            ],
 
             'bare log renders empty' => [
                 'template' => '{{log}}',
@@ -1851,6 +1861,12 @@ public static function ifElseProvider(): array
                 'data' => new SafeString('0'),
                 'expected' => 'T',
             ],
+
+            'if+includeZero else branch: ../ inside each resolves to actual parent' => [
+                'template' => '{{#each items}}{{#if falsy includeZero=true}}Y{{else}}{{../name}}{{/if}}{{/each}}',
+                'data' => ['items' => [['name' => 'Item', 'falsy' => false]], 'name' => 'Root'],
+                'expected' => 'Root',
+            ],
         ];
     }
 
@@ -1991,6 +2007,12 @@ public static function sectionProvider(): array
                 'template' => '{{#* inline "p"}}BEFORE{{/inline}}{{#foo}}{{else}}{{#* inline "p"}}INSIDE{{/inline}}{{> p}}{{/foo}}{{> p}}',
                 'expected' => 'INSIDEBEFORE',
             ],
+
+            'blockHelperMissing false context: ../ inside each resolves to actual parent' => [
+                'template' => '{{#each items}}{{#falsy}}Y{{else}}{{../name}}{{/falsy}}{{/each}}',
+                'data' => ['items' => [['name' => 'Item', 'falsy' => false]], 'name' => 'Root'],
+                'expected' => 'Root',
+            ],
         ];
     }