Merge branch '2.14.x' into 2.15.x

* 2.14.x: Psalm 5.6.0, PHPStan 1.9.14 (doctrine#10468)
derrabus · Jan 26, 2023 · 2ee936a · 2ee936a
2 parents 843bff4 + c78f933
commit 2ee936a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -42,14 +42,14 @@
         "doctrine/annotations": "^1.13 || ^2",
         "doctrine/coding-standard": "^9.0.2 || ^11.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
-        "phpstan/phpstan": "~1.4.10 || 1.9.8",
+        "phpstan/phpstan": "~1.4.10 || 1.9.14",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5.28",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.1",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
         "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "vimeo/psalm": "4.30.0 || 5.5.0"
+        "vimeo/psalm": "4.30.0 || 5.6.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >= 3.0"

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -425,11 +425,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
 
-		-
-			message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node\\:\\:\\$pathExpression\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Query/SqlWalker.php
-
 		-
 			message: "#^Call to function is_string\\(\\) with Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node will always evaluate to false\\.$#"
 			count: 1

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.5.0@b63061a27f2683ec0f3509012bb22daab3b65b61">
+<files psalm-version="5.6.0@e784128902dfe01d489c4123d69918a9f3c1eac5">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <DeprecatedClass>
       <code>IterableResult</code>