Skip to content

Commit

Permalink
PHPStan 5.16.0, Symfony 7.0 (#11095)
Browse files Browse the repository at this point in the history
  • Loading branch information
@derrabus
derrabus committed Nov 29, 2023
1 parent 1a4fe6e commit 212edaa
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 57 deletions.
8 changes: 4 additions & 4 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
"psr/log": "^1 || ^2 || ^3",
"squizlabs/php_codesniffer": "3.7.2",
"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.15.0"
"symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7.0",
"symfony/var-exporter": "^4.4 || ^5.4 || ^6.2 || ^7.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
"vimeo/psalm": "4.30.0 || 5.16.0"
},
"conflict": {
"doctrine/annotations": "<1.13 || >= 3.0"
Expand Down
64 changes: 11 additions & 53 deletions psalm-baseline.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
<file src="lib/Doctrine/ORM/AbstractQuery.php">
<DeprecatedClass>
<code>IterableResult</code>
Expand Down Expand Up @@ -590,7 +590,6 @@
<DocblockTypeContradiction>
<code><![CDATA[! $mapping['isOwningSide']]]></code>
<code><![CDATA[! $this->table]]></code>
<code><![CDATA[! class_exists($mapping['targetEntity'])]]></code>
<code><![CDATA[$this->table]]></code>
<code><![CDATA[isset($mapping['id']) && $mapping['id'] === true && ! $mapping['isOwningSide']]]></code>
<code><![CDATA[isset($mapping['orderBy']) && ! is_array($mapping['orderBy'])]]></code>
Expand Down Expand Up @@ -626,9 +625,6 @@
<code>$quotedColumnNames</code>
<code><![CDATA[$this->namespace . '\\' . $className]]></code>
</LessSpecificReturnStatement>
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
<MoreSpecificReturnType>
<code>FieldMapping</code>
<code>class-string|null</code>
Expand Down Expand Up @@ -869,6 +865,9 @@
<MoreSpecificReturnType>
<code>class-string</code>
</MoreSpecificReturnType>
<NoValue>
<code>$metadata</code>
</NoValue>
<PossiblyNullArrayAccess>
<code><![CDATA[$this->tables[$tableName]]]></code>
<code><![CDATA[$this->tables[$tableName]]]></code>
Expand Down Expand Up @@ -1730,11 +1729,6 @@
<code>$sqlWalker</code>
</ParamNameMismatch>
</file>
<file src="lib/Doctrine/ORM/Query/AST/Node.php">
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
</file>
<file src="lib/Doctrine/ORM/Query/AST/NullComparisonExpression.php">
<ParamNameMismatch>
<code>$sqlWalker</code>
Expand Down Expand Up @@ -1942,36 +1936,15 @@
<code>$parts</code>
</NonInvariantDocblockPropertyType>
</file>
<file src="lib/Doctrine/ORM/Query/Expr/Base.php">
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
</file>
<file src="lib/Doctrine/ORM/Query/Expr/Comparison.php">
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
</file>
<file src="lib/Doctrine/ORM/Query/Expr/Composite.php">
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
<PossiblyInvalidCast>
<code>$part</code>
</PossiblyInvalidCast>
</file>
<file src="lib/Doctrine/ORM/Query/Expr/From.php">
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
</file>
<file src="lib/Doctrine/ORM/Query/Expr/Func.php">
<LessSpecificReturnStatement>
<code><![CDATA[$this->arguments]]></code>
</LessSpecificReturnStatement>
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
<MoreSpecificReturnType>
<code><![CDATA[list<mixed>]]></code>
</MoreSpecificReturnType>
Expand All @@ -1982,9 +1955,6 @@
</NonInvariantDocblockPropertyType>
</file>
<file src="lib/Doctrine/ORM/Query/Expr/Join.php">
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
<PossiblyNullArgument>
<code><![CDATA[$this->conditionType]]></code>
</PossiblyNullArgument>
Expand All @@ -1994,16 +1964,6 @@
<code>$parts</code>
</NonInvariantDocblockPropertyType>
</file>
<file src="lib/Doctrine/ORM/Query/Expr/Math.php">
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
</file>
<file src="lib/Doctrine/ORM/Query/Expr/OrderBy.php">
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
</file>
<file src="lib/Doctrine/ORM/Query/Expr/Orx.php">
<NonInvariantDocblockPropertyType>
<code>$allowedClasses</code>
Expand All @@ -2017,9 +1977,6 @@
</NonInvariantDocblockPropertyType>
</file>
<file src="lib/Doctrine/ORM/Query/Filter/SQLFilter.php">
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
<MissingClosureParamType>
<code>$value</code>
</MissingClosureParamType>
Expand Down Expand Up @@ -2127,9 +2084,6 @@
<code>addNamedNativeQueryResultClassMapping</code>
<code>addNamedNativeQueryResultSetMapping</code>
</DeprecatedMethod>
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
<PossiblyUndefinedArrayOffset>
<code><![CDATA[$associationMapping['joinColumns']]]></code>
<code><![CDATA[$associationMapping['joinColumns']]]></code>
Expand Down Expand Up @@ -2192,12 +2146,18 @@
<ImplicitToStringCast>
<code>$expr</code>
</ImplicitToStringCast>
<InvalidArrayOffset>
<code><![CDATA[$this->queryComponents[$expression]]]></code>
</InvalidArrayOffset>
<InvalidNullableReturnType>
<code>string</code>
</InvalidNullableReturnType>
<MoreSpecificImplementedParamType>
<code>$query</code>
</MoreSpecificImplementedParamType>
<NoValue>
<code>$expression</code>
</NoValue>
<PossiblyInvalidArgument>
<code><![CDATA[$aggExpression->pathExpression]]></code>
</PossiblyInvalidArgument>
Expand Down Expand Up @@ -2293,9 +2253,6 @@
<InvalidPropertyAssignmentValue>
<code>new ArrayCollection($parameters)</code>
</InvalidPropertyAssignmentValue>
<MethodSignatureMustProvideReturnType>
<code>__toString</code>
</MethodSignatureMustProvideReturnType>
<PossiblyFalseArgument>
<code>$spacePos</code>
<code>$spacePos</code>
Expand Down Expand Up @@ -2748,6 +2705,7 @@
<NoValue>
<code>$entityState</code>
<code>$entityState</code>
<code>$object</code>
</NoValue>
<PossiblyInvalidArgument>
<code>$value</code>
Expand Down

0 comments on commit 212edaa

Please sign in to comment.