Remaining occurences

yiisoft · Feb 13, 2024 · ddacc15 · ddacc15
1 parent 2a5d859
commit ddacc15
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/ItemsStorageInterface.php b/src/ItemsStorageInterface.php
@@ -8,7 +8,7 @@
  * A storage for RBAC roles and permissions used in {@see Manager}.
  *
  * @psalm-type ItemsIndexedByName = array<string, Permission|Role>
- * @psalm-type AccessTree = array<string, array{
+ * @psalm-type Hierarchy = array<string, array{
  *     item: Permission|Role,
  *     children: array<string, Permission|Role>
  * }>
@@ -173,7 +173,7 @@ public function getParents(string $name): array;
      *
      * @return array A mapping between parent names and according items with all their children (references to other
      * parents found).
-     * @psalm-return AccessTree
+     * @psalm-return Hierarchy
      */
     public function getHierarchy(string $name): array;
 

diff --git a/src/SimpleItemsStorage.php b/src/SimpleItemsStorage.php
@@ -16,7 +16,7 @@
  *  }
  *
  * @psalm-import-type ItemsIndexedByName from ItemsStorageInterface
- * @psalm-import-type AccessTree from ItemsStorageInterface
+ * @psalm-import-type Hierarchy from ItemsStorageInterface
  */
 abstract class SimpleItemsStorage implements ItemsStorageInterface
 {
@@ -118,7 +118,7 @@ public function getHierarchy(string $name): array
         }
 
         $result = [$name => ['item' => $this->items[$name], 'children' => []]];
-        $this->fillAccessTreeRecursive($name, $result);
+        $this->fillHierarchyRecursive($name, $result);
 
         return $result;
     }
@@ -310,12 +310,12 @@ private function fillParentsRecursive(string $name, array &$result): void
     }
 
     /**
-     * @psalm-param AccessTree $result
-     * @psalm-param-out AccessTree $result
+     * @psalm-param Hierarchy $result
+     * @psalm-param-out Hierarchy $result
      *
      * @psalm-param ItemsIndexedByName $addedChildItems
      */
-    private function fillAccessTreeRecursive(string $name, array &$result, array $addedChildItems = []): void
+    private function fillHierarchyRecursive(string $name, array &$result, array $addedChildItems = []): void
     {
         foreach ($this->children as $parentName => $childItems) {
             foreach ($childItems as $childItem) {
@@ -325,14 +325,14 @@ private function fillAccessTreeRecursive(string $name, array &$result, array $ad
 
                 $parent = $this->get($parentName);
                 if ($parent !== null) {
-                    /** @psalm-var AccessTree $result Imported type in `psalm-param-out` is not resolved. */
+                    /** @psalm-var Hierarchy $result Imported type in `psalm-param-out` is not resolved. */
                     $result[$parentName]['item'] = $this->items[$parentName];
 
                     $addedChildItems[$childItem->getName()] = $childItem;
                     $result[$parentName]['children'] = $addedChildItems;
                 }
 
-                $this->fillAccessTreeRecursive($parentName, $result, $addedChildItems);
+                $this->fillHierarchyRecursive($parentName, $result, $addedChildItems);
             }
         }
     }

diff --git a/tests/Common/ItemsStorageTestTrait.php b/tests/Common/ItemsStorageTestTrait.php
@@ -28,7 +28,7 @@ protected function setUp(): void
             ClockMock::freeze(new DateTime('2023-05-10 08:24:39'));
         }
 
-        if ($this->name() === 'testGetAccessTree') {
+        if ($this->name() === 'testGetHierarchy') {
             ClockMock::freeze(new DateTime('2023-12-24 17:51:18'));
         }
 
@@ -37,7 +37,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        if (in_array($this->name(), ['testAddWithCurrentTimestamps', 'testGetAccessTree'], strict: true)) {
+        if (in_array($this->name(), ['testAddWithCurrentTimestamps', 'testGetHierarchy'], strict: true)) {
             ClockMock::reset();
         }
 
@@ -408,7 +408,7 @@ public function testGetParents(string $childName, array $expectedParents): void
         }
     }
 
-    public static function dataGetAccessTree(): array
+    public static function dataGetHierarchy(): array
     {
         $createdAt = (new DateTime('2023-12-24 17:51:18'))->getTimestamp();
         $postsViewPermission = (new Permission('posts.view'))->withCreatedAt($createdAt)->withUpdatedAt($createdAt);
@@ -489,11 +489,11 @@ public static function dataGetAccessTree(): array
     }
 
     /**
-     * @dataProvider dataGetAccessTree
+     * @dataProvider dataGetHierarchy
      */
-    public function testGetAccessTree(string $name, array $expectedAccessTree): void
+    public function testGetHierarchy(string $name, array $expectedHierarchy): void
     {
-        $this->assertEquals($expectedAccessTree, $this->getItemsStorage()->getHierarchy($name));
+        $this->assertEquals($expectedHierarchy, $this->getItemsStorage()->getHierarchy($name));
     }
 
     public function testRemoveChildren(): void