Improve filtering of items

yiisoft · Dec 6, 2023 · 184a797 · 184a797
1 parent 6860c53
commit 184a797
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/ItemsStorage.php b/src/ItemsStorage.php
@@ -503,10 +503,7 @@ private function fillChildrenRecursive(string $name, array &$result): void
      */
     private function filterRoles(array $items): array
     {
-        return array_filter(
-            $this->getRoles(),
-            static fn (Permission|Role $item): bool => array_key_exists($item->getName(), $items),
-        );
+        return array_filter($items, static fn (Permission|Role $item): bool => $item instanceof Role);
     }
 
     /**
@@ -517,9 +514,6 @@ private function filterRoles(array $items): array
      */
     private function filterPermissions(array $items): array
     {
-        return array_filter(
-            $this->getPermissions(),
-            static fn (Permission|Role $permissionItem): bool => array_key_exists($permissionItem->getName(), $items),
-        );
+        return array_filter($items, static fn (Permission|Role $item): bool => $item instanceof Permission);
     }
 }