Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3044' into Tier4-Kings-PR-06-12-2024

Author: glo23503

lib/internal/Magento/Framework/View/Layout.php

@@ -33,7 +33,7 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
     /**
      * Empty layout xml
      */
-    const LAYOUT_NODE = '<layout/>';
+    public const LAYOUT_NODE = '<layout/>';
 
     /**
      * Default cache life time
@@ -604,6 +604,9 @@ protected function _renderContainer($name, $useCache = true)
         $children = $this->getChildNames($name);
         foreach ($children as $child) {
             $html .= $this->renderElement($child, $useCache);
+            if (ctype_space($html)) {
+                $html = trim($html);
+            }
         }
         if ($html == '' || !$this->structure->getAttribute($name, Element::CONTAINER_OPT_HTML_TAG)) {
             return $html;

lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php

@@ -1149,6 +1149,45 @@ public function testRenderElementDoNotDisplay($displayValue): void
         $this->assertEquals($blockHtml, $this->model->renderElement($name, false));
     }
 
+    /**
+     * @param string $expectedResult
+     * @param string $blockHtml
+     *
+     * @return void
+     * @dataProvider trimWhitespaceContainingBlockHtmlDataProvider
+     */
+    public function testTrimWhitespaceContainingBlockHtml($expectedResult, $blockHtml): void
+    {
+        $name = 'test_container';
+        $child = 'child_block';
+        $children = [$child => true];
+        $displayValue = true;
+
+        $this->structureMock->expects($this->atLeastOnce())
+            ->method('getAttribute')
+            ->willReturnMap(
+                [
+                    [$name, 'display', $displayValue],
+                    [$child, 'display', $displayValue],
+                    [$child, 'type', Element::TYPE_BLOCK]
+                ]
+            );
+
+        $this->structureMock->expects($this->atLeastOnce())->method('hasElement')
+            ->willReturnMap([[$child, true]]);
+
+        $this->structureMock->expects($this->once())
+            ->method('getChildren')
+            ->with($name)
+            ->willReturn($children);
+
+        $block = $this->createMock(AbstractBlock::class);
+        $block->expects($this->once())->method('toHtml')->willReturn($blockHtml);
+
+        $this->model->setBlock($child, $block);
+        $this->assertEquals($expectedResult, $this->model->renderElement($name, false));
+    }
+
     /**
      * @return array
      */
@@ -1161,6 +1200,17 @@ public static function renderElementDoNotDisplayDataProvider(): array
         ];
     }
 
+    /**
+     * @return array
+     */
+    public static function trimWhitespaceContainingBlockHtmlDataProvider(): array
+    {
+        return [
+            ['', ' '],
+            [' <html/>', ' <html/>']
+        ];
+    }
+
     /**
      * @return array
      */