Improve regex parsing of quoted strings

Author: josbeir

src/View/StringTemplate.php

@@ -16,7 +16,7 @@ class StringTemplate extends StringTemplateBase
     protected function extractNamed(string &$formatted): array
     {
         $supportedIdentifiers = ['swap'];
-        $pattern = '/\s*(\w+(?:-\w+)*):(\w+(?:-\w+)*)=(["\'])(.*?)\3\s*/';
+        $pattern = '/\s*\b(\w+(?:-\w+)*):(\w+(?:-\w+)*)\b=(["\'])(.*?)\3\s*/';
         $attributes = [];
 
         $formatted = (string)preg_replace_callback(
@@ -55,7 +55,7 @@ public function format(string $name, array $data): string
         if (preg_match('/<(\w+)([^>]*)>/', $formatted, $matches)) {
             $attributesString = $matches[2];
             preg_match_all(
-                '/([a-zA-Z@][a-zA-Z0-9\-.:]*(?::\w+(?:-\w+)*)?)=(["\'])([^"\']*)\2/',
+                '/([a-zA-Z@][a-zA-Z0-9\-.:@]*)=(["\'])(.*?)\2+/',
                 $attributesString,
                 $attrMatches,
                 PREG_SET_ORDER,

tests/TestCase/View/StringTemplateTest.php

@@ -114,24 +114,7 @@ public function testWithFormHelperSwap(): void
         );
     }
 
-    public function testUnsupportedIdentifierIgnored(): void
-    {
-        $formatted = $this->templater->format('input', [
-            'type' => 'input',
-            'name' => 'test',
-            'attrs' => $this->templater->formatAttributes([
-                'class' => 'default-class',
-                'class:unsupported' => 'should-be-ignored',
-            ]),
-        ]);
-
-        $this->assertSame(
-            '<input class="bg-red-800 p-2 text-white rounded-sm default-class" type="input" name="test" class:unsupported="should-be-ignored">',
-            $formatted,
-        );
-    }
-
-    public function testMixedSupportedAndUnsupportedIdentifiers(): void
+    public function testIdentifierFiltering(): void
     {
         $formatted = $this->templater->format('input', [
             'type' => 'input',
@@ -140,30 +123,33 @@ public function testMixedSupportedAndUnsupportedIdentifiers(): void
                 'class' => 'default-class',
                 'class:swap' => 'swapped-class',
                 'data-value:unsupported' => 'should-remain',
-                'id:unknown' => 'should-stay',
+                'x-model.fill' => 'someValue',
+                '@click.prevent' => 'submit()',
             ]),
         ]);
 
         $this->assertSame(
-            '<input class="swapped-class" type="input" name="test" data-value:unsupported="should-remain" id:unknown="should-stay">',
+            '<input class="swapped-class" type="input" name="test" data-value:unsupported="should-remain" x-model.fill="someValue" @click.prevent="submit()">',
             $formatted,
         );
     }
 
-    public function testAttributesWithDotsPreserved(): void
+    public function testAttributesWithEncodedQuotes(): void
     {
-        $formatted = $this->templater->format('input', [
-            'type' => 'input',
-            'name' => 'test',
+        $this->templater = new StringTemplate([
+            'div' => '<div class="fieldset"{{attrs}}>{{content}}</div>',
+        ]);
+
+        $formatted = $this->templater->format('div', [
+            'content' => 'test content',
             'attrs' => $this->templater->formatAttributes([
-                'x-model.fill' => 'someValue',
-                'x-on:click' => 'handleClick()',
-                '@click.prevent' => 'submit()',
+                'x-show' => '["basic","digest"].includes(auth_type)',
+                'class:swap' => 'new-class',
             ]),
         ]);
 
         $this->assertSame(
-            '<input class="bg-red-800 p-2 text-white rounded-sm" type="input" name="test" x-model.fill="someValue" x-on:click="handleClick()" @click.prevent="submit()">',
+            '<div class="new-class" x-show="[&quot;basic&quot;,&quot;digest&quot;].includes(auth_type)">test content</div>',
             $formatted,
         );
     }