diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-17 17:36:26 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-17 17:36:26 -0700 |
| commit | ce4c78dd071768c40ce26296f4c0665cc9f5ecb7 (patch) | |
| tree | af693a1eef24099e926d354c781f53382df0b047 | |
| parent | c02003e6b8fcb6a22d2bf458a22f24277b3e0b45 (diff) | |
| parent | 5e988a888ab97091da0f1b87e1bb4e33204c1c2c (diff) | |
| download | php-git-ce4c78dd071768c40ce26296f4c0665cc9f5ecb7.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed test case for 5328d42
| -rw-r--r-- | Zend/tests/generators/errors/serialize_unserialize_error.phpt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zend/tests/generators/errors/serialize_unserialize_error.phpt b/Zend/tests/generators/errors/serialize_unserialize_error.phpt index aa2d4693f7..d06d4be4f1 100644 --- a/Zend/tests/generators/errors/serialize_unserialize_error.phpt +++ b/Zend/tests/generators/errors/serialize_unserialize_error.phpt @@ -34,9 +34,8 @@ Stack trace: exception 'Exception' with message 'Unserialization of 'Generator' is not allowed' in %s:%d Stack trace: -#0 [internal function]: Generator->__wakeup() -#1 %s(%d): unserialize('O:9:"Generator"...') -#2 {main} +#0 %s(%d): unserialize('O:9:"Generator"...') +#1 {main} exception 'Exception' with message 'Unserialization of 'Generator' is not allowed' in %s:%d Stack trace: |