Update code according to situation; fix CR comment

Author: uuf6429

src/Loader/CucumberNDJsonAstLoader.php

@@ -52,7 +52,7 @@ private static function getFeature(array $json, $filePath)
 
         return new FeatureNode(
             $featureJson['name'] ?? null,
-            trim($featureJson['description'] ?? '') ?: null,
+            $featureJson['description'] ? trim($featureJson['description']) : null,
             self::getTags($featureJson),
             self::getBackground($featureJson),
             self::getScenarios($featureJson),
@@ -158,17 +158,23 @@ private static function getTables(array $items): array
             static function ($tableJson) {
                 $table = [];
 
-                if (!isset($tableJson['tableHeader'])) {
-                    throw new NodeException(
-                        sprintf(
-                            'Table header is required, but none was specified for the example on line %s.',
-                            $tableJson['location']['line'],
-                        )
-                    );
+                if (isset($tableJson['tableHeader'])) {
+                    // Table header seems to have been deprecated, but is still in use (in cucumber test fixtures)
+                    $table[$tableJson['tableHeader']['location']['line']] = array_column($tableJson['tableHeader']['cells'], 'value');
+                } else {
+                    // Otherwise, assume the header is the first row (which would be now required)
+                    $firstRow = array_shift($tableJson['tableBody']);
+                    if ($firstRow === null) {
+                        throw new NodeException(
+                            sprintf(
+                                'Expected either a table header or at least one row for the example on line %s but found none.',
+                                $tableJson['location']['line'],
+                            )
+                        );
+                    }
+                    $table[$firstRow['line']] = array_column($firstRow['cells'], 'value');
                 }
 
-                $table[$tableJson['tableHeader']['location']['line']] = array_column($tableJson['tableHeader']['cells'], 'value');
-
                 foreach ($tableJson['tableBody'] as $bodyRow) {
                     $table[$bodyRow['location']['line']] = array_column($bodyRow['cells'], 'value');
                 }

tests/Loader/CucumberNDJsonAstLoaderTest.php

@@ -126,10 +126,11 @@ public function testValidLoading(): void
         );
     }
 
-    public function testOutlineTableHeaderIsRequired(): void
+    public function testOutlineTableHeaderOrNonEmptyTableIsRequired(): void
     {
-        $this->expectException(NodeException::class);
-        $this->expectExceptionMessage('Table header is required, but none was specified for the example on line 3.');
+        $this->expectExceptionObject(
+            new NodeException('Expected either a table header or at least one row for the example on line 3 but found none.')
+        );
 
         $this->loader->load($this->serializeCucumberMessagesToFile([
             'gherkinDocument' => [
@@ -143,20 +144,7 @@ public function testOutlineTableHeaderIsRequired(): void
                                 'examples' => [
                                     [
                                         'location' => ['line' => 3],
-                                        'tableBody' => [
-                                            [
-                                                'cells' => [
-                                                    ['value' => 'A1'],
-                                                    ['value' => 'B1'],
-                                                ],
-                                            ],
-                                            [
-                                                'cells' => [
-                                                    ['value' => 'A2'],
-                                                    ['value' => 'B2'],
-                                                ],
-                                            ],
-                                        ],
+                                        'tableBody' => [],
                                     ],
                                 ],
                             ],