diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:46:38 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:46:38 -0700 |
| commit | 21602ec21986375ed90242ad43015d99ae3251ab (patch) | |
| tree | a405fc1a146df2ed5fee231efc795dfe8d6c54bd | |
| parent | 7b6dd533ba285740671642cfbb7872e6ec46b6cb (diff) | |
| parent | 54187fa4b953d9d908a844d802cfe20472776ff5 (diff) | |
| download | php-git-21602ec21986375ed90242ad43015d99ae3251ab.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test
Conflicts:
sapi/cli/tests/005.phpt
| -rw-r--r-- | sapi/cli/tests/005.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt index cf50a968f4..c33ec0a5b8 100644 --- a/sapi/cli/tests/005.phpt +++ b/sapi/cli/tests/005.phpt @@ -74,7 +74,7 @@ string(1544) "Class [ <internal:Core> class Exception implements Throwable ] { } } - Method [ <internal:Core, prototype Throwable> final public method __wakeup ] { + Method [ <internal:Core> public method __wakeup ] { } Method [ <internal:Core, prototype Throwable> final public method getMessage ] { |