Skip to content

Commit 2ee936a

Browse files
committed
Merge branch '2.14.x' into 2.15.x
* 2.14.x: Psalm 5.6.0, PHPStan 1.9.14 (doctrine#10468)
2 parents 843bff4 + c78f933 commit 2ee936a

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
"doctrine/annotations": "^1.13 || ^2",
4343
"doctrine/coding-standard": "^9.0.2 || ^11.0",
4444
"phpbench/phpbench": "^0.16.10 || ^1.0",
45-
"phpstan/phpstan": "~1.4.10 || 1.9.8",
45+
"phpstan/phpstan": "~1.4.10 || 1.9.14",
4646
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5.28",
4747
"psr/log": "^1 || ^2 || ^3",
4848
"squizlabs/php_codesniffer": "3.7.1",
4949
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
5050
"symfony/var-exporter": "^4.4 || ^5.4 || ^6.2",
5151
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
52-
"vimeo/psalm": "4.30.0 || 5.5.0"
52+
"vimeo/psalm": "4.30.0 || 5.6.0"
5353
},
5454
"conflict": {
5555
"doctrine/annotations": "<1.13 || >= 3.0"

phpstan-baseline.neon

-5
Original file line numberDiff line numberDiff line change
@@ -425,11 +425,6 @@ parameters:
425425
count: 1
426426
path: lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
427427

428-
-
429-
message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node\\:\\:\\$pathExpression\\.$#"
430-
count: 1
431-
path: lib/Doctrine/ORM/Query/SqlWalker.php
432-
433428
-
434429
message: "#^Call to function is_string\\(\\) with Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node will always evaluate to false\\.$#"
435430
count: 1

psalm-baseline.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.5.0@b63061a27f2683ec0f3509012bb22daab3b65b61">
2+
<files psalm-version="5.6.0@e784128902dfe01d489c4123d69918a9f3c1eac5">
33
<file src="lib/Doctrine/ORM/AbstractQuery.php">
44
<DeprecatedClass>
55
<code>IterableResult</code>

0 commit comments

Comments
 (0)