Merge branch '2.4-develop' into admin-indexer-massinvalidte

Author: fredden

app/code/Magento/AdminAnalytics/registration.php

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminAnalytics', __DIR__);

app/code/Magento/AdminNotification/registration.php

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);

app/code/Magento/AdvancedPricingImportExport/registration.php

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdvancedPricingImportExport', __DIR__);

app/code/Magento/AdvancedSearch/registration.php

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdvancedSearch', __DIR__);

app/code/Magento/Amqp/registration.php

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Amqp', __DIR__);

app/code/Magento/AmqpStore/registration.php

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AmqpStore', __DIR__);

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

@@ -8,25 +8,24 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
-use Magento\Framework\Bulk\OperationManagementInterface;
 use Magento\AsynchronousOperations\Model\ConfigInterface as AsyncConfig;
-use Magento\Framework\MessageQueue\MessageValidator;
-use Magento\Framework\MessageQueue\MessageEncoder;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
-use Psr\Log\LoggerInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\TemporaryStateExceptionInterface;
+use Magento\Framework\Bulk\OperationManagementInterface;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
 use Magento\Framework\DB\Adapter\ConnectionException;
 use Magento\Framework\DB\Adapter\DeadlockException;
 use Magento\Framework\DB\Adapter\LockWaitException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Webapi\ServiceOutputProcessor;
-use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Psr\Log\LoggerInterface;
 
 /**
- * Class OperationProcessor
+ * Proccess operation
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -80,9 +79,9 @@ class OperationProcessor
      * @param ConsumerConfigurationInterface $configuration
      * @param Json $jsonHelper
      * @param OperationManagementInterface $operationManagement
-     * @param LoggerInterface $logger
      * @param \Magento\Framework\Webapi\ServiceOutputProcessor $serviceOutputProcessor
      * @param \Magento\Framework\Communication\ConfigInterface $communicationConfig
+     * @param LoggerInterface $logger
      */
     public function __construct(
         MessageValidator $messageValidator,
@@ -137,7 +136,9 @@ public function process(string $encodedMessage)
                 $result = $this->executeHandler($callback, $entityParams);
                 $status = $result['status'];
                 $errorCode = $result['error_code'];
+                // phpcs:disable Magento2.Performance.ForeachArrayMerge
                 $messages = array_merge($messages, $result['messages']);
+                // phpcs:enable Magento2.Performance.ForeachArrayMerge
                 $outputData = $result['output_data'];
             }
         }
@@ -174,8 +175,8 @@ public function process(string $encodedMessage)
     /**
      * Execute topic handler
      *
-     * @param $callback
-     * @param $entityParams
+     * @param callable $callback
+     * @param array $entityParams
      * @return array
      */
     private function executeHandler($callback, $entityParams)
@@ -187,7 +188,9 @@ private function executeHandler($callback, $entityParams)
             'output_data' => null
         ];
         try {
+            // phpcs:disable Magento2.Functions.DiscouragedFunction
             $result['output_data'] = call_user_func_array($callback, $entityParams);
+            // phpcs:enable Magento2.Functions.DiscouragedFunction
             $result['messages'][] = sprintf('Service execution success %s::%s', get_class($callback[0]), $callback[1]);
         } catch (\Zend_Db_Adapter_Exception  $e) {
             $this->logger->critical($e->getMessage());
@@ -206,9 +209,7 @@ private function executeHandler($callback, $entityParams)
             }
         } catch (NoSuchEntityException $e) {
             $this->logger->error($e->getMessage());
-            $result['status'] = ($e instanceof TemporaryStateExceptionInterface) ?
-                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED :
-                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $result['status'] = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
             $result['error_code'] = $e->getCode();
             $result['messages'][] = $e->getMessage();
         } catch (LocalizedException $e) {

app/code/Magento/AsynchronousOperations/registration.php

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AsynchronousOperations', __DIR__);

app/code/Magento/Authorization/registration.php

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Authorization', __DIR__);

app/code/Magento/Authorizenet/registration.php

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Authorizenet', __DIR__);