Fix re-binding of inner closure, fix test

Author: arnaud-lb

Zend/tests/partial_application/rebinding_003.phpt

@@ -4,58 +4,66 @@ Rebinding PFA of Closure rebinds inner Closure
 <?php
 
 class C {
-    function f($a) { var_dump($this, $this === $a); }
-    static function g($a) { var_dump(static::class); }
+    function getF() {
+        return function ($a) { var_dump($this, $this === $a); };
+    }
+    function getG() {
+        return static function ($a) { var_dump(static::class, $a); };
+    }
 }
 
 class SubClass extends C {}
 
 class Unrelated {}
 
 $c = new C();
-$f = $c->f(?);
-$g = $c->g(?);
+$f = $c->getF()(?);
+$g = $c->getG()(?);
 
 echo "# Can be rebound to \$this of the same class:\n";
-$f->bindTo(new C)($c);
+$d = new C();
+$f->bindTo($d)($d);
 
 echo "# Can be rebound to \$this of a sub-class:\n";
-$f->bindTo(new SubClass)($c);
+$d = new SubClass();
+$f->bindTo($d)($d);
 
 echo "# Cannot be rebound to an unrelated class:\n";
 try {
     $f->bindTo(new Unrelated)($c);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ": ", $e->getMessage(), "\n";
 }
 
-echo "# Cannot unbind \$this on instance method:\n";
+echo "# Cannot unbind \$this on non-static closure:\n";
 try {
     $f->bindTo(null)($c);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ": ", $e->getMessage(), "\n";
 }
 
-echo "# Can unbind \$this on static method:\n";
+echo "# Can unbind \$this on static closure:\n";
 $g->bindTo(null)($c);
 
 ?>
 --EXPECTF--
 # Can be rebound to $this of the same class:
 object(C)#%d (0) {
 }
-bool(false)
+bool(true)
 # Can be rebound to $this of a sub-class:
 object(SubClass)#%d (0) {
 }
-bool(false)
+bool(true)
 # Cannot be rebound to an unrelated class:
 
 Warning: Cannot bind method C::{closure:%s:%d}() to object of class Unrelated, this will be an error in PHP 9 in %s on line %d
-Value of type null is not callable
-# Cannot unbind $this on instance method:
+Error: Value of type null is not callable
+# Cannot unbind $this on non-static closure:
 
 Warning: Cannot unbind $this of method, this will be an error in PHP 9 in %s on line %d
-Value of type null is not callable
-# Can unbind $this on static method:
+Error: Value of type null is not callable
+# Can unbind $this on static closure:
 string(1) "C"
+object(C)#%d (0) {
+}

Zend/zend_closures.c

@@ -272,6 +272,7 @@ static zend_result do_closure_bind(zval *return_value, zval *zclosure, zval *new
 	if (ZEND_CLOSURE_FLAGS(closure) & ZEND_PARTIAL_OF_CLOSURE) {
 		/* Re-bind the inner closure */
 
+		closure = (zend_closure*)Z_OBJ_P(return_value);
 		HashTable *static_variables = ZEND_MAP_PTR_GET(closure->func.op_array.static_variables_ptr);
 		ZEND_ASSERT(static_variables->nNumOfElements > 0);
 		zval *inner = &static_variables->arData[0].val;