From 1b055dba904dc8fe13a640a9eecbb8c6aac21f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 11 Feb 2022 14:50:22 -0300
Subject: [PATCH 1/2] Fix TypeError in the `Tracker::handleQuery` method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/Tracker.php | 2 +-
 phpstan-baseline.neon         | 5 -----
 psalm-baseline.xml            | 9 ++-------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php
index 242d4efd59..fb97c6de32 100644
--- a/libraries/classes/Tracker.php
+++ b/libraries/classes/Tracker.php
@@ -950,7 +950,7 @@ class Tracker
         " AND `db_name` = '" . $dbi->escapeString($dbname ?? '') . "' " .
         " AND `table_name` = '"
         . $dbi->escapeString($result['tablename']) . "' " .
-        " AND `version` = '" . $dbi->escapeString($version ?? '') . "' ";
+        " AND `version` = '" . $dbi->escapeString((string) $version) . "' ";
 
         $dbi->queryAsControlUser($sqlQuery);
     }
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 650950309e..f14896b6b5 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -8450,11 +8450,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Tracker.php
 
-		-
-			message: "#^Variable \\$version on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 1
-			path: libraries/classes/Tracker.php
-
 		-
 			message: "#^Cannot access offset 'COLUMNS' on mixed\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 46136db8df..d6c53648f6 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -13439,8 +13439,7 @@
     </UnevaluatedCode>
   </file>
   <file src="libraries/classes/Tracker.php">
-    <DocblockTypeContradiction occurrences="4">
-      <code>''</code>
+    <DocblockTypeContradiction occurrences="3">
       <code>null</code>
       <code>null</code>
       <code>null</code>
@@ -13490,9 +13489,6 @@
       <code>mb_strpos($logEntry, "\n")</code>
       <code>mb_strpos($logEntry, "\n")</code>
     </PossiblyFalseOperand>
-    <PossiblyInvalidArgument occurrences="1">
-      <code>$version ?? ''</code>
-    </PossiblyInvalidArgument>
     <PossiblyInvalidPropertyFetch occurrences="4">
       <code>$statement-&gt;body[2]-&gt;value</code>
       <code>$statement-&gt;body[3]-&gt;value</code>
@@ -13508,10 +13504,9 @@
     <RedundantCondition occurrences="1">
       <code>$dbname</code>
     </RedundantCondition>
-    <RedundantConditionGivenDocblockType occurrences="4">
+    <RedundantConditionGivenDocblockType occurrences="3">
       <code>$statement-&gt;name !== null</code>
       <code>$statement-&gt;name !== null</code>
-      <code>$version</code>
       <code>isset($statement-&gt;options)</code>
     </RedundantConditionGivenDocblockType>
     <TypeDoesNotContainNull occurrences="1">

From bb00f429f2083fa3639369eaf6ff8cffbb9a68cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 11 Feb 2022 15:14:22 -0300
Subject: [PATCH 2/2] Fix `PhpMyAdmin\Tests\Selenium\Table\CreateTest` failing
 test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to f911458b71ea1871edcdb8aa72f01cffb6ca0a1d.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 test/selenium/Table/CreateTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/selenium/Table/CreateTest.php b/test/selenium/Table/CreateTest.php
index 54c67e8f2f..8faed4697d 100644
--- a/test/selenium/Table/CreateTest.php
+++ b/test/selenium/Table/CreateTest.php
@@ -65,7 +65,7 @@ class CreateTest extends TestBase
         $column_dropdown_details = [
             'field_0_6' => 'UNSIGNED',
             'field_1_2' => 'VARCHAR',
-            'field_1_5' => 'utf8_general_ci',
+            'field_1_5' => 'utf8mb4_general_ci',
             'field_1_4' => 'As defined:',
         ];
 
@@ -83,7 +83,7 @@ class CreateTest extends TestBase
         $this->moveto($ele);
         // post
         $ele->click();
-        $this->waitForElement('cssSelector', 'li.last.table');
+        $this->waitForElement('cssSelector', 'li.last.nav_node_table');
 
         $this->waitAjax();
 
@@ -162,7 +162,7 @@ class CreateTest extends TestBase
         );
 
         $this->assertEquals(
-            'utf8_general_ci',
+            'utf8mb4_general_ci',
             $this->getCellByTableId('tablestructure', 2, 5)
         );