🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #21804: [Backport] Issue #10645 - Allow BEM class via attribute tag. Public (by @amol2jcommerce)


Fixed GitHub Issues:
 - #10645: Adding BEM class in XML via attribute tag causes class to be rewritten (reported by @Zaylril) has been fixed in #21804 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. ab7aee9
     2. 743c034

Author: magento-engcom-team

lib/internal/Magento/Framework/View/Page/Config.php

@@ -498,7 +498,7 @@ public function addRss($title, $href)
      */
     public function addBodyClass($className)
     {
-        $className = preg_replace('#[^a-z0-9]+#', '-', strtolower($className));
+        $className = preg_replace('#[^a-z0-9-_]+#', '-', strtolower($className));
         $bodyClasses = $this->getElementAttribute(self::ELEMENT_TYPE_BODY, self::BODY_ATTRIBUTE_CLASS);
         $bodyClasses = $bodyClasses ? explode(' ', $bodyClasses) : [];
         $bodyClasses[] = $className;

lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/BodyTest.php

@@ -57,13 +57,13 @@ public function testProcess()
             ->method('getPageConfigStructure')
             ->willReturn($structureMock);
 
-        $bodyClasses = ['class_1', 'class_2'];
+        $bodyClasses = ['class_1', 'class--2'];
         $structureMock->expects($this->once())
             ->method('getBodyClasses')
             ->will($this->returnValue($bodyClasses));
         $this->pageConfigMock->expects($this->exactly(2))
             ->method('addBodyClass')
-            ->withConsecutive(['class_1'], ['class_2']);
+            ->withConsecutive(['class_1'], ['class--2']);
 
         $this->assertEquals(
             $this->bodyGenerator,

lib/internal/Magento/Framework/View/Test/Unit/Page/Config/StructureTest.php

@@ -58,7 +58,7 @@ public function testSetElementAttribute()
     public function testSetBodyClass()
     {
         $class1 = 'class_1';
-        $class2 = 'class_2';
+        $class2 = 'class--2';
         $expected = [$class1, $class2];
         $this->structure->setBodyClass($class1);
         $this->structure->setBodyClass($class2);