gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ImportXML existence check

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2026-03-17 12:37:06 +00:00
parent e454326296
commit 839a7e7974
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpstan-baseline.neon
View File

@ -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
-

5
psalm-baseline.xml
View File

@ -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>

43
src/Plugins/Import/ImportXml.php
View File

@ -157,35 +157,42 @@ class ImportXml extends ImportPlugin
/**
* Move down the XML tree to the actual data
*/
$databaseXml = $xml->database;
$analyses = null;
/** @var ImportTable[] $tables */
$tables = [];
$databaseName = (string) $databaseXml['name'];
$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'];
/** @var SimpleXMLElement $tableRowXml */
foreach ($databaseXml->table as $tableRowXml) {
$tableName = (string) $tableRowXml['name'];
$table = $tables[$tableName] ?? new ImportTable($tableName);
$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;
$tables[$tableName] = $table;
}
$table->rows[] = $tableRow;
$tables[$tableName] = $table;
}
unset($xml);