Merge #20242 - Fix ImportXML existence check

williamdes · williamdes · commit 7c502c3b40e3 · 2026-03-17T13:52:01.000+01:00
Pull-request: #20242 Fixes: #20153 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -9441,7 +9441,7 @@ parameters:
 		-
 			message: '#^Argument of an invalid type SimpleXMLElement\|null supplied for foreach, only iterables are supported\.$#'
 			identifier: foreach.nonIterable
-			count: 1
+			count: 2
 			path: src/Plugins/Import/ImportXml.php
 
 		-
@@ -9477,7 +9477,7 @@ parameters:
 		-
 			message: '#^Offset ''name'' might not exist on SimpleXMLElement\|null\.$#'
 			identifier: offsetAccess.notFound
-			count: 4
+			count: 3
 			path: src/Plugins/Import/ImportXml.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -6287,11 +6287,8 @@
       <code><![CDATA[string[]]]></code>
     </PossiblyUnusedReturnValue>
     <RedundantCondition>
-      <code><![CDATA[$databaseXml->table]]></code>
+      <code><![CDATA[isset($xml->database)]]></code>
     </RedundantCondition>
-    <TypeDoesNotContainType>
-      <code><![CDATA[[]]]></code>
-    </TypeDoesNotContainType>
     <UnnecessaryVarAnnotation>
       <code><![CDATA[SimpleXMLElement]]></code>
       <code><![CDATA[SimpleXMLElement]]></code>
diff --git a/src/Plugins/Import/ImportXml.php b/src/Plugins/Import/ImportXml.php
@@ -157,35 +157,42 @@ public function doImport(File|null $importHandle = null): array
         /**
          * Move down the XML tree to the actual data
          */
-        $databaseXml = $xml->database;
 
         $analyses = null;
         /** @var ImportTable[] $tables */
         $tables = [];
 
-        $databaseName = (string) $databaseXml['name'];
-
-        /** @var SimpleXMLElement $tableRowXml */
-        foreach ($databaseXml->table ?? [] as $tableRowXml) {
-            $tableName = (string) $tableRowXml['name'];
-
-            $table = $tables[$tableName] ?? new ImportTable($tableName);
+        $databaseName = '';
+        // SimpleXMLElement does not obey typical PHP rules.
+        // Children can be fetched through the magical __get() method,but if the child does not exist,
+        // it will return an empty SimpleXMLElement instead of null.
+        // This means that we need to check for the existence of the child before trying to access it.
+        if (isset($xml->database)) {
+            $databaseXml = $xml->database;
+            $databaseName = (string) $databaseXml['name'];
+
+            /** @var SimpleXMLElement $tableRowXml */
+            foreach ($databaseXml->table as $tableRowXml) {
+                $tableName = (string) $tableRowXml['name'];
+
+                $table = $tables[$tableName] ?? new ImportTable($tableName);
+
+                $tableRow = [];
+                /** @var SimpleXMLElement $tableCellXml */
+                foreach ($tableRowXml->column as $tableCellXml) {
+                    /** @psalm-suppress PossiblyNullArrayAccess */
+                    $columnName = (string) $tableCellXml['name'];
+                    if (! in_array($columnName, $table->columns, true)) {
+                        $table->columns[] = $columnName;
+                    }
 
-            $tableRow = [];
-            /** @var SimpleXMLElement $tableCellXml */
-            foreach ($tableRowXml->column as $tableCellXml) {
-                /** @psalm-suppress PossiblyNullArrayAccess */
-                $columnName = (string) $tableCellXml['name'];
-                if (! in_array($columnName, $table->columns, true)) {
-                    $table->columns[] = $columnName;
+                    $tableRow[] = (string) $tableCellXml;
                 }
 
-                $tableRow[] = (string) $tableCellXml;
-            }
-
-            $table->rows[] = $tableRow;
+                $table->rows[] = $tableRow;
 
-            $tables[$tableName] = $table;
+                $tables[$tableName] = $table;
+            }
         }
 
         unset($xml);

Original file line number	Diff line number	Diff line change
`@@ -9441,7 +9441,7 @@ parameters:`
`9441`	`9441`	`-`
`9442`	`9442`	`message: '#^Argument of an invalid type SimpleXMLElement\\|null supplied for foreach, only iterables are supported\.$#'`
`9443`	`9443`	`identifier: foreach.nonIterable`
`9444`		`- count: 1`
	`9444`	`+ count: 2`
`9445`	`9445`	`path: src/Plugins/Import/ImportXml.php`
`9446`	`9446`
`9447`	`9447`	`-`
`@@ -9477,7 +9477,7 @@ parameters:`
`9477`	`9477`	`-`
`9478`	`9478`	`message: '#^Offset ''name'' might not exist on SimpleXMLElement\\|null\.$#'`
`9479`	`9479`	`identifier: offsetAccess.notFound`
`9480`		`- count: 4`
	`9480`	`+ count: 3`
`9481`	`9481`	`path: src/Plugins/Import/ImportXml.php`
`9482`	`9482`
`9483`	`9483`	`-`