Merge pull request #7142 from kenjis/fix-parser-exclamation-mark

fix: [Parser] `!` does not work if delimiters are changed

Author: kenjis

system/View/Parser.php

@@ -257,7 +257,9 @@ protected function parse(string $template, array $data = [], ?array $options = n
      */
     protected function parseSingle(string $key, string $val): array
     {
-        $pattern = '#' . $this->leftDelimiter . '!?\s*' . preg_quote($key, '#') . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' . $this->rightDelimiter . '#ums';
+        $pattern = '#' . $this->leftDelimiter . '!?\s*' . preg_quote($key, '#')
+            . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?'
+            . $this->rightDelimiter . '#ums';
 
         return [$pattern => $val];
     }
@@ -506,7 +508,10 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
         // Replace the content in the template
         return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
             // Check for {! !} syntax to not escape this one.
-            if (strpos($matches[0], '{!') === 0 && substr($matches[0], -2) === '!}') {
+            if (
+                strpos($matches[0], $this->leftDelimiter . '!') === 0
+                && substr($matches[0], -1 - strlen($this->rightDelimiter)) === '!' . $this->rightDelimiter
+            ) {
                 $escape = false;
             }
 

tests/system/View/ParserTest.php

@@ -600,11 +600,24 @@ public function testParserNoEscape()
             'title' => '<script>Heroes</script>',
         ];
 
-        $template = '{! title!}';
+        $template = '{! title !}';
         $this->parser->setData($data);
         $this->assertSame('<script>Heroes</script>', $this->parser->renderString($template));
     }
 
+    public function testParserNoEscapeAndDelimiterChange()
+    {
+        $this->parser->setDelimiters('{{', '}}');
+
+        $data = [
+            'title' => '<script>Heroes</script>',
+        ];
+        $this->parser->setData($data);
+
+        $template = '{{! title !}}';
+        $this->assertSame('<script>Heroes</script>', $this->parser->renderString($template));
+    }
+
     public function testIgnoresComments()
     {
         $data = [