diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-08-04 14:46:30 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-08-04 14:46:30 -0700 |
| commit | 742c54aecfc4cbc3c0cfccbe4eee1d50946f44d8 (patch) | |
| tree | ee875613f6a805679f45a2bb4ed6858448231ffc | |
| parent | 69ed3969dd3b00feaa62f611c5095e27ba96274d (diff) | |
| parent | 0a21b5d97039945a9e5dc683f2f5e8b379f07ada (diff) | |
| download | php-git-742c54aecfc4cbc3c0cfccbe4eee1d50946f44d8.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test
update NEWS
| -rw-r--r-- | sapi/cli/tests/005.phpt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt index 84b0f98440..a840e8ffd2 100644 --- a/sapi/cli/tests/005.phpt +++ b/sapi/cli/tests/005.phpt @@ -4,7 +4,7 @@ show information about class <?php include "skipif.inc"; if (!extension_loaded("reflection")) { - die("skip reflection extension required"); + die("skip reflection extension required"); } ?> --FILE-- @@ -18,7 +18,7 @@ var_dump(`"$php" -n --rc exception`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(40) "Exception: Class unknown does not exist " string(183) "Class [ <internal:Core> class stdClass ] { @@ -40,7 +40,7 @@ string(183) "Class [ <internal:Core> class stdClass ] { } " -string(1355) "Class [ <internal:Core> class Exception ] { +string(1424) "Class [ <internal:Core> class Exception ] { - Constants [0] { } @@ -61,7 +61,7 @@ string(1355) "Class [ <internal:Core> class Exception ] { Property [ <default> private $previous ] } - - Methods [10] { + - Methods [11] { Method [ <internal:Core> final private method __clone ] { } @@ -74,6 +74,9 @@ string(1355) "Class [ <internal:Core> class Exception ] { } } + Method [ <internal:Core> final public method __wakeup ] { + } + Method [ <internal:Core> final public method getMessage ] { } |