Fixes #10726: Added `yii\rbac\ManagerInterface::canAddChild()`

framework/CHANGELOG.md

@@ -28,6 +28,7 @@ Yii Framework 2 Change Log
 - Eng #10976: `Inflector::transliterate()` now uses `strtr` instead of `str_replace` (DrDeath72)
 - Bug #11040: Check parameter 'recursive' and disable recursive copying with option 'recursive' => false in method BaseFileHelper::copyDirectory (Ni-san)
 - Chg: HTMLPurifier dependency updated to `~4.6` (samdark)
+- Chg #10726: Added `yii\rbac\ManagerInterface::canAddChild()` (dkhlystov, samdark)
 - Chg #11071: `yii\helpers\BaseArrayHelper::isIn()` and `isTraversable()` since now throw `\yii\base\InvalidParamException` instead of `\InvalidArgumentException` (nukkumatti)
 
 2.0.7 February 14, 2016

framework/UPGRADE.md

@@ -22,6 +22,8 @@ ______________________
 * `yii\helpers\BaseArrayHelper` methods `isIn()` and `isSubset()` throw `\yii\base\InvalidParamException`
   instead of `\InvalidArgumentException`. If you wrap calls of these methods in try/catch block, change expected
   exception class.
+- `yii\rbac\ManagerInterface::canAddChild()` method was added. If you have custom backend for RBAC you need to implement
+  it.
 
 
 Upgrade from Yii 2.0.6

framework/rbac/DbManager.php

@@ -679,6 +679,14 @@ class DbManager extends BaseManager
     /**
      * @inheritdoc
      */
+    public function canAddChild($parent, $child)
+    {
+        return !$this->detectLoop($parent, $child);
+    }
+
+    /**
+     * @inheritdoc
+     */
     public function addChild($parent, $child)
     {
         if ($parent->name === $child->name) {

framework/rbac/ManagerInterface.php

@@ -129,6 +129,16 @@ interface ManagerInterface
     public function getRules();
 
     /**
+     * Checks the possibility of adding a child to parent
+     * @param Item $parent the parent item
+     * @param Item $child the child item to be added to the hierarchy
+     * @return boolean possibility of adding
+     *
+     * @since 2.0.8
+     */
+    public function canAddChild($parent, $child);
+
+    /**
      * Adds an item as a child of another item.
      * @param Item $parent
      * @param Item $child

framework/rbac/PhpManager.php

@@ -151,6 +151,14 @@ class PhpManager extends BaseManager
     /**
      * @inheritdoc
      */
+    public function canAddChild($parent, $child)
+    {
+        return !$this->detectLoop($parent, $child);
+    }
+
+    /**
+     * @inheritdoc
+     */
     public function addChild($parent, $child)
     {
         if (!isset($this->items[$parent->name], $this->items[$child->name])) {
@@ -817,7 +825,7 @@ class PhpManager extends BaseManager
         $result = [];
         foreach ($this->assignments as $userID => $assignments) {
             foreach ($assignments as $userAssignment) {
-                if ($userAssignment->roleName === $roleName && $userAssignment->userId === $userID) {
+                if ($userAssignment->roleName === $roleName && $userAssignment->userId == $userID) {
                     $result[] = (string)$userID;
                 }
             }

tests/framework/rbac/ManagerTestCase.php

@@ -312,4 +312,16 @@ abstract class ManagerTestCase extends TestCase
         $this->assertEquals(['author B'], $this->auth->getUserIdsByRole('author'));
         $this->assertEquals(['admin C'], $this->auth->getUserIdsByRole('admin'));
     }
+
+    public function testCanAddChild()
+    {
+        $this->prepareData();
+
+        $author = $this->auth->createRole('author');
+        $reader = $this->auth->createRole('reader');
+
+        $this->assertTrue($this->auth->canAddChild($author, $reader));
+        $this->assertFalse($this->auth->canAddChild($reader, $author));
+    }
+
 }