archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Handle static return type in AST printer

Browse source 
Fixes OSS-Fuzz #20782.
This commit is contained in:
Nikita Popov 2020-02-19 09:45:41 +01:00
parent 736b22dc0b
commit 28a30f7afa
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Zend/tests/assert/expect_015.phpt
View file

@ -119,7 +119,7 @@ assert(0 && ($a = function &(array &...$a) {
}
}));
assert(0 && ($a = function () {
assert(0 && ($a = function (): ?static {
declare(C=1) { echo 1; }
$x = '\'"`$a';
$x = "'\"`$a";
@ -160,7 +160,7 @@ Warning: assert(): assert(0 && ($a = function () {
$y = clone $x;
yield 1 => 2;
yield from $x;
})) failed in %sexpect_015.php on line %d
})) failed in %s on line %d
Warning: assert(): assert(0 && ($a = function &(array &$a, ?X $b = null) use($c, &$d): ?X {
abstract class A extends B implements C, D {
@ -202,7 +202,7 @@ Warning: assert(): assert(0 && ($a = function &(array &$a, ?X $b = null) use($c,
}
})) failed in %sexpect_015.php on line %d
})) failed in %s on line %d
Warning: assert(): assert(0 && ($a = function &(array &$a, X $b = null, int|float $c) use($c, &$d): X {
final class A {
@ -242,7 +242,7 @@ Warning: assert(): assert(0 && ($a = function &(array &$a, X $b = null, int|floa
}
})) failed in %sexpect_015.php on line %d
})) failed in %s on line %d
Warning: assert(): assert(0 && ($a = function &(?array &$a, X $b = null) use($c, &$d): X {
class A {
@ -255,7 +255,7 @@ Warning: assert(): assert(0 && ($a = function &(?array &$a, X $b = null) use($c,
use T3;
}
})) failed in %sexpect_015.php on line %d
})) failed in %s on line %d
Warning: assert(): assert(0 && ($a = function &(array &...$a) {
declare(A = 1, B = 2);
@ -268,9 +268,9 @@ Warning: assert(): assert(0 && ($a = function &(array &...$a) {
} finally {
echo 3;
}
})) failed in %sexpect_015.php on line %d
})) failed in %s on line %d
Warning: assert(): assert(0 && ($a = function () {
Warning: assert(): assert(0 && ($a = function (): ?static {
declare(C = 1) {
echo 1;
}
@ -296,4 +296,4 @@ Warning: assert(): assert(0 && ($a = function () {
if ($a) {
} else {
}
})) failed in %sexpect_015.php on line %d
})) failed in %s on line %d

1
Zend/zend_ast.c
View file

@ -1571,6 +1571,7 @@ simple_list:
switch (ast->attr & ~ZEND_TYPE_NULLABLE) {
case IS_ARRAY: APPEND_STR("array");
case IS_CALLABLE: APPEND_STR("callable");
case IS_STATIC: APPEND_STR("static");
EMPTY_SWITCH_DEFAULT_CASE();
}
break;