Merge remote-tracking branch 'origin/MAGETWO-61178' into BUGS-2.0

Author: slavvka

app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php

@@ -55,7 +55,6 @@ protected function _afterLoad()
          * Assign parent items
          */
         foreach ($this as $item) {
-            $this->_resource->unserializeFields($item);
             if ($item->getParentItemId()) {
                 $item->setParentItem($this->getItemById($item->getParentItemId()));
             }

lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php

@@ -571,8 +571,13 @@ protected function _afterLoad()
         parent::_afterLoad();
         foreach ($this->_items as $item) {
             $item->setOrigData();
-            if ($this->_resetItemsDataChanged && ($item instanceof \Magento\Framework\Model\AbstractModel)) {
-                $item->setDataChanges(false);
+
+            if ($item instanceof \Magento\Framework\Model\AbstractModel) {
+                $this->getResource()->unserializeFields($item);
+
+                if ($this->_resetItemsDataChanged) {
+                    $item->setDataChanges(false);
+                }
             }
         }
         $this->_eventManager->dispatch('core_collection_abstract_load_after', ['collection' => $this]);

lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php

@@ -9,6 +9,7 @@
 namespace Magento\Framework\Model\Test\Unit\ResourceModel\Db\Collection;
 
 use Magento\Framework\DB\Select;
+use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Framework\DataObject as MagentoObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
@@ -257,6 +258,30 @@ public function addFieldToSelectDataProvider()
         ];
     }
 
+    public function testLoadWithItemFieldsUnserialization()
+    {
+        $itemMock = $this->getMockBuilder(AbstractModel::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->uut->addItem($itemMock);
+
+        $itemMock->expects($this->once())
+            ->method('setOrigData');
+        $this->resourceMock->expects($this->once())
+            ->method('unserializeFields')
+            ->with($itemMock);
+
+        $this->managerMock->expects($this->exactly(2))
+            ->method('dispatch')
+            ->withConsecutive(
+                ['core_collection_abstract_load_before', ['collection' => $this->uut]],
+                ['core_collection_abstract_load_after', ['collection' => $this->uut]]
+
+            );
+
+        $this->uut->load();
+    }
+
     /**
      * @dataProvider addExpressionFieldToSelectDataProvider
      */