ENGCOM-6125: Simplify some conditional checks #24849

Author: VladimirZaets

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/Indexer/Test/Unit/Model/IndexerTest.php

@@ -154,15 +154,7 @@ public function testGetLatestUpdated($getViewIsEnabled, $getViewGetUpdated, $get
         $this->stateFactoryMock->expects($this->once())->method('create')->will($this->returnValue($stateMock));
 
         if ($getViewIsEnabled && $getViewGetUpdated) {
-            if (!$getStateGetUpdated) {
-                $this->assertEquals($getViewGetUpdated, $this->model->getLatestUpdated());
-            } else {
-                if ($getViewGetUpdated == $getStateGetUpdated) {
-                    $this->assertEquals($getViewGetUpdated, $this->model->getLatestUpdated());
-                } else {
-                    $this->assertEquals($getViewGetUpdated, $this->model->getLatestUpdated());
-                }
-            }
+            $this->assertEquals($getViewGetUpdated, $this->model->getLatestUpdated());
         } else {
             $getLatestUpdated = $this->model->getLatestUpdated();
             $this->assertEquals($getStateGetUpdated, $getLatestUpdated);

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

@@ -830,7 +830,7 @@ define([
         ],
         'validate-state': [
             function (value) {
-                return value !== 0 || value === '';
+                return value !== 0;
             },
             $.mage.__('Please select State/Province.')
         ],

lib/web/mage/validation.js

@@ -1129,7 +1129,7 @@ define([
         ],
         'validate-state': [
             function (v) {
-                return v !== 0 || v === '';
+                return v !== 0;
             },
             $.mage.__('Please select State/Province.')
         ],