From 0ca6b456d553467110e50ab417310a05c6283796 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Fri, 14 Oct 2022 20:53:13 +0100
Subject: [PATCH] Casting to int something that's already int

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 .../Controllers/Table/SearchController.php        |  2 +-
 .../Controllers/Table/ZoomSearchController.php    |  2 +-
 libraries/classes/Display/Results.php             |  2 +-
 phpstan-baseline.neon                             | 15 ---------------
 psalm-baseline.xml                                |  9 +--------
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php
index 85bb4c956033..09199d96a716 100644
--- a/libraries/classes/Controllers/Table/SearchController.php
+++ b/libraries/classes/Controllers/Table/SearchController.php
@@ -225,7 +225,7 @@ public function getDataRowAction(): void
             $i = 0;
             foreach ($row as $col => $val) {
                 if (isset($fields_meta[$i]) && $fields_meta[$i]->isMappedTypeBit) {
-                    $row[$col] = Util::printableBitValue((int) $val, (int) $fields_meta[$i]->length);
+                    $row[$col] = Util::printableBitValue((int) $val, $fields_meta[$i]->length);
                 }
 
                 $i++;
diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php
index 5d87f73030c6..b1f6cae4bc19 100644
--- a/libraries/classes/Controllers/Table/ZoomSearchController.php
+++ b/libraries/classes/Controllers/Table/ZoomSearchController.php
@@ -284,7 +284,7 @@ public function getDataRowAction(): void
             $i = 0;
             foreach ($row as $col => $val) {
                 if ($fields_meta[$i]->isMappedTypeBit) {
-                    $row[$col] = Util::printableBitValue((int) $val, (int) $fields_meta[$i]->length);
+                    $row[$col] = Util::printableBitValue((int) $val, $fields_meta[$i]->length);
                 }
 
                 $i++;
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index dc21ce75d2b8..d1471157b9cf 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -3147,7 +3147,7 @@ private function getDataCellForNonNumericColumns(
         }
 
         if ($meta->isMappedTypeBit) {
-            $displayedColumn = Util::printableBitValue((int) $displayedColumn, (int) $meta->length);
+            $displayedColumn = Util::printableBitValue((int) $displayedColumn, $meta->length);
 
             // some results of PROCEDURE ANALYSE() are reported as
             // being BINARY but they are quite readable,
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index b076e39fa622..212c5e579fe2 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1535,11 +1535,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Table/ReplaceController.php
 
-		-
-			message: "#^Casting to int something that's already int\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Table/SearchController.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\SearchController\\:\\:getColumnMinMax\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1705,11 +1700,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Table/ZoomSearchController.php
 
-		-
-			message: "#^Casting to int something that's already int\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Table/ZoomSearchController.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\ZoomSearchController\\:\\:getColumnProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -2905,11 +2895,6 @@ parameters:
 			count: 2
 			path: libraries/classes/Display/Results.php
 
-		-
-			message: "#^Casting to int something that's already int\\.$#"
-			count: 1
-			path: libraries/classes/Display/Results.php
-
 		-
 			message: "#^Casting to string something that's already string\\.$#"
 			count: 2
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 3adc1fb0ffa0..eeabd3a12ed0 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -3921,9 +3921,6 @@
     <PossiblyInvalidOperand occurrences="1">
       <code>$_POST['where_clause']</code>
     </PossiblyInvalidOperand>
-    <RedundantCastGivenDocblockType occurrences="1">
-      <code>(int) $fields_meta[$i]-&gt;length</code>
-    </RedundantCastGivenDocblockType>
   </file>
   <file src="libraries/classes/Controllers/Table/SqlController.php">
     <MixedAssignment occurrences="2">
@@ -4442,9 +4439,6 @@
       <code>$_POST['maxPlotLimit']</code>
       <code>$_POST['where_clause']</code>
     </PossiblyInvalidOperand>
-    <RedundantCastGivenDocblockType occurrences="1">
-      <code>(int) $fields_meta[$i]-&gt;length</code>
-    </RedundantCastGivenDocblockType>
   </file>
   <file src="libraries/classes/Controllers/TableController.php">
     <MixedArgument occurrences="1">
@@ -6469,8 +6463,7 @@
       <code>(int) $GLOBALS['cfg']['LimitChars']</code>
       <code>(int) $GLOBALS['cfg']['LimitChars']</code>
     </RedundantCast>
-    <RedundantCastGivenDocblockType occurrences="3">
-      <code>(int) $meta-&gt;length</code>
+    <RedundantCastGivenDocblockType occurrences="2">
       <code>(string) $fieldsMeta[$i]-&gt;name</code>
       <code>(string) $fieldsMeta[$i]-&gt;name</code>
     </RedundantCastGivenDocblockType>