Merge remote-tracking branch 'origin/2.10.x' into 2.11.x

Author: greg0ire

phpstan-baseline.neon

@@ -895,16 +895,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php
 
-		-
-			message: "#^Parameter \\#2 \\$start of method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getSubstringExpression\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php
-
-		-
-			message: "#^Parameter \\#3 \\$length of method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getSubstringExpression\\(\\) expects int\\|null, string\\|null given\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php
-
 		-
 			message: "#^Parameter \\#1 \\$simpleArithmeticExpr of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkSimpleArithmeticExpression\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
 			count: 1

phpstan-dbal2.neon

@@ -30,3 +30,14 @@ parameters:
             message: '/^Parameter #3 \$startPos of method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getLocateExpression\(\) expects int\|false, string given\.$/'
             count: 1
             path: lib/Doctrine/ORM/Query/AST/Functions/LocateFunction.php
+
+        # Won't get fixed in DBAL 2
+        -
+            message: "#^Parameter \\#2 \\$start of method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getSubstringExpression\\(\\) expects int, string given\\.$#"
+            count: 1
+            path: lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php
+
+        -
+            message: "#^Parameter \\#3 \\$length of method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getSubstringExpression\\(\\) expects int\\|null, string\\|null given\\.$#"
+            count: 1
+            path: lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php

phpstan.neon

@@ -38,8 +38,3 @@ parameters:
             message: '/^Call to an undefined method Doctrine\\Common\\Cache\\Cache::deleteAll\(\)\.$/'
             count: 1
             path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php
-        # See https://github.com/doctrine/dbal/pull/5129
-        -
-            message: '/^Parameter #3 \$startPos of method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getLocateExpression\(\) expects int\|false, string given\.$/'
-            count: 1
-            path: lib/Doctrine/ORM/Query/AST/Functions/LocateFunction.php