Upgrade psalm to 5.21.x

Fixes various `RiskyTruthyFalsyComparison` issues Signed-off-by: George Steel <[email protected]>
laminas · Feb 1, 2024 · 6f92812 · 6f92812
1 parent 5b66374
commit 6f92812
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 64 deletions.
diff --git a/composer.json b/composer.json
@@ -40,10 +40,10 @@
     "require-dev": {
         "ext-json": "*",
         "laminas/laminas-coding-standard": "~2.5.0",
-        "phpunit/phpunit": "^10.5.5",
+        "phpunit/phpunit": "^10.5.9",
         "psalm/plugin-phpunit": "^0.18.4",
         "psr/http-message": "^2.0",
-        "vimeo/psalm": "^5.18",
+        "vimeo/psalm": "^5.21.1",
         "webmozart/assert": "^1.11"
     },
     "suggest": {

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
+<files psalm-version="5.21.1@8c473e2437be8b6a8fd8f630f0f11a16b114c494">
   <file src="src/ArrayInput.php">
     <DocblockTypeContradiction>
       <code>is_array($value)</code>

diff --git a/src/BaseInputFilter.php b/src/BaseInputFilter.php
@@ -96,7 +96,7 @@ public function add($input, $name = null)
             ));
         }
 
-        if ($input instanceof InputInterface && (empty($name) || is_int($name))) {
+        if ($input instanceof InputInterface && ($name === null || $name === '' || is_int($name))) {
             $name = $input->getName();
         }
 
@@ -233,7 +233,7 @@ public function isValid($context = null)
             ));
         }
 
-        $inputs = $this->validationGroup ?: array_keys($this->inputs);
+        $inputs = $this->validationGroup ?? array_keys($this->inputs);
         return $this->validateInputs($inputs, $this->data, $context);
     }
 
@@ -247,7 +247,7 @@ public function isValid($context = null)
      */
     protected function validateInputs(array $inputs, array $data = [], $context = null)
     {
-        $inputContext = $context ?: array_merge($this->getRawValues(), $data);
+        $inputContext = $context ?? array_merge($this->getRawValues(), $data);
 
         $this->validInputs   = [];
         $this->invalidInputs = [];
@@ -413,7 +413,7 @@ public function getValue($name)
      */
     public function getValues()
     {
-        $inputs = $this->validationGroup ?: array_keys($this->inputs);
+        $inputs = $this->validationGroup ?? array_keys($this->inputs);
         $values = [];
         foreach ($inputs as $name) {
             $input = $this->inputs[$name];

diff --git a/src/CollectionInputFilter.php b/src/CollectionInputFilter.php
@@ -221,7 +221,7 @@ public function isValid($context = null)
             $valid = false;
         }
 
-        if (! $this->data) {
+        if ($this->data === null) {
             $this->clearValues();
             $this->clearRawValues();
 
@@ -316,7 +316,7 @@ public function getMessages()
      */
     public function getUnknown()
     {
-        if (! $this->data) {
+        if ($this->data === null) {
             throw new Exception\RuntimeException(sprintf(
                 '%s: no data present!',
                 __METHOD__

diff --git a/src/InputFilterPluginManagerFactory.php b/src/InputFilterPluginManagerFactory.php
@@ -38,7 +38,7 @@ class InputFilterPluginManagerFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $name = null, ?array $options = null)
     {
-        $pluginManager = new InputFilterPluginManager($container, $options ?: []);
+        $pluginManager = new InputFilterPluginManager($container, $options ?? []);
 
         // If this is in a laminas-mvc application, the ServiceListener will inject
         // merged configuration during bootstrap.
@@ -75,7 +75,7 @@ public function __invoke(ContainerInterface $container, $name = null, ?array $op
      */
     public function createService(ServiceLocatorInterface $container, $name = null, $requestedName = null)
     {
-        return $this($container, $requestedName ?: InputFilterPluginManager::class, $this->creationOptions);
+        return $this($container, $requestedName ?? InputFilterPluginManager::class, $this->creationOptions);
     }
 
     /**