Merge branch '2.12.x' into 2.13.x

* 2.12.x: Psalm 4.23, PHPStan 1.6.3 (#9718)
doctrine · May 2, 2022 · a02642e · a02642e
2 parents b4da0ec + 5209184
commit a02642e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -42,13 +42,13 @@
         "doctrine/annotations": "^1.13",
         "doctrine/coding-standard": "^9.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
-        "phpstan/phpstan": "~1.4.10 || 1.6.1",
-        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
+        "phpstan/phpstan": "~1.4.10 || 1.6.3",
+        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.6.2",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "vimeo/psalm": "4.22.0"
+        "vimeo/psalm": "4.23.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >= 2.0"

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
+<files psalm-version="4.23.0@f1fe6ff483bf325c803df9f510d09a03fd796f88">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <DeprecatedClass occurrences="1">
       <code>IterableResult</code>
@@ -548,9 +548,6 @@
       <code>getConfiguration</code>
       <code>getConnection</code>
     </PossiblyNullReference>
-    <PropertyTypeCoercion occurrences="1">
-      <code>$subClass-&gt;table</code>
-    </PropertyTypeCoercion>
   </file>
   <file src="lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php">
     <DeprecatedConstant occurrences="1">