Fixes

Author: Girgias

Zend/zend_inheritance.c

@@ -195,7 +195,11 @@ static void do_inherit_parent_constructor(zend_class_entry *ce) /* {{{ */
 		return;
 	}
 
-	ce->constructor = parent->constructor;
+	if (zend_is_non_instantiable_constructor(parent->constructor)) {
+		ce->constructor = NULL;
+	} else {
+		ce->constructor = parent->constructor;
+	}
 }
 /* }}} */
 

ext/com_dotnet/com_extension.stub.php

@@ -370,6 +370,7 @@ public function __construct(string $assembly_name, string $datatype_name, int $c
 }
 #endif
 
+#[\NonInstantiableClass("Cannot directly construct com_safeproxy_array; it is for internal usage only")]
 final class com_safearray_proxy
 {
 }

ext/com_dotnet/com_extension_arginfo.h

@@ -321,12 +321,6 @@ static zend_function *saproxy_method_get(zend_object **object, zend_string *name
 	return NULL;
 }
 
-static zend_function *saproxy_constructor_get(zend_object *object)
-{
-	zend_throw_error(NULL, "Cannot directly construct com_safeproxy_array; it is for internal usage only");
-	return NULL;
-}
-
 static zend_string* saproxy_class_name_get(const zend_object *object)
 {
 	return zend_string_copy(php_com_saproxy_class_entry->name);
@@ -412,7 +406,6 @@ zend_object_handlers php_com_saproxy_handlers = {
 	saproxy_dimension_delete,
 	saproxy_properties_get,
 	saproxy_method_get,
-	saproxy_constructor_get,
 	saproxy_class_name_get,
 	saproxy_object_cast,
 	saproxy_count_elements,

ext/com_dotnet/com_saproxy.c

@@ -16,5 +16,5 @@ foreach (['Dom\HTMLDocument', 'Dom\XMLDocument'] as $class) {
 
 ?>
 --EXPECT--
-Class Dom\HTMLDocument is an internal class marked as final that cannot be instantiated without invoking its constructor
-Class Dom\XMLDocument is an internal class marked as final that cannot be instantiated without invoking its constructor
+Class Dom\HTMLDocument cannot be instantiated manually
+Class Dom\XMLDocument cannot be instantiated manually

ext/dom/tests/modern/html/interactions/without_constructor.phpt

@@ -18,7 +18,7 @@ require_once 'skipifconnectfailure.inc';
 ?>
 ==DONE==
 --EXPECTF--
-Fatal error: Uncaught Error: Class test cannot be instantiated in %sbug74968.php:%d
+Fatal error: Uncaught ValueError: mysqli_result::fetch_object(): Argument #1 ($class) Class "test" cannot be instantiated in %sbug74968.php:%d
 Stack trace:
 #0 %sbug74968.php(%d): mysqli_result->fetch_object('test')
 #1 {main}

ext/mysqli/tests/bug74968.phpt

@@ -116,14 +116,13 @@ require_once 'skipifconnectfailure.inc';
             $this->b = $b;
         }
     }
-    /*
-    TODO
-    I think we should bail out here. The following line will give a Fatal error: Call to private ... from invalid context
-    var_dump($obj = new mysqli_fetch_object_private_constructor(1, 2));
-    This does not fail.
-    */
-    mysqli_fetch_object($res, 'mysqli_fetch_object_private_constructor', array('a', 'b'));
-    mysqli_free_result($res);
+
+    try {
+        var_dump(mysqli_fetch_object($res, 'mysqli_fetch_object_private_constructor', ['a', 'b']));
+        mysqli_free_result($res);
+    } catch (Throwable $e) {
+        echo $e::class, ': ', $e->getMessage(), "\n";
+    }
 
     try {
         var_dump(mysqli_fetch_object($res, 'this_class_does_not_exist'));

ext/mysqli/tests/mysqli_fetch_object.phpt

@@ -626,7 +626,7 @@ PHP_METHOD(PDO, prepare)
 			zend_type_error("PDO::ATTR_STATEMENT_CLASS class must be derived from PDOStatement");
 			RETURN_THROWS();
 		}
-		if (UNEXPECTED(dbstmt_ce->constructor == NULL)) {
+		if (UNEXPECTED(zend_is_non_instantiable_constructor(dbstmt_ce->constructor))) {
 			zend_throw_error(
 				NULL,
 				"Class %s cannot be used as a user-supplied statement class as it cannot be instantiated",

ext/pdo/pdo_dbh.c

@@ -1026,6 +1026,14 @@ static bool pdo_verify_fetch_mode(uint32_t default_mode_and_flags, zend_long mod
 }
 /* }}} */
 
+/* Based on zend_is_class_instantiable() but doesn't check the visibility of the constructor */
+static bool pdo_is_class_instantiable(const zend_class_entry *ce) {
+	return
+		!(ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_ENUM))
+		&& (!ce->constructor || !zend_is_non_instantiable_constructor(ce->constructor))
+	;
+}
+
 /* {{{ Fetches the next row and returns it, or false if there are no more rows */
 PHP_METHOD(PDOStatement, fetch)
 {
@@ -1088,7 +1096,7 @@ PHP_METHOD(PDOStatement, fetchObject)
 		ce = zend_standard_class_def;
 	}
 
-	if (UNEXPECTED(!zend_is_class_instantiable(ce))) {
+	if (UNEXPECTED(!pdo_is_class_instantiable(ce))) {
 		zend_argument_value_error(1, "Class \"%s\" cannot be instantiated", ZSTR_VAL(ce->name));
 		RETURN_THROWS();
 	}
@@ -1196,7 +1204,7 @@ PHP_METHOD(PDOStatement, fetchAll)
 			} else {
 				fetch_class = zend_standard_class_def;
 			}
-			if (UNEXPECTED(!zend_is_class_instantiable(fetch_class))) {
+			if (UNEXPECTED(!pdo_is_class_instantiable(fetch_class))) {
 				zend_throw_error(NULL, "Cannot instantiate an object of class %s", ZSTR_VAL(fetch_class->name));
 				RETURN_THROWS();
 			}
@@ -1716,7 +1724,7 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a
 					zend_argument_type_error(arg1_arg_num, "must be a valid class");
 					return false;
 				}
-				if (UNEXPECTED(cep->constructor == NULL)) {
+				if (UNEXPECTED(!pdo_is_class_instantiable(cep))) {
 					zend_throw_error(NULL, "Cannot instantiate an object of class %s", ZSTR_VAL(cep->name));
 					return false;
 				}

ext/pdo/pdo_stmt.c

@@ -2116,7 +2116,7 @@ PHP_FUNCTION(pg_fetch_object)
 		RETURN_THROWS();
 	}
 
-	if (UNEXPECTED(!constructor && ctor_params && zend_hash_num_elements(ctor_params) > 0)) {
+	if (UNEXPECTED(!ce->constructor && ctor_params && zend_hash_num_elements(ctor_params) > 0)) {
 		zend_argument_value_error(4,
 			"must be empty when the specified class (%s) does not have a constructor",
 			ZSTR_VAL(ce->name)