Merge pull request #1437 from magento-jackalopes/pr-aug25

pdohogne-magento · web-flow · commit 4d9d6b0d6928 · 2017-08-29T13:03:01.000-05:00
[jackalopes] MAGETWO-71551: Inconsistent quote information after upgrade on 2.2
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -153,14 +153,15 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     /**
      * Items per page for collection limitation
      *
-     * @var null
+     * @var int|null
      */
     protected $_itemsPerPage = null;
 
     /**
      * Header columns for export file
      *
      * @var array
+     * @deprecated
      */
     protected $_headerColumns = [];
 
@@ -234,17 +235,15 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     protected $_fieldsMap = [
         'image' => 'base_image',
         'image_label' => "base_image_label",
-        'image' => 'base_image',
-        'image_label' => 'base_image_label',
         'thumbnail' => 'thumbnail_image',
         'thumbnail_label' => 'thumbnail_image_label',
         self::COL_MEDIA_IMAGE => 'additional_images',
         '_media_image_label' => 'additional_image_labels',
-        Product::COL_STORE => 'store_view_code',
-        Product::COL_ATTR_SET => 'attribute_set_code',
-        Product::COL_TYPE => 'product_type',
-        Product::COL_CATEGORY => 'categories',
-        Product::COL_PRODUCT_WEBSITES => 'product_websites',
+        self::COL_STORE => 'store_view_code',
+        self::COL_ATTR_SET => 'attribute_set_code',
+        self::COL_TYPE => 'product_type',
+        self::COL_CATEGORY => 'categories',
+        self::COL_PRODUCT_WEBSITES => 'product_websites',
         'status' => 'product_online',
         'news_from_date' => 'new_from_date',
         'news_to_date' => 'new_to_date',
@@ -691,7 +690,7 @@ protected function updateDataWithCategoryColumns(&$dataRow, &$rowCategories, $pr
      */
     public function _getHeaderColumns()
     {
-        return $this->_customHeadersMapping($this->_headerColumns);
+        return $this->_customHeadersMapping($this->rowCustomizer->addHeaderColumns($this->_headerColumns));
     }
 
     /**
@@ -700,13 +699,13 @@ public function _getHeaderColumns()
      * @param array $customOptionsData
      * @param array $stockItemRows
      * @return void
+     * @deprecated Logic will be moved to _getHeaderColumns in future release
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function setHeaderColumns($customOptionsData, $stockItemRows)
     {
         if (!$this->_headerColumns) {
-            $customOptCols = [
-                'custom_options',
-            ];
             $this->_headerColumns = array_merge(
                 [
                     self::COL_SKU,
@@ -719,21 +718,19 @@ protected function setHeaderColumns($customOptionsData, $stockItemRows)
                 $this->_getExportMainAttrCodes(),
                 [self::COL_ADDITIONAL_ATTRIBUTES],
                 reset($stockItemRows) ? array_keys(end($stockItemRows)) : [],
-                [],
                 [
                     'related_skus',
                     'related_position',
                     'crosssell_skus',
                     'crosssell_position',
                     'upsell_skus',
-                    'upsell_position'
-                ],
-                ['additional_images', 'additional_image_labels', 'hide_from_product_page']
+                    'upsell_position',
+                    'additional_images',
+                    'additional_image_labels',
+                    'hide_from_product_page',
+                    'custom_options'
+                ]
             );
-            // have we merge custom options columns
-            if ($customOptionsData) {
-                $this->_headerColumns = array_merge($this->_headerColumns, $customOptCols);
-            }
         }
     }
 
@@ -892,10 +889,12 @@ protected function getExportData()
             $productIds = array_keys($rawData);
             $stockItemRows = $this->prepareCatalogInventory($productIds);
 
-            $this->rowCustomizer->prepareData($this->_getEntityCollection(), $productIds);
+            $this->rowCustomizer->prepareData(
+                $this->_prepareEntityCollection($this->_entityCollectionFactory->create()),
+                $productIds
+            );
 
             $this->setHeaderColumns($multirawData['customOptionsData'], $stockItemRows);
-            $this->_headerColumns = $this->rowCustomizer->addHeaderColumns($this->_headerColumns);
 
             foreach ($rawData as $productId => $productData) {
                 foreach ($productData as $storeId => $dataRow) {
@@ -1231,9 +1230,6 @@ private function appendMultirowData(&$dataRow, &$multiRawData)
             return null;
         } elseif ($storeId != Store::DEFAULT_STORE_ID) {
             $dataRow[self::COL_STORE] = $this->_storeIdToCode[$storeId];
-            if (isset($productData[Store::DEFAULT_STORE_ID][self::COL_VISIBILITY])) {
-                $dataRow[self::COL_VISIBILITY] = $productData[Store::DEFAULT_STORE_ID][self::COL_VISIBILITY];
-            }
         }
         $dataRow[self::COL_SKU] = $sku;
         return $dataRow;
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
@@ -270,11 +270,15 @@ public function testGetHeaderColumns()
         $headerColumnsValue = ['headerColumns value'];
         $expectedResult = 'result';
         $this->setPropertyValue($product, '_headerColumns', $headerColumnsValue);
-        $product
-            ->expects($this->once())
+        $this->setPropertyValue($product, 'rowCustomizer', $this->rowCustomizer);
+        $product->expects($this->once())
             ->method('_customHeadersMapping')
             ->with($headerColumnsValue)
             ->willReturn($expectedResult);
+        $this->rowCustomizer->expects($this->once())
+            ->method('addHeaderColumns')
+            ->with($headerColumnsValue)
+            ->willReturn($headerColumnsValue);
 
         $result = $product->_getHeaderColumns();
 
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
@@ -13,11 +13,29 @@
 
 class RowCustomizer implements RowCustomizerInterface
 {
+    /**
+     * Header column for Configurable Product variations
+     */
+    const CONFIGURABLE_VARIATIONS_COLUMN = 'configurable_variations';
+
+    /**
+     * Header column for Configurable Product variation labels
+     */
+    const CONFIGURABLE_VARIATIONS_LABELS_COLUMN = 'configurable_variation_labels';
+
     /**
      * @var array
      */
     protected $configurableData = [];
 
+    /**
+     * @var string[]
+     */
+    private $configurableColumns = [
+        self::CONFIGURABLE_VARIATIONS_COLUMN,
+        self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN
+    ];
+
     /**
      * Prepare configurable data for export
      *
@@ -54,8 +72,11 @@ public function prepareData($collection, $productIds)
             }
 
             $this->configurableData[$product->getId()] = [
-                'configurable_variations' => implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $variations),
-                'configurable_variation_labels' => implode(
+                self::CONFIGURABLE_VARIATIONS_COLUMN => implode(
+                    ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR,
+                    $variations
+                ),
+                self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN => implode(
                     Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
                     $variationsLabels
                 )
@@ -71,17 +92,7 @@ public function prepareData($collection, $productIds)
      */
     public function addHeaderColumns($columns)
     {
-        // have we merge configurable products data
-        if (!empty($this->configurableData)) {
-            $columns = array_merge(
-                $columns,
-                [
-                    'configurable_variations',
-                    'configurable_variation_labels',
-                ]
-            );
-        }
-        return $columns;
+        return array_merge($columns, $this->configurableColumns);
     }
 
     /**
diff --git a/app/code/Magento/Quote/Setup/UpgradeData.php b/app/code/Magento/Quote/Setup/UpgradeData.php
@@ -40,7 +40,7 @@ public function __construct(
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
-        if (version_compare($context->getVersion(), '2.0.4', '<')) {
+        if (version_compare($context->getVersion(), '2.0.6', '<')) {
             $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
             $this->convertSerializedDataToJsonFactory->create(['quoteSetup' => $quoteSetup])
                 ->convert();
diff --git a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="empty" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="Magento_Shipping::tracking/popup.phtml"/>
+            <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="Magento_Shipping::tracking/popup.phtml" cacheable="false" />
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
@@ -22,23 +22,24 @@ $results = $block->getTrackingInfo();
                 <?php foreach ($result as $counter => $track): ?>
                     <div class="table-wrapper">
                         <?php
-                            $block->addChild('shipping.tracking.details.' . $counter, Template::class, [
+                            $shipmentBlockIdentifier = $shipId . '.' . $counter;
+                            $block->addChild('shipping.tracking.details.' . $shipmentBlockIdentifier, Template::class, [
                                 'track' => $track,
                                 'template' => 'Magento_Shipping::tracking/details.phtml',
                                 'storeSupportEmail' => $block->getStoreSupportEmail()
                             ]
                         );
                         ?>
-                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.details.' . $counter) ?>
+                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.details.' . $shipmentBlockIdentifier) ?>
                     </div>
                     <?php if (is_object($track) && !empty($track->getProgressdetail())): ?>
                         <?php
-                            $block->addChild('shipping.tracking.progress.' . $counter, Template::class, [
+                            $block->addChild('shipping.tracking.progress.' . $shipmentBlockIdentifier, Template::class, [
                                 'track' => $track,
                                 'template' => 'Magento_Shipping::tracking/progress.phtml'
                             ]);
                         ?>
-                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.progress.' . $counter) ?>
+                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.progress.' . $shipmentBlockIdentifier) ?>
                     <?php endif; ?>
                 <?php endforeach; ?>
             <?php else: ?>
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
@@ -6,7 +6,6 @@
 namespace Magento\CatalogImportExport\Model;
 
 use Magento\Framework\App\Bootstrap;
-use Magento\Framework\App\Config;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
@@ -16,11 +15,6 @@
  */
 abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var \Magento\CatalogImportExport\Model\Export\Product
-     */
-    protected $model;
-
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
@@ -61,8 +55,6 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
 
     protected function setUp()
     {
-        parent::setUp();
-
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->fileSystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
         $this->productResource = $this->objectManager->create(
@@ -262,9 +254,33 @@ public function testImportReplace($fixtures, $skus, $skippedAttributes = [])
     }
 
     /**
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     *
+     * @param array $fixtures
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @dataProvider importReplaceDataProvider
+     */
+    public function testImportReplaceWithPagination($fixtures, $skus, $skippedAttributes = [])
+    {
+        $this->fixtures = $fixtures;
+        $this->executeFixtures($fixtures, $skus);
+        $this->modifyData($skus);
+        $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
+        $this->executeImportReplaceTest($skus, $skippedAttributes, true);
+    }
+
+    /**
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @param bool $usePagination
+     *
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function executeImportReplaceTest($skus, $skippedAttributes)
+    protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagination = false)
     {
         $replacedAttributes = [
             'row_id',
@@ -285,7 +301,18 @@ protected function executeImportReplaceTest($skus, $skippedAttributes)
             $index++;
         }
 
-        $csvfile = $this->exportProducts();
+        $exportProduct = $this->objectManager->create(\Magento\CatalogImportExport\Model\Export\Product::class);
+        if ($usePagination) {
+            /** @var \ReflectionProperty $itemsPerPageProperty */
+            $itemsPerPageProperty = $this->objectManager->create(\ReflectionProperty::class, [
+                'class' => \Magento\CatalogImportExport\Model\Export\Product::class,
+                'name' => '_itemsPerPage'
+            ]);
+            $itemsPerPageProperty->setAccessible(true);
+            $itemsPerPageProperty->setValue($exportProduct, 1);
+        }
+
+        $csvfile = $this->exportProducts($exportProduct);
         $this->importProducts($csvfile, \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE);
 
         while ($index > 0) {
@@ -326,13 +353,16 @@ protected function executeImportReplaceTest($skus, $skippedAttributes)
     /**
      * Export products in the system
      *
+     * @param \Magento\CatalogImportExport\Model\Export\Product|null $exportProduct
      * @return string Return exported file name
      */
-    private function exportProducts()
+    private function exportProducts(\Magento\CatalogImportExport\Model\Export\Product $exportProduct = null)
     {
         $csvfile = uniqid('importexport_') . '.csv';
 
-        $exportProduct = $this->objectManager->create(\Magento\CatalogImportExport\Model\Export\Product::class);
+        $exportProduct = $exportProduct ?: $this->objectManager->create(
+            \Magento\CatalogImportExport\Model\Export\Product::class
+        );
         $exportProduct->setWriter(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
                 \Magento\ImportExport\Model\Export\Adapter\Csv::class,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
@@ -79,8 +79,6 @@
     \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
 )->setWebsiteIds(
     [1]
-)->setCateroryIds(
-    []
 )->setStockData(
     ['qty' => 100, 'is_in_stock' => 1]
 )->setCanSaveCustomOptions(
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
@@ -39,10 +39,10 @@ public function exportImportDataProvider()
      */
     protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
     {
-        /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable $prooductType */
-        $prooductType = $expectedProduct->getTypeInstance();
-        $expectedAssociatedProducts = $prooductType->getUsedProductCollection($expectedProduct);
-        $actualAssociatedProducts = iterator_to_array($prooductType->getUsedProductCollection($actualProduct));
+        /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable $productType */
+        $productType = $expectedProduct->getTypeInstance();
+        $expectedAssociatedProducts = $productType->getUsedProductCollection($expectedProduct);
+        $actualAssociatedProducts = iterator_to_array($productType->getUsedProductCollection($actualProduct));
 
         $expectedAssociatedProductSkus = [];
         $actualAssociatedProductSkus = [];
@@ -103,19 +103,4 @@ public function importReplaceDataProvider()
         }
         return $data;
     }
-
-    /**
-     * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
-     * @magentoAppIsolation enabled
-     *
-     * @param array $fixtures
-     * @param string[] $skus
-     * @param string[] $skippedAttributes
-     * @dataProvider importReplaceDataProvider
-     */
-    public function testImportReplace($fixtures, $skus, $skippedAttributes = [])
-    {
-        parent::testImportReplace($fixtures, $skus, $skippedAttributes);
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php b/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
diff --git a/lib/internal/Magento/Framework/Convert/DataObject.php b/lib/internal/Magento/Framework/Convert/DataObject.php

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function __construct(`
`40`	`40`	`*/`
`41`	`41`	`public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)`
`42`	`42`	`{`
`43`		`- if (version_compare($context->getVersion(), '2.0.4', '<')) {`
	`43`	`+ if (version_compare($context->getVersion(), '2.0.6', '<')) {`
`44`	`44`	`$quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);`
`45`	`45`	`$this->convertSerializedDataToJsonFactory->create(['quoteSetup' => $quoteSetup])`
`46`	`46`	`->convert();`