From 42cc191c413727aed32118b82cfe3c75f05a482c Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 2 Nov 2012 14:26:23 +0800
Subject: [PATCH] Implemented instance invoke

---
 Zend/tests/instance_invoke_001.phpt | 31 +++++++++++++++++++++++++++++
 Zend/tests/instance_invoke_002.phpt | 13 ++++++++++++
 Zend/tests/instance_invoke_003.phpt | 27 +++++++++++++++++++++++++
 Zend/zend_language_parser.y         |  2 ++
 4 files changed, 73 insertions(+)
 create mode 100644 Zend/tests/instance_invoke_001.phpt
 create mode 100644 Zend/tests/instance_invoke_002.phpt
 create mode 100644 Zend/tests/instance_invoke_003.phpt

diff --git a/Zend/tests/instance_invoke_001.phpt b/Zend/tests/instance_invoke_001.phpt
new file mode 100644
index 000000000000..2f2c8f3c4da7
--- /dev/null
+++ 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
new file mode 100644
index 000000000000..24d29177bac8
--- /dev/null
+++ 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
new file mode 100644
index 000000000000..e648a758aeca
--- /dev/null
+++ 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
index c1514c5d783c..115e09f498de 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -727,6 +727,8 @@ instance_call:
 		/* empty */ 		{ $$ = $0; }
 	|	{ zend_do_push_object(&$0 TSRMLS_CC); zend_do_begin_variable_parse(TSRMLS_C); }
 		chaining_instance_call	{ zend_do_pop_object(&$$ TSRMLS_CC); zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); }
+	|	{ zend_do_begin_dynamic_function_call(&$0, 0 TSRMLS_CC); }
+		function_call_parameter_list { zend_do_end_function_call(&$0, &$$, &$2, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } instance_call { $$ = $4; }
 ;
 
 new_expr: