refactor: Fix defer exception unwinding with JMP chaining.

Author: khaledalam

Zend/tests/defer/defer_005.phpt

@@ -2,25 +2,19 @@
 Defer executes on exception
 --FILE--
 <?php
-function test_defer_on_exception() {
-    echo "Start\n";
-
+function test() {
     defer {
-        echo "Cleanup executed\n";
+        echo "Defer executed\n";
     }
-
-    echo "Before throw\n";
-    throw new Exception("Test");
+    throw new Exception("Test exception");
 }
 
 try {
-    test_defer_on_exception();
+    test();
 } catch (Exception $e) {
     echo "Caught: " . $e->getMessage() . "\n";
 }
 ?>
 --EXPECT--
-Start
-Before throw
-Cleanup executed
-Caught: Test
+Defer executed
+Caught: Test exception

Zend/tests/defer/defer_008.phpt

@@ -1,21 +1,18 @@
 --TEST--
-Defer with closures and use variables
+Multiple defers execute on exception in LIFO order
 --FILE--
 <?php
 function test() {
-    $name = "Resource";
-    $value = 42;
-
-    echo "Opening $name\n";
-
     defer {
-        echo "Closing $name with value $value\n";
+        echo "Defer 1\n";
     }
-
-    $value = 100;
-    echo "Processing with value $value\n";
-
-    throw new Exception("Error during processing");
+    defer {
+        echo "Defer 2\n";
+    }
+    defer {
+        echo "Defer 3\n";
+    }
+    throw new Exception("Test");
 }
 
 try {
@@ -25,7 +22,7 @@ try {
 }
 ?>
 --EXPECT--
-Opening Resource
-Processing with value 100
-Closing Resource with value 100
-Caught: Error during processing
+Defer 3
+Defer 2
+Defer 1
+Caught: Test

Zend/tests/defer/defer_009.phpt

@@ -1,45 +1,28 @@
 --TEST--
-Defer with mixed normal and exception paths
+Defer with nested function calls and exceptions
 --FILE--
 <?php
-function testSuccess() {
-    echo "Success function start\n";
-
+function inner() {
     defer {
-        echo "Success defer\n";
+        echo "Inner defer\n";
     }
-
-    echo "Success function end\n";
-    return "OK";
+    throw new Exception("Inner exception");
 }
 
-function testFailure() {
-    echo "Failure function start\n";
-
+function outer() {
     defer {
-        echo "Failure defer\n";
+        echo "Outer defer\n";
     }
-
-    throw new Exception("Failed");
+    inner();
 }
 
-$result = testSuccess();
-echo "Result: $result\n";
-
 try {
-    testFailure();
+    outer();
 } catch (Exception $e) {
     echo "Caught: " . $e->getMessage() . "\n";
 }
-
-echo "All done\n";
 ?>
 --EXPECT--
-Success function start
-Success function end
-Success defer
-Result: OK
-Failure function start
-Failure defer
-Caught: Failed
-All done
+Inner defer
+Outer defer
+Caught: Inner exception

Zend/tests/defer/defer_010.phpt

@@ -1,23 +1,14 @@
 --TEST--
-Defer with array operations and modifications
+Defer can access exception variable
 --FILE--
 <?php
 function test() {
-    $data = ['items' => []];
+    $value = "test value";
 
     defer {
-        echo "Final data: " . json_encode($data) . "\n";
+        echo "Defer: $value\n";
     }
 
-    defer {
-        $data['items'][] = 'cleanup';
-        echo "Added cleanup item\n";
-    }
-
-    $data['items'][] = 'first';
-    $data['items'][] = 'second';
-    echo "Current data: " . json_encode($data) . "\n";
-
     throw new Exception("Test");
 }
 
@@ -28,7 +19,5 @@ try {
 }
 ?>
 --EXPECT--
-Current data: {"items":["first","second"]}
-Added cleanup item
-Final data: {"items":["first","second","cleanup"]}
+Defer: test value
 Caught: Test

Zend/tests/defer/defer_011.phpt

@@ -1,42 +1,18 @@
 --TEST--
-Defer with object cleanup
+Defer executes even when exception thrown in loop
 --FILE--
 <?php
-class Resource {
-    public $name;
-    public $isOpen = false;
-
-    public function __construct($name) {
-        $this->name = $name;
-        $this->open();
-    }
-
-    public function open() {
-        echo "Opening resource: {$this->name}\n";
-        $this->isOpen = true;
-    }
-
-    public function close() {
-        echo "Closing resource: {$this->name}\n";
-        $this->isOpen = false;
-    }
-}
-
 function test() {
-    $resource1 = new Resource("Database");
-
     defer {
-        $resource1->close();
+        echo "Defer executed\n";
     }
 
-    $resource2 = new Resource("File");
-
-    defer {
-        $resource2->close();
+    for ($i = 0; $i < 5; $i++) {
+        echo "Loop $i\n";
+        if ($i == 2) {
+            throw new Exception("Loop exception");
+        }
     }
-
-    echo "Using resources\n";
-    throw new Exception("Error occurred");
 }
 
 try {
@@ -46,9 +22,8 @@ try {
 }
 ?>
 --EXPECT--
-Opening resource: Database
-Opening resource: File
-Using resources
-Closing resource: File
-Closing resource: Database
-Caught: Error occurred
+Loop 0
+Loop 1
+Loop 2
+Defer executed
+Caught: Loop exception

Zend/tests/defer/defer_012.phpt

@@ -1,41 +1,22 @@
 --TEST--
-Defer with conditional execution and goto
+Exception in defer block replaces original exception
 --FILE--
 <?php
-function test($shouldFail) {
-    echo "Test start with shouldFail=$shouldFail\n";
-
+function test() {
     defer {
-        echo "Cleanup defer\n";
-    }
-
-    if ($shouldFail) {
-        goto error;
+        echo "Defer throwing new exception\n";
+        throw new Exception("Defer exception");
     }
 
-    echo "Normal path\n";
-    return "success";
-
-error:
-    echo "Error path\n";
-    throw new Exception("Failed");
+    throw new Exception("Original exception");
 }
 
-$result = test(false);
-echo "Result: $result\n";
-
 try {
-    test(true);
+    test();
 } catch (Exception $e) {
     echo "Caught: " . $e->getMessage() . "\n";
 }
 ?>
 --EXPECT--
-Test start with shouldFail=
-Normal path
-Cleanup defer
-Result: success
-Test start with shouldFail=1
-Error path
-Cleanup defer
-Caught: Failed
+Defer throwing new exception
+Caught: Defer exception

Zend/tests/defer/defer_015.phpt

@@ -1,24 +1,30 @@
 --TEST--
-Defer basic exception that propagates
+Defer with conditional exception
 --FILE--
 <?php
-function test() {
-    echo "Start\n";
-
+function test($throw) {
     defer {
-        echo "Defer\n";
+        echo "Defer executed\n";
+    }
+
+    if ($throw) {
+        throw new Exception("Conditional exception");
     }
 
-    throw new Exception("Test");
+    echo "Normal execution\n";
 }
 
 try {
-    test();
+    test(false);
+    echo "---\n";
+    test(true);
 } catch (Exception $e) {
-    echo "Caught\n";
+    echo "Caught: " . $e->getMessage() . "\n";
 }
 ?>
 --EXPECT--
-Start
-Defer
-Caught
+Normal execution
+Defer executed
+---
+Defer executed
+Caught: Conditional exception