Merge remote-tracking branch 'origin/MAGETWO-98832' into 2.3-develop-pr21

Author: serhii-balko

app/code/Magento/Customer/Model/AccountManagement.php

@@ -565,6 +565,7 @@ public function authenticate($username, $password)
         }
         try {
             $this->getAuthentication()->authenticate($customerId, $password);
+            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (InvalidEmailOrPasswordException $e) {
             throw new InvalidEmailOrPasswordException(__('Invalid login or password.'));
         }
@@ -905,6 +906,7 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
             throw new InputMismatchException(
                 __('A customer with the same email address already exists in an associated website.')
             );
+            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (LocalizedException $e) {
             throw $e;
         }
@@ -924,6 +926,7 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
                 }
             }
             $this->customerRegistry->remove($customer->getId());
+            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (InputException $e) {
             $this->customerRepository->delete($customer);
             throw $e;
@@ -1026,6 +1029,7 @@ private function changePasswordForCustomer($customer, $currentPassword, $newPass
     {
         try {
             $this->getAuthentication()->authenticate($customer->getId(), $currentPassword);
+            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (InvalidEmailOrPasswordException $e) {
             throw new InvalidEmailOrPasswordException(
                 __("The password doesn't match this account. Verify the password and try again.")