Merge pull request #107 from laminas/renovate/lock-file-maintenance

Lock file maintenance, minor improvements to static analysis
laminas · Feb 2, 2023 · 97930db · 97930db
2 parents 890feb3 + 75ec4b8
commit 97930db
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 53 deletions.
diff --git a/bin/laminas b/bin/laminas
@@ -9,7 +9,6 @@ use Laminas\Cli\ContainerResolver;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
 
-/** @psalm-suppress MissingFile */
 if (file_exists($a = __DIR__ . '/../../../autoload.php')) {
     require $a;
 } elseif (file_exists($a = __DIR__ . '/../vendor/autoload.php')) {

diff --git a/composer.json b/composer.json
@@ -37,12 +37,12 @@
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.5.0",
-        "laminas/laminas-mvc": "^3.5.0",
-        "laminas/laminas-servicemanager": "^3.19",
+        "laminas/laminas-mvc": "^3.6",
+        "laminas/laminas-servicemanager": "^3.20",
         "mikey179/vfsstream": "2.0.x-dev",
-        "phpunit/phpunit": "^9.5.25",
-        "psalm/plugin-phpunit": "^0.18.0",
-        "vimeo/psalm": "^5.0"
+        "phpunit/phpunit": "^9.5.28",
+        "psalm/plugin-phpunit": "^0.18.4",
+        "vimeo/psalm": "^5.6"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/psalm.xml b/psalm.xml
@@ -4,6 +4,8 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     findUnusedPsalmSuppress="true"
+    findUnusedCode="false"
+    findUnusedBaselineEntry="true"
     errorLevel="1"
     errorBaseline="psalm-baseline.xml"
 >

diff --git a/src/Input/AbstractInputParam.php b/src/Input/AbstractInputParam.php
@@ -100,14 +100,15 @@ public function isRequired(): bool
 
     /**
      * @param mixed $defaultValue
-     * @psalm-suppress LessSpecificImplementedReturnType
+     * @return $this
      */
     public function setDefault($defaultValue): InputParamInterface
     {
         $this->default = $defaultValue;
         return $this;
     }
 
+    /** @return $this */
     public function setDescription(string $description): InputParamInterface
     {
         $this->description = $description;
@@ -116,7 +117,7 @@ public function setDescription(string $description): InputParamInterface
 
     /**
      * @param null|string|string[] $shortcut
-     * @psalm-suppress LessSpecificImplementedReturnType
+     * @return $this
      */
     public function setShortcut($shortcut): InputParamInterface
     {
@@ -125,6 +126,7 @@ public function setShortcut($shortcut): InputParamInterface
         return $this;
     }
 
+    /** @return $this */
     public function setRequiredFlag(bool $required): InputParamInterface
     {
         $this->required = $required;

diff --git a/src/Input/IntParam.php b/src/Input/IntParam.php
@@ -66,12 +66,14 @@ static function (mixed $value) use ($min, $max): int {
         return $question;
     }
 
+    /** @return $this */
     public function setMin(?int $min): self
     {
         $this->min = $min;
         return $this;
     }
 
+    /** @return $this */
     public function setMax(?int $max): self
     {
         $this->max = $max;