Use more specific type hints (#200)

* Use more specific type hints

* Sync FakeItemsStorage, fix unit tests

src/ItemsStorageInterface.php

@@ -28,10 +28,10 @@ public function getAll(): array;
      *
      * @param string $name The role or the permission name.
      *
-     * @return Item|null The role or the permission corresponding to the specified name. `null` is returned if no such
+     * @return Permission|Role|null The role or the permission corresponding to the specified name. `null` is returned if no such
      * item.
      */
-    public function get(string $name): ?Item;
+    public function get(string $name): Permission|Role|null;
 
     /**
      * Whether named role or permission exists.
@@ -54,17 +54,17 @@ public function roleExists(string $name): bool;
     /**
      * Adds the role or the permission to RBAC system.
      *
-     * @param Item $item The role or the permission to add.
+     * @param Permission|Role $item The role or the permission to add.
      */
-    public function add(Item $item): void;
+    public function add(Permission|Role $item): void;
 
     /**
      * Updates the specified role or permission in the system.
      *
      * @param string $name The old name of the role or permission.
-     * @param Item $item Modified role or permission.
+     * @param Permission|Role $item Modified role or permission.
      */
-    public function update(string $name, Item $item): void;
+    public function update(string $name, Permission|Role $item): void;
 
     /**
      * Removes a role or permission from the RBAC system.

src/Manager.php

@@ -308,7 +308,7 @@ private function executeRule(string $user, Item $item, array $params): bool
     /**
      * @throws ItemAlreadyExistsException
      */
-    private function addItem(Item $item): void
+    private function addItem(Permission|Role $item): void
     {
         if ($this->itemsStorage->exists($item->getName())) {
             throw new ItemAlreadyExistsException($item);

tests/Support/FakeItemsStorage.php

@@ -19,7 +19,7 @@ public function getAll(): array
         return $this->items;
     }
 
-    public function get(string $name): ?Item
+    public function get(string $name): Permission|Role|null
     {
         return $this->items[$name] ?? null;
     }
@@ -34,7 +34,7 @@ public function roleExists(string $name): bool
         return isset($this->getItemsByType(Item::TYPE_ROLE)[$name]);
     }
 
-    public function add(Item $item): void
+    public function add(Permission|Role $item): void
     {
         $this->items[$item->getName()] = $item;
     }
@@ -164,7 +164,7 @@ public function remove(string $name): void
         $this->removeItemByName($name);
     }
 
-    public function update(string $name, Item $item): void
+    public function update(string $name, Permission|Role $item): void
     {
         if ($item->getName() !== $name) {
             $this->updateItemName($name, $item);