Commit:    57b67d71b0264143ba33d997eff918d34e8adc67
Author:    krakjoe <joe.watk...@live.co.uk>         Mon, 18 Nov 2013 11:51:41 
+0000
Parents:   5cc88ca88a5388865ceab7c116be1c4c6b57a97f
Branches:  PHP-5.6

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=57b67d71b0264143ba33d997eff918d34e8adc67

Log:
display uncaught exceptions

Changed paths:
  M  phpdbg_prompt.c
  M  test.php


Diff:
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index e5cd87f..c365345 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -440,10 +440,19 @@ static PHPDBG_COMMAND(run) /* {{{ */
                        }
                } zend_end_try();
 
-        EG(active_op_array) = orig_op_array;
-           EG(opline_ptr) = orig_opline;
-           EG(return_value_ptr_ptr) = orig_retval_ptr;
+               if (EG(exception)) {
+                       phpdbg_error("Uncaught Exception !");
+                       /*
+                       * @TODO(anyone) something better !!
+                       */
+                       zend_print_zval_r(
+                               EG(exception), 0 TSRMLS_CC);
+               }
 
+               EG(active_op_array) = orig_op_array;
+           EG(opline_ptr) = orig_opline;
+           EG(return_value_ptr_ptr) = orig_retval_ptr;         
+                               
        } else {
                phpdbg_error("Nothing to execute!");
        }
diff --git a/test.php b/test.php
index 45aeb81..2266d15 100644
--- a/test.php
+++ b/test.php
@@ -1,5 +1,4 @@
 <?php
-
 if (isset($include))
        include (sprintf("%s/web-bootstrap.php", dirname(__FILE__)));


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to