Merge branch '2.11.x' into 3.0.x

doctrine · Oct 18, 2020 · 3c84585 · 3c84585
2 parents 877609c + 2224d36
commit 3c84585
Show file tree

Hide file tree

Showing 83 changed files with 526 additions and 335 deletions.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -59,4 +59,4 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Psalm
-        uses: docker://vimeo/psalm-github-actions
+        uses: docker://vimeo/psalm-github-actions:3.17.2
diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         "phpunit/phpunit": "^9.4",
         "psalm/plugin-phpunit": "^0.10.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
-        "vimeo/psalm": "^3.14.2"
+        "vimeo/psalm": "^3.17.2"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."