Merge remote-tracking branch 'origin/MC-33205' into 2.4-develop-pr32

Author: zakdma

app/code/Magento/Catalog/Helper/Output.php

@@ -15,6 +15,7 @@
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filter\Template;
+use Magento\Framework\Phrase;
 use function is_object;
 use function method_exists;
 use function preg_match;
@@ -157,7 +158,7 @@ public function process($method, $result, $params)
      * Prepare product attribute html output
      *
      * @param ModelProduct $product
-     * @param string $attributeHtml
+     * @param string|Phrase $attributeHtml
      * @param string $attributeName
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -235,14 +236,14 @@ public function categoryAttribute($category, $attributeHtml, $attributeName)
     /**
      * Check if string has directives
      *
-     * @param string $attributeHtml
+     * @param string|Phrase $attributeHtml
      * @return bool
      */
     public function isDirectivesExists(string $attributeHtml): bool
     {
         $matches = false;
         foreach ($this->directivePatterns as $pattern) {
-            if (preg_match($pattern, $attributeHtml)) {
+            if (preg_match($pattern, (string)$attributeHtml)) {
                 $matches = true;
                 break;
             }

dev/tests/integration/testsuite/Magento/Catalog/Helper/OutputTest.php

@@ -5,17 +5,23 @@
  */
 namespace Magento\Catalog\Helper;
 
-class OutputTest extends \PHPUnit\Framework\TestCase
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Phrase;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class OutputTest extends TestCase
 {
     /**
-     * @var \Magento\Catalog\Helper\Output
+     * @var Output
      */
     protected $_helper;
 
     protected function setUp()
     {
-        $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Catalog\Helper\Output::class
+        $this->_helper = Bootstrap::getObjectManager()->get(
+            Output::class
         );
     }
 
@@ -50,7 +56,7 @@ public function testProductAttribute()
     {
         $this->_testAttribute(
             'productAttribute',
-            \Magento\Catalog\Model\Product::ENTITY,
+            Product::ENTITY,
             "&lt;p&gt;line1&lt;/p&gt;<br />\nline2"
         );
     }
@@ -59,41 +65,50 @@ public function testCategoryAttribute()
     {
         $this->_testAttribute(
             'categoryAttribute',
-            \Magento\Catalog\Model\Category::ENTITY,
+            Category::ENTITY,
             "&lt;p&gt;line1&lt;/p&gt;\nline2"
         );
     }
 
     /**
+     * Tests if string has directives.
+     *
      * @dataProvider isDirectiveDataProvider
+     * @param string|Phrase $html
+     * @param bool $expectedResult
      */
-    public function testIsDirective($html, $expectedResult)
+    public function testIsDirectivesExists($html, bool $expectedResult): void
     {
         $this->assertEquals($expectedResult, $this->_helper->isDirectivesExists($html));
     }
 
-    public function isDirectiveDataProvider()
+    /**
+     * Data provider for testIsDirectivesExists()
+     *
+     * @return array
+     */
+    public function isDirectiveDataProvider(): array
     {
         return [
-            ['{{', false],
-            ['Test string', false],
-            ['{store url="customer/account/login"}', false],
-            ['{{store url="customer/account/login"}}', true],
+            'attribute_html_without_directive' => ['Test string', false],
+            'attribute_html_with_incorrect_directive' => ['{store url="customer/account/login"}', false],
+            'attribute_html_with_correct_directive' => ['{{store url="customer/account/login"}}', true],
+            'attribute_html_with_object_type' => [__('{{store url="%1"}}', 'customer/account/login'), true],
         ];
     }
 
     /**
      * Helper method for testProcess()
      *
-     * @param \Magento\Catalog\Helper\Output $helper
+     * @param Output $helper
      * @param string $string
      * @param mixed $params
      * @return string
      * @see testProcess()
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function sampleProcessor(\Magento\Catalog\Helper\Output $helper, $string, $params)
+    public function sampleProcessor(Output $helper, $string, $params)
     {
         return __CLASS__ . $string;
     }
@@ -109,7 +124,7 @@ public function sampleProcessor(\Magento\Catalog\Helper\Output $helper, $string,
     protected function _testAttribute($method, $entityCode, $expectedResult)
     {
         $attributeName = 'description';
-        $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $attribute = Bootstrap::getObjectManager()->get(
             \Magento\Eav\Model\Config::class
         )->getAttribute(
             $entityCode,