ENGCOM-4553: Fix importFromArray by setting _isCollectionLoaded to true after import #21869

magento-engcom-team · magento-engcom-team · commit 28eac1fb9ad8 · 2019-04-09T07:27:18.000-05:00
- Merge Pull Request #21869 from slackerzz/magento2:fix_collection_importFromArray - Merged commits: 1. 2f49a5c 2. 3773c27 3. 0de4572
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -264,7 +264,7 @@ public function setEntity($entity)
             $this->_entity = $this->_eavEntityFactory->create()->setType($entity);
         } else {
             throw new LocalizedException(
-                __('The "%1" entity supplied is invalid. Verify the entity and try again.', print_r($entity, 1))
+                __('The entity supplied to collection is invalid. Verify the entity and try again.')
             );
         }
         return $this;
@@ -1061,6 +1061,7 @@ public function importFromArray($arr)
                 $this->_items[$entityId]->addData($row);
             }
         }
+        $this->_setIsLoaded();
         return $this;
     }
 
@@ -1164,7 +1165,6 @@ public function _loadEntities($printQuery = false, $logQuery = false)
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
-     * @throws LocalizedException
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ public function setEntity($entity)`
`264`	`264`	`$this->_entity = $this->_eavEntityFactory->create()->setType($entity);`
`265`	`265`	`} else {`
`266`	`266`	`throw new LocalizedException(`
`267`		`- __('The "%1" entity supplied is invalid. Verify the entity and try again.', print_r($entity, 1))`
	`267`	`+ __('The entity supplied to collection is invalid. Verify the entity and try again.')`
`268`	`268`	`);`
`269`	`269`	`}`
`270`	`270`	`return $this;`
`@@ -1061,6 +1061,7 @@ public function importFromArray($arr)`
`1061`	`1061`	`$this->_items[$entityId]->addData($row);`
`1062`	`1062`	`}`
`1063`	`1063`	`}`
	`1064`	`+ $this->_setIsLoaded();`
`1064`	`1065`	`return $this;`
`1065`	`1066`	`}`
`1066`	`1067`
`@@ -1164,7 +1165,6 @@ public function _loadEntities($printQuery = false, $logQuery = false)`
`1164`	`1165`	`* @param bool $printQuery`
`1165`	`1166`	`* @param bool $logQuery`
`1166`	`1167`	`* @return $this`
`1167`		`- * @throws LocalizedException`
`1168`	`1168`	`* @throws \Exception`
`1169`	`1169`	`* @SuppressWarnings(PHPMD.CyclomaticComplexity)`
`1170`	`1170`	`* @SuppressWarnings(PHPMD.NPathComplexity)`