MAGETWO-67722: Add ability to inject exception code in LocalizedException #9363

ishakhsuvarov · ishakhsuvarov · commit 0f50989ad746 · 2017-06-29T17:19:11.000+03:00
- Expanded initial implementation
diff --git a/app/code/Magento/Paypal/Model/Api/ProcessableException.php b/app/code/Magento/Paypal/Model/Api/ProcessableException.php
@@ -40,7 +40,7 @@ class ProcessableException extends LocalizedException
      */
     public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
     {
-        parent::__construct($phrase, $cause);
+        parent::__construct($phrase, $cause, $code);
         $this->code = $code;
     }
 
diff --git a/app/code/Magento/Search/Model/Synonym/MergeConflictException.php b/app/code/Magento/Search/Model/Synonym/MergeConflictException.php
@@ -28,10 +28,11 @@ class MergeConflictException extends LocalizedException
      * @param array $conflictingSynonyms
      * @param Phrase|null $phrase
      * @param \Exception|null $cause
+     * @param int $code
      */
-    public function __construct(array $conflictingSynonyms, Phrase $phrase = null, \Exception $cause = null)
+    public function __construct(array $conflictingSynonyms, Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
-        parent::__construct($phrase, $cause);
+        parent::__construct($phrase, $cause, $code);
         $this->conflictingSynonyms = $conflictingSynonyms;
     }
 
diff --git a/app/code/Magento/Store/Model/StoreIsInactiveException.php b/app/code/Magento/Store/Model/StoreIsInactiveException.php
@@ -16,12 +16,13 @@ class StoreIsInactiveException extends LocalizedException
     /**
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
+     * @param int $code
      */
-    public function __construct(Phrase $phrase = null, \Exception $cause = null)
+    public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
         if ($phrase === null) {
             $phrase = new Phrase('Store is inactive');
         }
-        parent::__construct($phrase, $cause);
+        parent::__construct($phrase, $cause, $code);
     }
 }
diff --git a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
@@ -39,11 +39,12 @@ abstract class AbstractAggregateException extends LocalizedException
      *
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
+     * @param int $code
      */
-    public function __construct(Phrase $phrase, \Exception $cause = null)
+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
     {
         $this->originalPhrase = $phrase;
-        parent::__construct($phrase, $cause);
+        parent::__construct($phrase, $cause, $code);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php b/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php
@@ -15,12 +15,13 @@ class AlreadyExistsException extends LocalizedException
     /**
      * @param Phrase $phrase
      * @param \Exception $cause
+     * @param int $code
      */
-    public function __construct(Phrase $phrase = null, \Exception $cause = null)
+    public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
         if ($phrase === null) {
             $phrase = new Phrase('Unique constraint violation found');
         }
-        parent::__construct($phrase, $cause);
+        parent::__construct($phrase, $cause, $code);
     }
 }
diff --git a/lib/internal/Magento/Framework/Exception/InputException.php b/lib/internal/Magento/Framework/Exception/InputException.php
@@ -49,13 +49,14 @@ class InputException extends AbstractAggregateException
      *
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
+     * @param int $code
      */
-    public function __construct(Phrase $phrase = null, \Exception $cause = null)
+    public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
         if ($phrase === null) {
             $phrase = new Phrase('One or more input exceptions have occurred.');
         }
-        parent::__construct($phrase, $cause);
+        parent::__construct($phrase, $cause, $code);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php b/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php
@@ -27,13 +27,14 @@ class NoSuchEntityException extends LocalizedException
     /**
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
+     * @param int $code
      */
-    public function __construct(Phrase $phrase = null, \Exception $cause = null)
+    public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
         if ($phrase === null) {
             $phrase = new Phrase('No such entity.');
         }
-        parent::__construct($phrase, $cause);
+        parent::__construct($phrase, $cause, $code);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Exception/SerializationException.php b/lib/internal/Magento/Framework/Exception/SerializationException.php
@@ -27,12 +27,13 @@ class SerializationException extends LocalizedException
     /**
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
+     * @param int $code
      */
-    public function __construct(Phrase $phrase = null, \Exception $cause = null)
+    public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
         if ($phrase === null) {
             $phrase = new Phrase('One or more input exceptions have occurred.');
         }
-        parent::__construct($phrase, $cause);
+        parent::__construct($phrase, $cause, $code);
     }
 }
diff --git a/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php b/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php
@@ -25,7 +25,7 @@ class CouldNotSaveException extends LocalizedCouldNotSaveException implements Te
      */
     public function __construct(Phrase $phrase, \Exception $previous = null, $code = 0)
     {
-        parent::__construct($phrase, $previous);
+        parent::__construct($phrase, $previous, $code);
         $this->code = $code;
     }
 }
diff --git a/lib/internal/Magento/Framework/Validator/Exception.php b/lib/internal/Magento/Framework/Validator/Exception.php
@@ -30,11 +30,13 @@ class Exception extends InputException
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
      * @param array $messages Validation error messages
+     * @param int $code
      */
     public function __construct(
         Phrase $phrase = null,
         \Exception $cause = null,
-        array $messages = []
+        array $messages = [],
+        $code = 0
     ) {
         if (!empty($messages)) {
             $message = '';
@@ -49,7 +51,7 @@ public function __construct(
             }
             $phrase = new Phrase($message);
         }
-        parent::__construct($phrase, $cause);
+        parent::__construct($phrase, $cause, $code);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Webapi/Exception.php b/lib/internal/Magento/Framework/Webapi/Exception.php
@@ -105,7 +105,7 @@ public function __construct(
         if ($httpCode < 400 || $httpCode > 599) {
             throw new \InvalidArgumentException(sprintf('The specified HTTP code "%d" is invalid.', $httpCode));
         }
-        parent::__construct($phrase);
+        parent::__construct($phrase, null, $code);
         $this->code = $code;
         $this->_httpCode = $httpCode;
         $this->_details = $details;

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class ProcessableException extends LocalizedException`
`40`	`40`	`*/`
`41`	`41`	`public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)`
`42`	`42`	`{`
`43`		`- parent::__construct($phrase, $cause);`
	`43`	`+ parent::__construct($phrase, $cause, $code);`
`44`	`44`	`$this->code = $code;`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,11 @@ class MergeConflictException extends LocalizedException`
`28`	`28`	`* @param array $conflictingSynonyms`
`29`	`29`	`* @param Phrase\|null $phrase`
`30`	`30`	`* @param \Exception\|null $cause`
	`31`	`+ * @param int $code`
`31`	`32`	`*/`
`32`		`- public function __construct(array $conflictingSynonyms, Phrase $phrase = null, \Exception $cause = null)`
	`33`	`+ public function __construct(array $conflictingSynonyms, Phrase $phrase = null, \Exception $cause = null, $code = 0)`
`33`	`34`	`{`
`34`		`- parent::__construct($phrase, $cause);`
	`35`	`+ parent::__construct($phrase, $cause, $code);`
`35`	`36`	`$this->conflictingSynonyms = $conflictingSynonyms;`
`36`	`37`	`}`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,13 @@ class StoreIsInactiveException extends LocalizedException`
`16`	`16`	`/**`
`17`	`17`	`* @param \Magento\Framework\Phrase $phrase`
`18`	`18`	`* @param \Exception $cause`
	`19`	`+ * @param int $code`
`19`	`20`	`*/`
`20`		`- public function __construct(Phrase $phrase = null, \Exception $cause = null)`
	`21`	`+ public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)`
`21`	`22`	`{`
`22`	`23`	`if ($phrase === null) {`
`23`	`24`	`$phrase = new Phrase('Store is inactive');`
`24`	`25`	`}`
`25`		`- parent::__construct($phrase, $cause);`
	`26`	`+ parent::__construct($phrase, $cause, $code);`
`26`	`27`	`}`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,12 @@ abstract class AbstractAggregateException extends LocalizedException`
`39`	`39`	`*`
`40`	`40`	`* @param \Magento\Framework\Phrase $phrase`
`41`	`41`	`* @param \Exception $cause`
	`42`	`+ * @param int $code`
`42`	`43`	`*/`
`43`		`- public function __construct(Phrase $phrase, \Exception $cause = null)`
	`44`	`+ public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)`
`44`	`45`	`{`
`45`	`46`	`$this->originalPhrase = $phrase;`
`46`		`- parent::__construct($phrase, $cause);`
	`47`	`+ parent::__construct($phrase, $cause, $code);`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,13 @@ class AlreadyExistsException extends LocalizedException`
`15`	`15`	`/**`
`16`	`16`	`* @param Phrase $phrase`
`17`	`17`	`* @param \Exception $cause`
	`18`	`+ * @param int $code`
`18`	`19`	`*/`
`19`		`- public function __construct(Phrase $phrase = null, \Exception $cause = null)`
	`20`	`+ public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)`
`20`	`21`	`{`
`21`	`22`	`if ($phrase === null) {`
`22`	`23`	`$phrase = new Phrase('Unique constraint violation found');`
`23`	`24`	`}`
`24`		`- parent::__construct($phrase, $cause);`
	`25`	`+ parent::__construct($phrase, $cause, $code);`
`25`	`26`	`}`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,14 @@ class InputException extends AbstractAggregateException`
`49`	`49`	`*`
`50`	`50`	`* @param \Magento\Framework\Phrase $phrase`
`51`	`51`	`* @param \Exception $cause`
	`52`	`+ * @param int $code`
`52`	`53`	`*/`
`53`		`- public function __construct(Phrase $phrase = null, \Exception $cause = null)`
	`54`	`+ public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)`
`54`	`55`	`{`
`55`	`56`	`if ($phrase === null) {`
`56`	`57`	`$phrase = new Phrase('One or more input exceptions have occurred.');`
`57`	`58`	`}`
`58`		`- parent::__construct($phrase, $cause);`
	`59`	`+ parent::__construct($phrase, $cause, $code);`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,14 @@ class NoSuchEntityException extends LocalizedException`
`27`	`27`	`/**`
`28`	`28`	`* @param \Magento\Framework\Phrase $phrase`
`29`	`29`	`* @param \Exception $cause`
	`30`	`+ * @param int $code`
`30`	`31`	`*/`
`31`		`- public function __construct(Phrase $phrase = null, \Exception $cause = null)`
	`32`	`+ public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)`
`32`	`33`	`{`
`33`	`34`	`if ($phrase === null) {`
`34`	`35`	`$phrase = new Phrase('No such entity.');`
`35`	`36`	`}`
`36`		`- parent::__construct($phrase, $cause);`
	`37`	`+ parent::__construct($phrase, $cause, $code);`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,13 @@ class SerializationException extends LocalizedException`
`27`	`27`	`/**`
`28`	`28`	`* @param \Magento\Framework\Phrase $phrase`
`29`	`29`	`* @param \Exception $cause`
	`30`	`+ * @param int $code`
`30`	`31`	`*/`
`31`		`- public function __construct(Phrase $phrase = null, \Exception $cause = null)`
	`32`	`+ public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)`
`32`	`33`	`{`
`33`	`34`	`if ($phrase === null) {`
`34`	`35`	`$phrase = new Phrase('One or more input exceptions have occurred.');`
`35`	`36`	`}`
`36`		`- parent::__construct($phrase, $cause);`
	`37`	`+ parent::__construct($phrase, $cause, $code);`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class CouldNotSaveException extends LocalizedCouldNotSaveException implements Te`
`25`	`25`	`*/`
`26`	`26`	`public function __construct(Phrase $phrase, \Exception $previous = null, $code = 0)`
`27`	`27`	`{`
`28`		`- parent::__construct($phrase, $previous);`
	`28`	`+ parent::__construct($phrase, $previous, $code);`
`29`	`29`	`$this->code = $code;`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function __construct(`
`105`	`105`	`if ($httpCode < 400 \|\| $httpCode > 599) {`
`106`	`106`	`throw new \InvalidArgumentException(sprintf('The specified HTTP code "%d" is invalid.', $httpCode));`
`107`	`107`	`}`
`108`		`- parent::__construct($phrase);`
	`108`	`+ parent::__construct($phrase, null, $code);`
`109`	`109`	`$this->code = $code;`
`110`	`110`	`$this->_httpCode = $httpCode;`
`111`	`111`	`$this->_details = $details;`