Merge pull request #583 from magento-dragons/MAGETWO-40862

MAGETWO-40565: Improve Sample Data Performance

Author: Klymenko, Volodymyr(vklymenko)

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

@@ -78,9 +78,7 @@ protected function setUp()
         $connection->expects($this->any())->method('quoteInto')->will($this->returnValue('query'));
         $select->expects($this->any())->method('getConnection')->willReturn($connection);
         $this->connection->expects($this->any())->method('select')->will($this->returnValue($select));
-        $this->connection->expects($this->any())->method('fetchPairs')->will($this->returnValue([
-            '1' => '1', '2' => '2'
-        ]));
+        $this->connection->expects($this->any())->method('fetchAll')->will($this->returnValue([]));
         $this->connection->expects($this->any())->method('insertOnDuplicate')->willReturnSelf();
         $this->connection->expects($this->any())->method('delete')->willReturnSelf();
         $this->connection->expects($this->any())->method('quoteInto')->willReturn('');

app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php

@@ -184,7 +184,7 @@ protected function _initAttributes()
     {
         // temporary storage for attributes' parameters to avoid double querying inside the loop
         $entityId = $this->_entityModel->getEntityTypeId();
-        $entityAttributes = $this->_connection->fetchPairs(
+        $entityAttributes = $this->_connection->fetchAll(
             $this->_connection->select()->from(
                 ['attr' => $this->_resource->getTableName('eav_entity_attribute')],
                 ['attr.attribute_id']
@@ -197,7 +197,10 @@ protected function _initAttributes()
             )
         );
         $absentKeys = [];
-        foreach ($entityAttributes as $attributeId => $attributeSetName) {
+        foreach ($entityAttributes as $item) {
+            $attributeId = $item['attribute_id'];
+            $attributeSetName = $item['attribute_set_name'];
+
             if (!isset(self::$commonAttributesCache[$attributeId])) {
                 if (!isset($absentKeys[$attributeSetName])) {
                     $absentKeys[$attributeSetName] = [];
@@ -208,7 +211,10 @@ protected function _initAttributes()
         foreach ($absentKeys as $attributeSetName => $attributeIds) {
             $this->attachAttributesById($attributeSetName, $attributeIds);
         }
-        foreach ($entityAttributes as $attributeId => $attributeSetName) {
+        foreach ($entityAttributes as $item) {
+            $attributeId = $item['attribute_id'];
+            $attributeSetName = $item['attribute_set_name'];
+
             if (isset(self::$commonAttributesCache[$attributeId])) {
                 $attribute = self::$commonAttributesCache[$attributeId];
                 $this->_addAttributeParams(

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php

@@ -192,8 +192,15 @@ protected function setUp()
         $this->connection->expects($this->any())->method('quoteInto')->willReturn('');
         $this->connection
             ->expects($this->any())
-            ->method('fetchPairs')
-            ->will($this->returnValue($entityAttributes));
+            ->method('fetchAll')
+            ->will($this->returnValue(
+                [
+                    [
+                        'attribute_id' => 'attribute_id',
+                        'attribute_set_name' => 'attribute_set_name'
+                    ]
+                ]
+            ));
 
         $this->resource = $this->getMock(
             '\Magento\Framework\App\Resource',

app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php

@@ -208,7 +208,7 @@ protected function setUp()
         $this->_connection->expects($this->any())->method('insertOnDuplicate')->willReturnSelf();
         $this->_connection->expects($this->any())->method('delete')->willReturnSelf();
         $this->_connection->expects($this->any())->method('quoteInto')->willReturn('');
-        $this->_connection->expects($this->any())->method('fetchPairs')->will($this->returnValue([]));
+        $this->_connection->expects($this->any())->method('fetchAll')->will($this->returnValue([]));
 
         $this->resource = $this->getMock(
             '\Magento\Framework\App\Resource',
@@ -524,7 +524,7 @@ public function testSaveData()
             ['attribute_id' => 132, 'product_id' => 4, 'option_id' => 4, 'product_super_attribute_id' => 132],
             ['attribute_id' => 132, 'product_id' => 5, 'option_id' => 5, 'product_super_attribute_id' => 132],
         ]));
-        $this->_connection->expects($this->any())->method('fetchPairs')->with($this->select)->will(
+        $this->_connection->expects($this->any())->method('fetchAll')->with($this->select)->will(
             $this->returnValue([])
         );
 

app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php

@@ -110,7 +110,10 @@ protected function setUp()
             false
         );
         $entityAttributes = [
-            'attribute_id' => 'attributeSetName'
+            [
+                'attribute_id' => 'attribute_id',
+                'attribute_set_name' => 'attribute_set_name'
+            ]
         ];
         $this->connection = $this->getMock(
             'Magento\Framework\DB\Adapter\Pdo\Mysql',
@@ -136,7 +139,7 @@ protected function setUp()
         $this->connection->expects($this->any())->method('insertOnDuplicate')->willReturnSelf();
         $this->connection->expects($this->any())->method('delete')->willReturnSelf();
         $this->connection->expects($this->any())->method('quoteInto')->willReturn('');
-        $this->connection->expects($this->any())->method('fetchPairs')->will($this->returnValue($entityAttributes));
+        $this->connection->expects($this->any())->method('fetchAll')->will($this->returnValue($entityAttributes));
         $this->resource = $this->getMock(
             '\Magento\Framework\App\Resource',
             ['getConnection', 'getTableName'],

app/design/frontend/Magento/luma/etc/view.xml

@@ -188,7 +188,7 @@
         <var name="gallery:loop">false</var> <!-- Gallery navigation loop (true/false) -->
         <var name="gallery:keyboard">true</var> <!-- Turn on/off keyboard arrows navigation (true/false) -->
         <var name="gallery:arrows">true</var> <!-- Turn on/off arrows on the sides preview (true/false) -->
-        <var name="gallery:caption">true</var> <!-- Display alt text as image title (true/false) -->
+        <var name="gallery:show_caption">true</var> <!-- Display alt text as image title (true/false) -->
 
         <var name="magnifier:top"></var> <!-- Top position of magnifier -->
         <var name="magnifier:left"></var> <!-- Right position of magnifier -->