remove __clone method from __PHP_Incomplete_Class, use .clone_obj

jordikroon · jordikroon · commit a689adabd5e5 · 2026-03-01T20:21:15.000+01:00
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
@@ -1488,7 +1488,6 @@
 final class __PHP_Incomplete_Class
 {
     private function __construct() {}
-    private function __clone(): void {}
 }
 
 class AssertionError extends Error
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
diff --git a/ext/standard/basic_functions_decl.h b/ext/standard/basic_functions_decl.h
diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c
@@ -104,14 +104,9 @@ static ZEND_COLD zend_function *incomplete_class_get_constructor(zend_object *ob
 
 ZEND_COLD ZEND_METHOD(__PHP_Incomplete_Class, __construct)
 {
-	zend_throw_error(NULL, "Instantiation of class __PHP_Incomplete_Class is not allowed");
-}
-/* }}} */
+	ZEND_PARSE_PARAMETERS_NONE();
 
-/* {{{ Private clone preventing cloning */
-ZEND_COLD ZEND_METHOD(__PHP_Incomplete_Class, __clone)
-{
-	zend_throw_error(NULL, "Cannot clone __PHP_Incomplete_Class using __clone()");
+	zend_throw_error(NULL, "Instantiation of class __PHP_Incomplete_Class is not allowed");
 }
 /* }}} */
 
@@ -139,6 +134,7 @@ PHPAPI void php_register_incomplete_class_handlers(void)
 	php_incomplete_object_handlers.write_property = incomplete_class_write_property;
 	php_incomplete_object_handlers.get_property_ptr_ptr = incomplete_class_get_property_ptr_ptr;
 	php_incomplete_object_handlers.get_method = incomplete_class_get_method;
+	php_incomplete_object_handlers.clone_obj = NULL;
 
 	php_ce_incomplete_class->create_object = php_create_incomplete_object;
 }
diff --git a/ext/standard/tests/serialize/incomplete_class_clone.phpt b/ext/standard/tests/serialize/incomplete_class_clone.phpt
@@ -13,7 +13,7 @@ var_dump(clone($o));
 string(22) "__PHP_Incomplete_Class"
 bool(false)
 
-Fatal error: Uncaught Error: Call to private method __PHP_Incomplete_Class::__clone() from global scope in %s:%d
+Fatal error: Uncaught Error: Trying to clone an uncloneable object of class __PHP_Incomplete_Class in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/standard/tests/serialize/incomplete_class_constructor.phpt b/ext/standard/tests/serialize/incomplete_class_constructor.phpt
@@ -8,7 +8,7 @@ var_dump(new __PHP_Incomplete_Class());
 --EXPECTF--
 string(22) "__PHP_Incomplete_Class"
 
-Fatal error: Uncaught Error: Call to private __PHP_Incomplete_Class::__construct() from global scope in %s:%d
+Fatal error: Uncaught Error: Instantiation of class Closure is not allowed in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

Original file line number	Diff line number	Diff line change
`@@ -1488,7 +1488,6 @@`
`1488`	`1488`	`final class __PHP_Incomplete_Class`
`1489`	`1489`	`{`
`1490`	`1490`	`private function __construct() {}`
`1491`		`- private function __clone(): void {}`
`1492`	`1491`	`}`
`1493`	`1492`
`1494`	`1493`	`class AssertionError extends Error`