Fix error reported by PHPStan

MauricioFauth · MauricioFauth · commit d1c2c6e07dcc · 2023-06-09T18:38:25.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
@@ -1575,7 +1575,7 @@ public function getTableDef(
                     }
 
                     // Creating the parts that drop foreign keys.
-                    if ($field->key !== null && $field->key->type === 'FOREIGN KEY') {
+                    if ($field->key !== null && $field->key->type === 'FOREIGN KEY' && $field->name !== null) {
                         $dropped[] = 'FOREIGN KEY ' . Context::escape($field->name);
                         unset($statement->fields[$key]);
                     }
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5245,11 +5245,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Plugins/Export/ExportPhparray.php
 
-		-
-			message: "#^Binary operation \"\\.\" between 'FOREIGN KEY ' and array\\<string\\>\\|string results in an error\\.$#"
-			count: 1
-			path: libraries/classes/Plugins/Export/ExportSql.php
-
 		-
 			message: "#^Cannot access offset 'alias' on mixed\\.$#"
 			count: 8
@@ -5360,11 +5355,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Plugins/Export/ExportSql.php
 
-		-
-			message: "#^Parameter \\#1 \\$str of static method PhpMyAdmin\\\\SqlParser\\\\Context\\:\\:escape\\(\\) expects array\\<string\\>\\|string, string\\|null given\\.$#"
-			count: 1
-			path: libraries/classes/Plugins/Export/ExportSql.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function strtoupper expects string, mixed given\\.$#"
 			count: 1
@@ -5400,11 +5390,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Plugins/Export/ExportSql.php
 
-		-
-			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Token\\:\\:\\$token \\(string\\) does not accept array\\<string\\>\\|string\\.$#"
-			count: 1
-			path: libraries/classes/Plugins/Export/ExportSql.php
-
 		-
 			message: "#^Cannot access offset 'action_timing' on mixed\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -8817,16 +8817,9 @@
       <code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
       <code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
     </PossiblyInvalidArrayOffset>
-    <PossiblyInvalidOperand>
-      <code><![CDATA[Context::escape($field->name)]]></code>
-    </PossiblyInvalidOperand>
-    <PossiblyInvalidPropertyAssignmentValue>
-      <code>Context::escape($alias)</code>
-    </PossiblyInvalidPropertyAssignmentValue>
     <PossiblyNullArgument>
       <code>$createQuery</code>
       <code>$definition</code>
-      <code><![CDATA[$field->name]]></code>
       <code>$tableAlias</code>
       <code>$tableAlias</code>
       <code>$tableAlias</code>

Original file line number	Diff line number	Diff line change
`@@ -1575,7 +1575,7 @@ public function getTableDef(`
`1575`	`1575`	`}`
`1576`	`1576`
`1577`	`1577`	`// Creating the parts that drop foreign keys.`
`1578`		`- if ($field->key !== null && $field->key->type === 'FOREIGN KEY') {`
	`1578`	`+ if ($field->key !== null && $field->key->type === 'FOREIGN KEY' && $field->name !== null) {`
`1579`	`1579`	`$dropped[] = 'FOREIGN KEY ' . Context::escape($field->name);`
`1580`	`1580`	`unset($statement->fields[$key]);`
`1581`	`1581`	`}`