Merge branch 'ACP2E-185' of https://github.com/magento-l3/magento2ce into PR-L3-2023-01-31

Author: aplapana

app/code/Magento/Catalog/Controller/Product/View.php

@@ -125,6 +125,7 @@ protected function noProductRedirect()
             $resultForward->forward('noroute');
             return $resultForward;
         }
+        return $this->getResponse();
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Controller/Product/ViewTest.php

@@ -27,6 +27,8 @@
 
 /**
  * Responsible for testing product view action on a strorefront.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ViewTest extends TestCase
 {

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

@@ -29,7 +29,7 @@ public function __construct(array $collectionPostProcessors = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(Collection $collection, array $attributeNames, ContextInterface $context = null): Collection
     {

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

@@ -97,7 +97,7 @@
         <plugin name="productAttributesDynamicFields"  type="Magento\CatalogGraphQl\Plugin\Search\Request\ConfigReader" />
     </type>
 
-    <preference type="\Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider" for="\Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface"/>
+    <preference type="Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider" for="Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface"/>
 
     <preference type="Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search" for="Magento\CatalogGraphQl\Model\Resolver\Products\Query\ProductQueryInterface"/>
 

app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/DataProviderFactory.php

@@ -18,8 +18,6 @@
 class DataProviderFactory
 {
     /**
-     * Object Manager
-     *
      * @var ObjectManagerInterface
      */
     private $objectManager;
@@ -33,8 +31,9 @@ public function __construct(ObjectManagerInterface $objectManager)
     }
 
     /**
-     * Recreates an instance of the DataProviderInterface in order to support QueryAware interface
-     * and add a QueryContainer to the DataProvider
+     * Recreates an instance of the DataProviderInterface.
+     *
+     * It should be done in order to support QueryAware interface and add a QueryContainer to the DataProvider.
      *
      * The Query is an optional argument as it's not required to pass the QueryContainer for data providers
      * who not implementing QueryAwareInterface, but the method is also responsible for checking

app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php

@@ -16,6 +16,7 @@
  *
  * @api
  * @since 100.1.0
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInterface, QueryAwareInterface
 {
@@ -50,32 +51,32 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
 
     /**
      * @var \Magento\Elasticsearch\Model\Config
-     * @deprecated 100.2.0 as this class shouldn't be responsible for query building
-     * and should only modify existing query
+     * @deprecated 100.2.0
+     * @see this class shouldn't be responsible for query building and should only modify existing query
      * @since 100.1.0
      */
     protected $clientConfig;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @deprecated 100.2.0 as this class shouldn't be responsible for query building
-     * and should only modify existing query
+     * @deprecated 100.2.0
+     * @see this class shouldn't be responsible for query building and should only modify existing query
      * @since 100.1.0
      */
     protected $storeManager;
 
     /**
      * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver
-     * @deprecated 100.2.0 as this class shouldn't be responsible for query building
-     * and should only modify existing query
+     * @deprecated 100.2.0
+     * @see this class shouldn't be responsible for query building and should only modify existing query
      * @since 100.1.0
      */
     protected $searchIndexNameResolver;
 
     /**
      * @var string
-     * @deprecated 100.2.0 as this class shouldn't be responsible for query building
-     * and should only modify existing query
+     * @deprecated 100.2.0
+     * @see this class shouldn't be responsible for query building and should only modify existing query
      * @since 100.1.0
      */
     protected $indexerId;

app/code/Magento/ImportExport/Model/Export.php

@@ -10,38 +10,36 @@
  * Export model
  *
  * @api
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  * @deprecated 100.3.2
+ * @see \Magento\ImportExport\Api\ExportManagementInterface
  */
 class Export extends \Magento\ImportExport\Model\AbstractModel
 {
-    const FILTER_ELEMENT_GROUP = 'export_filter';
+    public const FILTER_ELEMENT_GROUP = 'export_filter';
 
-    const FILTER_ELEMENT_SKIP = 'skip_attr';
+    public const FILTER_ELEMENT_SKIP = 'skip_attr';
 
     /**
      * Allow multiple values wrapping in double quotes for additional attributes.
      */
-    const FIELDS_ENCLOSURE = 'fields_enclosure';
+    public const FIELDS_ENCLOSURE = 'fields_enclosure';
 
     /**
      * Filter fields types.
      */
-    const FILTER_TYPE_SELECT = 'select';
+    public const FILTER_TYPE_SELECT = 'select';
 
-    const FILTER_TYPE_MULTISELECT = 'multiselect';
+    public const FILTER_TYPE_MULTISELECT = 'multiselect';
 
-    const FILTER_TYPE_INPUT = 'input';
+    public const FILTER_TYPE_INPUT = 'input';
 
-    const FILTER_TYPE_DATE = 'date';
+    public const FILTER_TYPE_DATE = 'date';
 
-    const FILTER_TYPE_NUMBER = 'number';
+    public const FILTER_TYPE_NUMBER = 'number';
 
     /**
-     * Entity adapter.
-     *
      * @var \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      */
     protected $_entityAdapter;
@@ -225,6 +223,7 @@ public function filterAttributeCollection(\Magento\Framework\Data\Collection $co
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function getAttributeFilterType(\Magento\Eav\Model\Entity\Attribute $attribute)
     {
@@ -245,13 +244,15 @@ public static function getAttributeFilterType(\Magento\Eav\Model\Entity\Attribut
             __('We can\'t determine the attribute filter type.')
         );
     }
+    //phpcs:enable Magento2.Functions.StaticFunction
 
     /**
      * Determine filter type for static attribute.
      *
      * @static
      * @param \Magento\Eav\Model\Entity\Attribute $attribute
      * @return string
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function getStaticAttributeFilterType(\Magento\Eav\Model\Entity\Attribute $attribute)
     {
@@ -277,6 +278,7 @@ public static function getStaticAttributeFilterType(\Magento\Eav\Model\Entity\At
         }
         return $type;
     }
+    //phpcs:enable Magento2.Functions.StaticFunction
 
     /**
      * MIME-type for 'Content-Type' header.

app/code/Magento/Quote/Model/Product/Plugin/UpdateQuote.php

@@ -18,15 +18,11 @@ class UpdateQuote
 {
 
     /**
-     * Quote Resource
-     *
      * @var Quote
      */
     private $resource;
 
     /**
-     * Product ID locator.
-     *
      * @var ProductIdLocatorInterface
      */
     private $productIdLocator;
@@ -49,8 +45,8 @@ public function __construct(
      * Update the quote trigger_recollect column is 1 when product price is changed through API.
      *
      * @param TierPriceStorageInterface $subject
-     * @param $result
-     * @param $prices
+     * @param array $result
+     * @param array $prices
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -61,7 +57,6 @@ public function afterUpdate(
     ): array {
         $this->resource->markQuotesRecollect($this->retrieveAffectedProductIdsForPrices($prices));
         return $result;
-
     }
 
     /**