MAGETWO-35183: 500 Internal Server Error in case of excess "Maximum Qty Allowed in Shopping Cart" value

Michail Slabko · Michail Slabko · commit 0d580af19dd5 · 2015-03-17T13:29:57.000+02:00
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -2042,9 +2042,7 @@ public function addMessage($message, $index = 'error')
             return $this;
         }
 
-        if (is_string($message)) {
-            $message = $this->messageFactory->create(\Magento\Framework\Message\MessageInterface::TYPE_ERROR, $message);
-        }
+        $message = $this->messageFactory->create(\Magento\Framework\Message\MessageInterface::TYPE_ERROR, $message);
 
         $messages[$index] = $message;
         $this->setData('messages', $messages);
diff --git a/lib/internal/Magento/Framework/Message/AbstractMessage.php b/lib/internal/Magento/Framework/Message/AbstractMessage.php
@@ -47,7 +47,7 @@ abstract public function getType();
      */
     public function getText()
     {
-        return $this->text;
+        return (string)$this->text;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -2042,9 +2042,7 @@ public function addMessage($message, $index = 'error')`
`2042`	`2042`	`return $this;`
`2043`	`2043`	`}`
`2044`	`2044`
`2045`		`- if (is_string($message)) {`
`2046`		`- $message = $this->messageFactory->create(\Magento\Framework\Message\MessageInterface::TYPE_ERROR, $message);`
`2047`		`- }`
	`2045`	`+ $message = $this->messageFactory->create(\Magento\Framework\Message\MessageInterface::TYPE_ERROR, $message);`
`2048`	`2046`
`2049`	`2047`	`$messages[$index] = $message;`
`2050`	`2048`	`$this->setData('messages', $messages);`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ abstract public function getType();`
`47`	`47`	`*/`
`48`	`48`	`public function getText()`
`49`	`49`	`{`
`50`		`- return $this->text;`
	`50`	`+ return (string)$this->text;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`