Fix psalm issues

doctrine · Apr 30, 2024 · 793f09e · 793f09e
1 parent 15b741d
commit 793f09e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Platforms/MariaDBPlatform.php b/src/Platforms/MariaDBPlatform.php
@@ -169,13 +169,16 @@ protected function createReservedKeywordsList(): KeywordList
      * {@inheritDoc}
      *
      * @link https://mariadb.com/kb/en/unicode/
+     * @link https://mariadb.com/kb/en/old-mode/
      */
     public function informationSchemaUsesUtf8mb3(Connection $connection): bool
     {
         if (version_compare($connection->getServerVersion(), '10.6.0') < 0) {
             return false;
         }
 
-        return ! $connection->fetchOne('SELECT @old_mode');
+        $old_mode = (string) $connection->fetchOne('SELECT @old_mode');
+
+        return ! str_contains($old_mode, 'UTF8_IS_UTF8MB3');
     }
 }
diff --git a/tests/Platforms/MySQL/ComparatorTest.php b/tests/Platforms/MySQL/ComparatorTest.php
@@ -96,7 +96,7 @@ public function testUtf8AndUtf8mb3Mismatches(bool $useUtf8mb3, string $defaultCh
         self::assertNotEmpty($utf8Comparator->compareTables($table6, $table5)->getModifiedColumns());
     }
 
-    /** @return array{bool,string}[] */
+    /** @return iterable<array{bool,string}> */
     public static function utf8AndUtf8mb3MismatchesProvider(): iterable
     {
         yield [false, 'utf8'];