Skip to content

Commit

Permalink
Merge pull request #9341 from derrabus/bump/phpstan-psalm
Browse files Browse the repository at this point in the history
PHPStan 1.3.3, Psalm 4.18.1
  • Loading branch information
greg0ire authored Jan 9, 2022
2 parents fd19444 + f3630ea commit 2fecb3c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
"doctrine/annotations": "^1.13",
"doctrine/coding-standard": "^9.0",
"phpbench/phpbench": "^0.16.10 || ^1.0",
"phpstan/phpstan": "1.3.0",
"phpstan/phpstan": "1.3.3",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
"squizlabs/php_codesniffer": "3.6.2",
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"vimeo/psalm": "4.17.0"
"vimeo/psalm": "4.18.1"
},
"conflict": {
"doctrine/annotations": "<1.13 || >= 2.0"
Expand Down
8 changes: 4 additions & 4 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.17.0@6f4707aa41c9174353a6434bba3fc8840f981d9c">
<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
<file src="lib/Doctrine/ORM/AbstractQuery.php">
<DeprecatedClass occurrences="1">
<code>IterableResult</code>
Expand Down Expand Up @@ -1027,14 +1027,14 @@
<code>$this-&gt;table</code>
<code>$this-&gt;table</code>
</PropertyTypeCoercion>
<RedundantCast occurrences="1">
<code>array_values</code>
</RedundantCast>
<RedundantConditionGivenDocblockType occurrences="3">
<code>$className !== null</code>
<code>$mapping !== false</code>
<code>$mapping !== false</code>
</RedundantConditionGivenDocblockType>
<RedundantFunctionCall occurrences="1">
<code>array_values</code>
</RedundantFunctionCall>
<TooManyArguments occurrences="2">
<code>joinColumnName</code>
<code>joinColumnName</code>
Expand Down

0 comments on commit 2fecb3c

Please sign in to comment.