From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 14 Apr 2015 14:18:55 +0000 (+0300)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~307
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65baab7741c3deb4b9b6e1a5a7972c3318f9ea34;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #63336 is not a bug
  fix test

Conflicts:
	Zend/tests/bug63336.phpt
---

65baab7741c3deb4b9b6e1a5a7972c3318f9ea34
diff --cc Zend/tests/bug63336.phpt
index cf54a99216,a7cc097e3f..b47a770a4d
--- 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