[ZF3] Rbac component cleaning

library/Zend/Permissions/Rbac/AbstractRole.php

@@ -9,15 +9,21 @@
 
 namespace Zend\Permissions\Rbac;
 
+use RecursiveArrayIterator;
 use RecursiveIteratorIterator;
 
-abstract class AbstractRole extends AbstractIterator implements RoleInterface
+abstract class AbstractRole implements RoleInterface
 {
     /**
      * @var null|RoleInterface
      */
     protected $parent;
 
+    /**
+     * @var array|RoleInterface[]
+     */
+    protected $children = array();
+
     /**
      * @var string
      */
@@ -41,14 +47,12 @@ public function getName()
     /**
      * Add permission to the role.
      *
-     * @param $name
-     * @return RoleInterface
+     * @param  string $name
+     * @return void
      */
     public function addPermission($name)
     {
-        $this->permissions[$name] = true;
-
-        return $this;
+        $this->permissions[(string)$name] = true;
     }
 
     /**
@@ -63,8 +67,9 @@ public function hasPermission($name)
             return true;
         }
 
-        $it = new RecursiveIteratorIterator($this, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($it as $leaf) {
+        $iteratorIterator = new RecursiveIteratorIterator($this, RecursiveIteratorIterator::CHILD_FIRST);
+
+        foreach ($iteratorIterator as $leaf) {
             /** @var RoleInterface $leaf */
             if ($leaf->hasPermission($name)) {
                 return true;
@@ -74,17 +79,40 @@ public function hasPermission($name)
         return false;
     }
 
+    /**
+     * Set parent role
+     *
+     * @param  RoleInterface $parent
+     * @return void
+     */
+    public function setParent(RoleInterface $parent)
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Get parent role
+     *
+     * @return null|RoleInterface
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
     /**
      * Add a child.
      *
      * @param  RoleInterface|string $child
-     * @return Role
+     * @return void
+     * @throws Exception\InvalidArgumentException
      */
     public function addChild($child)
     {
         if (is_string($child)) {
             $child = new Role($child);
         }
+
         if (!$child instanceof RoleInterface) {
             throw new Exception\InvalidArgumentException(
                 'Child must be a string or implement Zend\Permissions\Rbac\RoleInterface'
@@ -93,26 +121,25 @@ public function addChild($child)
 
         $child->setParent($this);
         $this->children[] = $child;
-
-        return $this;
     }
 
     /**
-     * @param  RoleInterface $parent
-     * @return RoleInterface
+     * Get children roles
+     *
+     * @return array|RoleInterface[]
      */
-    public function setParent($parent)
+    public function getChildren()
     {
-        $this->parent = $parent;
-
-        return $this;
+        return $this->children;
     }
 
     /**
-     * @return null|RoleInterface
+     * Implement the IteratorAggregate interface
+     *
+     * @return \Traversable
      */
-    public function getParent()
+    public function getIterator()
     {
-        return $this->parent;
+        return new RecursiveArrayIterator($this->children);
     }
 }

library/Zend/Permissions/Rbac/AssertionInterface.php

@@ -14,7 +14,7 @@ interface AssertionInterface
     /**
      * Assertion method - must return a boolean.
      *
-     * @param  Rbac    $rbac
+     * @param  Rbac $rbac
      * @return bool
      */
     public function assert(Rbac $rbac);

library/Zend/Permissions/Rbac/Rbac.php

@@ -9,30 +9,39 @@
 
 namespace Zend\Permissions\Rbac;
 
+use RecursiveArrayIterator;
 use RecursiveIteratorIterator;
 
-class Rbac extends AbstractIterator
+class Rbac
 {
     /**
-     * flag: whether or not to create roles automatically if
-     * they do not exist.
+     * List of roles
+     *
+     * @var array|RoleInterface[]
+     */
+    protected $roles = array();
+
+    /**
+     * flag: whether or not to create roles automatically if they do not exist.
      *
      * @var bool
      */
     protected $createMissingRoles = false;
 
     /**
-     * @param  bool                     $createMissingRoles
-     * @return \Zend\Permissions\Rbac\Rbac
+     * Set whether or not to create roles automatically if they do not exist
+     *
+     * @param  bool $createMissingRoles
+     * @return void
      */
     public function setCreateMissingRoles($createMissingRoles)
     {
-        $this->createMissingRoles = $createMissingRoles;
-
-        return $this;
+        $this->createMissingRoles = (bool) $createMissingRoles;
     }
 
     /**
+     * Get whether or not to create roles automatically if they do not exist
+     *
      * @return bool
      */
     public function getCreateMissingRoles()
@@ -41,62 +50,62 @@ public function getCreateMissingRoles()
     }
 
     /**
-     * Add a child.
+     * Add a child
      *
-     * @param  string|RoleInterface               $child
-     * @param  array|RoleInterface|null           $parents
-     * @return self
+     * @param  string|RoleInterface       $child
+     * @param  array|RoleInterface[]|null $parents
+     * @return void
      * @throws Exception\InvalidArgumentException
      */
     public function addRole($child, $parents = null)
     {
         if (is_string($child)) {
             $child = new Role($child);
         }
+
         if (!$child instanceof RoleInterface) {
             throw new Exception\InvalidArgumentException(
                 'Child must be a string or implement Zend\Permissions\Rbac\RoleInterface'
             );
         }
 
-        if ($parents) {
+        if (null !== $parents) {
             if (!is_array($parents)) {
                 $parents = array($parents);
             }
+
             foreach ($parents as $parent) {
                 if ($this->createMissingRoles && !$this->hasRole($parent)) {
                     $this->addRole($parent);
                 }
+
                 $this->getRole($parent)->addChild($child);
             }
         }
 
-        $this->children[] = $child;
-
-        return $this;
+        $this->roles[] = $child;
     }
 
     /**
      * Is a child with $name registered?
      *
-     * @param  \Zend\Permissions\Rbac\RoleInterface|string $objectOrName
+     * @param  RoleInterface|string $objectOrName
      * @return bool
      */
     public function hasRole($objectOrName)
     {
         try {
             $this->getRole($objectOrName);
-
             return true;
         } catch (Exception\InvalidArgumentException $e) {
             return false;
         }
     }
 
     /**
-     * Get a child.
+     * Get a child
      *
-     * @param  \Zend\Permissions\Rbac\RoleInterface|string $objectOrName
+     * @param  RoleInterface|string $objectOrName
      * @return RoleInterface
      * @throws Exception\InvalidArgumentException
      */
@@ -108,8 +117,10 @@ public function getRole($objectOrName)
             );
         }
 
-        $it = new RecursiveIteratorIterator($this, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($it as $leaf) {
+        $iterator         = new RecursiveArrayIterator($this->roles);
+        $iteratorIterator = new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::CHILD_FIRST);
+
+        foreach ($iteratorIterator as $leaf) {
             if ((is_string($objectOrName) && $leaf->getName() == $objectOrName) || $leaf == $objectOrName) {
                 return $leaf;
             }
@@ -127,6 +138,7 @@ public function getRole($objectOrName)
      * @param  RoleInterface|string             $role
      * @param  string                           $permission
      * @param  AssertionInterface|Callable|null $assert
+     * @throws Exception\InvalidArgumentException
      * @return bool
      */
     public function isGranted($role, $permission, $assert = null)
@@ -147,10 +159,6 @@ public function isGranted($role, $permission, $assert = null)
             }
         }
 
-        if ($this->getRole($role)->hasPermission($permission)) {
-            return true;
-        }
-
-        return false;
+        return $this->getRole($role)->hasPermission($permission);
     }
 }