Merge branch 'maindevelop' into bugfix

Author: irenelagno

app/code/Magento/Catalog/Model/Product/Option.php

@@ -567,7 +567,7 @@ protected function _getValidationRulesBeforeSave()
     public function getProductSku()
     {
         $productSku = $this->_getData(self::KEY_PRODUCT_SKU);
-        if (!$productSku) {
+        if (!$productSku && $this->getProduct()) {
             $productSku = $this->getProduct()->getSku();
         }
         return $productSku;

app/code/Magento/Catalog/Model/Product/Option/Repository.php

@@ -125,7 +125,11 @@ public function duplicate(
      */
     public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $option)
     {
-        $product = $this->productRepository->get($option->getProductSku());
+        $productSku = $option->getProductSku();
+        if (!$productSku) {
+            throw new CouldNotSaveException(__('ProductSku should be specified'));
+        }
+        $product = $this->productRepository->get($productSku);
         $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
         $option->setData('product_id', $product->getData($metadata->getLinkField()));
         $option->setOptionId(null);

app/code/Magento/Catalog/Setup/CategorySetup.php

@@ -14,7 +14,6 @@
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Catalog\Model\Product\Type;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 class CategorySetup extends EavSetup
 {
@@ -598,7 +597,7 @@ public function getDefaultEntities()
                         'filterable' => true,
                         'comparable' => true,
                         'visible_in_advanced_search' => true,
-                        'apply_to' => implode(',', [Type::TYPE_SIMPLE, Type::TYPE_VIRTUAL, Configurable::TYPE_CODE]),
+                        'apply_to' => implode(',', [Type::TYPE_SIMPLE, Type::TYPE_VIRTUAL]),
                         'is_used_in_grid' => true,
                         'is_visible_in_grid' => false,
                         'is_filterable_in_grid' => true,

app/code/Magento/Catalog/Test/Unit/Model/Product/TypeTest.php

@@ -142,14 +142,6 @@ public function testFactory()
 
     public function testPriceFactory()
     {
-        $this->assertInstanceOf(
-            '\Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price',
-            $this->_model->priceFactory('type_id_3')
-        );
-        $this->assertInstanceOf(
-            '\Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price',
-            $this->_model->priceFactory('type_id_3')
-        );
         $this->assertInstanceOf(
             '\Magento\Catalog\Model\Product\Type\Price',
             $this->_model->priceFactory('type_id_1')
@@ -318,7 +310,7 @@ private function getMockedTypePriceFactory()
             ->will(
                 $this->returnValueMap(
                     [
-                        ['some_model', [], $this->getMockedProductTypeConfigurablePrice()],
+                        ['some_model', [], $this->getMockedProductTypePrice()],
                         ['Magento\Catalog\Model\Product\Type\Price', [], $this->getMockedProductTypePrice()],
                     ]
                 )
@@ -338,16 +330,4 @@ private function getMockedProductTypePrice()
 
         return $mock;
     }
-
-    /**
-     * @return \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price
-     */
-    private function getMockedProductTypeConfigurablePrice()
-    {
-        $mockBuild = $this->getMockBuilder('\Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price')
-            ->disableOriginalConstructor();
-        $mock = $mockBuild->getMock();
-
-        return $mock;
-    }
 }

app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php

@@ -97,7 +97,7 @@ protected function setUp()
             false
         );
         $this->hydratorMock = $this->getMock(
-            'Magento\Framework\Model\Entity\EntityHydrator',
+            'Magento\Framework\Model\Entity\Hydrator',
             ['extract'],
             [],
             '',

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -818,21 +818,6 @@ public function testSaveAndDuplicate()
         $this->model->afterSave();
     }
 
-    public function testGetIsSalableConfigurable()
-    {
-        $typeInstanceMock = $this->getMock(
-            'Magento\ConfigurableProduct\Model\Product\Type\Configurable', ['getIsSalable'], [], '', false);
-
-        $typeInstanceMock
-            ->expects($this->atLeastOnce())
-            ->method('getIsSalable')
-            ->willReturn(true);
-
-        $this->model->setTypeInstance($typeInstanceMock);
-
-        self::assertTrue($this->model->getIsSalable());
-    }
-
     public function testGetIsSalableSimple()
     {
         $typeInstanceMock =

app/code/Magento/Catalog/composer.json

@@ -26,7 +26,6 @@
         "magento/module-config": "100.0.*",
         "magento/module-media-storage": "100.0.*",
         "magento/framework": "100.0.*",
-        "magento/module-configurable-product": "100.0.*",
         "magento/module-ui": "100.0.*"
     },
     "suggest": {

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

@@ -542,18 +542,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Model\OrchestratorPool">
-        <arguments>
-            <argument name="operations" xsi:type="array">
-                <item name="default" xsi:type="array">
-                    <item name="read" xsi:type="string">Magento\Framework\Model\Operation\Read</item>
-                    <item name="create" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Create</item>
-                    <item name="update" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Update</item>
-                    <item name="delete" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Delete</item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Model\Entity\RepositoryFactory">
         <arguments>
             <argument name="entities" xsi:type="array">

app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php

@@ -41,6 +41,10 @@ public function aroundFilter(
         Category $category
     ) {
         $proceed($collection, $category);
-        $collection->addSearchFilter($this->queryFactory->get()->getQueryText());
+        /** @var \Magento\Search\Model\Query $query */
+        $query = $this->queryFactory->get();
+        if (!$query->isQueryTextShort()) {
+            $collection->addSearchFilter($query->getQueryText());
+        }
     }
 }

app/code/Magento/ConfigurableProduct/Setup/InstallData.php

@@ -53,6 +53,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
             'special_to_date',
             'tier_price',
             'weight',
+            'color'
         ];
         foreach ($attributes as $attributeCode) {
             $relatedProductTypes = explode(