Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-89315

Author: Bohdan Korablov

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

@@ -77,9 +77,8 @@ public function getPopupTitle()
         $messageCount = count($this->_messages->getUnread());
         if ($messageCount > 1) {
             return __('You have %1 new system messages', $messageCount);
-        } else {
-            return __('You have %1 new system message', $messageCount);
         }
+        return __('You have %1 new system message', $messageCount);
     }
 
     /**

app/code/Magento/AdminNotification/Block/Window.php

@@ -98,10 +98,9 @@ protected function _getLatestItem()
     {
         if ($this->_latestItem == null) {
             $items = array_values($this->_criticalCollection->getItems());
+            $this->_latestItem = false;
             if (count($items)) {
                 $this->_latestItem = $items[0];
-            } else {
-                $this->_latestItem = false;
             }
         }
         return $this->_latestItem;

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -626,9 +626,8 @@ protected function _getCustomerGroupById(
     ): string {
         if ($allGroups !== 0) {
             return ImportAdvancedPricing::VALUE_ALL_GROUPS;
-        } else {
-            return $this->_groupRepository->getById($groupId)->getCode();
         }
+        return $this->_groupRepository->getById($groupId)->getCode();
     }
 
     /**

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -482,9 +482,8 @@ protected function deleteProductTierPrices(array $listSku, $table)
                 $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, 0);
                 return false;
             }
-        } else {
-            return false;
         }
+        return false;
     }
 
     /**

app/code/Magento/Analytics/Model/Config/Backend/Enabled.php

@@ -67,12 +67,7 @@ public function afterSave()
         try {
             if ($this->isValueChanged()) {
                 $enabled = $this->getData('value');
-
-                if ($enabled) {
-                    $this->subscriptionHandler->processEnabled();
-                } else {
-                    $this->subscriptionHandler->processDisabled();
-                }
+                $enabled ? $this->subscriptionHandler->processEnabled() : $this->subscriptionHandler->processDisabled();
             }
         } catch (\Exception $e) {
             $this->_logger->error($e->getMessage());

app/code/Magento/Authorization/Model/ResourceModel/Role.php

@@ -68,6 +68,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $role)
         }
 
         if (!$role->getTreeLevel()) {
+            $treeLevel = 0;
             if ($role->getPid() > 0) {
                 $select = $this->getConnection()->select()->from(
                     $this->getMainTable(),
@@ -79,8 +80,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $role)
                 $binds = ['pid' => (int)$role->getPid()];
 
                 $treeLevel = $this->getConnection()->fetchOne($select, $binds);
-            } else {
-                $treeLevel = 0;
             }
 
             $role->setTreeLevel($treeLevel + 1);

app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php

@@ -26,11 +26,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     protected $_selectionsAppended = false;
 
-    /**
-     * @var int[]
-     */
-    private $productIds = [];
-
     /**
      * Init model and resource model
      *
@@ -99,34 +94,20 @@ public function joinValues($storeId)
      */
     public function setProductIdFilter($productId)
     {
-        $this->productIds[] = $productId;
-
         $productTable = $this->getTable('catalog_product_entity');
         $linkField = $this->getConnection()->getAutoIncrementField($productTable);
         $this->getSelect()->join(
             ['cpe' => $productTable],
             'cpe.'.$linkField.' = main_table.parent_id',
             []
         )->where(
-            "cpe.entity_id = (?)",
-            $this->productIds
+            "cpe.entity_id = ?",
+            $productId
         );
 
         return $this;
     }
 
-    /**
-     * Clear product id's after load to insure valid future usage of collection.
-     *
-     * @return $this
-     */
-    protected function _afterLoad()
-    {
-        $this->productIds = [];
-
-        return parent::_afterLoad();
-    }
-
     /**
      * Set product link filter
      *

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php

@@ -99,9 +99,17 @@ private function fetch() : array
         $optionsCollection = $this->bundleOptionFactory->create()->getResourceCollection();
         // All products in collection will have same store id.
         $optionsCollection->joinValues($this->storeManager->getStore()->getId());
-        foreach ($this->skuMap as $parentInfo) {
-            $optionsCollection->setProductIdFilter($parentInfo['entity_id']);
-        }
+
+        $productTable = $optionsCollection->getTable('catalog_product_entity');
+        $linkField = $optionsCollection->getConnection()->getAutoIncrementField($productTable);
+        $optionsCollection->getSelect()->join(
+            ['cpe' => $productTable],
+            'cpe.'.$linkField.' = main_table.parent_id',
+            []
+        )->where(
+            "cpe.entity_id IN (?)",
+            $this->skuMap
+        );
         $optionsCollection->setPositionOrder();
 
         $this->extensionAttributesJoinProcessor->process($optionsCollection);

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php

@@ -8,14 +8,11 @@
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
 
 use Magento\Catalog\Model\Product\Visibility;
-use Magento\Catalog\Model\ResourceModel\CategoryProduct;
-use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
 use Magento\Framework\Api\SearchResultsInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 
 /**
  * Product field data provider, used for GraphQL resolver processing.
@@ -27,40 +24,15 @@ class Product
      */
     private $collectionFactory;
 
-    /**
-     * @var JoinProcessorInterface
-     */
-    private $joinProcessor;
-
-    /**
-     * @var CollectionProcessorInterface
-     */
-    private $collectionProcessor;
-
     /**
      * @var ProductSearchResultsInterfaceFactory
      */
     private $searchResultsFactory;
 
     /**
-     * @var CategoryProduct
-     */
-    private $categoryProduct;
-
-    /**
-     * @var SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var \Magento\Catalog\Model\Layer\Resolver
-     */
-    private $layerResolver;
-
-    /**
-     * @var \Magento\Catalog\Model\ProductRepository
+     * @var CollectionProcessorInterface
      */
-    private $productRepository;
+    private $collectionProcessor;
 
     /**
      * @var Visibility
@@ -69,32 +41,20 @@ class Product
 
     /**
      * @param CollectionFactory $collectionFactory
-     * @param JoinProcessorInterface $joinProcessor
-     * @param CollectionProcessorInterface $collectionProcessor
      * @param ProductSearchResultsInterfaceFactory $searchResultsFactory
-     * @param CategoryProduct $categoryProduct
-     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param Visibility $visibility
+     * @param CollectionProcessorInterface $collectionProcessor
      */
     public function __construct(
         CollectionFactory $collectionFactory,
-        JoinProcessorInterface $joinProcessor,
-        CollectionProcessorInterface $collectionProcessor,
         ProductSearchResultsInterfaceFactory $searchResultsFactory,
-        CategoryProduct $categoryProduct,
-        SearchCriteriaBuilder $searchCriteriaBuilder,
-        \Magento\Catalog\Model\Layer\Resolver $layerResolver,
-        \Magento\Catalog\Model\ProductRepository $productRepository,
-        Visibility $visibility
+        Visibility $visibility,
+        CollectionProcessorInterface $collectionProcessor
     ) {
         $this->collectionFactory = $collectionFactory;
-        $this->joinProcessor = $joinProcessor;
-        $this->collectionProcessor = $collectionProcessor;
         $this->searchResultsFactory = $searchResultsFactory;
-        $this->categoryProduct = $categoryProduct;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->visibility = $visibility;
-        $this->layerResolver = $layerResolver;
-        $this->productRepository = $productRepository;
+        $this->collectionProcessor = $collectionProcessor;
     }
 
     /**
@@ -114,29 +74,17 @@ public function getList(
     ): SearchResultsInterface {
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $this->collectionFactory->create();
-        $this->joinProcessor->process($collection);
 
-        foreach ($attributes as $attributeCode) {
-            $collection->addAttributeToSelect($attributeCode);
-        }
-        $collection->addAttributeToSelect('special_price');
-        $collection->addAttributeToSelect('special_price_from');
-        $collection->addAttributeToSelect('special_price_to');
-        $collection->addAttributeToSelect('tax_class_id');
-        $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
-        $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
+        $this->collectionProcessor->process($collection, $searchCriteria, $attributes);
 
         if (!$isChildSearch) {
             $visibilityIds
                 = $isSearch ? $this->visibility->getVisibleInSearchIds() : $this->visibility->getVisibleInCatalogIds();
             $collection->setVisibility($visibilityIds);
         }
-
-        $this->collectionProcessor->process($searchCriteria, $collection);
-        $collection->addWebsiteNamesToResult();
         $collection->load();
 
-        // Methods that perform extra fetches
+        // Methods that perform extra fetches post-load
         $collection->addCategoryIds();
         $collection->addMediaGalleryData();
         $collection->addOptionsToResult();

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+/**
+ * Adds passed in attributes to product collection results
+ *
+ * {@inheritdoc}
+ */
+class AttributeProcessor implements CollectionProcessorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(
+        Collection $collection,
+        SearchCriteriaInterface $searchCriteria,
+        array $attributeNames
+    ): Collection {
+        foreach ($attributeNames as $name) {
+            $collection->addAttributeToSelect($name);
+        }
+
+        return $collection;
+    }
+}