Merge branch '3.6.x' into 3.7.x

* 3.6.x:
  Run tests with MySQL 8.1 (doctrine#6118)
  Fix a typo and a space (doctrine#6119)
  PHPStan 1.10.26 (doctrine#6116)
  Fix self deprecation

.github/workflows/continuous-integration.yml

@@ -378,6 +378,7 @@ jobs:
         mysql-version:
           - "5.7"
           - "8.0"
+          - "8.1"
         extension:
           - "mysqli"
           - "pdo_mysql"

UPGRADE.md

@@ -1329,7 +1329,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.
@@ -1393,7 +1393,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
 

composer.json

@@ -43,7 +43,7 @@
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.1",
-        "phpstan/phpstan": "1.10.21",
+        "phpstan/phpstan": "1.10.26",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "9.6.9",
         "psalm/plugin-phpunit": "0.18.4",

phpstan.neon.dist

@@ -136,5 +136,9 @@ parameters:
             message: '~^Strict comparison using === between array<int, array> and false will always evaluate to false\.$~'
             paths:
                 - src/Driver/PgSQL/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-strict-rules/rules.neon

src/Schema/Column.php

@@ -436,7 +436,7 @@ public function setCustomSchemaOptions(array $customSchemaOptions)
      */
     public function getCustomSchemaOptions()
     {
-        Deprecation::trigger(
+        Deprecation::triggerIfCalledFromOutside(
             'doctrine/dbal',
             'https://github.com/doctrine/dbal/pull/5476',
             'Column::getCustomSchemaOptions() is deprecated. Use getPlatformOptions() instead.',