Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test

Conflicts:
	sapi/cli/tests/005.phpt

diff --cc sapi/cli/tests/005.phpt
index cf50a968f4833386cd4683ac3c8a54fe330ddc6c,dff654a96345dfe08695d36081267891330f4601..c33ec0a5b892ab78a85b73dc3ff6a06b30e0e74c
--- 1/sapi/cli/tests/005.phpt
--- 2/sapi/cli/tests/005.phpt
+++ b/sapi/cli/tests/005.phpt
@@@ -74,31 -74,31 +74,31 @@@ string(1544) "Class [ <internal:Core> c
        }
      }
  
-     Method [ <internal:Core, prototype Throwable> final public method __wakeup ] {
+     Method [ <internal:Core> public method __wakeup ] {
      }
  
 -    Method [ <internal:Core> final public method getMessage ] {
 +    Method [ <internal:Core, prototype Throwable> final public method getMessage ] {
      }
  
 -    Method [ <internal:Core> final public method getCode ] {
 +    Method [ <internal:Core, prototype Throwable> final public method getCode ] {
      }
  
 -    Method [ <internal:Core> final public method getFile ] {
 +    Method [ <internal:Core, prototype Throwable> final public method getFile ] {
      }
  
 -    Method [ <internal:Core> final public method getLine ] {
 +    Method [ <internal:Core, prototype Throwable> final public method getLine ] {
      }
  
 -    Method [ <internal:Core> final public method getTrace ] {
 +    Method [ <internal:Core, prototype Throwable> final public method getTrace ] {
      }
  
 -    Method [ <internal:Core> final public method getPrevious ] {
 +    Method [ <internal:Core, prototype Throwable> final public method getPrevious ] {
      }
  
 -    Method [ <internal:Core> final public method getTraceAsString ] {
 +    Method [ <internal:Core, prototype Throwable> final public method getTraceAsString ] {
      }
  
 -    Method [ <internal:Core> public method __toString ] {
 +    Method [ <internal:Core, prototype Throwable> public method __toString ] {
      }
    }
  }