Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed test case for 5328d42
This commit is contained in:
Stanislav Malyshev 2014-04-17 17:37:05 -07:00
commit 3405d799f8

View File

@ -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: