Merge remote-tracking branch 'tango-ce/MAGETWO-33812' into MAGETWO-33846

Author: Yuri Kovsher

app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php

@@ -35,7 +35,7 @@ public function execute()
             $resultRedirect->setPath('customer/index');
             return $resultRedirect;
         } catch (\Magento\Framework\Validator\ValidatorException $exception) {
-            $messages = $exception->getMessages();
+            $messages = $exception->getMessages(\Magento\Framework\Message\MessageInterface::TYPE_ERROR);
             if (!count($messages)) {
                 $messages = $exception->getMessage();
             }

dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php

@@ -66,8 +66,8 @@ public function testSave()
 
     /**
      * @magentoDbIsolation enabled
-     * @expectedException \Magento\Framework\Exception\AlreadyExistsException
-     * @expectedExceptionMessage Class name and class type already exists.
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage A class with the same name already exists for ClassType PRODUCT.
      */
     public function testSaveThrowsExceptionIfGivenTaxClassNameIsNotUnique()
     {

dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php

@@ -324,9 +324,9 @@ public function testResetPasswordActionCoreException()
         );
 
         // Setup a core exception to return
-        $error = 'Something Bad happened';
-        $exception = new \Magento\Framework\Validator\ValidatorException($error);
-        $exception->addError('Something Bad happened');
+        $exception = new \Magento\Framework\Validator\ValidatorException();
+        $error = new \Magento\Framework\Message\Error('Something Bad happened');
+        $exception->addMessage($error);
 
         $this->_customerRepositoryMock->expects(
             $this->once()
@@ -341,7 +341,7 @@ public function testResetPasswordActionCoreException()
         // Verify error message is set
         $this->messageManager->expects($this->once())
             ->method('addMessage')
-            ->with($this->equalTo(new \Magento\Framework\Message\Error($error)));
+            ->with($this->equalTo($error));
 
         $this->_testedObject->execute();
     }
@@ -351,34 +351,26 @@ public function testResetPasswordActionCoreExceptionWarn()
         $warningText = 'Warning';
         $customerId = 1;
 
-        $this->_request->expects(
-            $this->once()
-        )->method(
-            'getParam'
-        )->with(
-            $this->equalTo('customer_id'),
-            $this->equalTo(0)
-        )->will(
-            $this->returnValue($customerId)
-        );
+        $this->_request->expects($this->once())
+            ->method('getParam')
+            ->with($this->equalTo('customer_id'), $this->equalTo(0))
+            ->will($this->returnValue($customerId));
 
         // Setup a core exception to return
         $exception = new \Magento\Framework\Validator\ValidatorException($warningText);
-        $error = 'Something Not So Bad happened';
-        $exception->addError($error);
+
+        $error = new \Magento\Framework\Message\Warning('Something Not So Bad happened');
+        $exception->addMessage($error);
 
         $this->_customerRepositoryMock->expects($this->once())
             ->method('getById')
             ->with($customerId)
             ->will($this->throwException($exception));
 
         // Verify Warning is converted to an Error and message text is set to exception text
-        $this->messageManager->expects(
-            $this->once()
-        )->method(
-            'addMessage'
-        )->with(
-            $this->equalTo(new \Magento\Framework\Message\Error($warningText))
+        $this->messageManager->expects($this->once())
+            ->method('addMessage')
+            ->with($this->equalTo(new \Magento\Framework\Message\Error($warningText))
         );
 
         $this->_testedObject->execute();

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] : [];
     }
 }