Merge remote-tracking branch 'magento-l3/ACP2E-290' into L3_PR_21-12-13

Author: veloraven

app/code/Magento/Theme/Controller/Result/MessagePlugin.php

@@ -7,7 +7,7 @@
 
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Stdlib\Cookie\CookieSizeLimitReachedException;
 use Magento\Framework\Translate\Inline\ParserInterface;
 use Magento\Framework\Translate\InlineInterface;
 use Magento\Framework\Session\Config\ConfigInterface;
@@ -22,7 +22,7 @@ class MessagePlugin
     /**
      * Cookies name for messages
      */
-    const MESSAGES_COOKIES_NAME = 'mage-messages';
+    public const MESSAGES_COOKIES_NAME = 'mage-messages';
 
     /**
      * @var \Magento\Framework\Stdlib\CookieManagerInterface
@@ -101,11 +101,44 @@ public function afterRenderResult(
         ResultInterface $result
     ) {
         if (!($subject instanceof Json)) {
-            $this->setCookie($this->getMessages());
+            $newMessages = [];
+            foreach ($this->messageManager->getMessages(true)->getItems() as $message) {
+                $newMessages[] = [
+                    'type' => $message->getType(),
+                    'text' => $this->interpretationStrategy->interpret($message),
+                ];
+            }
+            if (!empty($newMessages)) {
+                $this->setMessages($this->getCookiesMessages(), $newMessages);
+            }
         }
         return $result;
     }
 
+    /**
+     * Add new messages to already existing ones.
+     *
+     * In case if there are too many messages clear old messages.
+     *
+     * @param array $oldMessages
+     * @param array $newMessages
+     * @throws CookieSizeLimitReachedException
+     */
+    private function setMessages(array $oldMessages, array $newMessages): void
+    {
+        $messages = array_merge($oldMessages, $newMessages);
+        try {
+            $this->setCookie($messages);
+        } catch (CookieSizeLimitReachedException $e) {
+            if (empty($oldMessages)) {
+                throw $e;
+            }
+
+            array_shift($oldMessages);
+            $this->setMessages($oldMessages, $newMessages);
+        }
+    }
+
     /**
      * Set 'mage-messages' cookie with 'messages' array
      *
@@ -166,24 +199,6 @@ private function convertMessageText(string $text): string
         return $text;
     }
 
-    /**
-     * Return messages array and clean message manager messages
-     *
-     * @return array
-     */
-    protected function getMessages()
-    {
-        $messages = $this->getCookiesMessages();
-        /** @var MessageInterface $message */
-        foreach ($this->messageManager->getMessages(true)->getItems() as $message) {
-            $messages[] = [
-                'type' => $message->getType(),
-                'text' => $this->interpretationStrategy->interpret($message),
-            ];
-        }
-        return $messages;
-    }
-
     /**
      * Return messages stored in cookies
      *