Merge pull request #18622 from kamil-tekiela/Remove-recasts

MauricioFauth · web-flow · commit 8cc6db10d75c · 2023-08-15T00:03:18.000-03:00
Remove redundant casts
diff --git a/libraries/classes/ConfigStorage/Relation.php b/libraries/classes/ConfigStorage/Relation.php
@@ -1461,8 +1461,7 @@ public function getCreateTableSqlQueries(array $tableNameReplacements): array
                 continue;
             }
 
-            // The following redundant cast is needed for PHPStan
-            $tableName = (string) $table[1];
+            $tableName = $table[1];
 
             // Replace the table name with another one
             if (isset($tableNameReplacements[$tableName])) {
diff --git a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php
@@ -42,7 +42,7 @@ public function __invoke(ServerRequest $request): void
             $subFromPrefix = mb_substr($current, 0, mb_strlen((string) $fromPrefix));
 
             if ($subFromPrefix === $fromPrefix) {
-                $newTableName = $toPrefix . mb_substr($current, mb_strlen((string) $fromPrefix));
+                $newTableName = $toPrefix . mb_substr($current, mb_strlen($fromPrefix));
             } else {
                 $newTableName = $current;
             }
diff --git a/libraries/classes/Dbal/DbiMysqli.php b/libraries/classes/Dbal/DbiMysqli.php
@@ -272,7 +272,7 @@ public function getProtoInfo(Connection $connection): int
         $mysqli = $connection->connection;
 
         // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-        return (int) $mysqli->protocol_version;
+        return $mysqli->protocol_version;
     }
 
     /**
diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
@@ -276,7 +276,7 @@ public static function removeRequestVars(array $allowList): void
         // and use type casting because the variables could have become
         // strings
         $keys = array_keys(
-            array_merge((array) $_REQUEST, (array) $_GET, (array) $_POST, (array) $_COOKIE),
+            array_merge($_REQUEST, $_GET, $_POST, $_COOKIE),
         );
 
         foreach ($keys as $key) {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1555,11 +1555,6 @@ parameters:
 			count: 1
 			path: libraries/classes/ConfigStorage/Relation.php
 
-		-
-			message: "#^Casting to string something that's already string\\.$#"
-			count: 1
-			path: libraries/classes/ConfigStorage/Relation.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 23
@@ -3540,11 +3535,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php
 
-		-
-			message: "#^Casting to string something that's already string\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php
-
 		-
 			message: "#^Parameter \\#1 \\$dbname of method PhpMyAdmin\\\\DatabaseInterface\\:\\:selectDb\\(\\) expects PhpMyAdmin\\\\Identifiers\\\\DatabaseName\\|string, mixed given\\.$#"
 			count: 1
@@ -11895,11 +11885,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Dbal/DbiMysqli.php
 
-		-
-			message: "#^Casting to int something that's already int\\.$#"
-			count: 1
-			path: libraries/classes/Dbal/DbiMysqli.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Dbal\\\\DbiMysqli\\:\\:affectedRows\\(\\) should return int\\|numeric\\-string but returns int\\|string\\.$#"
 			count: 1
@@ -23085,11 +23070,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Sanitize.php
 
-		-
-			message: "#^Casting to array something that's already array\\.$#"
-			count: 4
-			path: libraries/classes/Sanitize.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -806,7 +806,6 @@
       <code><![CDATA[(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]]]></code>
       <code><![CDATA[(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]]]></code>
       <code><![CDATA[(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]]]></code>
-      <code>(string) $table[1]</code>
     </RedundantCast>
     <RedundantCondition>
       <code><![CDATA[is_array($GLOBALS['cfg']['ForeignKeyDropdownOrder'])]]></code>
@@ -1599,9 +1598,6 @@
     <PossiblyUnusedMethod>
       <code>__construct</code>
     </PossiblyUnusedMethod>
-    <RedundantCast>
-      <code>(string) $fromPrefix</code>
-    </RedundantCast>
   </file>
   <file src="libraries/classes/Controllers/Database/Structure/ShowCreateController.php">
     <MixedArgument>
@@ -5428,9 +5424,6 @@
     <PossiblyNullOperand>
       <code>$errorMessage</code>
     </PossiblyNullOperand>
-    <RedundantCast>
-      <code><![CDATA[(int) $mysqli->protocol_version]]></code>
-    </RedundantCast>
   </file>
   <file src="libraries/classes/Dbal/MysqliResult.php">
     <InvalidReturnStatement>
@@ -10890,12 +10883,6 @@
       <code>$found[0]</code>
       <code>$found[0]</code>
     </MixedReturnStatement>
-    <RedundantCast>
-      <code>(array) $_COOKIE</code>
-      <code>(array) $_GET</code>
-      <code>(array) $_POST</code>
-      <code>(array) $_REQUEST</code>
-    </RedundantCast>
     <RedundantCondition>
       <code><![CDATA[$GLOBALS['config'] !== null]]></code>
     </RedundantCondition>

Original file line number	Diff line number	Diff line change
`@@ -1461,8 +1461,7 @@ public function getCreateTableSqlQueries(array $tableNameReplacements): array`
`1461`	`1461`	`continue;`
`1462`	`1462`	`}`
`1463`	`1463`
`1464`		`- // The following redundant cast is needed for PHPStan`
`1465`		`- $tableName = (string) $table[1];`
	`1464`	`+ $tableName = $table[1];`
`1466`	`1465`
`1467`	`1466`	`// Replace the table name with another one`
`1468`	`1467`	`if (isset($tableNameReplacements[$tableName])) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __invoke(ServerRequest $request): void`
`42`	`42`	`$subFromPrefix = mb_substr($current, 0, mb_strlen((string) $fromPrefix));`
`43`	`43`
`44`	`44`	`if ($subFromPrefix === $fromPrefix) {`
`45`		`- $newTableName = $toPrefix . mb_substr($current, mb_strlen((string) $fromPrefix));`
	`45`	`+ $newTableName = $toPrefix . mb_substr($current, mb_strlen($fromPrefix));`
`46`	`46`	`} else {`
`47`	`47`	`$newTableName = $current;`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ public function getProtoInfo(Connection $connection): int`
`272`	`272`	`$mysqli = $connection->connection;`
`273`	`273`
`274`	`274`	`// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps`
`275`		`- return (int) $mysqli->protocol_version;`
	`275`	`+ return $mysqli->protocol_version;`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`/**`