Also allow variable variables with braces

sgolemon · sgolemon · commit 66a62522192f · 2016-04-29T04:34:33.000Z
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -1860,7 +1860,7 @@ inline_char_handler:
 	RETURN_TOKEN(T_VARIABLE);
 }
 
-<ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE,ST_VAR_OFFSET>"$$"[^$a-zA-Z_\x7f-\xff] {
+<ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE,ST_VAR_OFFSET>"$$"[^${a-zA-Z_\x7f-\xff] {
 	/* Don't catch false positives from variable variables */
 	yyless(yyleng - 1);
 	RETURN_TOKEN(T_PIPE_VARIABLE);

Original file line number	Diff line number	Diff line change
`@@ -1860,7 +1860,7 @@ inline_char_handler:`
`1860`	`1860`	`RETURN_TOKEN(T_VARIABLE);`
`1861`	`1861`	`}`
`1862`	`1862`
`1863`		`-<ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE,ST_VAR_OFFSET>"$$"[^$a-zA-Z_\x7f-\xff] {`
	`1863`	`+<ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE,ST_VAR_OFFSET>"$$"[^${a-zA-Z_\x7f-\xff] {`
`1864`	`1864`	`/* Don't catch false positives from variable variables */`
`1865`	`1865`	`yyless(yyleng - 1);`
`1866`	`1866`	`RETURN_TOKEN(T_PIPE_VARIABLE);`