Merge pull request #7365 from magento-gl/GL_Mainline_PR_22122021

Author: sidolov

app/code/Magento/Catalog/etc/acl.xml

@@ -12,7 +12,7 @@
                 <resource id="Magento_Catalog::catalog" title="Catalog" translate="title" sortOrder="30">
                     <resource id="Magento_Catalog::catalog_inventory" title="Inventory" translate="title" sortOrder="10">
                         <resource id="Magento_Catalog::products" title="Products" translate="title" sortOrder="10">
-                            <resource id="Magento_Catalog::update_attributes" title="Update Attributes" translate="title" sortOrder="10" />
+                            <resource id="Magento_Catalog::update_attributes" title="Mass Update Attributes" translate="title" sortOrder="10" />
                             <resource id="Magento_Catalog::edit_product_design" title="Edit Product Design" translate="title" sortOrder="20" />
                         </resource>
                         <resource id="Magento_Catalog::categories" title="Categories" translate="title" sortOrder="20">
@@ -27,7 +27,7 @@
                         </resource>
                     </resource>
                     <resource id="Magento_Backend::stores_attributes">
-                        <resource id="Magento_Catalog::attributes_attributes" title="Product" translate="title" sortOrder="30" />
+                        <resource id="Magento_Catalog::attributes_attributes" title="Product" translate="title" sortOrder="30"/>
                         <resource id="Magento_Catalog::sets" title="Attribute Set" translate="title" sortOrder="40"/>
                     </resource>
                 </resource>

app/code/Magento/Catalog/i18n/en_US.csv

@@ -148,7 +148,7 @@ Quantity,Quantity
 Edit,Edit
 "Are you sure?","Are you sure?"
 "Change Status","Change Status"
-"Update Attributes","Update Attributes"
+"Mass Update Attributes","Mass Update Attributes"
 "start typing to search category","start typing to search category"
 "New Category","New Category"
 "Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"

app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html

@@ -20,6 +20,7 @@
             <div class="action-dropdown-menu-item-edit" visible="customVisible">
                 <input class="admin__control-text" type="text"
                     data-bind="
+                        attr: {'aria-label': $t('New View')},
                         value: customLabel,
                         hasFocus: isCustomVisible(),
                         keyboard: {

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php

@@ -55,7 +55,8 @@ public function testTopologyInstallation(array $expectedConfig, array $bindingCo
         $this->assertArrayHasKey($name, $this->declaredExchanges);
         unset(
             $this->declaredExchanges[$name]['message_stats'],
-            $this->declaredExchanges[$name]['user_who_performed_action']
+            $this->declaredExchanges[$name]['user_who_performed_action'],
+            $this->declaredExchanges[$name]['policy']
         );
 
         $this->assertEquals(

lib/internal/Magento/Framework/Session/SaveHandler.php

@@ -6,13 +6,18 @@
 
 namespace Magento\Framework\Session;
 
+use Magento\Framework\App\Area;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\State;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\SessionException;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Session\Config\ConfigInterface;
 use Psr\Log\LoggerInterface;
 
 /**
  * Magento session save handler.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SaveHandler implements SaveHandlerInterface
 {
@@ -48,25 +53,41 @@ class SaveHandler implements SaveHandlerInterface
      */
     private $sessionMaxSizeConfig;
 
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManager;
+
+    /**
+     * @var State|mixed
+     */
+    private $appState;
+
     /**
      * @param SaveHandlerFactory $saveHandlerFactory
      * @param ConfigInterface $sessionConfig
      * @param LoggerInterface $logger
      * @param SessionMaxSizeConfig $sessionMaxSizeConfigs
      * @param string $default
+     * @param ManagerInterface|null $messageManager
+     * @param State|null $appState
      */
     public function __construct(
         SaveHandlerFactory $saveHandlerFactory,
         ConfigInterface $sessionConfig,
         LoggerInterface $logger,
         SessionMaxSizeConfig $sessionMaxSizeConfigs,
-        $default = self::DEFAULT_HANDLER
+        $default = self::DEFAULT_HANDLER,
+        ManagerInterface $messageManager = null,
+        State $appState = null
     ) {
         $this->saveHandlerFactory = $saveHandlerFactory;
         $this->sessionConfig = $sessionConfig;
         $this->logger = $logger;
         $this->defaultHandler = $default;
         $this->sessionMaxSizeConfig = $sessionMaxSizeConfigs;
+        $this->messageManager = $messageManager ?: ObjectManager::getInstance()->get(ManagerInterface::class);
+        $this->appState = $appState ?: ObjectManager::getInstance()->get(State::class);
     }
 
     /**
@@ -99,10 +120,22 @@ public function close()
      * @param string $sessionId
      * @return string
      */
-    #[\ReturnTypeWillChange]
-    public function read($sessionId)
+    public function read($sessionId): string
     {
-        return $this->callSafely('read', $sessionId);
+        $sessionData = $this->callSafely('read', $sessionId);
+        $sessionMaxSize = $this->sessionMaxSizeConfig->getSessionMaxSize();
+        $sessionSize = strlen($sessionData);
+
+        if ($sessionSize !== null && $sessionMaxSize < $sessionSize) {
+            $sessionData = '';
+            if ($this->appState->getAreaCode() === Area::AREA_FRONTEND) {
+                $this->messageManager->addErrorMessage(
+                    __('There is an error. Please Contact store administrator.')
+                );
+            }
+        }
+
+        return $sessionData;
     }
 
     /**
@@ -131,7 +164,7 @@ public function write($sessionId, $data)
             )
         );
 
-        return $this->callSafely('write', $sessionId, $this->read($sessionId));
+        return $this->callSafely('write', $sessionId, $data);
     }
 
     /**

lib/internal/Magento/Framework/Session/Test/Unit/SaveHandlerTest.php

@@ -119,17 +119,33 @@ public function testWriteSessionMaxSizeNull()
         $this->assertTrue($this->saveHandler->write("test_session_id", "testdata"));
     }
 
-    public function testWriteMoreThanSessionMaxSize()
+    public function testWriteMoreThanSessionMaxSize(): void
     {
-        $this->sessionMaxSizeConfigMock->expects($this->once())
+        $this->sessionMaxSizeConfigMock
+            ->expects($this->once())
+            ->method('getSessionMaxSize')
+            ->willReturn(1);
+
+        $this->saveHandlerAdapterMock
+            ->expects($this->never())
+            ->method('read');
+
+        $this->assertTrue($this->saveHandler->write("test_session_id", "testdata"));
+    }
+    
+    public function testReadMoreThanSessionMaxSize(): void
+    {
+        $this->sessionMaxSizeConfigMock
+            ->expects($this->once())
             ->method('getSessionMaxSize')
             ->willReturn(1);
 
-        $this->saveHandlerAdapterMock->expects($this->once())
+        $this->saveHandlerAdapterMock
+            ->expects($this->once())
             ->method('read')
             ->with('test_session_id')
             ->willReturn('test_session_data');
 
-        $this->assertTrue($this->saveHandler->write("test_session_id", "testdata"));
+        $this->assertEquals(null, $this->saveHandler->read("test_session_id"));
     }
 }