Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Psalm 4.30.0, PHPStan 1.9.2 #10213

Merged
merged 1 commit into from Nov 10, 2022
Merged

Psalm 4.30.0, PHPStan 1.9.2 #10213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions lib/Doctrine/ORM/Query/Expr/Base.php
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@
namespace Doctrine\ORM\Query\Expr;

use InvalidArgumentException;
use Stringable;

use function count;
use function get_class;
Expand All @@ -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 */
Expand Down
13 changes: 2 additions & 11 deletions psalm-baseline.xml
View file
Open in desktop
@@ -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>
Expand Down Expand Up @@ -2039,18 +2039,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">
Expand Down