From: Nikita Popov <nikic@php.net>
Date: Fri, 11 Mar 2016 21:28:50 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~490
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9f0c8429db8f25d3e1d768ad4db69ee4c4a277c;p=php

Merge branch 'PHP-7.0'
---

d9f0c8429db8f25d3e1d768ad4db69ee4c4a277c
diff --cc Zend/zend_language_parser.y
index fd45f6275a,804ed37473..754c50215d
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@@ -701,14 -701,14 +701,14 @@@ class_statement_list
  class_statement:
  		variable_modifiers property_list ';'
  			{ $$ = $2; $$->attr = $1; }
 -	|	T_CONST class_const_list ';'
 -			{ $$ = $2; RESET_DOC_COMMENT(); }
 +	|	method_modifiers T_CONST class_const_list ';'
 +			{ $$ = $3; $$->attr = $1; }
  	|	T_USE name_list trait_adaptations
  			{ $$ = zend_ast_create(ZEND_AST_USE_TRAIT, $2, $3); }
- 	|	method_modifiers function returns_ref identifier '(' parameter_list ')'
- 		return_type backup_doc_comment method_body
- 			{ $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1, $2, $9,
- 				  zend_ast_get_str($4), $6, NULL, $10, $8); }
+ 	|	method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')'
+ 		return_type method_body
+ 			{ $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1, $2, $5,
+ 				  zend_ast_get_str($4), $7, NULL, $10, $9); }
  ;
  
  name_list: