diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:45:55 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:45:55 -0700 |
| commit | 54187fa4b953d9d908a844d802cfe20472776ff5 (patch) | |
| tree | 37c4d92f95a85f4276720420eac3c303d1f04e76 | |
| parent | eb7ba73079b73ca4ef91307ae1ef30b43468717b (diff) | |
| parent | 2425f88afd487181e4b2a86e9008b98a03dfb663 (diff) | |
| download | php-git-54187fa4b953d9d908a844d802cfe20472776ff5.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
| -rw-r--r-- | sapi/cli/tests/005.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt index a840e8ffd2..dff654a963 100644 --- a/sapi/cli/tests/005.phpt +++ b/sapi/cli/tests/005.phpt @@ -40,7 +40,7 @@ string(183) "Class [ <internal:Core> class stdClass ] { } " -string(1424) "Class [ <internal:Core> class Exception ] { +string(1418) "Class [ <internal:Core> class Exception ] { - Constants [0] { } @@ -74,7 +74,7 @@ string(1424) "Class [ <internal:Core> class Exception ] { } } - Method [ <internal:Core> final public method __wakeup ] { + Method [ <internal:Core> public method __wakeup ] { } Method [ <internal:Core> final public method getMessage ] { |