Merge 3.4.x into 3.5.x

composer.json

@@ -42,14 +42,14 @@
     "require-dev": {
         "doctrine/coding-standard": "10.0.0",
         "jetbrains/phpstorm-stubs": "2022.2",
-        "phpstan/phpstan": "1.8.2",
+        "phpstan/phpstan": "1.8.3",
         "phpstan/phpstan-strict-rules": "^1.3",
-        "phpunit/phpunit": "9.5.21",
+        "phpunit/phpunit": "9.5.24",
         "psalm/plugin-phpunit": "0.17.0",
         "squizlabs/php_codesniffer": "3.7.1",
         "symfony/cache": "^5.4|^6.0",
         "symfony/console": "^4.4|^5.4|^6.0",
-        "vimeo/psalm": "4.24.0"
+        "vimeo/psalm": "4.27.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

phpstan.neon.dist

@@ -27,7 +27,6 @@ parameters:
         -
             message: '~^Only booleans are allowed in .*, mixed given~'
             paths:
-                - src/Driver/*/Driver.php
                 - src/Platforms/*Platform.php
                 - src/Query/QueryBuilder.php
                 - src/Schema/*SchemaManager.php
@@ -101,11 +100,6 @@ parameters:
                 - src/Driver/Mysqli/Exception/InvalidCharset.php
                 - src/Driver/Mysqli/Exception/StatementError.php
 
-        -
-            message: '~^Unable to resolve the template type T in call to method Doctrine\\DBAL\\Portability\\Converter\:\:compose\(\)$~'
-            paths:
-                - src/Portability/Converter.php
-
         # Type check for legacy implementations of the Connection interface
         # TODO: remove in 4.0.0
         - "~Call to function method_exists\\(\\) with Doctrine\\\\DBAL\\\\Driver\\\\Connection and 'getNativeConnection' will always evaluate to true\\.~"

src/Connection.php

@@ -443,7 +443,7 @@ private function getServerVersion()
 
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4750',
+            'https://github.com/doctrine/dbal/pull/4750',
             'Not implementing the ServerInfoAwareConnection interface in %s is deprecated',
             get_class($connection),
         );

src/Platforms/AbstractMySQLPlatform.php

@@ -332,7 +332,7 @@ public function prefersIdentityColumns()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/1519',
+            'https://github.com/doctrine/dbal/pull/1519',
             'AbstractMySQLPlatform::prefersIdentityColumns() is deprecated.',
         );
 

src/Platforms/AbstractPlatform.php

@@ -591,7 +591,7 @@ public function getSqlCommentStartString()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getSqlCommentStartString() is deprecated.',
         );
 
@@ -609,7 +609,7 @@ public function getSqlCommentEndString()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getSqlCommentEndString() is deprecated.',
         );
 
@@ -715,7 +715,7 @@ public function getWildcards()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getWildcards() is deprecated.'
             . ' Use AbstractPlatform::getLikeWildcardCharacters() instead.',
         );
@@ -748,7 +748,7 @@ public function getAvgExpression($column)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getAvgExpression() is deprecated. Use AVG() in SQL instead.',
         );
 
@@ -770,7 +770,7 @@ public function getCountExpression($column)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getCountExpression() is deprecated. Use COUNT() in SQL instead.',
         );
 
@@ -790,7 +790,7 @@ public function getMaxExpression($column)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getMaxExpression() is deprecated. Use MAX() in SQL instead.',
         );
 
@@ -810,7 +810,7 @@ public function getMinExpression($column)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getMinExpression() is deprecated. Use MIN() in SQL instead.',
         );
 
@@ -830,7 +830,7 @@ public function getSumExpression($column)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getSumExpression() is deprecated. Use SUM() in SQL instead.',
         );
 
@@ -854,7 +854,7 @@ public function getMd5Expression($column)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getMd5Expression() is deprecated.',
         );
 
@@ -886,7 +886,7 @@ public function getSqrtExpression($column)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getSqrtExpression() is deprecated. Use SQRT() in SQL instead.',
         );
 
@@ -907,7 +907,7 @@ public function getRoundExpression($column, $decimals = 0)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getRoundExpression() is deprecated. Use ROUND() in SQL instead.',
         );
 
@@ -978,7 +978,7 @@ public function getRtrimExpression($str)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getRtrimExpression() is deprecated. Use RTRIM() in SQL instead.',
         );
 
@@ -998,7 +998,7 @@ public function getLtrimExpression($str)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getLtrimExpression() is deprecated. Use LTRIM() in SQL instead.',
         );
 
@@ -1019,7 +1019,7 @@ public function getUpperExpression($str)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getUpperExpression() is deprecated. Use UPPER() in SQL instead.',
         );
 
@@ -1040,7 +1040,7 @@ public function getLowerExpression($str)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getLowerExpression() is deprecated. Use LOWER() in SQL instead.',
         );
 
@@ -1136,7 +1136,7 @@ public function getNotExpression($expression)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getNotExpression() is deprecated. Use NOT() in SQL instead.',
         );
 
@@ -1156,7 +1156,7 @@ public function getIsNullExpression($expression)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getIsNullExpression() is deprecated. Use IS NULL in SQL instead.',
         );
 
@@ -1176,7 +1176,7 @@ public function getIsNotNullExpression($expression)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getIsNotNullExpression() is deprecated. Use IS NOT NULL in SQL instead.',
         );
 
@@ -1204,7 +1204,7 @@ public function getBetweenExpression($expression, $value1, $value2)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getBetweenExpression() is deprecated. Use BETWEEN in SQL instead.',
         );
 
@@ -1224,7 +1224,7 @@ public function getAcosExpression($value)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getAcosExpression() is deprecated. Use ACOS() in SQL instead.',
         );
 
@@ -1244,7 +1244,7 @@ public function getSinExpression($value)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getSinExpression() is deprecated. Use SIN() in SQL instead.',
         );
 
@@ -1262,7 +1262,7 @@ public function getPiExpression()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getPiExpression() is deprecated. Use PI() in SQL instead.',
         );
 
@@ -1282,7 +1282,7 @@ public function getCosExpression($value)
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getCosExpression() is deprecated. Use COS() in SQL instead.',
         );
 
@@ -3135,7 +3135,7 @@ public function getTemporaryTableSQL()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getTemporaryTableSQL() is deprecated.',
         );
 
@@ -3264,7 +3264,7 @@ public function getUniqueFieldDeclarationSQL()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getUniqueFieldDeclarationSQL() is deprecated. Use UNIQUE in SQL instead.',
         );
 
@@ -3311,7 +3311,7 @@ public function prefersIdentityColumns()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/1519',
+            'https://github.com/doctrine/dbal/pull/1519',
             'AbstractPlatform::prefersIdentityColumns() is deprecated.',
         );
 
@@ -3536,7 +3536,7 @@ public function getListUsersSQL()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::getListUsersSQL() is deprecated.',
         );
 
@@ -3835,7 +3835,7 @@ public function supportsIndexes()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::supportsIndexes() is deprecated.',
         );
 
@@ -3871,7 +3871,7 @@ public function supportsAlterTable()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::supportsAlterTable() is deprecated. All platforms must implement altering tables.',
         );
 
@@ -3889,7 +3889,7 @@ public function supportsTransactions()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::supportsTransactions() is deprecated.',
         );
 
@@ -3927,7 +3927,7 @@ public function supportsPrimaryConstraints()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::supportsPrimaryConstraints() is deprecated.',
         );
 
@@ -4029,7 +4029,7 @@ public function supportsGettingAffectedRows()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::supportsGettingAffectedRows() is deprecated.',
         );
 
@@ -4105,7 +4105,7 @@ public function supportsViews()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::supportsViews() is deprecated. All platforms must implement support for views.',
         );
 
@@ -4231,7 +4231,7 @@ public function supportsLimitOffset()
     {
         Deprecation::triggerIfCalledFromOutside(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/4724',
+            'https://github.com/doctrine/dbal/pull/4724',
             'AbstractPlatform::supportsViews() is deprecated.'
             . ' All platforms must implement support for offsets in modify limit clauses.',
         );

src/Platforms/DB2Platform.php

@@ -918,7 +918,7 @@ public function prefersIdentityColumns()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/1519',
+            'https://github.com/doctrine/dbal/pull/1519',
             'DB2Platform::prefersIdentityColumns() is deprecated.',
         );
 

src/Platforms/SQLServerPlatform.php

@@ -109,7 +109,7 @@ public function prefersIdentityColumns()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/1519',
+            'https://github.com/doctrine/dbal/pull/1519',
             'SQLServerPlatform::prefersIdentityColumns() is deprecated.',
         );
 

src/Platforms/SqlitePlatform.php

@@ -217,7 +217,7 @@ public function prefersIdentityColumns()
     {
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pulls/1519',
+            'https://github.com/doctrine/dbal/pull/1519',
             'SqlitePlatform::prefersIdentityColumns() is deprecated.',
         );