fix attribute regex

matheo · matheo · commit 01df60f220c0 · 2023-04-12T20:57:55.000+02:00
diff --git a/src/TwigComponent/src/Twig/ComponentLexer.php b/src/TwigComponent/src/Twig/ComponentLexer.php
@@ -21,11 +21,12 @@
  * @internal
  *
  * thanks to @giorgiopogliani for the inspiration on this lexer <3
+ *
  * @see https://github.com/giorgiopogliani/twig-components
  */
 class ComponentLexer extends Lexer
 {
-    public const ATTRIBUTES_REGEX = '(?<attributes>(?:\s+[\w\-:.@]+(=(?:\\\"[^\\\"]*\\\"|\'[^\']*\'|[^\'\\\"=<>]+))?)*\s*)';
+    public const ATTRIBUTES_REGEX = '(?<attributes>(?:\s+[\w\-:.@]+(=(?:"[^"]*"|\'[^\']*\'|[^\'\\\"=<>]+))?)*\s*)';
     public const OPEN_TAGS_REGEX = '/<\s*t:(?<name>([[\w\-\:\.]+))\s*'.self::ATTRIBUTES_REGEX.'(\s?)+>/';
     public const CLOSE_TAGS_REGEX = '/<\/\s*t:([\w\-\:\.]+)\s*>/';
     public const SELF_CLOSE_TAGS_REGEX = '/<\s*t:(?<name>([\w\-\:\.]+))\s*'.self::ATTRIBUTES_REGEX.'(\s?)+\/>/';
diff --git a/src/TwigComponent/tests/Fixtures/templates/tags/open_tag.html.twig b/src/TwigComponent/tests/Fixtures/templates/tags/open_tag.html.twig
@@ -1,2 +1,2 @@
-<t:component_a propA propB='hello'>
+<t:component_a propA propB="hello">
 </t:component_a>

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,12 @@`
`21`	`21`	`* @internal`
`22`	`22`	`*`
`23`	`23`	`* thanks to @giorgiopogliani for the inspiration on this lexer <3`
	`24`	`+ *`
`24`	`25`	`* @see https://github.com/giorgiopogliani/twig-components`
`25`	`26`	`*/`
`26`	`27`	`class ComponentLexer extends Lexer`
`27`	`28`	`{`
`28`		`- public const ATTRIBUTES_REGEX = '(?<attributes>(?:\s+[\w\-:.@]+(=(?:\\\"[^\\\"]\\\"\|\'[^\']\'\|[^\'\\\"=<>]+))?)\s)';`
	`29`	`+ public const ATTRIBUTES_REGEX = '(?<attributes>(?:\s+[\w\-:.@]+(=(?:"[^"]"\|\'[^\']\'\|[^\'\\\"=<>]+))?)\s)';`
`29`	`30`	`public const OPEN_TAGS_REGEX = '/<\st:(?<name>([[\w\-\:\.]+))\s'.self::ATTRIBUTES_REGEX.'(\s?)+>/';`
`30`	`31`	`public const CLOSE_TAGS_REGEX = '/<\/\st:([\w\-\:\.]+)\s>/';`
`31`	`32`	`public const SELF_CLOSE_TAGS_REGEX = '/<\st:(?<name>([\w\-\:\.]+))\s'.self::ATTRIBUTES_REGEX.'(\s?)+\/>/';`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-<t:component_a propA propB='hello'>`
	`1`	`+<t:component_a propA propB="hello">`
`2`	`2`	`</t:component_a>`