Merge remote-tracking branch 'origin/MAGETWO-51104' into PR

Author: igrybkov

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Config;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Model\Product\Gallery\ReadHandler as GalleryReadHandler;
@@ -151,6 +152,11 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      */
     private $productGalleryReadHandler;
 
+    /**
+     * @var Config
+     */
+    private $catalogConfig;
+
     /**
      * @codingStandardsIgnoreStart/End
      *
@@ -511,6 +517,7 @@ public function getUsedProducts($product, $requiredAttributeIds = null)
                 ->addAttributeToSelect('weight')
                 ->addAttributeToSelect('image')
                 ->addAttributeToSelect('status')
+                ->addAttributeToSelect($this->getCatalogConfig()->getProductAttributes())
                 ->addFilterByRequiredOptions()
                 ->setStoreId($product->getStoreId());
 
@@ -1181,4 +1188,17 @@ private function getMetadataPool()
         }
         return $this->metadataPool;
     }
+
+    /**
+     * Get Config instance
+     * @return Config
+     * @deprecated
+     */
+    private function getCatalogConfig()
+    {
+        if (!$this->catalogConfig) {
+            $this->catalogConfig = ObjectManager::getInstance()->get(Config::class);
+        }
+        return $this->catalogConfig;
+    }
 }

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

@@ -10,6 +10,7 @@
 
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Config;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\EntityManager\EntityMetadata;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -18,6 +19,7 @@
  * Class \Magento\ConfigurableProduct\Test\Unit\Model\Product\Type\ConfigurableTest
  *
  * @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConfigurableTest extends \PHPUnit_Framework_TestCase
 {
@@ -85,6 +87,11 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     private $cache;
 
+    /**
+     * @var Config
+     */
+    protected $catalogConfig;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -149,6 +156,9 @@ protected function setUp()
             ->willReturn($this->entityMetadata);
         $this->cache = $this->getMockBuilder(\Magento\Framework\Cache\FrontendInterface::class)
             ->getMockForAbstractClass();
+        $this->catalogConfig = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->_model = $this->_objectHelper->getObject(
             Configurable::class,
@@ -164,7 +174,8 @@ protected function setUp()
                 'logger' => $logger,
                 'productRepository' => $this->productRepository,
                 'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
-                'cache' => $this->cache
+                'cache' => $this->cache,
+                'catalogConfig' => $this->catalogConfig,
             ]
         );
         $refClass = new \ReflectionClass(Configurable::class);