Improve types more

yiisoft · Dec 6, 2023 · 15efe5d · 15efe5d
1 parent 184a797
commit 15efe5d
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/ItemsStorage.php b/src/ItemsStorage.php
@@ -95,10 +95,9 @@ public function getRoles(): array
 
     public function getRolesByNames(array $names): array
     {
-        /** @psalm-var array<string, Role> */
         return array_filter(
             $this->getAll(),
-            static fn (Item $item): bool => $item->getType() === Item::TYPE_ROLE && in_array($item->getName(), $names),
+            static fn (Permission|Role $item): bool => $item instanceof Role && in_array($item->getName(), $names),
         );
     }
 
@@ -114,11 +113,10 @@ public function getPermissions(): array
 
     public function getPermissionsByNames(array $names): array
     {
-        /** @psalm-var array<string, Permission> */
         return array_filter(
             $this->getAll(),
-            static function (Item $item) use ($names): bool {
-                return $item->getType() === Item::TYPE_PERMISSION && in_array($item->getName(), $names);
+            static function (Permission|Role $item) use ($names): bool {
+                return $item instanceof Permission && in_array($item->getName(), $names);
             },
         );
     }
@@ -336,15 +334,13 @@ private function hasItem(string $name): bool
     /**
      * @psalm-param Item::TYPE_* $type
      *
-     * @return Item[]
      * @psalm-return ($type is Item::TYPE_PERMISSION ? array<string, Permission> : array<string, Role>)
      */
     private function getItemsByType(string $type): array
     {
-        /** @psalm-var array<string, Permission> | array<string, Role> */
         return array_filter(
             $this->getAll(),
-            static fn (Item $item): bool => $item->getType() === $type,
+            static fn (Permission|Role $item): bool => $item->getType() === $type,
         );
     }