Merge remote-tracking branch 'origin/MAGETWO-37726' into MAGETWO-37985

Author: Leonid Poluyanov

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -123,6 +123,13 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      */
     protected $_attributeTypes = [];
 
+    /**
+     * Product collection
+     *
+     * @var \Magento\Catalog\Model\Resource\Product\CollectionFactory
+     */
+    protected $_entityCollectionFactory;
+
     /**
      * Product collection
      *
@@ -231,7 +238,7 @@ public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Psr\Log\LoggerInterface $logger,
-        \Magento\Catalog\Model\Resource\Product\Collection $collection,
+        \Magento\Catalog\Model\Resource\Product\CollectionFactory $collectionFactory,
         \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig,
         \Magento\Catalog\Model\Resource\ProductFactory $productFactory,
         \Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $attrSetColFactory,
@@ -243,7 +250,7 @@ public function __construct(
         \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider,
         \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer
     ) {
-        $this->_entityCollection = $collection;
+        $this->_entityCollectionFactory = $collectionFactory;
         $this->_exportConfig = $exportConfig;
         $this->_logger = $logger;
         $this->_productFactory = $productFactory;
@@ -669,12 +676,13 @@ protected function setHeaderColumns($customOptionsData, $stockItemRows)
     }
 
     /**
-     * Get product collection
-     *
-     * @return \Magento\Catalog\Model\Resource\Product\Collection
+     * {@inheritdoc}
      */
-    protected function _getEntityCollection()
+    protected function _getEntityCollection($resetCollection = false)
     {
+        if ($resetCollection || empty($this->_entityCollection)) {
+            $this->_entityCollection = $this->_entityCollectionFactory->create();
+        }
         return $this->_entityCollection;
     }
 
@@ -735,23 +743,23 @@ protected function paginateCollection($page, $pageSize)
     /**
      * Export process
      *
-     * @see https://jira.corp.x.com/browse/MAGETWO-7894
      * @return string
      */
     public function export()
     {
         //Execution time may be very long
         set_time_limit(0);
 
-        $this->_prepareEntityCollection($this->_getEntityCollection());
-        $this->_getEntityCollection()->setOrder('has_options', 'asc');
-        $this->_getEntityCollection()->setStoreId(Store::DEFAULT_STORE_ID);
         $writer = $this->getWriter();
         $page = 0;
         while (true) {
             ++$page;
+            $entityCollection = $this->_getEntityCollection(true);
+            $entityCollection->setOrder('has_options', 'asc');
+            $entityCollection->setStoreId(Store::DEFAULT_STORE_ID);
+            $this->_prepareEntityCollection($entityCollection);
             $this->paginateCollection($page, $this->getItemsPerPage());
-            if ($this->_getEntityCollection()->count() == 0) {
+            if ($entityCollection->count() == 0) {
                 break;
             }
             $exportData = $this->getExportData();
@@ -761,7 +769,7 @@ public function export()
             foreach ($exportData as $dataRow) {
                 $writer->writeRow($dataRow);
             }
-            if ($this->_getEntityCollection()->getCurPage() >= $this->_getEntityCollection()->getLastPageNumber()) {
+            if ($entityCollection->getCurPage() >= $entityCollection->getLastPageNumber()) {
                 break;
             }
         }

app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php

@@ -190,9 +190,10 @@ abstract protected function _getHeaderColumns();
     /**
      * Get entity collection
      *
+     * @param bool $resetCollection
      * @return \Magento\Framework\Data\Collection\Db
      */
-    abstract protected function _getEntityCollection();
+    abstract protected function _getEntityCollection($resetCollection = false);
 
     /**
      * Get attributes codes which are appropriate for export.

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php

@@ -70,24 +70,22 @@ public function testExport()
      */
     public function testExportStockItemAttributesAreFilled()
     {
-        $filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
+        $fileWrite = $this->getMock('Magento\Framework\Filesystem\File\Write', [], [], '', false);
         $directoryMock = $this->getMock('Magento\Framework\Filesystem\Directory\Write', [], [], '', false);
-
-        $filesystemMock->expects($this->once())->method('getDirectoryWrite')->will($this->returnValue($directoryMock));
-
         $directoryMock->expects($this->any())->method('getParentDirectory')->will($this->returnValue('some#path'));
-
         $directoryMock->expects($this->any())->method('isWritable')->will($this->returnValue(true));
-
         $directoryMock->expects($this->any())->method('isFile')->will($this->returnValue(true));
-
         $directoryMock->expects(
             $this->any()
         )->method(
             'readFile'
         )->will(
             $this->returnValue('some string read from file')
         );
+        $directoryMock->expects($this->once())->method('openFile')->will($this->returnValue($fileWrite));
+
+        $filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
+        $filesystemMock->expects($this->once())->method('getDirectoryWrite')->will($this->returnValue($directoryMock));
 
         $exportAdapter = new \Magento\ImportExport\Model\Export\Adapter\Csv($filesystemMock);