From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 25 May 2015 22:17:27 +0000 (+0200)
Subject: Fix tokenizer test due to recent changes
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~32^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31f3eeb0c56eeeaf2c8bff4722cb1b6a3d2e25fc;p=php

Fix tokenizer test due to recent changes
---

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index e9a77c3399..9f61fabe35 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -270,8 +270,7 @@ reserved_non_modifiers:
 	| T_FOR | T_ENDFOR | T_FOREACH | T_ENDFOREACH | T_DECLARE | T_ENDDECLARE | T_AS | T_TRY | T_CATCH | T_FINALLY
 	| T_THROW | T_USE | T_INSTEADOF | T_GLOBAL | T_VAR | T_UNSET | T_ISSET | T_EMPTY | T_CONTINUE | T_GOTO
 	| T_FUNCTION | T_CONST | T_RETURN | T_PRINT | T_YIELD | T_LIST | T_SWITCH | T_ENDSWITCH | T_CASE | T_DEFAULT | T_BREAK
-	| T_ARRAY | T_CALLABLE | T_EXTENDS | T_IMPLEMENTS | T_NAMESPACE | T_TRAIT | T_INTERFACE
-	| T_CLASS
+	| T_ARRAY | T_CALLABLE | T_EXTENDS | T_IMPLEMENTS | T_NAMESPACE | T_TRAIT | T_INTERFACE | T_CLASS
 ;
 
 semi_reserved:
diff --git a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
index ab334358ab..eb0e300964 100644
--- a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
+++ b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
@@ -58,7 +58,7 @@ L6: T_STRING continue
 ;
 L7: T_STRING X
 L7: T_DOUBLE_COLON ::
-L7: T_CLASS class
+L7: T_STRING class
 ;
 L9: T_CLASS class
 L9: T_STRING X