com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.c Zend/zend_compile.h Zend/zend_globals.h
| From: | Nikita Popov | Date: | Thu, 21 Mar 2019 15:28:19 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.c Zend/zend_compile.h Zend/zend_globals.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105293@lists.php.net to get a copy of this message | ||
Commit: 6b7545c2255fe2cd88b999f60fe8a9af4261171e
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 21 Mar 2019 16:28:19 +0100
Parents: c4b383d6638ed2dc246841559cfaca1c04436247 e528762c1c59bc0bd0bd6d78246c14269630cf0f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b7545c2255fe2cd88b999f60fe8a9af4261171e
Log:
Merge branch 'PHP-7.4'
Changed paths:
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM Zend/zend_globals.h
Diff:
diff --cc Zend/zend_compile.c
index 23b6759,73ea213..3cb1720
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -7940,8 -8071,7 +7944,8 @@@ void zend_compile_const_expr_const(zend
}
zend_ast_destroy(ast);
- *ast_ptr = zend_ast_create_constant(resolved_name,
- *ast_ptr = zend_ast_create_constant(&loc, resolved_name, !is_fully_qualified ?
IS_CONSTANT_UNQUALIFIED : 0);
++ *ast_ptr = zend_ast_create_constant(&loc, resolved_name,
+ !is_fully_qualified && FC(current_namespace) ? IS_CONSTANT_UNQUALIFIED_IN_NAMESPACE :
0);
}
/* }}} */