Disallow data classes in ReflectionProperty::setValue() and ReflectionMethod::invoke()

Author: iluuu1994

ext/reflection/php_reflection.c

@@ -3433,6 +3433,13 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic)
 			_DO_THROW("Given object is not an instance of the class this method was declared in");
 			RETURN_THROWS();
 		}
+
+		if (Z_OBJCE_P(object)->ce_flags & ZEND_ACC_DATA_CLASS) {
+			zend_throw_exception_ex(reflection_exception_ptr, 0,
+				"May not invoke mutating method \"%s::%s()\" through reflection",
+				ZSTR_VAL(Z_OBJCE_P(object)->name), ZSTR_VAL(mptr->common.function_name));
+			RETURN_THROWS();
+		}
 	}
 	/* Copy the zend_function when calling via handler (e.g. Closure::__invoke()) */
 	callback = _copy_function(mptr);
@@ -5744,7 +5751,6 @@ ZEND_METHOD(ReflectionProperty, setValue)
 			if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &tmp, &value) == FAILURE) {
 				RETURN_THROWS();
 			}
-			ZVAL_DEREF(tmp);
 
 			if (Z_TYPE_P(tmp) != IS_NULL && Z_TYPE_P(tmp) != IS_OBJECT) {
 				zend_string *method_name = get_active_function_or_method_name();
@@ -5755,7 +5761,6 @@ ZEND_METHOD(ReflectionProperty, setValue)
 				}
 			}
 		} else {
-			ZVAL_DEREF(value);
 			zend_string *method_name = get_active_function_or_method_name();
 			zend_error(E_DEPRECATED, "Calling %s() with a single argument is deprecated", ZSTR_VAL(method_name));
 			zend_string_release(method_name);
@@ -5766,23 +5771,15 @@ ZEND_METHOD(ReflectionProperty, setValue)
 
 		zend_update_static_property_ex(intern->ce, ref->unmangled_name, value);
 	} else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &object, &value) == FAILURE) {
-			RETURN_THROWS();
-		}
-
-		zval *orig_object = object;
-		ZVAL_DEREF(object);
-		if (Z_TYPE_P(object) != IS_OBJECT) {
-			zend_argument_type_error(1, "must be of type object, %s given", zend_zval_value_name(object));
+		if (zend_parse_parameters(ZEND_NUM_ARGS(), "oz", &object, &value) == FAILURE) {
 			RETURN_THROWS();
 		}
 
 		if (Z_OBJCE_P(object)->ce_flags & ZEND_ACC_DATA_CLASS) {
-			if (Z_TYPE_P(orig_object) != IS_REFERENCE) {
-				zend_throw_error(NULL, "Instance of data class %s must be passed by reference", ZSTR_VAL(Z_OBJCE_P(object)->name));
-				RETURN_THROWS();
-			}
-			SEPARATE_DATA_OBJ(object);
+			zend_throw_exception_ex(reflection_exception_ptr, 0,
+				"May not set property value of data class \"%s\" through reflection",
+				ZSTR_VAL(Z_OBJCE_P(object)->name));
+			RETURN_THROWS();
 		}
 
 		zend_update_property_ex(intern->ce, Z_OBJ_P(object), ref->unmangled_name, value);

ext/reflection/php_reflection.stub.php

@@ -451,10 +451,7 @@ public function getName(): string {}
     /** @tentative-return-type */
     public function getValue(?object $object = null): mixed {}
 
-    /**
-     * @prefer-ref $objectOrValue
-     * @tentative-return-type
-     */
+    /** @tentative-return-type */
     public function setValue(mixed $objectOrValue, mixed $value = UNKNOWN): void {}
 
     /** @tentative-return-type */

ext/reflection/php_reflection_arginfo.h

@@ -7,95 +7,29 @@ data class Box {
     public function __construct(
         public $value,
     ) {}
-}
-
-function getBoxByValue() {
-    return new Box(1);
-}
 
-$returnByReference = new Box(1);
-function &getBoxByReference() {
-    global $returnByReference;
-    return $returnByReference;
+    public mutating function setNull() {
+        $this->value = null;
+    }
 }
 
-const BOX = new Box(1);
-
-class Prop {
-    public function __construct(
-        public $box,
-    ) {}
-}
-
-class ReadonlyProp {
-    public function __construct(
-        public readonly Box $box,
-    ) {}
-}
-
-$reflection = new ReflectionProperty(Box::class, 'value');
-
-echo "CV\n";
 $box = new Box(1);
-$copy = $box;
-$reflection->setValue($box, 2);
-var_dump($box->value);
-var_dump($copy->value);
-
-echo "\nReturn by value\n";
-try {
-    $reflection->setValue(getBoxByValue(), 2);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "\nReturn by reference\n";
-$copy = getBoxByReference();
-$reflection->setValue(getBoxByReference(), 2);
-var_dump(getBoxByReference()->value);
-var_dump($copy->value);
 
-echo "\nConst\n";
+$reflection = new ReflectionProperty(Box::class, 'value');
 try {
-    $reflection->setValue(BOX, 2);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    $reflection->setValue($box, 2);
+} catch (Exception $ex) {
+    echo get_class($ex) . ': ' . $ex->getMessage(), "\n";
 }
 
-echo "\nProp\n";
-$prop = new Prop(new Box(1));
-$copy = $prop->box;
-$reflection->setValue($prop->box, 2);
-var_dump($prop->box->value);
-var_dump($copy->value);
-
-echo "\nReadonly prop\n";
-$readonlyProp = new ReadonlyProp(new Box(1));
+$reflection = new ReflectionMethod(Box::class, 'setNull');
 try {
-    $reflection->setValue($readonlyProp->box, 2);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    $reflection->invoke($box);
+} catch (Exception $ex) {
+    echo get_class($ex) . ': ' . $ex->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-CV
-int(2)
-int(1)
-
-Return by value
-Instance of data class Box must be passed by reference
-
-Return by reference
-int(2)
-int(1)
-
-Const
-Instance of data class Box must be passed by reference
-
-Prop
-int(2)
-int(1)
-
-Readonly prop
-Cannot modify readonly property ReadonlyProp::$box
+ReflectionException: May not set property value of data class "Box" through reflection
+ReflectionException: May not invoke mutating method "Box::setNull()" through reflection