Merge pull request #24 from thenotsoft/fix-populate-item

Fix ItemsStorage::populateItem and test
yiisoft · Sep 9, 2022 · 1776fef · 1776fef
2 parents 3a338e8 + d039202
commit 1776fef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ItemsStorage.php b/src/ItemsStorage.php
@@ -272,7 +272,7 @@ private function populateItem(array $attributes): Item
     {
         return $this->createItemByTypeAndName($attributes['type'], $attributes['name'])
             ->withDescription($attributes['description'] ?? '')
-            ->withRuleName($attributes['ruleName'] ?? '')
+            ->withRuleName($attributes['ruleName'] ?? null)
             ->withCreatedAt((int)$attributes['createdAt'])
             ->withUpdatedAt((int)$attributes['updatedAt']);
     }

diff --git a/tests/ItemsStorageTest.php b/tests/ItemsStorageTest.php
@@ -15,14 +15,14 @@ public function testUpdate(): void
     {
         $storage = $this->getStorage();
         $item = $storage->get('Parent 1');
-        $this->assertEmpty($item->getRuleName());
+        $this->assertNull($item->getRuleName());
 
         $item = $item
             ->withName('Super Admin')
             ->withRuleName('super admin');
         $storage->update('Parent 1', $item);
-        $this->assertSame('Super Admin', $storage->get('Super Admin')->getName());
-        $this->assertSame('super admin', $storage->get('Super Admin')->getRuleName());
+        $this->assertSame('Super Admin', $storage->get('Super Admin')?->getName());
+        $this->assertSame('super admin', $storage->get('Super Admin')?->getRuleName());
     }
 
     public function testGet(): void