com php-src: Revert "Merge branch 'PHP-5.6' into PHP-7.0": Zend/tests/bug70944.phpt

From: Date: Tue, 24 Nov 2015 20:02:54 +0000
Subject: com php-src: Revert "Merge branch 'PHP-5.6' into PHP-7.0": Zend/tests/bug70944.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89999@lists.php.net to get a copy of this message
Commit: 5bd117a542c658abeea9a24843783f7eba05c575 Author: Anatol Belski <ab@php.net> Tue, 24 Nov 2015 21:02:54 +0100 Parents: 74413fe7578b50c6de3b0f9c4966bb0a936a7f17 Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5bd117a542c658abeea9a24843783f7eba05c575 Log: Revert "Merge branch 'PHP-5.6' into PHP-7..0" This reverts commit 7d2a26b3fd90fb8ef8ab5d1a7134c370f3be0a78. Changed paths: M Zend/tests/bug70944.phpt Diff: diff --git a/Zend/tests/bug70944.phpt b/Zend/tests/bug70944.phpt index 192fd6d..f14af65 100644 --- a/Zend/tests/bug70944.phpt +++ b/Zend/tests/bug70944.phpt @@ -2,36 +2,15 @@ Bug #70944 (try{ } finally{} can create infinite chains of exceptions) --FILE-- <?php +$e = new Exception("Bar"); try { - $e = new Exception("Foo"); - try { - throw new Exception("Bar", 0, $e); - } finally { - throw $e; - } -} catch (Exception $e) { - var_dump((string)$e); -} - -try { - $e = new Exception("Foo"); - try { - throw new Exception("Bar", 0, $e); - } finally { - throw new Exception("Dummy", 0, $e); - } -} catch (Exception $e) { - var_dump((string)$e); + throw new Exception("Foo", 0, $e); +} finally { + throw $e; } ?> --EXPECTF-- -string(%d) "exception 'Exception' with message 'Foo' in %sbug70944.php:%d -Stack trace: -#0 {main}" -string(%d) "exception 'Exception' with message 'Foo' in %sbug70944.php:%d +Fatal error: Uncaught Exception: Bar in %sbug70944.php:%d Stack trace: #0 {main} - -Next exception 'Exception' with message 'Dummy' in %sbug70944.php:%d -Stack trace: -#0 {main}" + thrown in %sbug70944.php on line %d

« previous php.cvs (#89999) next »