Test new API and fix issues encountered in testing

Author: Girgias

Zend/zend_API.c

@@ -1852,22 +1852,27 @@ ZEND_API zend_result object_init_with_constructor(zval *arg, zend_class_entry *c
 	if (UNEXPECTED(status == FAILURE)) {
 		return FAILURE;
 	}
-	/* A constructor does not return a value, however if an exception is thrown
+	zend_object * obj = Z_OBJ_P(arg);
+	zend_function *constructor = obj->handlers->get_constructor(obj);
+	if (UNEXPECTED(constructor == NULL)) {
+		return FAILURE;
+	}
+	/* A constructor should not return a value, however if an exception is thrown
 	 * zend_call_known_function() will set the retval to IS_UNDEF */
 	zval retval;
-	ZVAL_UNDEF(&retval);
 	zend_call_known_function(
-		class_type->constructor,
-		Z_OBJ_P(arg),
+		constructor,
+		obj,
 		class_type,
-		/* retval */ NULL,
+		/* retval */ &retval,
 		param_count,
 		params,
 		named_params
 	);
 	if (Z_TYPE(retval) == IS_UNDEF) {
 		return FAILURE;
 	} else {
+		/* Unlikely, but user constructors may return any value they want */
 		zval_ptr_dtor(&retval);
 		return SUCCESS;
 	}

ext/zend_test/test.c

@@ -460,6 +460,26 @@ static ZEND_FUNCTION(zend_call_method)
 	zend_call_method(obj, ce, NULL, ZSTR_VAL(method_name), ZSTR_LEN(method_name), return_value, argc - 2, arg1, arg2);
 }
 
+/* Instantiate a class and run the constructor via object_init_with_constructor */
+static ZEND_FUNCTION(zend_object_init_with_constructor)
+{
+	zend_class_entry *ce = NULL;
+	zval *args;
+	uint32_t num_args;
+	HashTable *named_args;
+
+	ZEND_PARSE_PARAMETERS_START(1, -1)
+		Z_PARAM_CLASS(ce)
+		Z_PARAM_VARIADIC_WITH_NAMED(args, num_args, named_args)
+	ZEND_PARSE_PARAMETERS_END();
+
+	zend_result status = object_init_with_constructor(return_value, ce, num_args, args, named_args);
+	if (status == FAILURE) {
+		RETURN_THROWS();
+	}
+	ZEND_ASSERT(!EG(exception));
+}
+
 static ZEND_FUNCTION(zend_get_unit_enum)
 {
 	ZEND_PARSE_PARAMETERS_NONE();

ext/zend_test/test.stub.php

@@ -247,6 +247,8 @@ function zend_get_current_func_name(): string {}
 
     function zend_call_method(object|string $obj_or_class, string $method, mixed $arg1 = UNKNOWN, mixed $arg2 = UNKNOWN): mixed {}
 
+    function zend_object_init_with_constructor(string $class, mixed ...$args): mixed {}
+
     function zend_test_zend_ini_parse_quantity(string $str): int {}
     function zend_test_zend_ini_parse_uquantity(string $str): int {}
 

ext/zend_test/test_arginfo.h

@@ -0,0 +1,98 @@
+--TEST--
+Zend: Test zend_forbid_dynamic_call() for methods
+--EXTENSIONS--
+zend_test
+sysvmsg
+--FILE--
+<?php
+
+class PrivateUser {
+    private function __construct() {
+        return new stdClass();
+    }
+}
+
+class ThrowingUser {
+    public function __construct() {
+        throw new Exception("Don't construct");
+    }
+}
+
+class TestUser {
+    public function __construct(int $int_param, string $string_param) {
+        return new stdClass();
+    }
+}
+
+echo "Testing impossible initializations\n";
+try {
+    $o = zend_object_init_with_constructor("_ZendTestInterface");
+    var_dump($o);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    $o = zend_object_init_with_constructor("_ZendTestTrait");
+    var_dump($o);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    $o = zend_object_init_with_constructor("ZendTestUnitEnum");
+    var_dump($o);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    $o = zend_object_init_with_constructor("SysvMessageQueue");
+    var_dump($o);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    $o = zend_object_init_with_constructor("PrivateUser");
+    var_dump($o);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    $o = zend_object_init_with_constructor("ThrowingUser");
+    var_dump($o);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+echo "Testing param passing\n";
+try {
+    $o = zend_object_init_with_constructor("TestUser");
+    var_dump($o);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    $o = zend_object_init_with_constructor("TestUser", "str", 5);
+    var_dump($o);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    $o = zend_object_init_with_constructor("TestUser", 5, string_param: "str");
+    var_dump($o);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+Testing impossible initializations
+Error: Cannot instantiate interface _ZendTestInterface
+Error: Cannot instantiate trait _ZendTestTrait
+Error: Cannot instantiate enum ZendTestUnitEnum
+Error: Cannot directly construct SysvMessageQueue, use msg_get_queue() instead
+Error: Call to private PrivateUser::__construct() from global scope
+Exception: Don't construct
+Testing param passing
+ArgumentCountError: Too few arguments to function TestUser::__construct(), 0 passed and exactly 2 expected
+TypeError: TestUser::__construct(): Argument #1 ($int_param) must be of type int, string given
+object(TestUser)#3 (0) {
+}