Fix calling partials named true, false, null, or undefined

{{> true}}, {{> false}}, {{> null}}, and {{> undefined}} fell through to compileExpression, which produced PHP literal values instead of string names. Boolean literals caused a type error; null/undefined silently rendered nothing.

Author: theodorejb

src/Compiler.php

@@ -410,12 +410,10 @@ private function PartialStatement(PartialStatement $statement): string
         if ($name instanceof SubExpression) {
             $p = $this->SubExpression($name);
             $this->context->usedDynPartial++;
-        } elseif ($name instanceof PathExpression || $name instanceof StringLiteral || $name instanceof NumberLiteral) {
+        } else {
             $partialName = $this->resolvePartialName($name);
             $p = self::quote($partialName);
             $this->resolveAndCompilePartial($partialName);
-        } else {
-            $p = $this->compileExpression($name);
         }
 
         $vars = $this->compilePartialParams($statement->params, $statement->hash);
@@ -452,36 +450,29 @@ private function PartialBlockStatement(PartialBlockStatement $statement): string
         $name = $statement->name;
         $depsBefore = count($this->programDepStack[array_key_last($this->programDepStack)]);
         $body = $this->compileProgram($statement->program);
-        $partialName = null;
-        $found = false;
 
-        if ($name instanceof PathExpression || $name instanceof StringLiteral || $name instanceof NumberLiteral) {
-            $partialName = $this->resolvePartialName($name);
-            $p = self::quote($partialName);
-            $found = ($this->context->usedPartial[$partialName] ?? '') !== '';
-
-            if (!$found && !str_starts_with($partialName, '@partial-block')) {
-                $cnt = $this->resolvePartial($partialName);
-                if ($cnt !== null) {
-                    $this->context->usedPartial[$partialName] = $cnt;
-                    $this->compilePartialTemplate($partialName, $cnt);
-                    $found = true;
-                }
-            }
+        $partialName = $this->resolvePartialName($name);
+        $p = self::quote($partialName);
+        $found = ($this->context->usedPartial[$partialName] ?? '') !== '';
 
-            // Mark as known for runtime resolution; not added to partialCode so $blockParams scope is preserved.
-            $this->context->usedPartial[$partialName] ??= '';
-        } else {
-            $p = $this->compileExpression($name);
+        if (!$found && !str_starts_with($partialName, '@partial-block')) {
+            $cnt = $this->resolvePartial($partialName);
+            if ($cnt !== null) {
+                $this->context->usedPartial[$partialName] = $cnt;
+                $this->compilePartialTemplate($partialName, $cnt);
+                $found = true;
+            }
         }
 
+        // Mark as known for runtime resolution; not added to partialCode so $blockParams scope is preserved.
+        $this->context->usedPartial[$partialName] ??= '';
         $vars = $this->compilePartialParams($statement->params, $statement->hash);
 
         // Capture $blockParams and any hoisted program vars so the partial block body can access them.
         $useVars = $this->buildInlineUseClause($depsBefore);
         $bodyClosure = self::templateClosure($body, useVars: $useVars);
 
-        if ($partialName !== null && !$found) {
+        if (!$found) {
             // Register the block body as a fallback partial only if no runtime partial with this name exists yet.
             $parts[] = "(isset(\$cx->inlinePartials[$p]) || isset(\$cx->partials[$p]) ? '' : "
                 . self::getRuntimeFunc('setInlinePartial', "\$cx, $p, $bodyClosure") . ')';
@@ -798,7 +789,7 @@ private function buildBasePath(bool $data, int $depth): string
     /**
      * Resolve the name of a non-SubExpression partial reference.
      */
-    private function resolvePartialName(PathExpression|StringLiteral|NumberLiteral $name): string
+    private function resolvePartialName(PathExpression|Literal $name): string
     {
         return $name instanceof PathExpression ? $name->original : $this->getLiteralKeyName($name);
     }

tests/RegressionTest.php

@@ -2,6 +2,7 @@
 
 namespace DevTheorem\Handlebars\Test;
 
+use Closure;
 use DevTheorem\Handlebars\Handlebars;
 use DevTheorem\Handlebars\HelperOptions;
 use DevTheorem\Handlebars\Options;
@@ -12,7 +13,7 @@
 /**
  * @phpstan-type RegIssue array{
  *     template: string, expected: string, data?: mixed, options?: Options,
- *     helpers?: array<string, \Closure>, partials?: array<string, string>,
+ *     helpers?: array<Closure>, partials?: array<string>,
  *     vars?: array<mixed>,
  * }
  */
@@ -44,8 +45,8 @@ public function testLog(): void
     }
 
     /**
-     * @param array<string, \Closure> $helpers
-     * @param array<string, string> $partials
+     * @param array<Closure> $helpers
+     * @param array<string> $partials
      * @param array<mixed> $vars
      */
     #[DataProvider("helperProvider")]
@@ -893,6 +894,18 @@ public static function helperProvider(): array
                 'data' => ['t' => 'val', 'foo' => ['1st', '2nd']],
                 'expected' => ' 1st bar,  0 1st val;  2nd bar,  1 2nd val; ',
             ],
+
+            'helpers can have literal names' => [
+                'template' => '{{42 1}} {{true 2}} {{false 3}} {{null 4}} {{undefined 5}}',
+                'helpers' => [
+                    '42' => fn($arg) => "number $arg,",
+                    'true' => fn($arg) => "true $arg,",
+                    'false' => fn($arg) => "false $arg,",
+                    'null' => fn($arg) => "null $arg,",
+                    'undefined' => fn($arg) => "undefined $arg",
+                ],
+                'expected' => 'number 1, true 2, false 3, null 4, undefined 5',
+            ],
         ];
     }
 
@@ -1154,6 +1167,18 @@ public static function partialProvider(): array
                 'data' => ['str' => 'hello'],
                 'expected' => 'val',
             ],
+
+            'partials can have literal names' => [
+                'template' => '{{> 42}} {{> true}} {{> false}} {{> null}} {{> undefined}}',
+                'partials' => [
+                    '42' => 'p42',
+                    'true' => 'pTrue',
+                    'false' => 'pFalse',
+                    'null' => 'pNull',
+                    'undefined' => 'pUndefined',
+                ],
+                'expected' => 'p42 pTrue pFalse pNull pUndefined',
+            ],
         ];
     }