Merge remote-tracking branch 'origin/2.3-develop' into MPI-PR-10012019

Author: arnobsh

app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php

@@ -8,6 +8,9 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type;
 
+/**
+ * Provides duplicating bundle options and selections
+ */
 class Bundle implements \Magento\Catalog\Model\Product\CopyConstructorInterface
 {
     /**
@@ -27,7 +30,17 @@ public function build(Product $product, Product $duplicate)
         $bundleOptions = $product->getExtensionAttributes()->getBundleProductOptions() ?: [];
         $duplicatedBundleOptions = [];
         foreach ($bundleOptions as $key => $bundleOption) {
-            $duplicatedBundleOptions[$key] = clone $bundleOption;
+            $duplicatedBundleOption = clone $bundleOption;
+            /**
+             * Set option and selection ids to 'null' in order to create new option(selection) for duplicated product,
+             * but not modifying existing one, which led to lost of option(selection) in original product.
+             */
+            $productLinks = $duplicatedBundleOption->getProductLinks() ?: [];
+            foreach ($productLinks as $productLink) {
+                $productLink->setSelectionId(null);
+            }
+            $duplicatedBundleOption->setOptionId(null);
+            $duplicatedBundleOptions[$key] = $duplicatedBundleOption;
         }
         $duplicate->getExtensionAttributes()->setBundleProductOptions($duplicatedBundleOptions);
     }

app/code/Magento/Bundle/Test/Unit/Model/Product/CopyConstructor/BundleTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Bundle\Test\Unit\Model\Product\CopyConstructor;
 
 use Magento\Bundle\Api\Data\BundleOptionInterface;
+use Magento\Bundle\Model\Link;
 use Magento\Bundle\Model\Product\CopyConstructor\Bundle;
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Model\Product;
@@ -45,6 +46,7 @@ public function testBuildNegative()
      */
     public function testBuildPositive()
     {
+        /** @var Product|\PHPUnit_Framework_MockObject_MockObject $product */
         $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -60,18 +62,42 @@ public function testBuildPositive()
             ->method('getExtensionAttributes')
             ->willReturn($extensionAttributesProduct);
 
+        $productLink = $this->getMockBuilder(Link::class)
+            ->setMethods(['setSelectionId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productLink->expects($this->exactly(2))
+            ->method('setSelectionId')
+            ->with($this->identicalTo(null));
+        $firstOption = $this->getMockBuilder(BundleOptionInterface::class)
+            ->setMethods(['getProductLinks'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $firstOption->expects($this->once())
+            ->method('getProductLinks')
+            ->willReturn([$productLink]);
+        $firstOption->expects($this->once())
+            ->method('setOptionId')
+            ->with($this->identicalTo(null));
+        $secondOption = $this->getMockBuilder(BundleOptionInterface::class)
+            ->setMethods(['getProductLinks'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $secondOption->expects($this->once())
+            ->method('getProductLinks')
+            ->willReturn([$productLink]);
+        $secondOption->expects($this->once())
+            ->method('setOptionId')
+            ->with($this->identicalTo(null));
         $bundleOptions = [
-            $this->getMockBuilder(BundleOptionInterface::class)
-                ->disableOriginalConstructor()
-                ->getMockForAbstractClass(),
-            $this->getMockBuilder(BundleOptionInterface::class)
-                ->disableOriginalConstructor()
-                ->getMockForAbstractClass()
+            $firstOption,
+            $secondOption
         ];
         $extensionAttributesProduct->expects($this->once())
             ->method('getBundleProductOptions')
             ->willReturn($bundleOptions);
 
+        /** @var Product|\PHPUnit_Framework_MockObject_MockObject $duplicate */
         $duplicate = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php

@@ -7,7 +7,6 @@
 
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\CatalogInventory\Model\Stock;
 
 /**
  * Class StockDataFilter
@@ -61,8 +60,8 @@ public function filter(array $stockData)
             $stockData['qty'] = self::MAX_QTY_VALUE;
         }
 
-        if (isset($stockData['min_qty'])) {
-            $stockData['min_qty'] = $this->purifyMinQty($stockData['min_qty'], $stockData['backorders']);
+        if (isset($stockData['min_qty']) && (int)$stockData['min_qty'] < 0) {
+            $stockData['min_qty'] = 0;
         }
 
         if (!isset($stockData['is_decimal_divided']) || $stockData['is_qty_decimal'] == 0) {
@@ -71,27 +70,4 @@ public function filter(array $stockData)
 
         return $stockData;
     }
-
-    /**
-     * Purifies min_qty.
-     *
-     * @param int $minQty
-     * @param int $backOrders
-     * @return float
-     */
-    private function purifyMinQty(int $minQty, int $backOrders): float
-    {
-        /**
-         * As described in the documentation if the Backorders Option is disabled
-         * it is recommended to set the Out Of Stock Threshold to a positive number.
-         * That's why to clarify the logic to the end user the code below prevent him to set a negative number so such
-         * a number will turn to zero.
-         * @see https://docs.magento.com/m2/ce/user_guide/catalog/inventory-backorders.html
-         */
-        if ($backOrders === Stock::BACKORDERS_NO && $minQty < 0) {
-            $minQty = 0;
-        }
-
-        return (float)$minQty;
-    }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php

@@ -6,45 +6,63 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\Registry;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\Catalog\Controller\Adminhtml\Product\Set;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
-class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface
+/**
+ * Edit attribute set controller.
+ */
+class Edit extends Set implements HttpGetActionInterface
 {
     /**
-     * @var \Magento\Framework\View\Result\PageFactory
+     * @var PageFactory
      */
     protected $resultPageFactory;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @var AttributeSetRepositoryInterface
+     */
+    private $attributeSetRepository;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param PageFactory $resultPageFactory
+     * @param AttributeSetRepositoryInterface $attributeSetRepository
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory
+        Context $context,
+        Registry $coreRegistry,
+        PageFactory $resultPageFactory,
+        AttributeSetRepositoryInterface $attributeSetRepository = null
     ) {
         parent::__construct($context, $coreRegistry);
         $this->resultPageFactory = $resultPageFactory;
+        $this->attributeSetRepository = $attributeSetRepository ?:
+            ObjectManager::getInstance()->get(AttributeSetRepositoryInterface::class);
     }
 
     /**
-     * @return \Magento\Backend\Model\View\Result\Page
+     * @inheritdoc
      */
     public function execute()
     {
         $this->_setTypeId();
-        $attributeSet = $this->_objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class)
-            ->load($this->getRequest()->getParam('id'));
-
+        $attributeSet = $this->attributeSetRepository->get($this->getRequest()->getParam('id'));
         if (!$attributeSet->getId()) {
             return $this->resultRedirectFactory->create()->setPath('catalog/*/index');
         }
-
         $this->_coreRegistry->register('current_attribute_set', $attributeSet);
 
-        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        /** @var Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->setActiveMenu('Magento_Catalog::catalog_attributes_sets');
         $resultPage->getConfig()->getTitle()->prepend(__('Attribute Sets'));

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php

@@ -8,6 +8,8 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Sql\UnionExpression;
 
 /**
  * Catalog Product Eav Select and Multiply Select Attributes Indexer resource model
@@ -199,13 +201,52 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
                 'dd.attribute_id',
                 's.store_id',
                 'value' => new \Zend_Db_Expr('COALESCE(ds.value, dd.value)'),
-                'cpe.entity_id',
+                'cpe.entity_id AS source_id',
             ]
         );
 
         if ($entityIds !== null) {
             $ids = implode(',', array_map('intval', $entityIds));
+            $selectWithoutDefaultStore = $connection->select()->from(
+                ['wd' => $this->getTable('catalog_product_entity_int')],
+                [
+                    'cpe.entity_id',
+                    'attribute_id',
+                    'store_id',
+                    'value',
+                    'cpe.entity_id',
+                ]
+            )->joinLeft(
+                ['cpe' => $this->getTable('catalog_product_entity')],
+                "cpe.{$productIdField} = wd.{$productIdField}",
+                []
+            )->joinLeft(
+                ['d2d' => $this->getTable('catalog_product_entity_int')],
+                sprintf(
+                    "d2d.store_id = 0 AND d2d.{$productIdField} = wd.{$productIdField} AND d2d.attribute_id = %s",
+                    $this->_eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'status')->getId()
+                ),
+                []
+            )->joinLeft(
+                ['d2s' => $this->getTable('catalog_product_entity_int')],
+                "d2s.store_id != 0 AND d2s.attribute_id = d2d.attribute_id AND " .
+                "d2s.{$productIdField} = d2d.{$productIdField}",
+                []
+            )
+                ->where((new \Zend_Db_Expr('COALESCE(d2s.value, d2d.value)')) . ' = ' . ProductStatus::STATUS_ENABLED)
+                ->where("wd.attribute_id IN({$attrIdsFlat})")
+                ->where('wd.value IS NOT NULL')
+                ->where('wd.store_id != 0')
+                ->where("cpe.entity_id IN({$ids})");
             $select->where("cpe.entity_id IN({$ids})");
+            $selects = new UnionExpression(
+                [$select, $selectWithoutDefaultStore],
+                Select::SQL_UNION,
+                '( %s )'
+            );
+
+            $select = $connection->select();
+            $select->from(['u' => $selects]);
         }
 
         /**
@@ -342,7 +383,7 @@ private function getMultiSelectAttributeWithSourceModels($attrIds)
             ProductAttributeInterface::ENTITY_TYPE_CODE,
             $criteria
         )->getItems();
-        
+
         $options = [];
         foreach ($attributes as $attribute) {
             $sourceModelOptions = $attribute->getOptions();

app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml

@@ -23,11 +23,13 @@
             <createData entity="SimpleProductInStockQuantityZero" stepKey="createProduct"/>
 
             <!-- Configure Magento to show out of stock products and to allow backorders -->
+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
             <magentoCLI command="config:set {{CatalogInventoryItemOptionsBackordersEnable.path}} {{CatalogInventoryItemOptionsBackordersEnable.value}}" stepKey="setConfigAllowBackordersTrue"/>
         </before>
 
         <after>
             <!-- Set Magento back to default configuration -->
+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <magentoCLI command="config:set {{CatalogInventoryItemOptionsBackordersDisable.path}} {{CatalogInventoryItemOptionsBackordersDisable.value}}" stepKey="setConfigAllowBackordersFalse"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
         </after>