diff options
| author | Levi Morrison <levim@php.net> | 2016-05-05 08:58:05 -0600 |
|---|---|---|
| committer | Levi Morrison <levim@php.net> | 2016-05-05 11:53:32 -0600 |
| commit | 56c3d75780b7c2faf290722a615fd2d797d2f041 (patch) | |
| tree | 282e0ea797ab1eec76421b06665b0bf06203edd1 | |
| parent | 9662259cb93ff04be80766bdade39d2e827e0e16 (diff) | |
| download | php-git-56c3d75780b7c2faf290722a615fd2d797d2f041.tar.gz | |
Fix bug #71428
This also affects bug #72119
| -rw-r--r-- | Zend/tests/bug71428.1.phpt | 2 | ||||
| -rw-r--r-- | Zend/tests/bug71428.3.phpt | 2 | ||||
| -rw-r--r-- | Zend/tests/bug72119.phpt | 4 | ||||
| -rw-r--r-- | Zend/zend_inheritance.c | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/Zend/tests/bug71428.1.phpt b/Zend/tests/bug71428.1.phpt index 064e8cfa51..e4d3a22f67 100644 --- a/Zend/tests/bug71428.1.phpt +++ b/Zend/tests/bug71428.1.phpt @@ -1,7 +1,5 @@ --TEST-- bug #71428.1: inheritance with null default values ---XFAIL-- -This is a BC break --FILE-- <?php class A { diff --git a/Zend/tests/bug71428.3.phpt b/Zend/tests/bug71428.3.phpt index 53e5129d89..558e87c56e 100644 --- a/Zend/tests/bug71428.3.phpt +++ b/Zend/tests/bug71428.3.phpt @@ -1,7 +1,5 @@ --TEST-- bug #71428: Validation type inheritance with = NULL ---XFAIL-- -This is a BC break --FILE-- <?php class A { } diff --git a/Zend/tests/bug72119.phpt b/Zend/tests/bug72119.phpt index eb9b4a73a7..064381ada0 100644 --- a/Zend/tests/bug72119.phpt +++ b/Zend/tests/bug72119.phpt @@ -14,6 +14,6 @@ class Hello implements Foo { } echo "OK\n"; ?> ---EXPECT-- -OK +--EXPECTF-- +Fatal error: Declaration of Hello::bar(array $baz = Array) must be compatible with Foo::bar(?array $baz = NULL) in %s on line %d diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index de9b63e342..879e00375c 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -319,13 +319,11 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c return 0; } -#if 0 // This introduces BC break described at https://bugs.php.net/bug.php?id=72119 if (proto_arg_info->type_hint && proto_arg_info->allow_null && !fe_arg_info->allow_null) { /* incompatible nullability */ return 0; } -#endif /* by-ref constraints on arguments are invariant */ if (fe_arg_info->pass_by_reference != proto_arg_info->pass_by_reference) { |