Refactoring and best practices for UpgradeQuoteCustomerEmailObserver

Author: UncleTioma

app/code/Magento/Customer/Observer/UpgradeQuoteCustomerEmailObserver.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Customer\Observer;
 
@@ -36,25 +37,31 @@ public function __construct(
      * @param Observer $observer
      * @return void
      */
-    public function execute(Observer $observer)
+    public function execute(Observer $observer): void
     {
+        /** @var \Magento\Customer\Model\Data\Customer $customerOrig */
+        $customerOrig = $observer->getEvent()->getOrigCustomerDataObject();
+        if (!$customerOrig) {
+            return;
+        }
+
+        $emailOrig = $customerOrig->getEmail();
+
         /** @var \Magento\Customer\Model\Data\Customer $customer */
         $customer = $observer->getEvent()->getCustomerDataObject();
         $email = $customer->getEmail();
 
-        /** @var \Magento\Customer\Model\Data\Customer $customerOrig */
-        $customerOrig = $observer->getEvent()->getOrigCustomerDataObject();
-        if ($customerOrig) {
-            $emailOrig = $customerOrig->getEmail();
-
-            if ($email != $emailOrig) {
-                try {
-                    $quote = $this->quoteRepository->getForCustomer($customer->getId());
-                    $quote->setCustomerEmail($email);
-                    $this->quoteRepository->save($quote);
-                } catch (NoSuchEntityException $e) {
-                }
-            }
+        if ($email == $emailOrig) {
+            return;
         }
+
+        try {
+            $quote = $this->quoteRepository->getForCustomer($customer->getId());
+            $quote->setCustomerEmail($email);
+            $this->quoteRepository->save($quote);
+        } catch (NoSuchEntityException $e) {
+            return;
+        }
+
     }
 }

app/code/Magento/Customer/Test/Unit/Observer/UpgradeQuoteCustomerEmailObserverTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Customer\Test\Unit\Observer;
 
@@ -82,14 +83,14 @@ public function testUpgradeQuoteCustomerEmail()
             ->method('getOrigCustomerDataObject')
             ->will($this->returnValue($customerOrig));
 
-        $customer->expects($this->any())
-            ->method('getEmail')
-            ->willReturn($this->returnValue($email));
-
         $customerOrig->expects($this->any())
             ->method('getEmail')
             ->willReturn($this->returnValue($origEmail));
 
+        $customer->expects($this->any())
+            ->method('getEmail')
+            ->willReturn($this->returnValue($email));
+
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getForCustomer')
             ->willReturn($quoteMock);