From: Stanislav Malyshev <stas@php.net>
Date: Tue, 4 Aug 2015 23:46:38 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta3~1^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21602ec21986375ed90242ad43015d99ae3251ab;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test

Conflicts:
	sapi/cli/tests/005.phpt
---

21602ec21986375ed90242ad43015d99ae3251ab
diff --cc sapi/cli/tests/005.phpt
index cf50a968f4,dff654a963..c33ec0a5b8
--- a/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 ] {
      }
    }
  }