[BUGFIX] Avoid accessing substructure when not of the expected type, r…

…esolves #360
cobwebch · Dec 27, 2024 · 897aa5f · 897aa5f
1 parent e366421
commit 897aa5f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,7 @@
 2024-12-27 Francois Suter (Idéative)  <[email protected]>
 
     * Add a delete reaction, resolves #361
+    * Avoid accessing substructure when not of the expected type, resolves #360
 
 2024-11-24 Francois Suter (Idéative)  <[email protected]>
 

diff --git a/Classes/Handler/ArrayHandler.php b/Classes/Handler/ArrayHandler.php
@@ -124,10 +124,12 @@ public function handleData($rawData, Importer $importer): array
                                 )
                             );
                             $theValue = $event->getSubstructure();
-                            $rows[$columnName] = $this->getSubstructureValues(
-                                $theValue,
-                                $columnData['substructureFields']
-                            );
+                            if (is_array($theValue)) {
+                                $rows[$columnName] = $this->getSubstructureValues(
+                                    $theValue,
+                                    $columnData['substructureFields']
+                                );
+                            }
                             // Prepare for the case where no substructure was found
                             // If one was found, it is added later
                             $data[$referenceCounter][$columnName] = null;

diff --git a/Classes/Handler/XmlHandler.php b/Classes/Handler/XmlHandler.php
@@ -109,11 +109,16 @@ public function handleData($rawData, Importer $importer): array
                             )
                         );
                         $nodeList = $event->getSubstructure();
-                        $rows[$columnName] = $this->getSubstructureValues(
-                            $nodeList,
-                            $columnData['substructureFields'],
-                            $xPathObject
-                        );
+                        if ($nodeList instanceof \DOMNodeList) {
+                            $rows[$columnName] = $this->getSubstructureValues(
+                                $nodeList,
+                                $columnData['substructureFields'],
+                                $xPathObject
+                            );
+                        }
+                        // Prepare for the case where no substructure was found
+                        // If one was found, it is added later
+                        $data[$referenceCounter][$columnName] = null;
                     } else {
                         $data[$referenceCounter][$columnName] = $this->getValue(
                             $theRecord,

diff --git a/Tests/Unit/Handler/ArrayHandlerTest.php b/Tests/Unit/Handler/ArrayHandlerTest.php
@@ -802,6 +802,17 @@ public function rawDataProvider(): array
                     ],
                 ],
             ],
+            'raw data with general array path but invalid value type' => [
+                'generalConfiguration' => [
+                    'arrayPath' => 'data/items',
+                ],
+                'rawData' => [
+                    'data' => [
+                        'items' => 'This should be an array',
+                    ],
+                ],
+                'expectedStructure' => [],
+            ],
             'raw data with general invalid array path (empty)' => [
                 'generalConfiguration' => [
                     'arrayPath' => '',