From: Nikita Popov <nikic@php.net>
Date: Wed, 4 Jun 2014 15:15:16 +0000 (+0200)
Subject: Allow only simple variables with global keyword
X-Git-Tag: POST_AST_MERGE^2~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4e42df4e6fc99bc05d243978146fb0b6e5b4085;p=php

Allow only simple variables with global keyword
---

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 6eb2c4287e..e28949d71c 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -597,15 +597,12 @@ function_call_parameter:
 ;
 
 global_var_list:
-		global_var_list ',' global_var	{ zend_do_fetch_global_variable(&$3, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); }
-	|	global_var						{ zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); }
+		global_var_list ',' global_var
+	|	global_var
 ;
 
-
 global_var:
-		T_VARIABLE			{ $$ = $1; }
-	|	'$' r_variable		{ $$ = $2; }
-	|	'$' '{' expr '}'	{ $$ = $3; }
+	simple_variable { zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); }
 ;