Fixed Manager::getMetaData() produces E_WARNING for the item, which is not present at source storage

klimov-paul · klimov-paul · commit cca40e0018df · 2018-06-22T15:14:22.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Yii 2 Content Management extension Change Log
 1.0.1 under development
 -----------------------
 
+- Bug #1: Fixed `Manager::getMetaData()` produces E_WARNING for the item, which is not present at source storage (klimov-paul)
 - Enh: Usage of deprecated `yii\base\InvalidParamException` replaced by `yii\base\InvalidArgumentException` (klimov-paul)
 
 
diff --git a/src/Manager.php b/src/Manager.php
@@ -228,13 +228,19 @@ public function getMetaData($id)
         if (empty($this->metaDataContentParts)) {
             return [];
         }
+
         $data = $this->getSourceStorage()->find($id);
+        if ($data === null) {
+            return [];
+        }
+
         $metaData = [];
         foreach ($data as $key => $value) {
             if (in_array($key, $this->metaDataContentParts, true)) {
                 $metaData[$key] = $value;
             }
         }
+
         return $metaData;
     }
 
diff --git a/tests/ManagerTest.php b/tests/ManagerTest.php
@@ -170,5 +170,10 @@ public function testMetaData()
         $this->assertFalse($items['item1']->has('body'));
 
         $this->assertEquals(['body' => 'Item 1 Body'], $manager->getMetaData('item1'));
+
+        $manager->save('new-item', [
+            'title' => 'new item'
+        ]);
+        $this->assertEquals([], $manager->getMetaData('new-item'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -228,13 +228,19 @@ public function getMetaData($id)`
`228`	`228`	`if (empty($this->metaDataContentParts)) {`
`229`	`229`	`return [];`
`230`	`230`	`}`
	`231`	`+`
`231`	`232`	`$data = $this->getSourceStorage()->find($id);`
	`233`	`+ if ($data === null) {`
	`234`	`+ return [];`
	`235`	`+ }`
	`236`	`+`
`232`	`237`	`$metaData = [];`
`233`	`238`	`foreach ($data as $key => $value) {`
`234`	`239`	`if (in_array($key, $this->metaDataContentParts, true)) {`
`235`	`240`	`$metaData[$key] = $value;`
`236`	`241`	`}`
`237`	`242`	`}`
	`243`	`+`
`238`	`244`	`return $metaData;`
`239`	`245`	`}`
`240`	`246`
Original file line number	Diff line number	Diff line change
`@@ -170,5 +170,10 @@ public function testMetaData()`
`170`	`170`	`$this->assertFalse($items['item1']->has('body'));`
`171`	`171`
`172`	`172`	`$this->assertEquals(['body' => 'Item 1 Body'], $manager->getMetaData('item1'));`
	`173`	`+`
	`174`	`+ $manager->save('new-item', [`
	`175`	`+ 'title' => 'new item'`
	`176`	`+ ]);`
	`177`	`+ $this->assertEquals([], $manager->getMetaData('new-item'));`
`173`	`178`	`}`
`174`	`179`	`}`