Fix merge issues (#18289)

kamil-tekiela · web-flow · commit 7c5319970246 · 2023-03-25T22:53:14.000-03:00
* Fix type issues after merge

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;

* Update DbiDummy.php

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;

---------

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
@@ -412,7 +412,7 @@ public function getTablesFull(
                 $sql .= ' LIMIT ' . $limitCount . ' OFFSET ' . $limitOffset;
             }
 
-            /** @var array<string, array<string, array<string, mixed>>> $tables */
+            /** @var mixed[][][] $tables */
             $tables = $this->fetchResult(
                 $sql,
                 [
@@ -438,7 +438,7 @@ public function getTablesFull(
                     [
                         $tables[$oneDatabaseName][$oneTableName]['Data_length'],
                         $tables[$oneDatabaseName][$oneTableName]['Index_length'],
-                    ] = StorageEngine::getMroongaLengths($oneDatabaseName, $oneTableName);
+                    ] = StorageEngine::getMroongaLengths((string) $oneDatabaseName, (string) $oneTableName);
                 }
             }
 
@@ -543,7 +543,7 @@ static function ($a, $b) {
                 [
                     $eachTables[$tableName]['Data_length'],
                     $eachTables[$tableName]['Index_length'],
-                ] = StorageEngine::getMroongaLengths($database, $tableName);
+                ] = StorageEngine::getMroongaLengths($database, (string) $tableName);
             }
 
             // Sort naturally if the config allows it and we're sorting
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -3445,11 +3445,6 @@ parameters:
 			count: 2
 			path: libraries/classes/DatabaseInterface.php
 
-		-
-			message: "#^Parameter \\#2 \\$tableName of static method PhpMyAdmin\\\\StorageEngine\\:\\:getMroongaLengths\\(\\) expects string, \\(int\\|string\\) given\\.$#"
-			count: 1
-			path: libraries/classes/DatabaseInterface.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Dbal\\\\DbalInterface\\:\\:connect\\(\\) has parameter \\$server with no value type specified in iterable type array\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -6136,8 +6136,8 @@
       <code>$user</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion>
-      <code>$tableName</code>
       <code><![CDATA[uksort($eachTables, 'strnatcasecmp')]]></code>
+      <code><![CDATA[uksort($oneDatabaseTables, 'strnatcasecmp')]]></code>
     </MixedArgumentTypeCoercion>
     <MixedArrayAccess>
       <code>$resultTarget[$row[$keyIndex]]</code>
diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php
@@ -1634,21 +1634,6 @@ private function init(): void
             ],
             [
                 'query' => "SHOW TABLE STATUS FROM `my_dataset` WHERE `Name` LIKE 'company\\\\_users%'",
-                'result' => [],
-            ],
-            [
-                'query' => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
-                . ' `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`,'
-                . ' `ENGINE` AS `Type`, `VERSION` AS `Version`, `ROW_FORMAT` AS `Row_format`,'
-                . ' `TABLE_ROWS` AS `Rows`, `AVG_ROW_LENGTH` AS `Avg_row_length`,'
-                . ' `DATA_LENGTH` AS `Data_length`, `MAX_DATA_LENGTH` AS `Max_data_length`,'
-                . ' `INDEX_LENGTH` AS `Index_length`, `DATA_FREE` AS `Data_free`,'
-                . ' `AUTO_INCREMENT` AS `Auto_increment`, `CREATE_TIME` AS `Create_time`,'
-                . ' `UPDATE_TIME` AS `Update_time`, `CHECK_TIME` AS `Check_time`,'
-                . ' `TABLE_COLLATION` AS `Collation`, `CHECKSUM` AS `Checksum`,'
-                . ' `CREATE_OPTIONS` AS `Create_options`, `TABLE_COMMENT` AS `Comment`'
-                . " FROM `information_schema`.`TABLES` t WHERE `TABLE_SCHEMA` COLLATE utf8_bin IN ('table1')"
-                . " AND t.`TABLE_NAME` COLLATE utf8_bin = 'pma_test' ORDER BY Name ASC",
                 'columns' => [
                     'Name',
                     'TABLE_TYPE',
@@ -2833,7 +2818,8 @@ private function init(): void
                     . ' `CHECK_TIME` AS `Check_time`, `TABLE_COLLATION` AS `Collation`,'
                     . ' `CHECKSUM` AS `Checksum`, `CREATE_OPTIONS` AS `Create_options`,'
                     . ' `TABLE_COMMENT` AS `Comment` FROM `information_schema`.`TABLES` t'
-                    . ' WHERE `TABLE_SCHEMA` IN (\'test_db\') AND t.`TABLE_NAME` IN (\'test_table\') ORDER BY Name ASC',
+                    . ' WHERE `TABLE_SCHEMA` COLLATE utf8_bin IN (\'test_db\')'
+                    . ' AND t.`TABLE_NAME` COLLATE utf8_bin IN (\'test_table\') ORDER BY Name ASC',
                 'columns' => [
                     'TABLE_CATALOG',
                     'TABLE_SCHEMA',

Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ public function getTablesFull(`
`412`	`412`	`$sql .= ' LIMIT ' . $limitCount . ' OFFSET ' . $limitOffset;`
`413`	`413`	`}`
`414`	`414`
`415`		`- /** @var array<string, array<string, array<string, mixed>>> $tables */`
	`415`	`+ /** @var mixed[][][] $tables */`
`416`	`416`	`$tables = $this->fetchResult(`
`417`	`417`	`$sql,`
`418`	`418`	`[`
`@@ -438,7 +438,7 @@ public function getTablesFull(`
`438`	`438`	`[`
`439`	`439`	`$tables[$oneDatabaseName][$oneTableName]['Data_length'],`
`440`	`440`	`$tables[$oneDatabaseName][$oneTableName]['Index_length'],`
`441`		`- ] = StorageEngine::getMroongaLengths($oneDatabaseName, $oneTableName);`
	`441`	`+ ] = StorageEngine::getMroongaLengths((string) $oneDatabaseName, (string) $oneTableName);`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`
`@@ -543,7 +543,7 @@ static function ($a, $b) {`
`543`	`543`	`[`
`544`	`544`	`$eachTables[$tableName]['Data_length'],`
`545`	`545`	`$eachTables[$tableName]['Index_length'],`
`546`		`- ] = StorageEngine::getMroongaLengths($database, $tableName);`
	`546`	`+ ] = StorageEngine::getMroongaLengths($database, (string) $tableName);`
`547`	`547`	`}`
`548`	`548`
`549`	`549`	`// Sort naturally if the config allows it and we're sorting`