Updated test suite. Fixed use of RoleInterface

visto9259 · Aug 30, 2024 · 57b5cd7 · 57b5cd7
1 parent 65b524c
commit 57b5cd7
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 102 deletions.
diff --git a/composer.json b/composer.json
@@ -64,15 +64,5 @@
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
-  },
-  "repositories": [
-    {
-      "type": "path",
-      "url": "../LmcRbacMvc"
-    },
-    {
-      "type": "path",
-      "url": "../LmcRbac"
-    }
-  ]
+  }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/src/Collector/RbacCollector.php b/src/Collector/RbacCollector.php
@@ -124,8 +124,15 @@ private function collectGuards(array $guards): void
     private function collectIdentityRolesAndPermissions(RoleService $roleService): void
     {
         $identityRoles = $roleService->getIdentityRoles();
-        foreach ($identityRoles as $role) {
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveRoleIterator($identityRoles),
+            RecursiveIteratorIterator::SELF_FIRST
+        );
+        foreach ($iterator as $role) {
             $roleName = $role->getName();
+            $this->collectedRoles[] = $roleName;
+            $this->collectPermissions($role);
+            /*
             if (empty($role->getChildren())) {
                 $this->collectedRoles[] = $roleName;
             } else {
@@ -140,6 +147,7 @@ private function collectIdentityRolesAndPermissions(RoleService $roleService): v
             }
 
             $this->collectPermissions($role);
+            */
         }
     }
 

diff --git a/test/Collector/RbacCollectorTest.php b/test/Collector/RbacCollectorTest.php
@@ -187,7 +187,8 @@ public function testCanCollect(): void
                 ],
             ],
             'roles'       => [
-                'member' => ['guest'],
+                'member', 'guest',
+//                'member' => ['guest'],
             ],
             'permissions' => [
                 'member' => ['write', 'delete', 'read'],