Merge branch 'PHP-5.6'

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

Conflicts:
	Zend/tests/bug63336.phpt

diff --cc Zend/tests/bug63336.phpt
index cf54a992167b8d6c41af6ffa731396bf6dcf70a2,a7cc097e3f06e9dc6c4b7b66fe89d030612dbcb2..b47a770a4dee1e7449ec5aca7902116917fa9f83
--- 1/Zend/tests/bug63336.phpt
--- 2/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