Simplify partial testing

Also added regression test for `@data` variables in partial block context.

Author: theodorejb

tests/ErrorTest.php

@@ -10,28 +10,32 @@
 
 /**
  * @phpstan-type RenderTest array{
- *     template: string, options?: Options, helpers?: array<string, \Closure>, data?: array<mixed>, expected: string,
+ *     template: string, expected: string, data?: mixed, options?: Options,
+ *     helpers?: array<string, \Closure>, partials?: array<string, string>,
  * }
  * @phpstan-type ErrorCase array{template: string, options?: Options, expected: string}
  */
 class ErrorTest extends TestCase
 {
     /**
      * @param array<string, \Closure> $helpers
-     * @param array<mixed> $data
+     * @param array<string, string> $partials
      */
     #[DataProvider("renderErrorProvider")]
     public function testRenderingException(
         string $template,
         string $expected,
         ?Options $options = null,
         array $helpers = [],
-        array $data = [],
+        array $partials = [],
+        mixed $data = null,
     ): void {
-        $php = Handlebars::precompile($template, $options ?? new Options());
+        $options ??= new Options();
+        $php = Handlebars::precompile($template, $options);
         $renderer = Handlebars::template($php);
         try {
-            $result = $renderer($data, ['helpers' => $helpers]);
+            $partials = array_map(fn($p) => Handlebars::compile($p, $options), $partials);
+            $result = $renderer($data, ['helpers' => $helpers, 'partials' => $partials]);
             $this->fail("Expected exception: {$expected}\nRendered: $result\nPHP code:\n$php");
         } catch (\Exception $e) {
             $this->assertSame($expected, $e->getMessage(), "PHP code:\n$php");
@@ -50,12 +54,10 @@ public static function renderErrorProvider(): array
             ],
             'partial-block not found in nested partials' => [
                 'template' => "{{#> testPartial}}\n  {{#> innerPartial}}\n   {{> @partial-block}}\n  {{/innerPartial}}\n{{/testPartial}}",
-                'options' => new Options(
-                    partials: [
-                        'testPartial' => 'testPartial => {{> @partial-block}} <=',
-                        'innerPartial' => 'innerPartial -> {{> @partial-block}} <-',
-                    ],
-                ),
+                'partials' => [
+                    'testPartial' => 'testPartial => {{> @partial-block}} <=',
+                    'innerPartial' => 'innerPartial -> {{> @partial-block}} <-',
+                ],
                 'expected' => "The partial @partial-block could not be found",
             ],
             'partial-block not found at top level' => [
@@ -95,6 +97,7 @@ public static function renderErrorProvider(): array
             'strict mode null property access in if' => [
                 'template' => '{{#if foo.bar}}bad{{else}}OK{{/if}}',
                 'options' => new Options(strict: true),
+                'data' => [],
                 'expected' => 'Cannot access property "bar" on null',
             ],
             'strict mode missing variable' => [

tests/HandlebarsSpecTest.php

@@ -54,49 +54,41 @@ public function testSpecs(array $spec): void
         }
         self::addDataHelpers($spec);
 
-        // setup helpers
+        $options = new Options(
+            compat: $spec['compileOptions']['compat'] ?? false,
+            knownHelpers: $spec['compileOptions']['knownHelpers'] ?? [],
+            knownHelpersOnly: $spec['compileOptions']['knownHelpersOnly'] ?? false,
+            strict: $spec['compileOptions']['strict'] ?? false,
+            assumeObjects: $spec['compileOptions']['assumeObjects'] ?? false,
+            preventIndent: $spec['compileOptions']['preventIndent'] ?? false,
+            ignoreStandalone: $spec['compileOptions']['ignoreStandalone'] ?? false,
+            explicitPartialContext: $spec['compileOptions']['explicitPartialContext'] ?? false,
+        );
+
         $helpers = [];
-        $helpersList = '[';
+        $helpersList = [];
+        $partials = [];
+
         foreach ($spec['helpers'] as $name => $func) {
             if (!isset($func['php'])) {
                 continue;
             }
             $helper = self::patchHelperCode($func['php']);
-            $helpersList .= "\n  '$name' => $helper,\n";
+            $helpersList[$name] = $helper;
             eval('$helpers[\'' . $name . '\'] = ' . $helper . ';');
         }
-        $helpersList .= ']';
 
-        // Convert "!code" partials (callable PHP strings) into actual callables.
-        $partials = [];
-        $stringPartials = [];
         foreach ($spec['partials'] as $name => $partial) {
+            // Convert "!code" partials (callable PHP strings) into actual callables.
             if (is_array($partial) && isset($partial['!code'], $partial['php'])) {
                 $partials[$name] = eval('return ' . $partial['php'] . ';');
             } else {
-                $stringPartials[$name] = $partial;
+                $partials[$name] = Handlebars::compile($partial, $options);
             }
         }
 
         try {
-            $knownHelpersOnly = $spec['compileOptions']['knownHelpersOnly'] ?? false;
-            $strict = $spec['compileOptions']['strict'] ?? false;
-            $assumeObjects = $spec['compileOptions']['assumeObjects'] ?? false;
-            $preventIndent = $spec['compileOptions']['preventIndent'] ?? false;
-            $ignoreStandalone = $spec['compileOptions']['ignoreStandalone'] ?? false;
-            $explicitPartialContext = $spec['compileOptions']['explicitPartialContext'] ?? false;
-
-            $php = Handlebars::precompile($spec['template'], new Options(
-                compat: $spec['compileOptions']['compat'] ?? false,
-                knownHelpers: $spec['compileOptions']['knownHelpers'] ?? [],
-                knownHelpersOnly: $knownHelpersOnly,
-                strict: $strict,
-                assumeObjects: $assumeObjects,
-                preventIndent: $preventIndent,
-                ignoreStandalone: $ignoreStandalone,
-                explicitPartialContext: $explicitPartialContext,
-                partials: $stringPartials,
-            ));
+            $php = Handlebars::precompile($spec['template'], $options);
         } catch (\Exception $e) {
             if ($spec['exception']) {
                 $this->expectNotToPerformAssertions();
@@ -127,20 +119,27 @@ public function testSpecs(array $spec): void
                 $this->expectNotToPerformAssertions();
                 return;
             }
-            $this->fail("Rendering error: {$e->getMessage()}\n\n" . self::getSpecDetails($php, $helpersList));
+            $this->fail("Rendering error: {$e->getMessage()}\n\n" . self::getSpecDetails($php, $helpersList, $spec['partials']));
         }
 
         if ($spec['exception']) {
             $details = $spec['exception'] === true ? '.' : ": {$spec['exception']}\n";
-            $this->fail("Expected exception{$details}\nResult: $result\n\n" . self::getSpecDetails($php, $helpersList));
+            $this->fail("Expected exception{$details}\nResult: $result\n\n" . self::getSpecDetails($php, $helpersList, $spec['partials']));
         }
 
-        $this->assertSame($spec['expected'], $result, self::getSpecDetails($php, $helpersList));
+        $this->assertSame($spec['expected'], $result, self::getSpecDetails($php, $helpersList, $spec['partials']));
     }
 
-    private static function getSpecDetails(string $code, string $helpers): string
+    /**
+     * @param array<mixed> $helpers
+     * @param array<mixed> $partials
+     */
+    private static function getSpecDetails(string $code, array $helpers, array $partials): string
     {
-        return "Helpers: $helpers\nPHP code:\n$code";
+        $flags = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT;
+        $partials = json_encode($partials, $flags);
+        $helpers = json_encode($helpers, $flags);
+        return "Partials: $partials\nHelpers: $helpers\nPHP code:\n$code";
     }
 
     /**