Make Psalm happy

psalm · Mar 30, 2020 · 9074932 · 9074932
1 parent 8f98135
commit 9074932
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/hooks/TestCaseHandler.php b/hooks/TestCaseHandler.php
@@ -413,15 +413,17 @@ function (
         }
     }
 
-    /** @return Type\Atomic[] */
+    /** @return non-empty-array<string,Type\Atomic> */
     private static function getAtomics(Type\Union $union): array
     {
         if (method_exists($union, 'getAtomicTypes')) {
-            /** @var Type\Atomic[] annotated for versions missing the method */
+            /** @var non-empty-array<string, Type\Atomic> annotated for versions missing the method */
             return $union->getAtomicTypes();
         } else {
             /** @psalm-suppress DeprecatedMethod annotated for newer versions that deprecated the method */
-            return $union->getTypes();
+            $types = $union->getTypes();
+            assert(!empty($types));
+            return $types;
         }
     }
 
@@ -454,13 +456,6 @@ private static function unionizeIterables(Codebase $codebase, Type\Union $iterab
             }
         }
 
-        if (empty($key_types) || empty($value_types)) {
-            return new Type\Atomic\TIterable([
-                Type::getMixed(),
-                Type::getMixed(),
-            ]);
-        }
-
         $combine =
             /** @param null|Type\Union $a */
             function ($a, Type\Union $b) use ($codebase): Type\Union {