Merge remote-tracking branch 'origin/MC-39037' into 2.4-develop-pr48

Author: Serhii Balko

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

@@ -14,12 +14,13 @@
  *  getPagerVisibility()
  *  getVarNamePage()
  */
-$numColumns = count($block->getColumns());
 
 /**
  * @var \Magento\Backend\Block\Widget\Grid\Extended $block
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
+$numColumns = count($block->getColumns());
+
 ?>
 <?php if ($block->getCollection()): ?>
     <?php if ($block->canDisplayContainer()): ?>
@@ -285,7 +286,9 @@ $numColumns = count($block->getColumns());
         </table>
 
     </div>
+        <?php if ($block->canDisplayContainer()): ?>
 </div>
+        <?php endif; ?>
     <?php
     /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
     $jsonHelper = $block->getData('jsonHelper');

dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/ExtendedTest.php

@@ -5,34 +5,44 @@
  */
 namespace Magento\Backend\Block\Widget\Grid;
 
+use Laminas\Stdlib\Parameters;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Data\Collection;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
  * @magentoAppArea adminhtml
  */
-class ExtendedTest extends \PHPUnit\Framework\TestCase
+class ExtendedTest extends TestCase
 {
     /**
-     * @var \Magento\Backend\Block\Widget\Grid\Extended
+     * @var Extended
      */
     protected $_block;
 
     /**
-     * @var \Magento\Framework\View\LayoutInterface
+     * @var LayoutInterface
      */
     protected $_layoutMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->_layoutMock = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\View\LayoutInterface::class
+        $this->_layoutMock = Bootstrap::getObjectManager()->get(
+            LayoutInterface::class
         );
-        $context = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Backend\Block\Template\Context::class,
+        $context = Bootstrap::getObjectManager()->create(
+            Context::class,
             ['layout' => $this->_layoutMock]
         );
         $this->_block = $this->_layoutMock->createBlock(
-            \Magento\Backend\Block\Widget\Grid\Extended::class,
+            Extended::class,
             'grid',
             ['context' => $context]
         );
@@ -47,7 +57,7 @@ protected function setUp(): void
     public function testAddColumnAddsChildToColumnSet()
     {
         $this->assertInstanceOf(
-            \Magento\Backend\Block\Widget\Grid\Column::class,
+            Column::class,
             $this->_block->getColumnSet()->getChildBlock('column1')
         );
         $this->assertCount(2, $this->_block->getColumnSet()->getChildNames());
@@ -84,4 +94,32 @@ public function testGetMainButtonsHtmlReturnsEmptyStringIfFiltersArentVisible()
         $this->_block->setFilterVisibility(false);
         $this->assertEquals('', $this->_block->getMainButtonsHtml());
     }
+
+    /**
+     * Checks that template does not have redundant div close tag
+     *
+     * @return void
+     */
+    public function testExtendedTemplateMarkup(): void
+    {
+        $mockCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->_block->setCollection($mockCollection);
+        $this->_block->getRequest()
+            ->setQuery(
+                Bootstrap::getObjectManager()
+                ->create(
+                    Parameters::class,
+                    [
+                        'values' => [
+                            'ajax' => true
+                        ]
+                    ]
+                )
+            );
+        $html = $this->_block->getHtml();
+        $html = str_replace(["\n", " "], '', $html);
+        $this->assertStringEndsWith("</table></div>", $html);
+    }
 }