CET-537/fix: Phpstan complaint about isset($order)

two-inc · Dec 6, 2024 · b4c6a7c · b4c6a7c
1 parent 9b728a6
commit b4c6a7c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/Controller/Payment/Cancel.php b/Controller/Payment/Cancel.php
@@ -52,8 +52,8 @@ public function __construct(
      */
     public function execute()
     {
+        $order = $this->orderService->getOrderByReference();
         try {
-            $order = $this->orderService->getOrderByReference();
             $this->orderService->cancelTwoOrder($order);
             $message = __(
                 'Your invoice purchase with %1 has been cancelled. The cart will be restored.',
@@ -62,10 +62,9 @@ public function execute()
             throw new LocalizedException($message);
         } catch (Exception $exception) {
             $this->orderService->restoreQuote();
-            if (isset($order)) {
+            if ($order) {
                 $this->orderService->failOrder($order, $exception->getMessage());
             }
-
             $this->messageManager->addErrorMessage($exception->getMessage());
             return $this->getResponse()->setRedirect($this->_url->getUrl('checkout/cart'));
         }

diff --git a/Controller/Payment/Confirm.php b/Controller/Payment/Confirm.php
@@ -62,8 +62,8 @@ public function __construct(
      */
     public function execute()
     {
+        $order = $this->orderService->getOrderByReference();
         try {
-            $order = $this->orderService->getOrderByReference();
             $twoOrder = $this->orderService->getTwoOrderFromApi($order);
             if (isset($twoOrder['state']) && $twoOrder['state'] != 'UNVERIFIED') {
                 if (in_array($twoOrder['state'], ['VERIFIED', 'CONFIRMED'])) {
@@ -103,10 +103,9 @@ public function execute()
             }
         } catch (Exception $exception) {
             $this->orderService->restoreQuote();
-            if (isset($order)) {
+            if ($order) {
                 $this->orderService->failOrder($order, $exception->getMessage());
             }
-
             $this->messageManager->addErrorMessage($exception->getMessage());
             return $this->getResponse()->setRedirect($this->_url->getUrl('checkout/cart'));
         }

diff --git a/Controller/Payment/Verificationfailed.php b/Controller/Payment/Verificationfailed.php
@@ -50,19 +50,18 @@ public function __construct(
      */
     public function execute()
     {
+        $order = $this->orderService->getOrderByReference();
         try {
-            $order = $this->orderService->getOrderByReference();
             $message = __(
                 'Your invoice purchase with %1 failed verification. The cart will be restored.',
                 $this->configRepository::PROVIDER
             );
             throw new LocalizedException($message);
         } catch (Exception $exception) {
             $this->orderService->restoreQuote();
-            if (isset($order)) {
+            if ($order) {
                 $this->orderService->failOrder($order, $exception->getMessage());
             }
-
             $this->messageManager->addErrorMessage($exception->getMessage());
             return $this->getResponse()->setRedirect($this->_url->getUrl('checkout/cart'));
         }