com php-src: Merge branch 'PHP-5.6': Zend/tests/bug63336.phpt

Commit: 65baab7741c3deb4b9b6e1a5a7972c3318f9ea34 Author: Dmitry Stogov <dmitry@zend.com> Tue, 14 Apr 2015 17:18:55 +0300 Parents: b7d8edca1f9e2fed2132041a84f6dd893c9c6c16 e8fb5201ba204cc59104db49f45737385abe139e Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=65baab7741c3deb4b9b6e1a5a7972c3318f9ea34 Log: Merge branch 'PHP-5.6' * PHP-5.6: Bug #63336 is not a bug fix test Conflicts: Zend/tests/bug63336.phpt Bugs: https://bugs.php.net/63336 Changed paths: MM Zend/tests/bug63336.phpt Diff: diff --cc Zend/tests/bug63336.phpt index cf54a99,a7cc097..b47a770 --- a/Zend/tests/bug63336.phpt +++ b/Zend/tests/bug63336.phpt @@@ -1,10 -1,8 +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 +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-- -Strict Standards: Declaration of Child::foo() should be compatible with Base::foo($var = TEST, $more = NULL) in %sbug63336.php on line %d ++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 -Strict Standards: Declaration of Child::bar() should be compatible with Base::bar($more = self::DUMMY) 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