Update PermissionWrapper.php

ArrayAccess · Jul 18, 2024 · 28fbecb · 28fbecb
1 parent 4f51b97
commit 28fbecb
Showing 1 changed file with 13 additions and 22 deletions.
diff --git a/src/Database/Wrapper/PermissionWrapper.php b/src/Database/Wrapper/PermissionWrapper.php
@@ -32,7 +32,7 @@ class PermissionWrapper implements PermissionInterface
     private array $cachedInvalidEntities = [];
 
     /**
-     * @var ?array<string, CapabilityInterface>
+     * @var ?array<string, bool>
      */
     private ?array $availableIdentities = null;
 
@@ -93,6 +93,7 @@ public function getCapabilityEntityFactory(): ?CapabilityEntityFactoryInterface
     public function setCapabilityEntityFactory(CapabilityEntityFactoryInterface $capabilityEntityFactory): void
     {
         if ($capabilityEntityFactory !== $this->capabilityEntityFactory) {
+            $this->cachedInvalidEntities = [];
             $this->availableIdentities = null;
         }
         $this->capabilityEntityFactory = $capabilityEntityFactory;
@@ -181,24 +182,11 @@ public function get(CapabilityInterface|string $identity): ?CapabilityInterface
             if (isset($this->cachedInvalidEntities[$identity])) {
                 return null;
             }
-
-            $em = $this->getConnection()->getEntityManager();
-            $this->availableIdentities ??= $this->getCapabilities();
-
-            if (!isset($this->availableIdentities[$identity])) {
-                return null;
-            }
-
-            $entity = $factory->createEntity(
-                $this->getConnection()->getEntityManager(),
-                $identity
-            );
-            if (!$entity) {
+            if (!isset($this->getCapabilities()[$identity])) {
                 $this->cachedInvalidEntities[$identity] = false;
                 return null;
             }
-            $this->availableIdentities[$identity] = true;
-            $this->add($entity);
+
         }
 
         return $this->permission->get($identity);
@@ -219,12 +207,15 @@ public function getCapabilities(): array
     {
         $factory = $this->getCapabilityEntityFactory();
         if ($this->availableIdentities === null && $factory) {
-            IterableHelper::each(
-                $factory->getCapabilityIdentities($this->getConnection()->getEntityManager()),
-                function (&$key, $value) {
-                    $key = strtolower($value);
-                    $this->availableIdentities[$key] = $value;
-                    return false;
+            $this->availableIdentities = [];
+            IterableHelper::every(
+                $this
+                    ->getCapabilityEntityFactory()
+                    ->all($this->getConnection()->getEntityManager()),
+                function ($e, CapabilityInterface $capability) {
+                    $identity = $this->identify($capability);
+                    $this->availableIdentities[$identity] = true;
+                    $this->permission->add($capability);
                 }
             );
         }