diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-04-28 19:32:14 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-04-28 19:32:14 +0200 |
| commit | 2c8e4ba8f1f63429f5d0e08a4a0fc6d449ca801a (patch) | |
| tree | 3257ef3663564609bcc921700caebee6334fab3b /Zend/tests/bug72119.phpt | |
| parent | 357ee4305ea75e40991590d2d3425689f5defb68 (diff) | |
| download | php-git-2c8e4ba8f1f63429f5d0e08a4a0fc6d449ca801a.tar.gz | |
Fix bad merge into master
This should only have been reverted in 7.0, but not for 7.1. (merge=ours??)
Added appropriate NEWS entry.
Diffstat (limited to 'Zend/tests/bug72119.phpt')
| -rw-r--r-- | Zend/tests/bug72119.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/tests/bug72119.phpt b/Zend/tests/bug72119.phpt index b8f070a25a..71d3a59d6f 100644 --- a/Zend/tests/bug72119.phpt +++ b/Zend/tests/bug72119.phpt @@ -14,5 +14,5 @@ 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 |