Merge remote-tracking branch 'origin/MC-33522' into 2.4.1-develop-pr25

Author: serhii-balko

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -248,7 +248,7 @@ protected function _extractData(
      * @param array $extractedCustomerData
      * @return array
      */
-    protected function saveDefaultFlags(array $addressIdList, array & $extractedCustomerData)
+    protected function saveDefaultFlags(array $addressIdList, array &$extractedCustomerData)
     {
         $result = [];
         $extractedCustomerData[CustomerInterface::DEFAULT_BILLING] = null;
@@ -290,7 +290,7 @@ protected function saveDefaultFlags(array $addressIdList, array & $extractedCust
      * @param array $extractedCustomerData
      * @return array
      */
-    protected function _extractCustomerAddressData(array & $extractedCustomerData)
+    protected function _extractCustomerAddressData(array &$extractedCustomerData)
     {
         $addresses = $this->getRequest()->getPost('address');
         $result = [];
@@ -380,6 +380,12 @@ public function execute()
                 $this->_coreRegistry->register(RegistryConstants::CURRENT_CUSTOMER_ID, $customerId);
                 $this->messageManager->addSuccessMessage(__('You saved the customer.'));
                 $returnToEdit = (bool)$this->getRequest()->getParam('back', false);
+            } catch (NoSuchEntityException $exception) {
+                $this->messageManager->addExceptionMessage(
+                    $exception,
+                    __('Something went wrong while saving the customer.')
+                );
+                $returnToEdit = false;
             } catch (\Magento\Framework\Validator\Exception $exception) {
                 $messages = $exception->getMessages();
                 if (empty($messages)) {

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php

@@ -22,6 +22,7 @@
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\TestCase\AbstractBackendController;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Tests for save customer via backend/customer/index/save controller.
@@ -224,6 +225,32 @@ public function createCustomerErrorsProvider(): array
         ];
     }
 
+    /**
+     * Update customer with exceptions
+     *
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testUpdateCustomerErrors(): void
+    {
+        $postData = [
+            'customer' => [
+                CustomerData::FIRSTNAME => 'John',
+                CustomerData::LASTNAME => 'Doe',
+            ],
+            'subscription' => '1',
+        ];
+        $expectedMessages = [(string)__('Something went wrong while saving the customer.')];
+        $postData['customer']['entity_id'] = -1;
+        $params = ['back' => true];
+        $this->dispatchCustomerSave($postData, $params);
+        $this->assertSessionMessages(
+            $this->equalTo($expectedMessages),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
     /**
      * Update customer with subscription and redirect to edit page.
      *
@@ -512,15 +539,15 @@ private function assertCustomerSubscription(
      * @param array $sender
      * @param int $customerId
      * @param string|null $newEmail
-     * @return \PHPUnit\Framework\MockObject\MockObject
+     * @return MockObject
      */
     private function prepareEmailMock(
         int $occurrenceNumber,
         string $templateId,
         array $sender,
         int $customerId,
         $newEmail = null
-    ) : \PHPUnit\Framework\MockObject\MockObject {
+    ) : MockObject {
         $area = Area::AREA_FRONTEND;
         $customer = $this->customerRepository->getById($customerId);
         $storeId = $customer->getStoreId();
@@ -568,12 +595,12 @@ private function prepareEmailMock(
     /**
      * Add email mock to class
      *
-     * @param \PHPUnit\Framework\MockObject\MockObject $transportBuilderMock
+     * @param MockObject $transportBuilderMock
      * @param string $className
      * @return void
      */
     private function addEmailMockToClass(
-        \PHPUnit\Framework\MockObject\MockObject $transportBuilderMock,
+        MockObject $transportBuilderMock,
         $className
     ): void {
         $mocked = $this->_objectManager->create(