Merge pull request #25 from mezzio/renovate/vimeo-psalm-5.x

Update dependency vimeo/psalm to v5
mezzio · Dec 1, 2022 · c615633 · c615633
2 parents 1fba8cc + b3f16ba
commit c615633
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 96 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,3 @@
-/.coveralls.yml export-ignore
 /.gitattributes export-ignore
 /.github/ export-ignore
 /.gitignore export-ignore

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /.phpcs-cache
 /.phpunit.result.cache
 /clover.xml
-/coveralls-upload.json
 /docs/html/
 /laminas-mkdoc-theme.tgz
 /laminas-mkdoc-theme/

diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "laminas/laminas-coding-standard": "~2.4.0",
         "phpunit/phpunit": "^9.5.26",
         "psalm/plugin-phpunit": "^0.18.0",
-        "vimeo/psalm": "^4.29.0"
+        "vimeo/psalm": "^5.0.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/test/TestAsset/FlashMessages.php b/test/TestAsset/FlashMessages.php
@@ -43,7 +43,7 @@ public function flashNow(string $key, $value, int $hops = 1): void
 
     /**
      * @param mixed|null $default
-     * @return mixed|void
+     * @return void
      */
     public function getFlash(string $key, $default = null)
     {