magento/magento2#: Replace deprecated addError, addSuccess, addException methods in Magento_Customer

atwixfirster · atwixfirster · commit 0bf86e6a094e · 2019-08-21T23:27:51.000+03:00
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -151,7 +151,9 @@ public function execute()
             $customerId = $this->getRequest()->getParam('id', false);
             $key = $this->getRequest()->getParam('key', false);
             if (empty($customerId) || empty($key)) {
-                throw new \Exception(__('Bad request.'));
+                $this->messageManager->addErrorMessage(__('Bad request.'));
+                $url = $this->urlModel->getUrl('*/*/index', ['_secure' => true]);
+                return $resultRedirect->setUrl($this->_redirect->error($url));
             }
 
             // log in and send greeting email
diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -15,6 +14,9 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Framework\Exception\State\InvalidTransitionException;
 
+/**
+ * Class Confirmation
+ */
 class Confirmation extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -26,6 +26,7 @@
 use Magento\Framework\Phrase;
 
 /**
+ * Class LoginPost
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LoginPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,6 +8,9 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * Class Delete
+ */
 class Delete extends \Magento\Customer\Controller\Adminhtml\Group implements HttpPostActionInterface
 {
     /**
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
@@ -73,6 +73,7 @@ public function execute()
 
     /**
      * Return component referer url
+     *
      * TODO: Technical dept referer url should be implement as a part of Action configuration in appropriate way
      *
      * @return null|string
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php
@@ -9,6 +9,9 @@
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * Class Edit
+ */
 class Edit extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
     /**
@@ -33,14 +36,11 @@ public function execute()
                 $customer = $this->_customerRepository->getById($customerId);
                 $customerData['account'] = $this->customerMapper->toFlatArray($customer);
                 $customerData['account'][CustomerInterface::ID] = $customerId;
-                try {
-                    $addresses = $customer->getAddresses();
-                    foreach ($addresses as $address) {
-                        $customerData['address'][$address->getId()] = $this->addressMapper->toFlatArray($address);
-                        $customerData['address'][$address->getId()]['id'] = $address->getId();
-                    }
-                } catch (NoSuchEntityException $e) {
-                    //do nothing
+
+                $addresses = $customer->getAddresses();
+                foreach ($addresses as $address) {
+                    $customerData['address'][$address->getId()] = $this->addressMapper->toFlatArray($address);
+                    $customerData['address'][$address->getId()]['id'] = $address->getId();
                 }
             } catch (NoSuchEntityException $e) {
                 $this->messageManager->addExceptionMessage($e, __('Something went wrong while editing the customer.'));
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
@@ -128,10 +128,12 @@ public function execute()
 
         $postItems = $this->getRequest()->getParam('items', []);
         if (!($this->getRequest()->getParam('isAjax') && count($postItems))) {
-            return $resultJson->setData([
-                'messages' => [__('Please correct the data sent.')],
-                'error' => true,
-            ]);
+            return $resultJson->setData(
+                [
+                    'messages' => [__('Please correct the data sent.')],
+                    'error' => true,
+                ]
+            );
         }
 
         foreach (array_keys($postItems) as $customerId) {
@@ -147,10 +149,12 @@ public function execute()
             $this->getEmailNotification()->credentialsChanged($this->getCustomer(), $currentCustomer->getEmail());
         }
 
-        return $resultJson->setData([
-            'messages' => $this->getErrorMessages(),
-            'error' => $this->isErrorExists()
-        ]);
+        return $resultJson->setData(
+            [
+                'messages' => $this->getErrorMessages(),
+                'error' => $this->isErrorExists()
+            ]
+        );
     }
 
     /**
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
@@ -255,10 +255,12 @@ public function testSuccessMessage($customerId, $key, $vatValidationEnabled, $ad
 
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
-                ['id', false, $customerId],
-                ['key', false, $key],
-            ]);
+            ->willReturnMap(
+                [
+                    ['id', false, $customerId],
+                    ['key', false, $key],
+                ]
+            );
 
         $this->customerRepositoryMock->expects($this->any())
             ->method('getById')
@@ -372,11 +374,13 @@ public function testSuccessRedirect(
 
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
-                ['id', false, $customerId],
-                ['key', false, $key],
-                ['back_url', false, $backUrl],
-            ]);
+            ->willReturnMap(
+                [
+                    ['id', false, $customerId],
+                    ['key', false, $key],
+                    ['back_url', false, $backUrl],
+                ]
+            );
 
         $this->customerRepositoryMock->expects($this->any())
             ->method('getById')
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php
@@ -346,11 +346,13 @@ public function testSuccessMessage(
 
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
-                ['password', null, $password],
-                ['password_confirmation', null, $password],
-                ['is_subscribed', false, true],
-            ]);
+            ->willReturnMap(
+                [
+                    ['password', null, $password],
+                    ['password_confirmation', null, $password],
+                    ['is_subscribed', false, true],
+                ]
+            );
 
         $this->customerMock->expects($this->once())
             ->method('setAddresses')
@@ -477,11 +479,13 @@ public function testSuccessRedirect(
 
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
-                ['password', null, $password],
-                ['password_confirmation', null, $password],
-                ['is_subscribed', false, true],
-            ]);
+            ->willReturnMap(
+                [
+                    ['password', null, $password],
+                    ['password_confirmation', null, $password],
+                    ['is_subscribed', false, true],
+                ]
+            );
 
         $this->customerMock->expects($this->once())
             ->method('setAddresses')
@@ -508,10 +512,12 @@ public function testSuccessRedirect(
 
         $this->urlMock->expects($this->any())
             ->method('getUrl')
-            ->willReturnMap([
-                ['*/*/index', ['_secure' => true], $successUrl],
-                ['*/*/create', ['_secure' => true], $successUrl],
-            ]);
+            ->willReturnMap(
+                [
+                    ['*/*/index', ['_secure' => true], $successUrl],
+                    ['*/*/create', ['_secure' => true], $successUrl],
+                ]
+            );
         $this->redirectMock->expects($this->once())
             ->method('success')
             ->with($this->equalTo($successUrl))
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
@@ -93,12 +93,14 @@ protected function setUp()
 
         $this->session = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'isLoggedIn',
-                'setCustomerDataAsLoggedIn',
-                'regenerateId',
-                'setUsername',
-            ])
+            ->setMethods(
+                [
+                    'isLoggedIn',
+                    'setCustomerDataAsLoggedIn',
+                    'regenerateId',
+                    'setUsername',
+                ]
+            )
             ->getMock();
 
         $this->accountManagement = $this->getMockBuilder(\Magento\Customer\Api\AccountManagementInterface::class)
@@ -253,10 +255,12 @@ public function testExecuteSuccessCustomRedirect()
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('login')
-            ->willReturn([
-                'username' => $username,
-                'password' => $password,
-            ]);
+            ->willReturn(
+                [
+                    'username' => $username,
+                    'password' => $password,
+                ]
+            );
 
         $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMockForAbstractClass();
@@ -335,10 +339,12 @@ public function testExecuteSuccess()
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('login')
-            ->willReturn([
-                'username' => $username,
-                'password' => $password,
-            ]);
+            ->willReturn(
+                [
+                    'username' => $username,
+                    'password' => $password,
+                ]
+            );
 
         $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMockForAbstractClass();
@@ -426,10 +432,12 @@ public function testExecuteWithException(
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('login')
-            ->willReturn([
-                'username' => $username,
-                'password' => $password,
-            ]);
+            ->willReturn(
+                [
+                    'username' => $username,
+                    'password' => $password,
+                ]
+            );
 
         $exception = new $exceptionData['exception'](__($exceptionData['message']));
 
@@ -488,10 +496,12 @@ protected function prepareContext()
 
         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'isPost',
-                'getPost',
-            ])
+            ->setMethods(
+                [
+                    'isPost',
+                    'getPost',
+                ]
+            )
             ->getMock();
 
         $this->resultRedirect = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/DeleteTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/DeleteTest.php
@@ -183,7 +183,7 @@ public function testExecuteWithException()
             ->willReturn(34);
         $exception = new \Exception('Exception');
         $this->messageManager->expects($this->once())
-            ->method('addErrorMessage')
+            ->method('addComplexErrorMessage')
             ->with(__('We can\'t delete the address right now.'))
             ->willThrowException($exception);
         $this->messageManager->expects($this->once())
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php
@@ -175,7 +175,7 @@ public function testExecuteWithTaxClassAndException()
             ->with('customer/group')
             ->willThrowException($exception);
         $this->messageManager->expects($this->once())
-            ->method('addErrorMessage')
+            ->method('addError')
             ->with('Exception');
         $this->dataObjectProcessorMock->expects($this->once())
             ->method('buildOutputDataArray')
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
@@ -291,10 +291,12 @@ protected function prepareMocksForErrorMessagesProcessing()
             ->willReturn('Error text');
         $this->resultJson->expects($this->once())
             ->method('setData')
-            ->with([
-                'messages' => ['Error text'],
-                'error' => true,
-            ])
+            ->with(
+                [
+                    'messages' => ['Error text'],
+                    'error' => true,
+                ]
+            )
             ->willReturnSelf();
     }
 
@@ -340,10 +342,12 @@ public function testExecuteWithoutItems()
         $this->resultJson
             ->expects($this->once())
             ->method('setData')
-            ->with([
-                'messages' => [__('Please correct the data sent.')],
-                'error' => true,
-            ])
+            ->with(
+                [
+                    'messages' => [__('Please correct the data sent.')],
+                    'error' => true,
+                ]
+            )
             ->willReturnSelf();
         $this->assertSame($this->resultJson, $this->controller->execute());
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
diff --git a/app/code/Magento/Customer/view/frontend/templates/messages/confirmAccountSuccessMessage.phtml b/app/code/Magento/Customer/view/frontend/templates/messages/confirmAccountSuccessMessage.phtml
diff --git a/app/code/Magento/Customer/view/frontend/templates/messages/unableDeleteAddressMessage.phtml b/app/code/Magento/Customer/view/frontend/templates/messages/unableDeleteAddressMessage.phtml

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ public function execute()`
`73`	`73`
`74`	`74`	`/**`
`75`	`75`	`* Return component referer url`
	`76`	`+ *`
`76`	`77`	`* TODO: Technical dept referer url should be implement as a part of Action configuration in appropriate way`
`77`	`78`	`*`
`78`	`79`	`* @return null\|string`