[Magento Community Engineering] Community Contributions - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/AsynchronousOperations/Model/OperationSearchResults.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with bulk Operation search result.
+ */
+class OperationSearchResults extends SearchResults implements OperationSearchResultsInterface
+{
+}

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

@@ -16,7 +16,7 @@
     <preference for="Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface" type="Magento\AsynchronousOperations\Model\OperationStatus" />
     <preference for="Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Detailed" />
     <preference for="Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Short" />
-    <preference for="Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface" type="Magento\AsynchronousOperations\Model\OperationSearchResults" />
     <preference for="Magento\AsynchronousOperations\Api\OperationRepositoryInterface" type="Magento\AsynchronousOperations\Model\OperationRepository" />
     <type name="Magento\Framework\EntityManager\MetadataPool">
         <arguments>

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/Model/CategoryAttributeSearchResults.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\CategoryAttributeSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Category Attribute search results.
+ */
+class CategoryAttributeSearchResults extends SearchResults implements CategoryAttributeSearchResultsInterface
+{
+}

app/code/Magento/Catalog/Model/CategorySearchResults.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\CategorySearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Category search results.
+ */
+class CategorySearchResults extends SearchResults implements CategorySearchResultsInterface
+{
+}

app/code/Magento/Catalog/Model/ProductAttributeSearchResults.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\ProductAttributeSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Product Attribute search results.
+ */
+class ProductAttributeSearchResults extends SearchResults implements ProductAttributeSearchResultsInterface
+{
+}

app/code/Magento/Catalog/Model/ProductSearchResults.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Product search results.
+ */
+class ProductSearchResults extends SearchResults implements ProductSearchResultsInterface
+{
+}

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/Observer/FlushCategoryPagesCache.php

@@ -0,0 +1,60 @@
+<?php declare(strict_types=1);
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Observer;
+
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Event\Observer as Event;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\PageCache\Model\Cache\Type as PageCache;
+use Magento\PageCache\Model\Config as CacheConfig;
+
+/**
+ * Flush the built in page cache when a category is moved
+ */
+class FlushCategoryPagesCache implements ObserverInterface
+{
+
+    /**
+     * @var CacheConfig
+     */
+    private $cacheConfig;
+
+    /**
+     *
+     * @var PageCache
+     */
+    private $pageCache;
+
+    /**
+     * FlushCategoryPagesCache constructor.
+     *
+     * @param CacheConfig $cacheConfig
+     * @param PageCache $pageCache
+     */
+    public function __construct(CacheConfig $cacheConfig, PageCache $pageCache)
+    {
+        $this->cacheConfig = $cacheConfig;
+        $this->pageCache = $pageCache;
+    }
+
+    /**
+     * Clean the category page cache if built in cache page cache is used.
+     *
+     * The built in cache requires cleaning all pages that contain the top category navigation menu when a
+     * category is moved. This is because the built in cache does not support ESI blocks.
+     *
+     * @param Event $event
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute(Event $event)
+    {
+        if ($this->cacheConfig->getType() == CacheConfig::BUILT_IN && $this->cacheConfig->isEnabled()) {
+            $this->pageCache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [Category::CACHE_TAG]);
+        }
+    }
+}

app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml

@@ -18,4 +18,15 @@
         <amOnPage url="{{StorefrontProductPage.url(productUrl)}}" stepKey="openProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoaded"/>
     </actionGroup>
+    <actionGroup name="StorefrontOpenProductPageOnSecondStore">
+        <annotations>
+            <description>Goes to the Storefront Product page for the provided store code and Product URL.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeCode" type="string"/>
+            <argument name="productUrl" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{StorefrontStoreViewProductPage.url(storeCode,productUrl)}}" stepKey="openProductPage"/>
+    </actionGroup>
 </actionGroups>