php · laruence · Feb 25, 2013 · Mar 8, 2013 · Mar 8, 2013 · Mar 9, 2013
diff --git a/Zend/tests/closure_047.phpt b/Zend/tests/closure_047.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Closure 046: Closure instance call
+--FILE--
+<?php
+
+(function () {
+   var_dump(__FUNCTION__);
+})();
+
+((function() {
+  var_dump($this);
+})->bindTo(new Stdclass()))();
+
+((function() {
+    return function() {
+        var_dump(123);
+    };
+})())();
+
+?>
+--EXPECTF--
+string(9) "{closure}"
+object(stdClass)#3 (0) {
+}
+int(123)
diff --git a/Zend/tests/function_chain_call_001.phpt b/Zend/tests/function_chain_call_001.phpt
@@ -0,0 +1,31 @@
+--TEST--
+function chained call
+--FILE--
+<?php
+class Invokeable {
+   public function __invoke() {
+        var_dump(__METHOD__);
+   }
+}
+function a() {
+   var_dump(__FUNCTION__);
+   return "b";
+}
+
+function b() {
+   var_dump(__FUNCTION__);
+   return function () {
+       var_dump(__FUNCTION__);
+       return new Invokeable();
+   };
+}
+
+(((a())
+       ()) // calling b
+          ()) // calling closure
+             (); // calling invokeable
+--EXPECTF--
+string(1) "a"
+string(1) "b"
+string(9) "{closure}"
+string(20) "Invokeable::__invoke"
diff --git a/Zend/tests/instance_invoke_001.phpt b/Zend/tests/instance_invoke_001.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Instance invoke 
+--FILE--
+<?php
+
+class Foo
+{
+    public function __invoke() {
+        echo "okey";
+    }
+}
+
+(new Foo())();
+
+class Bar
+{
+    public function __invoke($name) {
+        return $name;
+    }
+}
+
+var_dump((new Bar())());
+var_dump((new Bar())("okey"));
+
+--EXPECTF--
+okey
+Warning: Missing argument 1 for Bar::__invoke(), called in %sinstance_invoke_001.php on line %d and defined in %sinstance_invoke_001.php on line %d
+
+Notice: Undefined variable: name in %sinstance_invoke_001.php on line %d
+NULL
+string(4) "okey"
diff --git a/Zend/tests/instance_invoke_002.phpt b/Zend/tests/instance_invoke_002.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Instance invoke 
+--FILE--
+<?php
+
+class Foo
+{
+}
+
+(new Foo())();
+
+--EXPECTF--
+Fatal error: Function name must be a string in %sinstance_invoke_002.php on line %d
diff --git a/Zend/tests/instance_invoke_003.phpt b/Zend/tests/instance_invoke_003.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Instance invoke 
+--FILE--
+<?php
+
+class Foo
+{
+    public $var = "foo";
+    public function dummy() {
+        var_dump(__METHOD__);
+    }
+    public function __invoke() {
+        return $this;
+    }
+    public function __get($name) {
+        return $name;
+    }
+}
+
+(new Foo())()->dummy();
+var_dump((new Foo())->var);
+var_dump((new Foo())->noexists);
+
+--EXPECT--
+string(10) "Foo::dummy"
+string(3) "foo"
+string(8) "noexists"
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -45,7 +45,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %}
 
 %pure_parser
-%expect 3
+%expect 2
 
 %code requires {
 #ifdef ZTS
@@ -735,6 +735,15 @@ new_expr:
 		T_NEW class_name_reference { zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$1, &$2 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$$, &$1, &$4 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
 ;
 
+lambda_function:
+		function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); }
+		'(' parameter_list ')' lexical_vars
+		'{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $3; }
+	|	T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); }
+		'(' parameter_list ')' lexical_vars
+		'{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$ = $4; }
+
+
 expr_without_variable:
 		T_LIST '(' { zend_do_list_init(TSRMLS_C); } assignment_list ')' '=' expr { zend_do_list_end(&$$, &$7 TSRMLS_CC); }
 	|	variable '=' expr		{ zend_check_writable_variable(&$1); zend_do_assign(&$$, &$1, &$3 TSRMLS_CC); }
@@ -785,9 +794,8 @@ expr_without_variable:
 	|	expr '>' expr 					{ zend_do_binary_op(ZEND_IS_SMALLER, &$$, &$3, &$1 TSRMLS_CC); }
 	|	expr T_IS_GREATER_OR_EQUAL expr { zend_do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$3, &$1 TSRMLS_CC); }
 	|	expr T_INSTANCEOF class_name_reference { zend_do_instanceof(&$$, &$1, &$3, 0 TSRMLS_CC); }
-	|	parenthesis_expr 	{ $$ = $1; }
+	|	parenthesis_expr { $$ = $1; } instance_call { $$ = $3; }
 	|	new_expr		{ $$ = $1; }
-	|	'(' new_expr ')' { $$ = $2; } instance_call { $$ = $5; }
 	|	expr '?' { zend_do_begin_qm_op(&$1, &$2 TSRMLS_CC); }
 		expr ':' { zend_do_qm_true(&$4, &$2, &$5 TSRMLS_CC); }
 		expr	 { zend_do_qm_false(&$$, &$7, &$2, &$5 TSRMLS_CC); }
@@ -809,12 +817,7 @@ expr_without_variable:
 	|	'`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); }
 	|	T_PRINT expr  { zend_do_print(&$$, &$2 TSRMLS_CC); }
 	|	T_YIELD { zend_do_yield(&$$, NULL, NULL, 0 TSRMLS_CC); }
-	|	function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); }
-		'(' parameter_list ')' lexical_vars
-		'{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $3; }
-	|	T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); }
-		'(' parameter_list ')' lexical_vars
-		'{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$ = $4; }
+	| 	lambda_function { $$ = $1; }
 ;
 
 yield_expr:
@@ -866,6 +869,8 @@ function_call:
 		function_call_parameter_list { zend_do_end_function_call(NULL, &$$, &$5, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
 	|	variable_without_objects { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); }
 		function_call_parameter_list { zend_do_end_function_call(&$1, &$$, &$3, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
+	|	parenthesis_expr { zend_do_begin_variable_parse(TSRMLS_C); zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); }
+		function_call_parameter_list { zend_do_end_function_call(&$1, &$$, &$3, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); }
 ;
 
 class_name:

@@ -1244,7 +1244,7 @@ ZEND_VM_HANDLER(87, ZEND_FETCH_DIM_RW, VAR|CV, CONST|TMP|VAR|UNUSED|CV)
 	ZEND_VM_NEXT_OPCODE();
 }
 
-ZEND_VM_HANDLER(90, ZEND_FETCH_DIM_IS, VAR|CV, CONST|TMP|VAR|CV)
+ZEND_VM_HANDLER(90, ZEND_FETCH_DIM_IS, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
 {
 	USE_OPLINE
 	zend_free_op free_op1, free_op2;
@@ -1332,7 +1332,7 @@ ZEND_VM_HANDLER(96, ZEND_FETCH_DIM_UNSET, VAR|CV, CONST|TMP|VAR|CV)
 	}
 }
 
-ZEND_VM_HELPER(zend_fetch_property_address_read_helper, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
+ZEND_VM_HELPER(zend_fetch_property_address_read_helper, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 {
 	USE_OPLINE
 	zend_free_op free_op1;
@@ -1375,7 +1375,7 @@ ZEND_VM_HELPER(zend_fetch_property_address_read_helper, VAR|UNUSED|CV, CONST|TMP
 	ZEND_VM_NEXT_OPCODE();
 }
 
-ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
+ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 {
 	ZEND_VM_DISPATCH_TO_HELPER(zend_fetch_property_address_read_helper);
 }
@@ -1460,7 +1460,7 @@ ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 	ZEND_VM_NEXT_OPCODE();
 }
 
-ZEND_VM_HANDLER(91, ZEND_FETCH_OBJ_IS, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
+ZEND_VM_HANDLER(91, ZEND_FETCH_OBJ_IS, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 {
 	USE_OPLINE
 	zend_free_op free_op1;
@@ -2423,7 +2423,7 @@ ZEND_VM_HANDLER(109, ZEND_FETCH_CLASS, ANY, CONST|TMP|VAR|UNUSED|CV)
 	}
 }
 
-ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV)
+ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 {
 	USE_OPLINE
 	zval *function_name;
@@ -2484,7 +2484,9 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 	if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) {
 		call->object = NULL;
 	} else {
-		if (!PZVAL_IS_REF(call->object)) {
+		if (IS_OP1_TMP_FREE()) {
+			MAKE_REAL_ZVAL_PTR(call->object); 
+		} else if (!PZVAL_IS_REF(call->object)) {
 			Z_ADDREF_P(call->object); /* For $this pointer */
 		} else {
 			zval *this_ptr;
@@ -2675,18 +2677,23 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV)
 			EX(call) = call;
 			CHECK_EXCEPTION();
 			ZEND_VM_NEXT_OPCODE();
-		} else if (OP2_TYPE != IS_CONST && OP2_TYPE != IS_TMP_VAR &&
+		} else if (OP2_TYPE != IS_CONST &&
 		    EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) &&
 			Z_OBJ_HANDLER_P(function_name, get_closure) &&
 			Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) {
 			if (call->object) {
-				Z_ADDREF_P(call->object);
+				if (IS_OP2_TMP_FREE() &&
+						call->object == function_name) {
+					MAKE_REAL_ZVAL_PTR(call->object);
+				} else {
+					Z_ADDREF_P(call->object);
+				}
 			}
 			if (OP2_TYPE == IS_VAR && OP2_FREE &&
 			    call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) {
 				/* Delay closure destruction until its invocation */
 				call->fbc->common.prototype = (zend_function*)function_name;
-			} else {
+			} else if (!IS_OP2_TMP_FREE()) {
 				FREE_OP2();
 			}
 			call->is_ctor_call = 0;