Merge pull request #4 from visto9259/1.x

Reverting some of the changes
LM-Commons · Aug 8, 2024 · 279a10b · 279a10b
2 parents ab64dbd + 3a1a537
commit 279a10b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 20 deletions.
diff --git a/src/Rbac/Role/HierarchicalRole.php b/src/Rbac/Role/HierarchicalRole.php
@@ -9,8 +9,6 @@
 
 namespace Rbac\Role;
 
-use Traversable;
-
 /**
  * Simple implementation for a hierarchical role
  */
@@ -19,20 +17,20 @@ class HierarchicalRole extends Role implements HierarchicalRoleInterface
     /**
      * @var array|RoleInterface[]
      */
-    protected array $children = [];
+    protected $children = [];
 
     /**
      * {@inheritDoc}
      */
-    public function hasChildren(): bool
+    public function hasChildren()
     {
         return !empty($this->children);
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getChildren(): Traversable|array
+    public function getChildren()
     {
         return $this->children;
     }
@@ -42,7 +40,7 @@ public function getChildren(): Traversable|array
      *
      * @param RoleInterface $child
      */
-    public function addChild(RoleInterface $child): void
+    public function addChild(RoleInterface $child)
     {
         $this->children[$child->getName()] = $child;
     }

diff --git a/src/Rbac/Role/HierarchicalRoleInterface.php b/src/Rbac/Role/HierarchicalRoleInterface.php
@@ -23,12 +23,12 @@ interface HierarchicalRoleInterface extends RoleInterface
      *
      * @return bool
      */
-    public function hasChildren(): bool;
+    public function hasChildren();
 
     /**
      * Get child roles
      *
      * @return array|RoleInterface[]|Traversable
      */
-    public function getChildren(): array|Traversable;
+    public function getChildren();
 }
diff --git a/src/Rbac/Role/Role.php b/src/Rbac/Role/Role.php
@@ -18,27 +18,27 @@ class Role implements RoleInterface
     /**
      * @var string
      */
-    protected string $name;
+    protected $name;
 
     /**
      * @var string[]
      */
-    protected array $permissions = [];
+    protected $permissions = [];
 
     /**
      * Constructor
      *
      * @param string $name
      */
-    public function __construct(string $name)
+    public function __construct($name)
     {
         $this->name = (string) $name;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getName(): string
+    public function getName()
     {
         return $this->name;
     }
@@ -48,18 +48,18 @@ public function getName(): string
      *
      * @param string $permission
      */
-    public function addPermission(string $permission): void
+    public function addPermission($permission)
     {
         $this->permissions[(string) $permission] = $permission;
     }
 
     /**
      * Checks if a permission exists for this role
      *
-     * @param mixed $permission
+     * @param  string $permission
      * @return bool
      */
-    public function hasPermission(mixed $permission): bool
+    public function hasPermission($permission)
     {
         return isset($this->permissions[(string) $permission]);
     }

diff --git a/src/Rbac/Role/RoleInterface.php b/src/Rbac/Role/RoleInterface.php
@@ -21,13 +21,13 @@ interface RoleInterface
      *
      * @return string
      */
-    public function getName(): string;
+    public function getName();
 
     /**
      * Checks if a permission exists for this role (it does not check child roles)
      *
      * @param  mixed $permission
      * @return bool
      */
-    public function hasPermission(mixed $permission): bool;
+    public function hasPermission($permission);
 }
diff --git a/src/Rbac/Traversal/Strategy/GeneratorStrategy.php b/src/Rbac/Traversal/Strategy/GeneratorStrategy.php
@@ -24,7 +24,7 @@ class GeneratorStrategy implements TraversalStrategyInterface
      * @param  RoleInterface[]|Traversable $roles
      * @return Generator
      */
-    public function getRolesIterator($roles): Generator
+    public function getRolesIterator($roles)
     {
         foreach ($roles as $role) {
             yield $role;

diff --git a/src/Rbac/Traversal/Strategy/RecursiveRoleIteratorStrategy.php b/src/Rbac/Traversal/Strategy/RecursiveRoleIteratorStrategy.php
@@ -22,7 +22,7 @@ class RecursiveRoleIteratorStrategy implements TraversalStrategyInterface
      * @param  RoleInterface[]           $roles
      * @return RecursiveIteratorIterator
      */
-    public function getRolesIterator($roles): RecursiveIteratorIterator
+    public function getRolesIterator($roles)
     {
         return new RecursiveIteratorIterator(
             new RecursiveRoleIterator($roles),

diff --git a/src/Rbac/Traversal/Strategy/TraversalStrategyInterface.php b/src/Rbac/Traversal/Strategy/TraversalStrategyInterface.php
@@ -21,5 +21,5 @@ interface TraversalStrategyInterface
      * @param  RoleInterface[]|Traversable
      * @return Traversable
      */
-    public function getRolesIterator($roles): Traversable;
+    public function getRolesIterator($roles);
 }