MAGETWO-67722: Add ability to inject exception code in LocalizedExcep…

…tion #9363 - Expanded initial implementation
magento · Jun 29, 2017 · 0f50989 · 0f50989
1 parent d902e08
commit 0f50989
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 19 deletions.
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;