Require RuntimeContext in HelperOptions

Author: theodorejb

src/HelperOptions.php

@@ -21,10 +21,10 @@ class HelperOptions
     public function __construct(
         public mixed &$scope,
         public array &$data,
+        private readonly RuntimeContext $cx,
         public readonly string $name = '',
         public readonly array $hash = [],
         public readonly int $blockParams = 0,
-        private readonly ?RuntimeContext $cx = null,
         private readonly ?Closure $cb = null,
         private readonly ?Closure $inv = null,
         private readonly array $outerBlockParams = [],
@@ -45,9 +45,10 @@ public function __isset(string $name): bool
 
     public function fn(mixed $context = Scope::Use, mixed $data = null): string
     {
-        if ($this->cx === null) {
-            throw new \Exception('fn() is not supported for inline helpers');
-        } elseif ($this->cb === null) {
+        if ($this->cb === null) {
+            if ($this->inv === null) {
+                throw new \Exception('fn() is not supported for inline helpers');
+            }
             return '';
         }
         $cx = $this->cx;
@@ -69,9 +70,10 @@ public function fn(mixed $context = Scope::Use, mixed $data = null): string
 
     public function inverse(mixed $context = null, mixed $data = null): string
     {
-        if ($this->cx === null) {
-            throw new \Exception('inverse() is not supported for inline helpers');
-        } elseif ($this->inv === null) {
+        if ($this->inv === null) {
+            if ($this->cb === null) {
+                throw new \Exception('inverse() is not supported for inline helpers');
+            }
             return '';
         }
         return $this->callBlock($this->inv, $context ?? $this->scope, $context !== null, $data);
@@ -81,7 +83,6 @@ public function inverse(mixed $context = null, mixed $data = null): string
     private function callBlock(\Closure $closure, mixed $context, bool $pushDepths, ?array $data): string
     {
         $cx = $this->cx;
-        assert($cx !== null);
         $savedFrame = null;
         $bpStack = null;
 
@@ -133,7 +134,6 @@ public function iterate(array $items): string
             return '';
         }
         $cx = $this->cx;
-        assert($cx !== null);
         $cb = $this->cb;
 
         // Push depths and save partials once for the entire loop.

src/Runtime.php

@@ -479,6 +479,7 @@ public static function hbch(RuntimeContext $cx, \Closure $helper, string $name,
             $positional[] = new HelperOptions(
                 scope: $_this,
                 data: $cx->frame,
+                cx: $cx,
                 name: $name,
                 hash: $hash,
             );
@@ -502,10 +503,10 @@ public static function hbbch(RuntimeContext $cx, \Closure $helper, string $name,
         $positional[] = new HelperOptions(
             scope: $_this,
             data: $cx->frame,
+            cx: $cx,
             name: $name,
             hash: $hash,
             blockParams: $blockParamCount,
-            cx: $cx,
             cb: $cb,
             inv: $else,
             outerBlockParams: $outerBlockParams,

tests/ErrorTest.php

@@ -3,6 +3,7 @@
 namespace DevTheorem\Handlebars\Test;
 
 use DevTheorem\Handlebars\Handlebars;
+use DevTheorem\Handlebars\HelperOptions;
 use DevTheorem\Handlebars\Options;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -103,6 +104,20 @@ public static function renderErrorProvider(): array
                 'options' => new Options(strict: true),
                 'expected' => '"foo" not defined',
             ],
+            [
+                'template' => '{{foo}}',
+                'helpers' => [
+                    'foo' => fn(HelperOptions $options) => $options->fn(),
+                ],
+                'expected' => 'fn() is not supported for inline helpers',
+            ],
+            [
+                'template' => '{{foo}}',
+                'helpers' => [
+                    'foo' => fn(HelperOptions $options) => $options->inverse(),
+                ],
+                'expected' => 'inverse() is not supported for inline helpers',
+            ],
             [
                 'template' => '{{foo}}',
                 'helpers' => [