improve (make magical) constructor support

Author: krakjoe

Zend/tests/partial_function/object-constructor.phpt

@@ -14,7 +14,9 @@ class Foo {
 $foo = new Foo(?, ?);
 
 var_dump($foo);
-var_dump($foo(1,2));
+var_dump($first = $foo(1,2));
+var_dump($second = $foo(3,4));
+var_dump($first !== $second);
 
 // Empty constructors
 class Bar {
@@ -47,10 +49,7 @@ catch (RuntimeException $e) {
 
 ?>
 --EXPECTF--
-object(Closure)#%d (3) {
-  ["this"]=>
-  object(Foo)#%d (0) {
-  }
+object(Closure)#%d (%d) {
   ["parameter"]=>
   array(2) {
     ["$one"]=>
@@ -69,7 +68,11 @@ object(Closure)#%d (3) {
 Rocking Foo::__construct [1, 2]
 object(Foo)#%d (0) {
 }
-object(Closure)#%d (2) {
+Rocking Foo::__construct [3, 4]
+object(Foo)#%d (0) {
+}
+bool(true)
+object(Closure)#%d (%d) {
   ["this"]=>
   object(Bar)#%d (0) {
   }

Zend/zend_partial.c

@@ -27,6 +27,7 @@ typedef struct _zend_partial {
     zval            This;
     zend_function   func;
     zend_function   trampoline;
+    zend_class_entry *type;
     uint32_t        argc;
     zval           *argv;
     zend_array     *named;
@@ -440,10 +441,25 @@ ZEND_NAMED_FUNCTION(zend_partial_call_magic)
 	fci.params = ecalloc(sizeof(zval), fci.param_count);
 	fcc.function_handler = &partial->func;
 
-	if (!Z_ISUNDEF(partial->This)) {
+    
+	if (Z_TYPE(partial->This) == IS_OBJECT) {
 	    fci.object =
 	        fcc.object =
 	            zend_partial_this(Z_OBJ(partial->This));
+	} else if (partial->type) {
+	    zval instance;
+	        
+        if (partial->type->create_object) {
+            ZVAL_OBJ(&instance, 
+                partial->type->create_object(partial->type));
+        } else {
+            ZVAL_OBJ(&instance, zend_objects_new(partial->type));
+        }
+        
+        fci.object =
+            fcc.object =
+                Z_OBJ(instance);
+        GC_ADD_FLAGS(fci.object, IS_OBJ_DESTRUCTOR_CALLED);
 	}
 
 	memcpy(fci.params, partial->argv, partial->argc * sizeof(zval));
@@ -503,8 +519,7 @@ ZEND_NAMED_FUNCTION(zend_partial_call_magic)
         partial->func.internal_function.handler == zend_pass_function.handler)) {
         zval_ptr_dtor(return_value);
 
-        RETVAL_OBJ(
-            Z_OBJ(partial->This));
+        RETVAL_OBJ(fci.object);
     }
 
     if (!fcc.function_handler) {
@@ -577,7 +592,18 @@ void zend_partial_apply(zval *result, zend_execute_data *call) {
         }
     }
 
-    ZVAL_COPY(&partial->This, &call->This);
+    if (function->common.fn_flags & ZEND_ACC_CTOR) {
+        partial->type = Z_OBJCE(call->This);
+        
+        GC_ADD_FLAGS(
+            Z_OBJ(call->This), IS_OBJ_DESTRUCTOR_CALLED);
+        OBJ_RELEASE(Z_OBJ(call->This));
+        
+        ZVAL_UNDEF(&partial->This);
+    } else {
+        ZVAL_COPY(&partial->This, &call->This);
+    }
+
 
     memcpy(&partial->func, function,
            function->type == ZEND_INTERNAL_FUNCTION ?
@@ -592,8 +618,7 @@ void zend_partial_apply(zval *result, zend_execute_data *call) {
     }
 
     if (partial->func.common.fn_flags & ZEND_ACC_CTOR) {
-        GC_ADD_FLAGS(
-            Z_OBJ(partial->This), IS_OBJ_DESTRUCTOR_CALLED);
+
     }
 
     if (partial->func.type == ZEND_USER_FUNCTION) {