Fixed bug #81342

Allow arbitrary whitespace, not just horizontal spaces.
php · Aug 10, 2021 · 607be65 · 607be65
1 parent e9b2852
commit 607be65
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.0beta3
 
+- Core:
+  . Fixed bug #81342 (New ampersand token parsing depends on new line after it).
+    (Nikita)
+
 - Date:
   . Fixed bug #79580 (date_create_from_format misses leap year). (Derick)
   . Fixed bug #80963 (DateTimeZone::getTransitions() truncated). (Derick)

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -1858,7 +1858,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 	RETURN_TOKEN(T_SR);
 }
 
-<ST_IN_SCRIPTING>"&"{TABS_AND_SPACES}("$"|"...") {
+<ST_IN_SCRIPTING>"&"[ \t\r\n]*("$"|"...") {
 	yyless(1);
 	RETURN_TOKEN(T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG);
 }

diff --git a/ext/tokenizer/tests/bug81342.phpt b/ext/tokenizer/tests/bug81342.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Bug #81342: New ampersand token parsing depends on new line after it
+--FILE--
+<?php
+
+$tokens = PhpToken::tokenize('<?php $x & $x; $x &
+    $baz;
+');
+foreach ($tokens as $token) {
+    echo $token->getTokenName(), "\n";
+}
+
+?>
+--EXPECT--
+T_OPEN_TAG
+T_VARIABLE
+T_WHITESPACE
+T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG
+T_WHITESPACE
+T_VARIABLE
+;
+T_WHITESPACE
+T_VARIABLE
+T_WHITESPACE
+T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG
+T_WHITESPACE
+T_VARIABLE
+;
+T_WHITESPACE