Merge branch '3.7.x' into 4.0.x

* 3.7.x: Run tests with MySQL 8.1 (#6118) Sync MariaDB support strategy with upstream (#6110) Fix a typo and a space (#6119) PHPStan 1.10.26 (#6116) Fix self deprecation Pin Slevomat Coding Standard
doctrine · Aug 8, 2023 · 6b76e92 · 6b76e92
2 parents c97a3e6 + 1800cc4
commit 6b76e92
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 11 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -277,20 +277,23 @@ jobs:
         php-version:
           - "8.1"
         mariadb-version:
-          - "10.2"
-          - "10.5"
-          - "10.7"
-          - "10.9"
-          - "10.11"
+          - "10.2"  # Oldest version supported by DBAL
+          - "10.4"  # LTS (Jun 2024)
+          - "10.5"  # LTS (Jun 2025)
+          - "10.6"  # LTS (Jul 2026)
+          - "10.9"  # STS (Aug 2023)
+          - "10.10" # STS (Nov 2023)
+          - "10.11" # LTS (Feb 2028)
+          - "11.0"  # STS (Jun 2024)
         extension:
           - "mysqli"
           - "pdo_mysql"
         include:
           - php-version: "8.2"
-            mariadb-version: "10.11"
+            mariadb-version: "11.0"
             extension: "mysqli"
           - php-version: "8.3"
-            mariadb-version: "10.11"
+            mariadb-version: "11.0"
             extension: "pdo_mysql"
 
     services:
@@ -301,7 +304,7 @@ jobs:
           MYSQL_DATABASE: "doctrine_tests"
 
         options: >-
-          --health-cmd "mysqladmin ping --silent"
+          --health-cmd "mariadb-admin ping --silent || mysqladmin ping --silent"
 
         ports:
           - "3306:3306"
@@ -346,6 +349,7 @@ jobs:
         mysql-version:
           - "5.7"
           - "8.0"
+          - "8.1"
         extension:
           - "mysqli"
           - "pdo_mysql"

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -2217,7 +2217,7 @@ Additional related changes:
 
 1. The `FetchMode` class and the `setFetchMode()` method of the `Connection` and `Statement` interfaces are removed.
 2. The `Statement::fetch()` method is replaced with `fetchNumeric()`, `fetchAssociative()` and `fetchOne()`.
-3. The `Statement::fetchAll()` method is replaced with `fetchAllNumeric()`, `fetchAllAssociative()` and `fechColumn()`.
+3. The `Statement::fetchAll()` method is replaced with `fetchAllNumeric()`, `fetchAllAssociative()` and `fetchColumn()`.
 4. The `Statement::fetchColumn()` method is replaced with `fetchOne()`.
 5. The `Connection::fetchArray()` and `fetchAssoc()` methods are replaced with `fetchNumeric()` and `fetchAssociative()` respectively.
 6. The `StatementIterator` class is removed. The usage of a `Statement` object as `Traversable` is no longer possible. Use `iterateNumeric()`, `iterateAssociative()` and `iterateColumn()` instead.
@@ -2281,7 +2281,7 @@ All implementations of the `VersionAwarePlatformDriver` interface have to implem
 ## BC BREAK: Removed `MsSQLKeywords` class
 
 The `Doctrine\DBAL\Platforms\MsSQLKeywords` class has been removed.
-Please use `Doctrine\DBAL\Platforms\SQLServerPlatform `instead.
+Please use `Doctrine\DBAL\Platforms\SQLServerPlatform` instead.
 
 ## BC BREAK: Removed PDO DB2 driver
 

diff --git a/composer.json b/composer.json
@@ -41,11 +41,12 @@
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "dev-master#b51c647ece0a88c59fbc94028daebd047377bcdb",
-        "phpstan/phpstan": "1.10.21",
+        "phpstan/phpstan": "1.10.26",
         "phpstan/phpstan-phpunit": "1.3.13",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "10.2.2",
         "psalm/plugin-phpunit": "0.18.4",
+        "slevomat/coding-standard": "8.13.1",
         "squizlabs/php_codesniffer": "3.7.2",
         "symfony/cache": "^5.4|^6.0",
         "symfony/console": "^4.4.30|^5.4|^6.0",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -97,6 +97,9 @@ parameters:
                 - src/Driver/IBMDB2/Connection.php
                 - src/Driver/IBMDB2/Result.php
 
+        # Ignore the possible false return value of db2_num_rows().
+        - '~^Method Doctrine\\DBAL\\Driver\\IBMDB2\\Connection\:\:exec\(\) should return int but returns int<0, max>\|false\.$~'
+        - '~^Method Doctrine\\DBAL\\Driver\\IBMDB2\\Result\:\:rowCount\(\) should return int but returns int<0, max>\|false\.$~'
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -42,6 +42,11 @@
                 <file name="src/Driver/OCI8/ConvertPositionalToNamedPlaceholders.php"/>
             </errorLevel>
         </ConflictingReferenceConstraint>
+        <DeprecatedClass>
+            <errorLevel type="suppress">
+                <referencedClass name="Doctrine\DBAL\Platforms\MariaDB1043Platform"/>
+            </errorLevel>
+        </DeprecatedClass>
         <DeprecatedMethod>
             <errorLevel type="suppress">
                 <!-- TODO for PHPUnit 10 -->

diff --git a/src/Platforms/MariaDB1043Platform.php b/src/Platforms/MariaDB1043Platform.php
@@ -11,6 +11,9 @@
  *
  * Extend deprecated MariaDb1027Platform to ensure correct functions used in MySQLSchemaManager which
  * tests for MariaDb1027Platform not MariaDBPlatform.
+ *
+ * @deprecated This class will be merged with {@see MariaDBPlatform} in 4.0 because support for MariaDB
+ *             releases prior to 10.4.3 will be dropped.
  */
 class MariaDB1043Platform extends MariaDBPlatform
 {

diff --git a/tests/Driver/VersionAwarePlatformDriverTest.php b/tests/Driver/VersionAwarePlatformDriverTest.php
@@ -39,6 +39,7 @@ public static function mySQLVersionProvider(): array
             ['10.2.8-MariaDB-10.2.8+maria~xenial-log', MariaDBPlatform::class],
             ['10.2.8-MariaDB-1~lenny-log', MariaDBPlatform::class],
             ['10.5.2-MariaDB-1~lenny-log', MariaDB1052Platform::class],
+            ['11.0.2-MariaDB-1:11.0.2+maria~ubu2204', MariaDB1052Platform::class],
         ];
     }