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

Author: Sarmistha

lib/internal/Magento/Framework/Test/Unit/View/Element/TemplateTest.php

@@ -0,0 +1,92 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Test\Unit\View\Element;
+
+use Magento\Framework\Filter\FilterManager;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class TemplateTest extends TestCase
+{
+    /**
+     * @var FilterManager|MockObject
+     */
+    private $filterManagerMock;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var Template
+     */
+    private $templateModel;
+
+    protected function setUp(): void
+    {
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->filterManagerMock = $this->getMockBuilder(FilterManager::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['stripTags'])
+            ->getMock();
+
+        $this->contextMock->expects($this->once())
+            ->method('getFilterManager')
+            ->willReturn($this->filterManagerMock);
+
+        $this->templateModel = new Template($this->contextMock);
+    }
+
+    /**
+     * Test to verify the stripped output from the HTML input.
+     *
+     * @param $input
+     * @param $output
+     * @dataProvider tagDataProvider
+     */
+    public function testStripTags($input, $output): void
+    {
+        if ($input) {
+            $this->filterManagerMock->expects($this->once())
+                ->method('stripTags')
+                ->with($input)
+                ->willReturn($output);
+        }
+        $this->assertEquals($this->templateModel->stripTags($input), $output);
+    }
+
+    /**
+     * @return array
+     */
+    public function tagDataProvider(): array
+    {
+        return [
+            ['-1', '-1'],
+            ['0', '0'],
+            ['1', '1'],
+            ['Hello <b>world!</b>' , 'Hello world!']
+        ];
+    }
+}

lib/internal/Magento/Framework/View/Element/AbstractBlock.php

@@ -958,7 +958,7 @@ public function stripTags($data, $allowableTags = null, $allowHtmlEntities = fal
     {
         $params = ['allowableTags' => $allowableTags, 'escape' => $allowHtmlEntities];
 
-        return $data ? $this->filterManager->stripTags($data, $params) : '';
+        return $data ? $this->filterManager->stripTags($data, $params) : $data;
     }
 
     /**