From f8d8a2d0f463bdb79c1ed420b7f966d1c998476f Mon Sep 17 00:00:00 2001
From: Marcel Araujo <ceceldada@gmail.com>
Date: Fri, 21 Jun 2013 18:25:51 -0300
Subject: [PATCH 1/2] https://bugs.php.net/bug.php?id=64979

---
 .../generator_closure_static_variable.phpt    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 Zend/tests/generators/generator_closure_static_variable.phpt

diff --git a/Zend/tests/generators/generator_closure_static_variable.phpt b/Zend/tests/generators/generator_closure_static_variable.phpt
new file mode 100644
index 0000000000000..01d72407880fb
--- /dev/null
+++ b/Zend/tests/generators/generator_closure_static_variable.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Closures with static variables can be generators
+--FILE--
+<?php
+
+function new_closure_gen() {
+	return function() { 
+		static $foo = 0; 
+		yield ++$foo; 
+	};
+}
+
+$closure1 = new_closure_gen();
+$closure2 = new_closure_gen();
+
+$gen1 = $closure1();
+$gen2 = $closure1();
+$gen3 = $closure2();
+
+foreach (array($gen1, $gen2, $gen3) as $gen) {
+  foreach ($gen as $val) {
+    print "$val\n";
+  }
+}
+
+?>
+--EXPECT--
+int(1)
+int(2)
+int(1)
\ No newline at end of file

From 7545ff2d92243a9da1880643e74359d3e0dc7dfa Mon Sep 17 00:00:00 2001
From: Marcel Araujo <ceceldada@gmail.com>
Date: Fri, 21 Jun 2013 23:08:15 -0300
Subject: [PATCH 2/2] Use in preg_replace_callback() using variables by
 reference and test for bug #64979

---
 ...ure_static_variable.phpt => bug64979.phpt} | 58 +++++++++----------
 Zend/tests/closure_047.phpt                   | 26 +++++++++
 Zend/tests/closure_048.phpt                   | 26 +++++++++
 3 files changed, 81 insertions(+), 29 deletions(-)
 rename Zend/tests/{generators/generator_closure_static_variable.phpt => bug64979.phpt} (80%)
 create mode 100644 Zend/tests/closure_047.phpt
 create mode 100644 Zend/tests/closure_048.phpt

diff --git a/Zend/tests/generators/generator_closure_static_variable.phpt b/Zend/tests/bug64979.phpt
similarity index 80%
rename from Zend/tests/generators/generator_closure_static_variable.phpt
rename to Zend/tests/bug64979.phpt
index 01d72407880fb..55deeae26bfe6 100644
--- a/Zend/tests/generators/generator_closure_static_variable.phpt
+++ b/Zend/tests/bug64979.phpt
@@ -1,30 +1,30 @@
---TEST--
-Closures with static variables can be generators
---FILE--
-<?php
-
-function new_closure_gen() {
-	return function() { 
-		static $foo = 0; 
-		yield ++$foo; 
-	};
-}
-
-$closure1 = new_closure_gen();
-$closure2 = new_closure_gen();
-
-$gen1 = $closure1();
-$gen2 = $closure1();
-$gen3 = $closure2();
-
-foreach (array($gen1, $gen2, $gen3) as $gen) {
-  foreach ($gen as $val) {
-    print "$val\n";
-  }
-}
-
-?>
---EXPECT--
-int(1)
-int(2)
+--TEST--
+Bug #64578 (Closures with static variables can be generators)
+--FILE--
+<?php
+
+function new_closure_gen() {
+	return function() { 
+		static $foo = 0; 
+		yield ++$foo; 
+	};
+}
+
+$closure1 = new_closure_gen();
+$closure2 = new_closure_gen();
+
+$gen1 = $closure1();
+$gen2 = $closure1();
+$gen3 = $closure2();
+
+foreach (array($gen1, $gen2, $gen3) as $gen) {
+  foreach ($gen as $val) {
+    print "$val\n";
+  }
+}
+
+?>
+--EXPECT--
+int(1)
+int(2)
 int(1)
\ No newline at end of file
diff --git a/Zend/tests/closure_047.phpt b/Zend/tests/closure_047.phpt
new file mode 100644
index 0000000000000..2377bef6b7e39
--- /dev/null
+++ b/Zend/tests/closure_047.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Closure 047: Use in preg_replace_callback() using variables by reference
+--FILE--
+<?php
+
+function replace_variables($text, $params) {
+	
+	preg_replace_callback( '/(\?)/', function($matches) use (&$params, &$text) {
+	
+		$text = preg_replace( '/(\?)/', array_shift( $params ), $text, 1 );
+	
+	}, $text );
+	
+	return $text;
+}
+
+echo replace_variables('a=?', array('0')) . "\n";
+echo replace_variables('a=?, b=?', array('0', '1')) . "\n";
+echo replace_variables('a=?, b=?, c=?', array('0', '1', '2')) . "\n";
+echo "Done\n";
+?>
+--EXPECT--
+a=0
+a=0, b=1
+a=0, b=1, c=2
+Done
diff --git a/Zend/tests/closure_048.phpt b/Zend/tests/closure_048.phpt
new file mode 100644
index 0000000000000..40f2e2fbac8f7
--- /dev/null
+++ b/Zend/tests/closure_048.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Closure 048: Use in preg_replace_callback() using variables by reference
+--FILE--
+<?php
+
+function replace_variables($text, $params) {
+	
+	$c = function($matches) use (&$params, &$text) {
+		$text = preg_replace( '/(\?)/', array_shift( $params ), $text, 1 );
+	};
+
+	preg_replace_callback( '/(\?)/', $c, $text );
+	
+	return $text;
+}
+
+echo replace_variables('a=?', array('0')) . "\n";
+echo replace_variables('a=?, b=?', array('0', '1')) . "\n";
+echo replace_variables('a=?, b=?, c=?', array('0', '1', '2')) . "\n";
+echo "Done\n";
+?>
+--EXPECT--
+a=0
+a=0, b=1
+a=0, b=1, c=2
+Done