Skip to content

Commit c5e4e41

Browse files
authored
PHPStan 1.9.8, Psalm 5.4.0 (#10382)
1 parent 9431b2e commit c5e4e41

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
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 || dev-master",
45-
"phpstan/phpstan": "~1.4.10 || 1.9.5",
45+
"phpstan/phpstan": "~1.4.10 || 1.9.8",
4646
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
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.3.0"
52+
"vimeo/psalm": "4.30.0 || 5.4.0"
5353
},
5454
"conflict": {
5555
"doctrine/annotations": "<1.13 || >= 3.0"

psalm-baseline.xml

+2-9
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.3.0@b6faa3e96b8eb50ec71384c53799b8a107236bb6">
2+
<files psalm-version="5.4.0@62db5d4f6a7ae0a20f7cc5a4952d730272fc0863">
33
<file src="lib/Doctrine/ORM/AbstractQuery.php">
44
<DeprecatedClass occurrences="1">
55
<code>IterableResult</code>
@@ -2611,17 +2611,13 @@
26112611
<PossiblyNullArgument occurrences="1">
26122612
<code>$variableType</code>
26132613
</PossiblyNullArgument>
2614-
<PossiblyNullReference occurrences="1">
2615-
<code>getTraits</code>
2616-
</PossiblyNullReference>
26172614
<PropertyNotSetInConstructor occurrences="1">
26182615
<code>$classToExtend</code>
26192616
</PropertyNotSetInConstructor>
26202617
<RedundantCastGivenDocblockType occurrences="1">
26212618
<code>(bool) $embeddablesImmutable</code>
26222619
</RedundantCastGivenDocblockType>
2623-
<RedundantConditionGivenDocblockType occurrences="2">
2624-
<code>$reflClass !== false</code>
2620+
<RedundantConditionGivenDocblockType occurrences="1">
26252621
<code>isset($metadata-&gt;lifecycleCallbacks)</code>
26262622
</RedundantConditionGivenDocblockType>
26272623
</file>
@@ -2884,9 +2880,6 @@
28842880
<code>$collectionToUpdate</code>
28852881
<code>$em-&gt;getMetadataFactory()</code>
28862882
</InvalidArgument>
2887-
<InvalidArrayOffset occurrences="1">
2888-
<code>$commitOrder[$i]</code>
2889-
</InvalidArrayOffset>
28902883
<InvalidNullableReturnType occurrences="1">
28912884
<code>object</code>
28922885
</InvalidNullableReturnType>

0 commit comments

Comments
 (0)