diff options
author | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:45:32 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:45:32 -0700 |
commit | 2425f88afd487181e4b2a86e9008b98a03dfb663 (patch) | |
tree | 974c42479bca376f4f7a32b665e5288b9936851c | |
parent | f2f8ea9ac53973a1ddb55ddc5eae3109d841309c (diff) | |
parent | da5321013c4dbac0faac12f78b28f662a91b4bc1 (diff) | |
download | php-git-2425f88afd487181e4b2a86e9008b98a03dfb663.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 ] { |