tests

Author: krakjoe

Zend/tests/first_class_callable_004.phpt

@@ -4,7 +4,7 @@ First Class Callable from Private Scope
 <?php
 class Foo {
     private function method() {
-        return "OK";
+        return __METHOD__;
     }
 
     public function bar()  {
@@ -18,4 +18,4 @@ $bar = $foo->bar(...);
 echo ($bar())();
 ?>
 --EXPECT--
-OK
+Foo::method

Zend/tests/first_class_callable_008.phpt

@@ -0,0 +1,12 @@
+--TEST--
+First Class Callable from NEW
+--FILE--
+<?php
+class Foo {
+
+}
+
+new Foo(...);
+?>
+--EXPECTF--
+Fatal error: cannot create Closure from call to constructor in %s on line 6

Zend/tests/first_class_callable_009.phpt

@@ -0,0 +1,14 @@
+--TEST--
+First Class Callable from Closure::__invoke
+--FILE--
+<?php
+$closure = function() {
+    return "OK";
+};
+
+$foo = $closure->__invoke(...);
+
+echo $foo();
+?>
+--EXPECT--
+OK

Zend/zend_closures.c

@@ -745,6 +745,13 @@ void zend_closure_from_frame(zval *return_value, zend_execute_data *call) { /* {
 	}
 
 	if (mptr->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
+	    if (ZEND_CALL_INFO(call) & ZEND_CALL_HAS_THIS && Z_OBJCE(call->This) == zend_ce_closure
+	        && zend_string_equals_literal(mptr->common.function_name, "__invoke")) {
+	        zend_free_trampoline(mptr);
+	        RETURN_OBJ_COPY(Z_OBJ(call->This));
+	    }
+	    
+		
 		memset(&trampoline, 0, sizeof(zend_internal_function));
 		trampoline.type = ZEND_INTERNAL_FUNCTION;
 		trampoline.fn_flags = mptr->common.fn_flags & ZEND_ACC_STATIC;