Merge pull request #213 from magento-okapis/MAGETWO-53676

Author: Oleksii Korshenko

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

@@ -25,17 +25,14 @@ class Configurable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Catalog\Model\ResourceModel\Product\Relation $catalogProductRelation
-     * @param ScopeResolverInterface $scopeResolver
      * @param string $connectionName
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Catalog\Model\ResourceModel\Product\Relation $catalogProductRelation,
-        ScopeResolverInterface $scopeResolver = null,
         $connectionName = null
     ) {
         $this->_catalogProductRelation = $catalogProductRelation;
-        $this->scopeResolver = $scopeResolver;
         parent::__construct($context, $connectionName);
     }
 
@@ -252,6 +249,7 @@ public function getAttributeOptions($superAttribute, $productId)
 
     /**
      * @return ScopeResolverInterface
+     * @deprecated
      */
     private function getScopeResolver()
     {

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php

@@ -9,7 +9,6 @@
 
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable as ConfigurableResource;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ObjectManager;
 
@@ -63,10 +62,9 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param Configurable $catalogProductTypeConfigurable
+     * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable $catalogProductTypeConfigurable
      * @param \Magento\Catalog\Helper\Data $catalogData
-     * @param Attribute $resource
-     * @param ConfigurableResource $configurableResource
+     * @param \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute $resource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -78,14 +76,12 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         Configurable $catalogProductTypeConfigurable,
         \Magento\Catalog\Helper\Data $catalogData,
-        Attribute $resource,
-        ConfigurableResource $configurableResource = null,
+        \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute $resource,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_productTypeConfigurable = $catalogProductTypeConfigurable;
         $this->_catalogData = $catalogData;
-        $this->configurableResource = $configurableResource;
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
     }
 
@@ -332,6 +328,7 @@ public function __wakeup()
      * Get Configurable Resource
      *
      * @return ConfigurableResource
+     * @deprecated
      */
     private function getConfigurableResource()
     {

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

@@ -102,17 +102,21 @@ public function testGetConfigurableOptions()
             'Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable',
             [
                 'getTable',
-                'getConnection',
+                'getConnection'
             ],
             [
                 $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock(),
-                $this->relation,
-                $scopeResolver
+                $this->relation
             ],
             '',
             true
         );
 
+        $reflection = new \ReflectionClass('Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable');
+        $reflectionProperty = $reflection->getProperty('scopeResolver');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($configurable, $scopeResolver);
+
         $product = $this->getMockBuilder('Magento\Catalog\Model\Product')
             ->setMethods(
                 [