MAGETWO-96118: Few optimizations on category & product pages

Author: slopukhov

app/code/Magento/Catalog/etc/db_schema.xml

@@ -835,7 +835,7 @@
         <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_VALUE_ID" indexType="btree">
             <column name="value_id"/>
         </index>
-        <index referenceId="CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_ENTITY_ID_VALUE_ID_STORE_ID" indexType="btree">
+        <index referenceId="CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_VAL_ID_STORE_ID" indexType="btree">
             <column name="entity_id"/>
             <column name="value_id"/>
             <column name="store_id"/>

app/code/Magento/Catalog/etc/db_schema_whitelist.json

@@ -485,7 +485,7 @@
             "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_STORE_ID": true,
             "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_ENTITY_ID": true,
             "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_VALUE_ID": true,
-            "CATALOG_PRODUCT_ENTITY_MEDIA_GALLERY_VALUE_ENTITY_ID_VALUE_ID_STORE_ID": true
+            "CAT_PRD_ENTT_MDA_GLR_VAL_ENTT_ID_VAL_ID_STORE_ID": true
         },
         "constraint": {
             "PRIMARY": true,

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 namespace Magento\ConfigurableProduct\Model\Product\Type;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -128,6 +130,10 @@ public function testGetUsedProductAttributes()
         $this->assertEquals($testConfigurable->getData(), $attributes[$attributeId]->getData());
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     */
     public function testGetConfigurableAttributes()
     {
         $collection = $this->model->getConfigurableAttributes($this->product);
@@ -332,8 +338,7 @@ public function testGetSelectedAttributesInfo()
         $attribute = reset($attributes);
         $optionValueId = $attribute['values'][0]['value_index'];
 
-        $product->addCustomOption(
-            'attributes',
+        $product->addCustomOption('attributes',
             $serializer->serialize([$attribute['attribute_id'] => $optionValueId])
         );
 

lib/internal/Magento/Framework/Interception/PluginList/PluginList.php

@@ -264,7 +264,7 @@ public function getPlugin($type, $code)
     public function getNext($type, $method, $code = '__self')
     {
         $this->_loadScopedData();
-        if (!isset($this->_inherited[$type]) && !array_key_exists($type, $this->_inherited)) {
+        if ($this->_inherited !== null && !isset($this->_inherited[$type]) && !array_key_exists($type, $this->_inherited)) {
             $this->_inheritPlugins($type);
         }
         $key = $type . '_' . lcfirst($method) . '_' . $code;