Merge pull request #17376 from kamil-tekiela/getDbInfo-mangles-tables-with-numerical-names

MauricioFauth · web-flow · commit 10d31380ef62 · 2022-03-04T12:16:52.000-03:00
getDbInfo mangles table with numerical names
diff --git a/libraries/classes/Controllers/Database/Operations/CollationController.php b/libraries/classes/Controllers/Database/Operations/CollationController.php
@@ -68,7 +68,7 @@ public function __invoke(): void
          */
         if (isset($_POST['change_all_tables_collations']) && $_POST['change_all_tables_collations'] === 'on') {
             [$tables] = Util::getDbInfo($db, '');
-            foreach ($tables as $tableName => $data) {
+            foreach ($tables as ['Name' => $tableName]) {
                 if ($this->dbi->getTable($db, $tableName)->isView()) {
                     // Skip views, we can not change the collation of a view.
                     // issue #15283
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
@@ -2271,18 +2271,16 @@ public static function getDbInfo($db, string $subPart)
                 }
             }
 
-            $tables = array_merge(
-                $groupTable,
-                $dbi->getTablesFull(
-                    $db,
-                    $groupWithSeparator !== false ? $groupWithSeparator : '',
-                    $groupWithSeparator !== false,
-                    $limitOffset,
-                    $limitCount,
-                    $sort,
-                    $sortOrder,
-                    $tableType
-                )
+            // We must use union operator here instead of array_merge to preserve numerical keys
+            $tables = $groupTable + $dbi->getTablesFull(
+                $db,
+                $groupWithSeparator !== false ? $groupWithSeparator : '',
+                $groupWithSeparator !== false,
+                $limitOffset,
+                $limitCount,
+                $sort,
+                $sortOrder,
+                $tableType
             );
         }
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1229,16 +1229,15 @@
     <MixedArgumentTypeCoercion occurrences="1">
       <code>['db' =&gt; $db]</code>
     </MixedArgumentTypeCoercion>
-    <MixedAssignment occurrences="2">
-      <code>$data</code>
+    <MixedArrayAccess occurrences="1">
       <code>$tableName</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="1">
+      <code>['Name' =&gt; $tableName]</code>
     </MixedAssignment>
     <PossiblyNullArgument occurrences="1">
       <code>$_POST['db_collation']</code>
     </PossiblyNullArgument>
-    <UnusedForeachValue occurrences="1">
-      <code>$data</code>
-    </UnusedForeachValue>
   </file>
   <file src="libraries/classes/Controllers/Database/OperationsController.php">
     <MixedArgument occurrences="10">
