MAGETWO-33813: Replace Magento\Framework\Model\Exception to LocalizedException

Author: Yurii Torbyk

lib/internal/Magento/Framework/Model/AbstractModel.php

@@ -450,9 +450,10 @@ public function validateBeforeSave()
         $validator = $this->_getValidatorBeforeSave();
         if ($validator && !$validator->isValid($this)) {
             $errors = $validator->getMessages();
-            $exception = new \Magento\Framework\Validator\ValidatorException(
-                implode(PHP_EOL, $errors), [], null, $errors
-            );
+            $exception = new \Magento\Framework\Validator\ValidatorException(implode(PHP_EOL, $errors));
+            foreach ($errors as $errorMessage) {
+                $exception->addMessage(new \Magento\Framework\Message\Error($errorMessage));
+            }
             throw $exception;
         }
         return $this;

lib/internal/Magento/Framework/Validator/ValidatorException.php

@@ -12,7 +12,7 @@ class ValidatorException extends \Magento\Framework\Exception\InputException
     /**
      * @var array
      */
-    protected $_messages;
+    protected $messages = [];
 
     /**
      * Constructor
@@ -29,29 +29,46 @@ public function __construct(
         array $messages = []
     ) {
         if (!empty($messages)) {
-            $this->_messages = $messages;
             $message = '';
-            foreach ($this->_messages as $propertyMessages) {
+            foreach ($messages as $propertyMessages) {
                 foreach ($propertyMessages as $propertyMessage) {
                     if ($message) {
                         $message .= PHP_EOL;
                     }
                     $message .= $propertyMessage;
+                    $this->addMessage(new \Magento\Framework\Message\Error($propertyMessage));
                 }
             }
-        } else {
-            $this->_messages = [$message];
         }
         parent::__construct($message, $params, $cause);
     }
 
     /**
-     * Get validation error messages
-     *
+     * @param \Magento\Framework\Message\AbstractMessage $message
+     * @return $this
+     */
+    public function addMessage(\Magento\Framework\Message\AbstractMessage $message)
+    {
+        if (!isset($this->messages[$message->getType()])) {
+            $this->messages[$message->getType()] = [];
+        }
+        $this->messages[$message->getType()][] = $message;
+        return $this;
+    }
+
+    /**
+     * @param string $type
      * @return array
      */
-    public function getMessages()
+    public function getMessages($type = '')
     {
-        return $this->_messages;
+        if ('' == $type) {
+            $arrRes = [];
+            foreach ($this->messages as $messages) {
+                $arrRes = array_merge($arrRes, $messages);
+            }
+            return $arrRes;
+        }
+        return isset($this->messages[$type]) ? $this->messages[$type] : [];
     }
 }