Fix rshutdown deprecated warning (swoole#4026)

huanghantao · web-flow · commit 91ef1ec30c46 · 2021-01-25T18:53:12.000+08:00
When throw Exception, do not show the info
diff --git a/ext-src/swoole_event.cc b/ext-src/swoole_event.cc
@@ -735,7 +735,10 @@ static PHP_FUNCTION(swoole_event_rshutdown) {
         if (!sw_reactor()) {
             return;
         }
-        php_swoole_fatal_error(E_DEPRECATED, "Event::wait() in shutdown function is deprecated");
+        // when throw Exception, do not show the info
+        if (!sw_reactor()->bailout) {
+            php_swoole_fatal_error(E_DEPRECATED, "Event::wait() in shutdown function is deprecated");
+        }
         php_swoole_event_wait();
     }
     zend_end_try();
diff --git a/tests/swoole_event/deprecated_event_wait.phpt b/tests/swoole_event/deprecated_event_wait.phpt
@@ -0,0 +1,22 @@
+--TEST--
+swoole_event: deprecated_event_wait
+--SKIPIF--
+<?php
+
+use SebastianBergmann\CodeCoverage\Report\PHP;
+
+use function Swoole\Coroutine\run;
+
+require __DIR__ . '/../include/skipif.inc'; ?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+
+error_reporting(E_ALL & E_DEPRECATED);
+
+run(function () {
+    throw new Exception("Error Processing Request", 1);
+});
+
+?>
+--EXPECT--

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,10 @@ static PHP_FUNCTION(swoole_event_rshutdown) {`
`735`	`735`	`if (!sw_reactor()) {`
`736`	`736`	`return;`
`737`	`737`	`}`
`738`		`- php_swoole_fatal_error(E_DEPRECATED, "Event::wait() in shutdown function is deprecated");`
	`738`	`+ // when throw Exception, do not show the info`
	`739`	`+ if (!sw_reactor()->bailout) {`
	`740`	`+ php_swoole_fatal_error(E_DEPRECATED, "Event::wait() in shutdown function is deprecated");`
	`741`	`+ }`
`739`	`742`	`php_swoole_event_wait();`
`740`	`743`	`}`
`741`	`744`	`zend_end_try();`