Skip to content

Commit

Permalink
Merge pull request #4549 from morozov/psalm-4.6.4
Browse files Browse the repository at this point in the history
Upgrade Psalm to 4.6.4
  • Loading branch information
morozov authored Mar 17, 2021
2 parents c85d9d5 + 70797f3 commit 12bac17
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: "Static Analysis"

on:
Expand Down Expand Up @@ -50,6 +49,6 @@ jobs:
uses: actions/checkout@v2

- name: Psalm
uses: docker://vimeo/psalm-github-actions:4.5.2
uses: docker://vimeo/psalm-github-actions:4.6.4
with:
composer_require_dev: true
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"phpunit/phpunit": "9.5.0",
"psalm/plugin-phpunit": "0.13.0",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "4.5.2"
"vimeo/psalm": "4.6.4"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
Expand Down
9 changes: 2 additions & 7 deletions psalm.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,8 @@
<file name="lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php"/>
<file name="tests/Doctrine/Tests/DBAL/Functional/PortabilityTest.php"/>
<!--
See https://github.com/vimeo/psalm/issues/5305
Requires a release of
https://github.com/JetBrains/phpstorm-stubs/commit/43ce0bb13e927b9eb69cc06c16ab22f548c4735b
-->
<file name="lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php"/>
</errorLevel>
Expand Down Expand Up @@ -381,12 +382,6 @@
<file name="lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php"/>
</errorLevel>
</TooManyArguments>
<TypeDoesNotContainType>
<errorLevel type="suppress">
<!-- See https://github.com/vimeo/psalm/issues/4274 -->
<file name="lib/Doctrine/DBAL/Schema/Index.php"/>
</errorLevel>
</TypeDoesNotContainType>
<UndefinedConstant>
<errorLevel type="suppress">
<directory name="lib/Doctrine/DBAL/Driver/SQLAnywhere"/>
Expand Down

0 comments on commit 12bac17

Please sign in to comment.