MAGETWO-33846: Replace obsolete exceptions (see description - Part1)

Author: Yuri Kovsher

app/code/Magento/Backend/Model/Auth.php

@@ -6,6 +6,7 @@
 namespace Magento\Backend\Model;
 
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Exception\Plugin\AuthenticationException as PluginAuthenticationException;
 
 /**
  * Backend Auth model
@@ -75,7 +76,7 @@ public function __construct(
      *
      * @param \Magento\Backend\Model\Auth\StorageInterface $storage
      * @return $this
-     * @throws \Magento\Framework\Exception\AuthenticationException if $storage is not correct
+     * @throws \Magento\Framework\Exception\AuthenticationException
      */
     public function setAuthStorage($storage)
     {
@@ -136,7 +137,7 @@ public function getCredentialStorage()
      * @param string $username
      * @param string $password
      * @return void
-     * @throws \Exception|\Magento\Framework\Exception\Plugin\AuthenticationException
+     * @throws \Magento\Framework\Exception\AuthenticationException
      */
     public function login($username, $password)
     {
@@ -160,7 +161,7 @@ public function login($username, $password)
             if (!$this->getAuthStorage()->getUser()) {
                 self::throwException(__('Please correct the user name or password.'));
             }
-        } catch (\Magento\Framework\Exception\Plugin\AuthenticationException $e) {
+        } catch (PluginAuthenticationException $e) {
             $this->_eventManager->dispatch(
                 'backend_auth_user_login_failed',
                 ['user_name' => $username, 'exception' => $e]

app/code/Magento/Captcha/Model/Observer.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Captcha\Model;
 
+use Magento\Framework\Exception\Plugin\AuthenticationException as PluginAuthenticationException;
+
 /**
  * Captcha Observer
  *
@@ -275,7 +277,7 @@ public function checkUserLoginBackend($observer)
         if ($captchaModel->isRequired($login)) {
             if (!$captchaModel->isCorrect($this->_getCaptchaString($this->_request, $formId))) {
                 $captchaModel->logAttempt($login);
-                throw new \Magento\Framework\Exception\Plugin\AuthenticationException(__('Incorrect CAPTCHA.'));
+                throw new PluginAuthenticationException(__('Incorrect CAPTCHA.'));
             }
         }
         $captchaModel->logAttempt($login);

app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */

app/code/Magento/Cron/Model/Schedule.php

@@ -80,13 +80,13 @@ public function _construct()
     /**
      * @param string $expr
      * @return $this
-     * @throws CronException
+     * @throws \Magento\Framework\Exception\CronException
      */
     public function setCronExpr($expr)
     {
         $e = preg_split('#\s+#', $expr, null, PREG_SPLIT_NO_EMPTY);
         if (sizeof($e) < 5 || sizeof($e) > 6) {
-            throw new CronException('Invalid cron expression: ' . $expr);
+            throw new CronException(__('Invalid cron expression: %1', $expr));
         }
 
         $this->setCronExprArr($e);
@@ -127,7 +127,7 @@ public function trySchedule()
      * @param string $expr
      * @param int $num
      * @return bool
-     * @throws CronException
+     * @throws \Magento\Framework\Exception\CronException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -152,10 +152,10 @@ public function matchCronExpression($expr, $num)
         if (strpos($expr, '/') !== false) {
             $e = explode('/', $expr);
             if (sizeof($e) !== 2) {
-                throw new CronException('Invalid cron expression, expecting \'match/modulus\': ' . $expr);
+                throw new CronException(__('Invalid cron expression, expecting \'match/modulus\': %1', $expr));
             }
             if (!is_numeric($e[1])) {
-                throw new CronException('Invalid cron expression, expecting numeric modulus: ' . $expr);
+                throw new CronException(__('Invalid cron expression, expecting numeric modulus: %1', $expr));
             }
             $expr = $e[0];
             $mod = $e[1];
@@ -171,7 +171,7 @@ public function matchCronExpression($expr, $num)
             // handle range
             $e = explode('-', $expr);
             if (sizeof($e) !== 2) {
-                throw new CronException('Invalid cron expression, expecting \'from-to\' structure: ' . $expr);
+                throw new CronException(__('Invalid cron expression, expecting \'from-to\' structure: %1', $expr));
             }
 
             $from = $this->getNumeric($e[0]);
@@ -183,7 +183,7 @@ public function matchCronExpression($expr, $num)
         }
 
         if ($from === false || $to === false) {
-            throw new CronException('Invalid cron expression: ' . $expr);
+            throw new CronException(__('Invalid cron expression: %1', $expr));
         }
 
         return $num >= $from && $num <= $to && $num % $mod === 0;

app/code/Magento/Integration/Service/V1/Integration.php

@@ -129,7 +129,7 @@ private function _checkIntegrationByName($name)
     {
         $integration = $this->_integrationFactory->create()->load($name, 'name');
         if ($integration->getId()) {
-            throw new IntegrationException(__("Integration with name '%1' exists.", $name));
+            throw new IntegrationException(__('Integration with name \'%1\' exists.', $name));
         }
     }
 
@@ -144,7 +144,7 @@ protected function _loadIntegrationById($integrationId)
     {
         $integration = $this->_integrationFactory->create()->load($integrationId);
         if (!$integration->getId()) {
-            throw new IntegrationException(__("Integration with ID '%1' does not exist.", $integrationId));
+            throw new IntegrationException(__('Integration with ID \'%1\' does not exist.', $integrationId));
         }
         return $integration;
     }

app/code/Magento/Integration/Service/V1/IntegrationInterface.php

@@ -68,7 +68,7 @@ public function update(array $integrationData);
      *
      * @param int $integrationId
      * @return array Integration data
-     * @throws \Magento\Framework\Exception\IntegrationException If the integration does not exist or cannot be deleted
+     * @throws \Magento\Framework\Exception\IntegrationException
      */
     public function delete($integrationId);
 }

app/code/Magento/Integration/Service/V1/Oauth.php

@@ -265,7 +265,7 @@ protected function _loadConsumerById($consumerId)
     {
         $consumer = $this->_consumerFactory->create()->load($consumerId);
         if (!$consumer->getId()) {
-            throw new IntegrationException(__("Consumer with ID '%1' does not exist.", $consumerId));
+            throw new IntegrationException(__('Consumer with ID \'%1\' does not exist.', $consumerId));
         }
         return $consumer;
     }

app/code/Magento/User/Controller/Adminhtml/User/Save.php

@@ -56,9 +56,7 @@ public function execute()
             && !empty($data[$currentUserPasswordField]) && is_string($data[$currentUserPasswordField]);
         try {
             if (!($isCurrentUserPasswordValid && $currentUser->verifyIdentity($data[$currentUserPasswordField]))) {
-                throw new AuthenticationException(
-                    __('You have entered an invalid password for current user.')
-                );
+                throw new AuthenticationException(__('You have entered an invalid password for current user.'));
             }
             $model->save();
             $this->messageManager->addSuccess(__('You saved the user.'));

app/code/Magento/User/Model/User.php

@@ -540,8 +540,6 @@ public function getAclRole()
      * @param string $password
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\AuthenticationException
-     * @throws \Magento\Framework\Exception\Plugin\AuthenticationException
      */
     public function authenticate($username, $password)
     {

dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_Cron
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */