From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 28 Mar 2019 08:31:18 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0720313bd452adf451173574e97fd761f90623a2;p=php

Merge branch 'PHP-7.4'
---

0720313bd452adf451173574e97fd761f90623a2
diff --cc Zend/zend_compile.c
index 3cb1720ecc,2fa847d180..23b6759167
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -7944,8 -8067,7 +7940,8 @@@ void zend_compile_const_expr_const(zend
  	}
  
  	zend_ast_destroy(ast);
- 	*ast_ptr = zend_ast_create_constant(&loc, resolved_name,
 -	*ast_ptr = zend_ast_create_constant(resolved_name, !is_fully_qualified ? IS_CONSTANT_UNQUALIFIED : 0);
++	*ast_ptr = zend_ast_create_constant(resolved_name,
 +		!is_fully_qualified && FC(current_namespace) ? IS_CONSTANT_UNQUALIFIED_IN_NAMESPACE : 0);
  }
  /* }}} */