File tree Expand file tree Collapse file tree 3 files changed +31
-1
lines changed Expand file tree Collapse file tree 3 files changed +31
-1
lines changed Original file line number Diff line number Diff line change @@ -52,6 +52,10 @@ PHP NEWS
52
52
. Fixed bug GH-16009 (Segmentation fault with frameless functions and
53
53
undefined CVs). (nielsdos)
54
54
55
+ - PHPDBG:
56
+ . Fixed bug GH-16181 (phpdbg: exit in exception handler reports fatal error).
57
+ (cmb)
58
+
55
59
- Reflection:
56
60
. Fixed bug GH-16122 (The return value of ReflectionFunction::getNamespaceName()
57
61
and ReflectionFunction::inNamespace() for closures is incorrect). (timwolla)
Original file line number Diff line number Diff line change @@ -904,7 +904,7 @@ PHPDBG_COMMAND(run) /* {{{ */
904
904
}
905
905
} zend_end_try ();
906
906
907
- if (EG (exception )) {
907
+ if (EG (exception ) && ! zend_is_unwind_exit ( EG ( exception )) ) {
908
908
phpdbg_handle_exception ();
909
909
}
910
910
}
Original file line number Diff line number Diff line change
1
+ --TEST--
2
+ GH-16181 (phpdbg: exit in exception handler reports fatal error)
3
+ --PHPDBG--
4
+ r
5
+ c
6
+ q
7
+ --FILE--
8
+ <?php
9
+ set_exception_handler (function () {
10
+ echo "exception caught \n" ;
11
+ die;
12
+ });
13
+
14
+ echo "throwing exception \n" ;
15
+ throw new \Exception ("oh noes " );
16
+ ?>
17
+ --EXPECTF--
18
+ [Successful compilation of %s]
19
+ prompt> throwing exception
20
+ [Uncaught Exception in %s on line %d: oh noes]
21
+ >00008: throw new \Exception("oh noes");
22
+ 00009: ?>
23
+ 00010:
24
+ prompt> exception caught
25
+ [Script ended normally]
26
+ prompt>
You can’t perform that action at this time.
0 commit comments