diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-14 17:18:55 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-14 17:18:55 +0300 |
| commit | 65baab7741c3deb4b9b6e1a5a7972c3318f9ea34 (patch) | |
| tree | 6933fb286d7134fe12f6b5e446077923effaf745 /Zend | |
| parent | b7d8edca1f9e2fed2132041a84f6dd893c9c6c16 (diff) | |
| parent | e8fb5201ba204cc59104db49f45737385abe139e (diff) | |
| download | php-git-65baab7741c3deb4b9b6e1a5a7972c3318f9ea34.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Bug #63336 is not a bug
fix test
Conflicts:
Zend/tests/bug63336.phpt
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/bug63336.phpt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Zend/tests/bug63336.phpt b/Zend/tests/bug63336.phpt index cf54a99216..b47a770a4d 100644 --- a/Zend/tests/bug63336.phpt +++ b/Zend/tests/bug63336.phpt @@ -1,10 +1,8 @@ --TEST-- Bug #63336 (invalid E_NOTICE error occur) ---XFAIL-- -Bug is not fixed yet --FILE-- <?php -error_reporting(E_ALL | E_NOTICE ); +error_reporting(E_ALL & ~E_WARNING ); define("TEST", "123"); class Base { const DUMMY = "XXX"; @@ -18,7 +16,7 @@ class Child extends Base { public function bar($var, $more=self::DUMMY) { return true; } } ?> ---EXPECT-- -Warning: Declaration of Child::foo() should be compatible with Base::foo($var = '123', $more = NULL) in %sbug63336.php on line %d +--EXPECTF-- +Warning: Declaration of Child::foo() should be compatible with Base::foo($var = TEST, $more = NULL) in %sbug63336.php on line %d -Warning: Declaration of Child::bar() should be compatible with Base::bar($var, $more = 'XXX') in %sbug63336.php on line %d +Warning: Declaration of Child::bar() should be compatible with Base::bar($more = self::DUMMY) in %sbug63336.php on line %d |