com php-src: Wrong expectation in tests (for some reason backtraces contained invlalid extra frame at the top): Zend/tests/generato
rs/errors/non_ref_generator_iterated_by_ref_error .phpt Zend/tests/generators/generator_rewind.phpt Zen d/zend_builtin_functions.c
ext/soap/tests/bugs/bug5 4911.phpt

Commit: 477bd49ccab2a10c421a51f512d593251ef7adef Author: Dmitry Stogov <dmitry@zend.com> Mon, 7 Jul 2014 18:09:17 +0400 Parents: 4dd7c63d1e5e9954baf39f9e5d9c5d6d80b991b6 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=477bd49ccab2a10c421a51f512d593251ef7adef Log: Wrong expectation in tests (for some reason backtraces contained invlalid extra frame at the top) Changed paths: M Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt M Zend/tests/generators/generator_rewind.phpt M Zend/zend_builtin_functions.c M ext/soap/tests/bugs/bug54911.phpt Diff: diff --git a/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt b/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt index de5b22f..7878369 100644 --- a/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt +++ b/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt @@ -12,7 +12,6 @@ foreach ($gen as &$value) { } --EXPECTF-- Fatal error: Uncaught exception 'Exception' with message 'You can only iterate a generator by-reference if it declared that it yields by-reference' in %s:%d Stack trace: -#0 %s(%d): unknown() -#1 {main} +#0 {main} thrown in %s on line %d diff --git a/Zend/tests/generators/generator_rewind.phpt b/Zend/tests/generators/generator_rewind.phpt index c4b5bbb..f5452a7 100644 --- a/Zend/tests/generators/generator_rewind.phpt +++ b/Zend/tests/generators/generator_rewind.phpt @@ -56,7 +56,6 @@ Stack trace: exception 'Exception' with message 'Cannot traverse an already closed generator' in %s:%d Stack trace: -#0 %s(%d): unknown() -#1 {main} +#0 {main} in generator diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 96b339c..216a67a 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -2253,6 +2253,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int } if (!call) { call = ptr; + ptr = ptr->prev_execute_data; } array_init(return_value); diff --git a/ext/soap/tests/bugs/bug54911.phpt b/ext/soap/tests/bugs/bug54911.phpt index 1a2d6ee..6913925 100644 --- a/ext/soap/tests/bugs/bug54911.phpt +++ b/ext/soap/tests/bugs/bug54911.phpt @@ -15,8 +15,7 @@ Bug #54911 (Access to a undefined member in inherit SoapClient may cause Segment --EXPECTF-- Fatal error: Uncaught SoapFault exception: [Client] Access to undeclared static property: XSoapClient::$crash in %sbug54911.php:4 Stack trace: -#0 %sbug54911.php(4): XSoapClient->__doRequest() -#1 [internal function]: XSoapClient->__doRequest('<?xml version="...', '', '#', 1, 0) -#2 %sbug54911.php(8): SoapClient->__soapCall('', Array) -#3 {main} - thrown in %sbug54911.php on line 4 \ No newline at end of file +#0 [internal function]: XSoapClient->__doRequest('<?xml version="...', '', '#', 1, 0) +#1 %sbug54911.php(8): SoapClient->__soapCall('', Array) +#2 {main} + thrown in %sbug54911.php on line 4