Fix Psalm errors

Author: mspirkov

src/PseudoTypes/NonEmptyArray.php

@@ -35,14 +35,14 @@ public function underlyingType(): Type
      */
     public function __toString(): string
     {
-        if ($this->keyType) {
-            return 'non-empty-array<' . $this->keyType . ',' . $this->valueType . '>';
-        }
-
         if ($this->valueType === null) {
             return 'non-empty-array';
         }
 
+        if ($this->keyType) {
+            return 'non-empty-array<' . $this->keyType . ',' . $this->valueType . '>';
+        }
+
         return 'non-empty-array<' . $this->valueType . '>';
     }
 }

src/Types/AbstractList.php

@@ -76,14 +76,14 @@ public function getValueType(): Type
      */
     public function __toString(): string
     {
-        if ($this->keyType) {
-            return 'array<' . $this->keyType . ',' . $this->valueType . '>';
-        }
-
         if ($this->valueType === null) {
             return 'array';
         }
 
+        if ($this->keyType) {
+            return 'array<' . $this->keyType . ',' . $this->valueType . '>';
+        }
+
         if ($this->valueType instanceof Compound) {
             return '(' . $this->valueType . ')[]';
         }

src/Types/Collection.php

@@ -59,10 +59,13 @@ public function __toString(): string
     {
         $objectType = (string) ($this->fqsen ?? 'object');
 
+        /** @var string */
+        $valueType = $this->valueType;
+
         if ($this->keyType === null) {
-            return $objectType . '<' . $this->valueType . '>';
+            return $objectType . '<' . $valueType . '>';
         }
 
-        return $objectType . '<' . $this->keyType . ',' . $this->valueType . '>';
+        return $objectType . '<' . $this->keyType . ',' . $valueType . '>';
     }
 }

src/Types/Iterable_.php

@@ -25,14 +25,14 @@ final class Iterable_ extends AbstractList
      */
     public function __toString(): string
     {
-        if ($this->keyType) {
-            return 'iterable<' . $this->keyType . ',' . $this->valueType . '>';
-        }
-
         if ($this->valueType === null) {
             return 'iterable';
         }
 
+        if ($this->keyType) {
+            return 'iterable<' . $this->keyType . ',' . $this->valueType . '>';
+        }
+
         return 'iterable<' . $this->valueType . '>';
     }
 }