com php-src: Convert fatal error into EngineException: Zend/tests/generators/errors/resume_running_generator_err or.phpt Zend/zend_generators.c
| From: | Dmitry Stogov | Date: | Wed, 01 Apr 2015 10:49:11 +0000 |
| Subject: | com php-src: Convert fatal error into EngineException: Zend/tests/generators/errors/resume_running_generator_err or.phpt Zend/zend_generators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86016@lists.php.net to get a copy of this message | ||
Commit: 18f3d5490ac15c82263f158d36a22652ad831a3e
Author: Dmitry Stogov <dmitry@zend.com> Wed, 1 Apr 2015 13:49:11 +0300
Parents: 3ba4c7a1377964387c2fe122a9ef74c04a62e6c6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=18f3d5490ac15c82263f158d36a22652ad831a3e
Log:
Convert fatal error into EngineException
Changed paths:
M Zend/tests/generators/errors/resume_running_generator_error.phpt
M Zend/zend_generators.c
Diff:
diff --git a/Zend/tests/generators/errors/resume_running_generator_error.phpt
b/Zend/tests/generators/errors/resume_running_generator_error.phpt
index 567d72f...9a39155 100644
--- a/Zend/tests/generators/errors/resume_running_generator_error.phpt
+++ b/Zend/tests/generators/errors/resume_running_generator_error.phpt
@@ -5,7 +5,12 @@ It is not possible to resume an already running generator
function gen() {
$gen = yield;
- $gen->next();
+ try {
+ $gen->next();
+ } catch (EngineException $e) {
+ echo "\nException: " . $e->getMessage() . "\n";
+ }
+ $gen->next();
}
$gen = gen();
@@ -14,4 +19,6 @@ $gen->next();
?>
--EXPECTF--
+Exception: Cannot resume an already running generator
+
Fatal error: Cannot resume an already running generator in %s on line %d
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index b1fcdea..a64f341 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -303,7 +303,8 @@ ZEND_API void zend_generator_resume(zend_generator *generator) /* {{{ */
}
if (generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING) {
- zend_error_noreturn(E_ERROR, "Cannot resume an already running generator");
+ zend_error(E_EXCEPTION | E_ERROR, "Cannot resume an already running generator");
+ return;
}
/* Drop the AT_FIRST_YIELD flag */