Replace mocks with middlewares.

doctrine · Dec 30, 2021 · e1abaac · e1abaac
1 parent 47f931c
commit e1abaac
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 397 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "doctrine/cache": "^1.12.1 || ^2.1.1",
         "doctrine/collections": "^1.5",
         "doctrine/common": "^3.0.3",
-        "doctrine/dbal": "^3.2",
+        "doctrine/dbal": "^3.3@dev",
         "doctrine/deprecations": "^0.5.3",
         "doctrine/event-manager": "^1.1",
         "doctrine/inflector": "^1.4 || ^2.0",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1165,16 +1165,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

diff --git a/phpstan.neon b/phpstan.neon
@@ -12,8 +12,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
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -787,6 +787,9 @@
       <code>$class</code>
       <code>$subclass</code>
     </ArgumentTypeCoercion>
+    <DeprecatedMethod occurrences="1">
+      <code>canRequireSQLConversion</code>
+    </DeprecatedMethod>
     <DeprecatedProperty occurrences="4">
       <code>$this-&gt;columnNames</code>
       <code>$this-&gt;columnNames</code>