MAGETWO-54682: Fast load of product options

 - fix tests

Author: mslabko

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php

@@ -372,5 +372,4 @@ protected function copyImage($file)
             );
         }
     }
-    
 }

app/code/Magento/CatalogRule/Test/Unit/Pricing/Price/CatalogRulePriceTest.php

@@ -10,6 +10,7 @@
 
 /**
  * Class CatalogRulePriceTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CatalogRulePriceTest extends \PHPUnit_Framework_TestCase
 {

app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php

@@ -91,4 +91,4 @@ public function beforeLoad(Collection $productCollection, $printQuery = false, $
 
         return [$printQuery, $logQuery];
     }
-}
+}

app/code/Magento/CatalogRuleConfigurable/composer.json

@@ -4,12 +4,12 @@
     "require": {
         "php": "~5.5.0|~5.6.0|~7.0.0",
         "magento/module-configurable-product": "100.0.*",
+        "magento/module-catalog-rule": "100.0.*",
+        "magento/module-store": "100.0.*",
+        "magento/module-customer": "100.0.*",
         "magento/framework": "100.0.*",
         "magento/magento-composer-installer": "*"
     },
-    "suggest": {
-        "magento/module-catalog-rule": "100.0.*"
-    },
     "type": "magento2-module",
     "version": "100.0.5",
     "license": [

app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php

@@ -72,6 +72,7 @@ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $produ
 
     /**
      * @return \Magento\ConfigurableProduct\Pricing\Price\ConfigurableOptionsProviderInterface
+     * @deprecated
      */
     private function getConfigurableOptionsProvider()
     {

app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php

@@ -152,6 +152,7 @@ protected function getUsedProducts()
 
     /**
      * @return \Magento\ConfigurableProduct\Pricing\Price\ConfigurableOptionsProviderInterface
+     * @deprecated
      */
     private function getConfigurableOptionsProvider()
     {

app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php

@@ -89,5 +89,4 @@ public function afterCreateBatchBaseSelect(Media $originalResourceModel, Select
 
         return $select;
     }
-
 }

app/code/Magento/ProductVideo/Test/Unit/Model/Plugin/ExternalVideoEntryProcessorTest.php

@@ -274,13 +274,8 @@ public function testAfterLoadNoVideo()
             'values' => []
         ];
 
-        $resourceEntryResult = [];
-
         $this->productMock->expects($this->once())->method('getData')->with('media_gallery')->willReturn($mediaData);
-
-        $this->resourceEntryMediaGalleryMock->expects($this->once())->method('loadDataFromTableByValueId')->willReturn(
-            $resourceEntryResult
-        );
+        $this->resourceEntryMediaGalleryMock->expects($this->never())->method('loadDataFromTableByValueId');
         $this->mediaBackendModel->expects($this->any())->method('getAttribute')->willReturn($this->attributeMock);
 
         $this->modelObject->afterAfterLoad($this->mediaBackendModel, $this->productMock);