Finally with return now works in generators too

1 files changed, 33 insertions, 0 deletions

diff --git a/Zend/tests/generators/finally_with_return.phpt b/Zend/tests/generators/finally_with_return.phpt
new file mode 100644
index 0000000000..b26a49f32f
--- /dev/null
+++ b/Zend/tests/generators/finally_with_return.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Use of finally in generator with return
+--FILE--
+<?php
+
+function gen() {
+    try {
+        try {
+            echo "before return\n";
+            return;
+            echo "after return\n";
+        } finally {
+            echo "before return in inner finally\n";
+            return;
+            echo "after return in inner finally\n";
+        }
+    } finally {
+        echo "outer finally run\n";
+    }
+
+    echo "code after finally\n";
+
+    yield; // force generator
+}
+
+$gen = gen();
+$gen->rewind(); // force run
+
+?>
+--EXPECTF--
+before return
+before return in inner finally
+outer finally run