mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1' into PHP-7.2

Browse Source
This commit is contained in:
Nikita Popov 2018-06-29 23:23:02 +02:00
commit deb1bad80f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/tests/assert/expect_015.phpt
View File

@ -20,7 +20,7 @@ assert(0 && ($a = function () {
yield from $x; yield from $x;
})); }));
assert(0 && ($a = function &(array &$a, X $b = null) use ($c,&$d) : X { assert(0 && ($a = function &(array &$a, ?X $b = null) use ($c,&$d) : ?X {
abstract class A extends B implements C, D { abstract class A extends B implements C, D {
const X = 12; const X = 12;
const Y = self::X, Z = "aaa"; const Y = self::X, Z = "aaa";
@ -161,7 +161,7 @@ Warning: assert(): assert(0 && ($a = function () {
yield from $x; yield from $x;
})) failed in %sexpect_015.php on line %d })) failed in %sexpect_015.php on line %d
Warning: assert(): assert(0 && ($a = function &(array &$a, X $b = null) use($c, &$d): X { Warning: assert(): assert(0 && ($a = function &(array &$a, ?X $b = null) use($c, &$d): ?X {
abstract class A extends B implements C, D { abstract class A extends B implements C, D {
const X = 12; const X = 12;
const Y = self::X, Z = 'aaa'; const Y = self::X, Z = 'aaa';

6
Zend/zend_ast.c
View File

@ -1076,6 +1076,9 @@ tail_call:
zend_ast_export_ex(str, decl->child[1], 0, indent); zend_ast_export_ex(str, decl->child[1], 0, indent);
if (decl->child[3]) { if (decl->child[3]) {
smart_str_appends(str, ": "); smart_str_appends(str, ": ");
if (decl->child[3]->attr & ZEND_TYPE_NULLABLE) {
smart_str_appendc(str, '?');
}
zend_ast_export_ns_name(str, decl->child[3], 0, indent); zend_ast_export_ns_name(str, decl->child[3], 0, indent);
} }
if (decl->child[2]) { if (decl->child[2]) {
@ -1610,6 +1613,9 @@ simple_list:
break; break;
case ZEND_AST_PARAM: case ZEND_AST_PARAM:
if (ast->child[0]) { if (ast->child[0]) {
if (ast->child[0]->attr & ZEND_TYPE_NULLABLE) {
smart_str_appendc(str, '?');
}
zend_ast_export_ns_name(str, ast->child[0], 0, indent); zend_ast_export_ns_name(str, ast->child[0], 0, indent);
smart_str_appendc(str, ' '); smart_str_appendc(str, ' ');
} }