first class callable conversion

Author: krakjoe

Zend/tests/first_class_callable_001.phpt

@@ -0,0 +1,10 @@
+--TEST--
+First Class Callable from Internal
+--FILE--
+<?php
+$sprintf = sprintf(...);
+
+echo $sprintf("Hello %s", "World");
+?>
+--EXPECT--
+Hello World

Zend/tests/first_class_callable_002.phpt

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

Zend/tests/first_class_callable_003.phpt

@@ -0,0 +1,17 @@
+--TEST--
+First Class Callable from Method
+--FILE--
+<?php
+class Foo {
+    public function bar()  {
+        echo "OK";
+    }
+}
+
+$foo = new Foo;
+$bar = $foo->bar(...);
+
+echo $bar();
+?>
+--EXPECT--
+OK

Zend/tests/first_class_callable_004.phpt

@@ -0,0 +1,21 @@
+--TEST--
+First Class Callable from Private Scope
+--FILE--
+<?php
+class Foo {
+    private function method() {
+        return "OK";
+    }
+    
+    public function bar()  {
+        return $this->method(...);
+    }
+}
+
+$foo = new Foo;
+$bar = $foo->bar(...);
+
+echo ($bar())();
+?>
+--EXPECT--
+OK

Zend/tests/first_class_callable_005.phpt

@@ -0,0 +1,26 @@
+--TEST--
+First Class Callable from Magic
+--FILE--
+<?php
+class Foo {
+    public function __call($method, $args) {
+        return "OK CALL\n";
+    }
+    
+    public static function __callStatic($method, $args) {
+        return "OK CALL STATIC\n";
+    }
+}
+
+$foo = new Foo;
+$bar = $foo->anything(...);
+
+echo $bar();
+
+$qux = Foo::anything(...);
+
+echo $qux();
+?>
+--EXPECT--
+OK CALL
+OK CALL STATIC

Zend/tests/first_class_callable_006.phpt

@@ -0,0 +1,13 @@
+--TEST--
+First Class Callable from Closure
+--FILE--
+<?php
+$foo = function(){};
+$bar = $foo(...);
+
+if ($foo === $bar) {
+    echo "OK";
+}
+?>
+--EXPECT--
+OK

Zend/tests/first_class_callable_007.phpt

@@ -0,0 +1,12 @@
+--TEST--
+First Class Callable from Special Compiler Function
+--FILE--
+<?php
+$strlen = strlen(...);
+
+if ($strlen("Hello World") === 11) {
+    echo "OK";
+}
+?>
+--EXPECT--
+OK

Zend/zend_ast.h

@@ -70,6 +70,7 @@ enum _zend_ast_kind {
 	ZEND_AST_MAGIC_CONST = 0 << ZEND_AST_NUM_CHILDREN_SHIFT,
 	ZEND_AST_TYPE,
 	ZEND_AST_CONSTANT_CLASS,
+	ZEND_AST_CALLABLE_CONVERT,
 
 	/* 1 child node */
 	ZEND_AST_VAR = 1 << ZEND_AST_NUM_CHILDREN_SHIFT,

Zend/zend_closures.c

@@ -486,7 +486,8 @@ static zend_object *zend_closure_clone(zend_object *zobject) /* {{{ */
 
 int zend_closure_get_closure(zend_object *obj, zend_class_entry **ce_ptr, zend_function **fptr_ptr, zend_object **obj_ptr, bool check_only) /* {{{ */
 {
-	zend_closure *closure = (zend_closure *)obj;
+	zend_closure *closure = (zend_closure*)obj;
+
 	*fptr_ptr = &closure->func;
 	*ce_ptr = closure->called_scope;
 
@@ -734,6 +735,36 @@ ZEND_API void zend_create_fake_closure(zval *res, zend_function *func, zend_clas
 }
 /* }}} */
 
+void zend_closure_from_frame(zval *return_value, zend_execute_data *call) { /* {{{ */
+	zval instance;
+	zend_internal_function trampoline;
+	zend_function *mptr = call->func;
+
+	if (ZEND_CALL_INFO(call) & ZEND_CALL_CLOSURE) {
+		RETURN_OBJ(ZEND_CLOSURE_OBJECT(mptr));
+	}
+
+	if (mptr->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
+		memset(&trampoline, 0, sizeof(zend_internal_function));
+		trampoline.type = ZEND_INTERNAL_FUNCTION;
+		trampoline.fn_flags = mptr->common.fn_flags & ZEND_ACC_STATIC;
+		trampoline.handler = zend_closure_call_magic;
+		trampoline.function_name = mptr->common.function_name;
+		trampoline.scope = mptr->common.scope;
+
+		zend_free_trampoline(mptr);
+		mptr = (zend_function *) &trampoline;
+	}
+
+	if (ZEND_CALL_INFO(call) & ZEND_CALL_HAS_THIS) {
+		ZVAL_OBJ(&instance, Z_OBJ(call->This));
+
+		zend_create_fake_closure(return_value, mptr, mptr->common.scope, mptr->common.scope, &instance);
+	} else {
+		zend_create_fake_closure(return_value, mptr, mptr->common.scope, mptr->common.scope, NULL);
+	}
+} /* }}} */
+
 void zend_closure_bind_var(zval *closure_zv, zend_string *var_name, zval *var) /* {{{ */
 {
 	zend_closure *closure = (zend_closure *) Z_OBJ_P(closure_zv);

Zend/zend_closures.h

@@ -29,6 +29,7 @@ BEGIN_EXTERN_C()
 void zend_register_closure_ce(void);
 void zend_closure_bind_var(zval *closure_zv, zend_string *var_name, zval *var);
 void zend_closure_bind_var_ex(zval *closure_zv, uint32_t offset, zval *val);
+void zend_closure_from_frame(zval *closure_zv, zend_execute_data *frame);
 
 extern ZEND_API zend_class_entry *zend_ce_closure;