From ae79228fe9a0d489b3152fe3ed005b91da010846 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 10 Nov 2022 11:21:07 +0100 Subject: [PATCH] Psalm 4.30.0, PHPStan 1.9.2 --- composer.json | 4 ++-- lib/Doctrine/ORM/Query/Expr/Base.php | 5 +++-- psalm-baseline.xml | 13 ++----------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index e4c80322e1a..e6525f34d5a 100644 --- 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 index 06b92629e04..bab52dbc432 100644 --- 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 */ + /** @var list */ protected $allowedClasses = []; - /** @psalm-var list */ + /** @var list */ protected $parts = []; /** @param mixed $args */ diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 32c84df56a9..1c43c7c1f63 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + IterableResult @@ -2039,18 +2039,9 @@ $parts - - - $this->parts - - - $this->parts[0] - - - + $part - $this->parts[0]