com php-src: Merge branch 'PHP-5.6': sapi/cli/tests/005.phpt

From: Date: Tue, 04 Aug 2015 23:46:38 +0000
Subject: com php-src: Merge branch 'PHP-5.6': sapi/cli/tests/005.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88333@lists.php.net to get a copy of this message
Commit: 21602ec21986375ed90242ad43015d99ae3251ab Author: Stanislav Malyshev <stas@php.net> Tue, 4 Aug 2015 16:46:38 -0700 Parents: 7b6dd533ba285740671642cfbb7872e6ec46b6cb 54187fa4b953d9d908a844d802cfe20472776ff5 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=21602ec21986375ed90242ad43015d99ae3251ab Log: Merge branch 'PHP-5.6' * PHP-5.6: fix test Conflicts: sapi/cli/tests/005.phpt Changed paths: MM sapi/cli/tests/005.phpt Diff: diff --cc sapi/cli/tests/005.phpt index cf50a96,dff654a..c33ec0a --- 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 ] { } } }

« previous php.cvs (#88333) next »