Make partial init opt-in with flag rather than return true

Author: iluuu1994

Zend/tests/lazy_objects/gh15999_001.phpt

@@ -105,7 +105,7 @@ Error: Lazy object was released during initialization
 string(13) "C::__destruct"
 # Nested error (ghost):
 Error: Lazy object was released during initialization
-TypeError: Lazy object initializer must return NULL, no value or true
+TypeError: Lazy object initializer must return NULL or no value
 # Nested error (proxy):
 Error: Lazy object was released during initialization
 TypeError: The real instance class stdClass is not compatible with the proxy class C. The proxy must be a instance of the same class as the real instance, or a sub-class with no additional properties, and no overrides of the __destructor or __clone methods.

Zend/tests/lazy_objects/gh19224.phpt

@@ -16,22 +16,21 @@ $initializer = function ($obj, $prop) {
     if ($prop === null || $prop === 'y') {
         $obj->y = 2;
     }
-    return true;
 };
 
-$obj = $rc->newLazyGhost($initializer);
+$obj = $rc->newLazyGhost($initializer, ReflectionClass::PARTIAL_INITIALIZATION);
 var_dump($obj);
 var_dump($obj->x);
 var_dump($obj);
 var_dump($obj->y);
 var_dump($obj);
 
-$obj = $rc->newLazyGhost($initializer);
+$obj = $rc->newLazyGhost($initializer, ReflectionClass::PARTIAL_INITIALIZATION);
 foreach ($obj as $prop) {}
 var_dump($obj);
 
 // Object is realized when no specific prop is requested.
-$obj = $rc->newLazyGhost(function () {});
+$obj = $rc->newLazyGhost(function () {}, ReflectionClass::PARTIAL_INITIALIZATION);
 foreach ($obj as $prop) {}
 var_dump($obj);
 

Zend/tests/lazy_objects/init_exception_001.phpt

@@ -24,6 +24,6 @@ for ($i = 0; $i < 2; $i++) {
 --EXPECTF--
 Fatal error: Uncaught Exception in %s:%d
 Stack trace:
-#0 %s(%d): {closure:%s:%d}(Object(C), 'c')
+#0 %s(%d): {closure:%s:%d}(Object(C))
 #1 {main}
   thrown in %s on line %d

Zend/tests/lazy_objects/initializer_must_return_the_right_type.phpt

@@ -106,7 +106,7 @@ lazy ghost object(C)#%d (0) {
   uninitialized(int)
 }
 string(11) "initializer"
-TypeError: Lazy object initializer must return NULL, no value or true
+TypeError: Lazy object initializer must return NULL or no value
 lazy ghost object(C)#%d (0) {
   ["b"]=>
   uninitialized(int)

Zend/zend_lazy_objects.c

@@ -595,6 +595,9 @@ ZEND_API zend_object *zend_lazy_object_init_ex(zend_object *obj, zend_string *pr
 
 	zend_fcall_info_cache *initializer = zend_lazy_object_get_initializer_fcc(obj);
 
+	zend_lazy_object_info *info = zend_lazy_object_get_info(obj);
+	bool partial_initialization = info->flags & ZEND_LAZY_OBJECT_PARTIAL_INITIALIZATION;
+
 	/* Prevent reentrant initialization */
 	OBJ_EXTRA_FLAGS(obj) &= ~IS_OBJ_LAZY_UNINITIALIZED;
 
@@ -623,16 +626,18 @@ ZEND_API zend_object *zend_lazy_object_init_ex(zend_object *obj, zend_string *pr
 
 	/* Call initializer */
 	zval retval;
-	int argc = 2;
+	int argc = partial_initialization ? 2 : 1;
 	HashTable *named_params = NULL;
 	zend_object *instance = NULL;
 
 	zval args[2];
 	ZVAL_OBJ(&args[0], obj);
-	if (prop) {
-		ZVAL_STR(&args[1], prop);
-	} else {
-		ZVAL_NULL(&args[1]);
+	if (partial_initialization) {
+		if (prop) {
+			ZVAL_STR(&args[1], prop);
+		} else {
+			ZVAL_NULL(&args[1]);
+		}
 	}
 
 	zend_call_known_fcc(initializer, &retval, argc, args, named_params);
@@ -642,16 +647,16 @@ ZEND_API zend_object *zend_lazy_object_init_ex(zend_object *obj, zend_string *pr
 		goto exit;
 	}
 
-	if (Z_TYPE(retval) != IS_NULL && Z_TYPE(retval) != IS_TRUE) {
+	if (Z_TYPE(retval) != IS_NULL) {
 		zend_lazy_object_revert_init(obj, properties_table_snapshot, properties_snapshot);
 		zval_ptr_dtor(&retval);
-		zend_type_error("Lazy object initializer must return NULL, no value or true");
+		zend_type_error("Lazy object initializer must return NULL or no value");
 		goto exit;
 	}
 
 	/* Restore IS_PROP_LAZY flags for flags that remain uninitialized. */
 	int lazy_properties_count = 0;
-	if (Z_TYPE(retval) == IS_TRUE && prop) {
+	if (partial_initialization && prop) {
 		if (ce->default_properties_count) {
 			for (int i = 0; i < ce->default_properties_count; i++) {
 				zval *prop = &obj->properties_table[i];
@@ -664,7 +669,6 @@ ZEND_API zend_object *zend_lazy_object_init_ex(zend_object *obj, zend_string *pr
 		}
 		if (lazy_properties_count != 0) {
 			OBJ_EXTRA_FLAGS(obj) |= IS_OBJ_LAZY_UNINITIALIZED;
-			zend_lazy_object_info *info = zend_lazy_object_get_info(obj);
 			info->lazy_properties_count = lazy_properties_count;
 		}
 	}

Zend/zend_lazy_objects.h

@@ -36,9 +36,13 @@
 /* Do not call destructor when making existing object lazy */
 #define ZEND_LAZY_OBJECT_SKIP_DESTRUCTOR                    (1<<4)
 
+/* Initialization may not initialize all properties, keeping the object lazy. */
+#define ZEND_LAZY_OBJECT_PARTIAL_INITIALIZATION             (1<<5)
+
 #define ZEND_LAZY_OBJECT_USER_MASK (                                        \
 	ZEND_LAZY_OBJECT_SKIP_INITIALIZATION_ON_SERIALIZE |                     \
-	ZEND_LAZY_OBJECT_SKIP_DESTRUCTOR                                        \
+	ZEND_LAZY_OBJECT_SKIP_DESTRUCTOR |                                      \
+	ZEND_LAZY_OBJECT_PARTIAL_INITIALIZATION                                 \
 )
 
 #define ZEND_LAZY_OBJECT_STRATEGY_MASK (                                    \

ext/reflection/php_reflection.c

@@ -5148,6 +5148,11 @@ void reflection_class_new_lazy(INTERNAL_FUNCTION_PARAMETERS,
 		RETURN_THROWS();
 	}
 
+	if (strategy != ZEND_LAZY_OBJECT_STRATEGY_GHOST && (options & ZEND_LAZY_OBJECT_PARTIAL_INITIALIZATION)) {
+		zend_argument_error(reflection_exception_ptr, 2,
+				"does not accept ReflectionClass::PARTIAL_INITIALIZATION");
+	}
+
 	if (is_reset) {
 		if (zend_object_is_lazy(obj) && !zend_lazy_object_initialized(obj)) {
 			zend_throw_exception_ex(reflection_exception_ptr, 0, "Object is already lazy");

ext/reflection/php_reflection.stub.php

@@ -250,6 +250,9 @@ class ReflectionClass implements Reflector
     /** @cvalue ZEND_LAZY_OBJECT_SKIP_DESTRUCTOR */
     public const int SKIP_DESTRUCTOR = UNKNOWN;
 
+    /** @cvalue ZEND_LAZY_OBJECT_PARTIAL_INITIALIZATION */
+    public const int PARTIAL_INITIALIZATION = UNKNOWN;
+
     public string $name;
 
     private function __clone(): void {}