Merge branch '2.13.x' into 2.14.x

* 2.13.x: Psalm 4.30.0, PHPStan 1.9.2 (doctrine#10213)
derrabus · Nov 11, 2022 · 318af0a · 318af0a
2 parents 90ececc + 7e45ad9
commit 318af0a
Show file tree

Hide file tree

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

diff --git a/lib/Doctrine/ORM/Query/Expr/Base.php b/lib/Doctrine/ORM/Query/Expr/Base.php
@@ -5,6 +5,7 @@
 namespace Doctrine\ORM\Query\Expr;
 
 use InvalidArgumentException;
+use Stringable;
 
 use function count;
 use function get_class;
@@ -30,10 +31,10 @@ abstract class Base
     /** @var string */
     protected $postSeparator = ')';
 
-    /** @psalm-var list<class-string> */
+    /** @var list<class-string> */
     protected $allowedClasses = [];
 
-    /** @psalm-var list<string|object> */
+    /** @var list<string|Stringable> */
     protected $parts = [];
 
     /** @param mixed $args */

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.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
+<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <DeprecatedClass occurrences="1">
       <code>IterableResult</code>
@@ -2003,18 +2003,9 @@
       <code>$parts</code>
     </NonInvariantDocblockPropertyType>
   </file>
-  <file src="lib/Doctrine/ORM/Query/Expr/Base.php">
-    <ArgumentTypeCoercion occurrences="1">
-      <code>$this-&gt;parts</code>
-    </ArgumentTypeCoercion>
-    <PossiblyInvalidCast occurrences="1">
-      <code>$this-&gt;parts[0]</code>
-    </PossiblyInvalidCast>
-  </file>
   <file src="lib/Doctrine/ORM/Query/Expr/Composite.php">
-    <PossiblyInvalidCast occurrences="2">
+    <PossiblyInvalidCast occurrences="1">
       <code>$part</code>
-      <code>$this-&gt;parts[0]</code>
     </PossiblyInvalidCast>
   </file>
   <file src="lib/Doctrine/ORM/Query/Expr/GroupBy.php">