MC-23553: Invalid Template Strings when Translate Inline enabled

Author: mastiuhin-olexandr

lib/internal/Magento/Framework/Escaper.php

@@ -495,22 +495,27 @@ private function getTranslateInline()
     private function inlineSensitiveEscapeHthmlAttr(string $text): string
     {
         $escaper = $this->getEscaper();
+        $textLength = strlen($text);
+
+        if ($textLength < 6) {
+            return $escaper->escapeHtmlAttr($text);
+        }
+
         $firstCharacters = substr($text, 0, 3);
         $lastCharacters = substr($text, -3, 3);
 
-        if ($firstCharacters === '{{{' && $lastCharacters === '}}}') {
-            $textLength = strlen($text);
-            $text = substr($text, 3, $textLength - 6);
-            $strings = explode('}}{{', $text);
-            $escapedStrings = [];
+        if ($firstCharacters !== '{{{' || $lastCharacters !== '}}}') {
+            return $escaper->escapeHtmlAttr($text);
+        }
 
-            foreach ($strings as $string) {
-                $escapedStrings[] = $escaper->escapeHtmlAttr($string);
-            }
+        $text = substr($text, 3, $textLength - 6);
+        $strings = explode('}}{{', $text);
+        $escapedStrings = [];
 
-            return '{{{' . implode('}}{{', $escapedStrings) . '}}}';
+        foreach ($strings as $string) {
+            $escapedStrings[] = $escaper->escapeHtmlAttr($string);
         }
 
-        return $escaper->escapeHtmlAttr($text);
+        return '{{{' . implode('}}{{', $escapedStrings) . '}}}';
     }
 }

lib/internal/Magento/Framework/Test/Unit/EscaperTest.php

@@ -181,9 +181,9 @@ public function testEscapeHtml($data, $expected, $allowedTags = [])
      * @param string $input
      * @param string $output
      * @return void
-     * @dataProvider escapeHtmlAttrWithInlineProvider
+     * @dataProvider escapeHtmlAttributeWithInlineTranslateEnabledDataProvider
      */
-    public function testEscapeHtmlAttrWithInline(string $input, string $output): void
+    public function testEscapeHtmlAttributeWithInlineTranslateEnabled(string $input, string $output): void
     {
         $this->objectManagerHelper->setBackwardCompatibleProperty(
             $this->translateInline,
@@ -209,7 +209,7 @@ public function testEscapeHtmlAttrWithInline(string $input, string $output): voi
      *
      * @return array
      */
-    public function escapeHtmlAttrWithInlineProvider(): array
+    public function escapeHtmlAttributeWithInlineTranslateEnabledDataProvider(): array
     {
         return [
             [