MAGETWO-33814: Change parent class of Model\Exception sub-classes to Localized

Dmytro Poperechnyy · Dmytro Poperechnyy · commit dfd8de3ea7db · 2015-02-12T19:19:06.000+02:00
- Changed parent class of Model\Exception children to LocalizedException;
- Framework\Model\Exception deleted;
diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php
@@ -197,16 +197,15 @@ public function isLoggedIn()
      * Throws specific Backend Authentication \Exception
      *
      * @param string $msg
-     * @param string $code
      * @return void
      * @throws \Magento\Backend\Model\Auth\Exception
      * @static
      */
-    public static function throwException($msg = null, $code = null)
+    public static function throwException($msg = null)
     {
         if (is_null($msg)) {
             $msg = __('Authentication error occurred.');
         }
-        throw new \Magento\Backend\Model\Auth\Exception($msg, $code);
+        throw new \Magento\Backend\Model\Auth\Exception($msg);
     }
 }
diff --git a/app/code/Magento/Backend/Model/Auth/Exception.php b/app/code/Magento/Backend/Model/Auth/Exception.php
@@ -10,6 +10,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Exception extends \Magento\Framework\Model\Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Catalog/Model/Product/AttributeSet/AlreadyExistsException.php b/app/code/Magento/Catalog/Model/Product/AttributeSet/AlreadyExistsException.php
@@ -6,6 +6,6 @@
 
 namespace Magento\Catalog\Model\Product\AttributeSet;
 
-class AlreadyExistsException extends \Magento\Framework\Model\Exception
+class AlreadyExistsException extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php b/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php
@@ -78,7 +78,7 @@ public function getAttributeSet()
         $attributeSet = $this->attributeSetFactory->create();
         $attributeSet->setEntityTypeId($this->entityTypeId)->load($this->name, 'attribute_set_name');
         if ($attributeSet->getId()) {
-            throw new AlreadyExistsException();
+            throw new AlreadyExistsException(__('Attribute set already exists.'));
         }
 
         $attributeSet->setAttributeSetName($this->name)->validate();
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Exception.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Exception.php
@@ -6,6 +6,6 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
-class Exception extends \Magento\Framework\Model\Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/LargeSizeException.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/LargeSizeException.php
@@ -6,6 +6,6 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
-class LargeSizeException extends \Magento\Framework\Model\Exception
+class LargeSizeException extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/NotImageException.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/NotImageException.php
@@ -6,6 +6,6 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
-class NotImageException extends \Magento\Framework\Model\Exception
+class NotImageException extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/OptionRequiredException.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/OptionRequiredException.php
@@ -6,6 +6,6 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
-class OptionRequiredException extends \Magento\Framework\Model\Exception
+class OptionRequiredException extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/RunValidationException.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/RunValidationException.php
@@ -6,6 +6,6 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
-class RunValidationException extends \Magento\Framework\Model\Exception
+class RunValidationException extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
@@ -139,7 +139,7 @@ protected function buildImageValidator($object, $option, $fileFullPath = null)
         }
         if (count($dimensions) > 0) {
             if (!is_null($fileFullPath) && !$this->isImage($fileFullPath)) {
-                throw new NotImageException();
+                throw new NotImageException(__('This is not an image.'));
             }
             $object->addValidator(new \Zend_Validate_File_ImageSize($dimensions));
         }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
@@ -99,7 +99,9 @@ public function validate($processingParams, $option)
         try {
             $runValidation = $option->getIsRequire() || $upload->isUploaded($file);
             if (!$runValidation) {
-                throw new RunValidationException();
+                throw new RunValidationException(
+                    __('Validation failed. Required options were not filled or file was not uploaded.')
+                );
             }
 
             $fileInfo = $upload->getFileInfo($file)[$file];
@@ -114,7 +116,7 @@ public function validate($processingParams, $option)
                     __("The file you uploaded is larger than %1 Megabytes allowed by server", $value)
                 );
             } else {
-                throw new OptionRequiredException();
+                throw new OptionRequiredException(__('Option required.'));
             }
         }
 
diff --git a/app/code/Magento/Cron/Exception.php b/app/code/Magento/Cron/Exception.php
@@ -10,6 +10,6 @@
  */
 namespace Magento\Cron;
 
-class Exception extends \Magento\Framework\Model\Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Customer/Exception.php b/app/code/Magento/Customer/Exception.php
@@ -5,6 +5,6 @@
  */
 namespace Magento\Customer;
 
-class Exception extends \Magento\Framework\Model\Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -21,6 +21,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Encryption\EncryptorInterface as Encryptor;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
@@ -71,8 +72,6 @@ class AccountManagement implements AccountManagementInterface
     /**
      * Codes of exceptions related to customer model
      */
-    const EXCEPTION_EMAIL_EXISTS = 3;
-
     // Constants for the type of new account email to be sent
     const NEW_ACCOUNT_EMAIL_REGISTERED = 'registered';
 
@@ -512,7 +511,7 @@ public function createAccountWithPasswordHash(
         try {
             // If customer exists existing hash will be used by Repository
             $customer = $this->customerRepository->save($customer, $hash);
-        } catch (\Magento\Framework\Exception\Customer\Exception $e) {
+        } catch (AlreadyExistsException $e) {
             throw new InputMismatchException('Customer with the same email already exists in associated website.');
         } catch (LocalizedException $e) {
             throw $e;
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
@@ -68,8 +68,6 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
 
     const EXCEPTION_INVALID_EMAIL_OR_PASSWORD = 2;
 
-    const EXCEPTION_EMAIL_EXISTS = 3;
-
     const EXCEPTION_INVALID_RESET_PASSWORD_LINK_TOKEN = 4;
 
     const SUBSCRIBED_YES = 'yes';
diff --git a/app/code/Magento/Customer/Model/Resource/Customer.php b/app/code/Magento/Customer/Model/Resource/Customer.php
@@ -6,6 +6,7 @@
 namespace Magento\Customer\Model\Resource;
 
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\AlreadyExistsException;
 
 /**
  * Customer entity resource model
@@ -92,16 +93,17 @@ protected function _getDefaultAttributes()
      *
      * @param \Magento\Framework\Object $customer
      * @return $this
-     * @throws \Magento\Customer\Exception
-     * @throws \Magento\Framework\Model\Exception
+     * @throws AlreadyExistsException
+     * @throws InputException
+     * @throws \Magento\Framework\Validator\ValidatorException
      */
     protected function _beforeSave(\Magento\Framework\Object $customer)
     {
         /** @var \Magento\Customer\Model\Customer $customer */
         parent::_beforeSave($customer);
 
         if (!$customer->getEmail()) {
-            throw new \Magento\Customer\Exception(__('Customer email is required'));
+            throw new InputException(__('Customer email is required'));
         }
 
         $adapter = $this->_getWriteAdapter();
@@ -124,9 +126,8 @@ protected function _beforeSave(\Magento\Framework\Object $customer)
 
         $result = $adapter->fetchOne($select, $bind);
         if ($result) {
-            throw new \Magento\Customer\Exception(
-                __('Customer with the same email already exists in associated website.'),
-                \Magento\Customer\Model\Customer::EXCEPTION_EMAIL_EXISTS
+            throw new AlreadyExistsException(
+                __('Customer with the same email already exists in associated website.')
             );
         }
 
diff --git a/app/code/Magento/Directory/Exception.php b/app/code/Magento/Directory/Exception.php
@@ -5,6 +5,6 @@
  */
 namespace Magento\Directory;
 
-class Exception extends \Magento\Framework\Model\Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Eav/Exception.php b/app/code/Magento/Eav/Exception.php
@@ -5,6 +5,6 @@
  */
 namespace Magento\Eav;
 
-class Exception extends \Magento\Framework\Model\Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Integration/Exception.php b/app/code/Magento/Integration/Exception.php
@@ -5,6 +5,6 @@
  */
 namespace Magento\Integration;
 
-class Exception extends \Magento\Framework\Model\Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Payment/Model/Info/Exception.php b/app/code/Magento/Payment/Model/Info/Exception.php
@@ -12,6 +12,6 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Exception extends \Magento\Framework\Model\Exception
+class Exception extends \Magento\Framework\Exception\LocalizedException
 {
 }
diff --git a/app/code/Magento/Tax/Exception.php b/app/code/Magento/Tax/Exception.php
diff --git a/lib/internal/Magento/Framework/Exception/Customer/Exception.php b/lib/internal/Magento/Framework/Exception/Customer/Exception.php
diff --git a/lib/internal/Magento/Framework/Model/Exception.php b/lib/internal/Magento/Framework/Model/Exception.php

Original file line number	Diff line number	Diff line change
`@@ -197,16 +197,15 @@ public function isLoggedIn()`
`197`	`197`	`* Throws specific Backend Authentication \Exception`
`198`	`198`	`*`
`199`	`199`	`* @param string $msg`
`200`		`- * @param string $code`
`201`	`200`	`* @return void`
`202`	`201`	`* @throws \Magento\Backend\Model\Auth\Exception`
`203`	`202`	`* @static`
`204`	`203`	`*/`
`205`		`- public static function throwException($msg = null, $code = null)`
	`204`	`+ public static function throwException($msg = null)`
`206`	`205`	`{`
`207`	`206`	`if (is_null($msg)) {`
`208`	`207`	`$msg = __('Authentication error occurred.');`
`209`	`208`	`}`
`210`		`- throw new \Magento\Backend\Model\Auth\Exception($msg, $code);`
	`209`	`+ throw new \Magento\Backend\Model\Auth\Exception($msg);`
`211`	`210`	`}`
`212`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@`
`10`	`10`	`*`
`11`	`11`	`* @author Magento Core Team <core@magentocommerce.com>`
`12`	`12`	`*/`
`13`		`-class Exception extends \Magento\Framework\Model\Exception`
	`13`	`+class Exception extends \Magento\Framework\Exception\LocalizedException`
`14`	`14`	`{`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`
`7`	`7`	`namespace Magento\Catalog\Model\Product\AttributeSet;`
`8`	`8`
`9`		`-class AlreadyExistsException extends \Magento\Framework\Model\Exception`
	`9`	`+class AlreadyExistsException extends \Magento\Framework\Exception\LocalizedException`
`10`	`10`	`{`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function getAttributeSet()`
`78`	`78`	`$attributeSet = $this->attributeSetFactory->create();`
`79`	`79`	`$attributeSet->setEntityTypeId($this->entityTypeId)->load($this->name, 'attribute_set_name');`
`80`	`80`	`if ($attributeSet->getId()) {`
`81`		`- throw new AlreadyExistsException();`
	`81`	`+ throw new AlreadyExistsException(__('Attribute set already exists.'));`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`$attributeSet->setAttributeSetName($this->name)->validate();`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`
`7`	`7`	`namespace Magento\Catalog\Model\Product\Option\Type\File;`
`8`	`8`
`9`		`-class LargeSizeException extends \Magento\Framework\Model\Exception`
	`9`	`+class LargeSizeException extends \Magento\Framework\Exception\LocalizedException`
`10`	`10`	`{`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`
`7`	`7`	`namespace Magento\Catalog\Model\Product\Option\Type\File;`
`8`	`8`
`9`		`-class NotImageException extends \Magento\Framework\Model\Exception`
	`9`	`+class NotImageException extends \Magento\Framework\Exception\LocalizedException`
`10`	`10`	`{`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`
`7`	`7`	`namespace Magento\Catalog\Model\Product\Option\Type\File;`
`8`	`8`
`9`		`-class OptionRequiredException extends \Magento\Framework\Model\Exception`
	`9`	`+class OptionRequiredException extends \Magento\Framework\Exception\LocalizedException`
`10`	`10`	`{`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`
`7`	`7`	`namespace Magento\Catalog\Model\Product\Option\Type\File;`
`8`	`8`
`9`		`-class RunValidationException extends \Magento\Framework\Model\Exception`
	`9`	`+class RunValidationException extends \Magento\Framework\Exception\LocalizedException`
`10`	`10`	`{`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ protected function buildImageValidator($object, $option, $fileFullPath = null)`
`139`	`139`	`}`
`140`	`140`	`if (count($dimensions) > 0) {`
`141`	`141`	`if (!is_null($fileFullPath) && !$this->isImage($fileFullPath)) {`
`142`		`- throw new NotImageException();`
	`142`	`+ throw new NotImageException(__('This is not an image.'));`
`143`	`143`	`}`
`144`	`144`	`$object->addValidator(new \Zend_Validate_File_ImageSize($dimensions));`
`145`	`145`	`}`