Add object to isReadable, fetch child property

Author: iluuu1994

ext/reflection/php_reflection.c

@@ -6709,10 +6709,12 @@ ZEND_METHOD(ReflectionProperty, isReadable)
 {
 	reflection_object *intern;
 	property_reference *ref;
+	zend_object *obj = NULL;
 	zend_string *scope_name = ZSTR_KNOWN(ZEND_STR_STATIC);
 
-	ZEND_PARSE_PARAMETERS_START(0, 1)
+	ZEND_PARSE_PARAMETERS_START(0, 2)
 		Z_PARAM_OPTIONAL
+		Z_PARAM_OBJ_OR_NULL(obj)
 		Z_PARAM_STR_OR_NULL(scope_name)
 	ZEND_PARSE_PARAMETERS_END();
 
@@ -6723,6 +6725,14 @@ ZEND_METHOD(ReflectionProperty, isReadable)
 		RETURN_THROWS();
 	}
 
+	if (obj) {
+		if (!instanceof_function(obj->ce, prop->ce)) {
+			_DO_THROW("Given object is not an instance of the class this property was declared in");
+			RETURN_THROWS();
+		}
+		prop = reflection_property_get_effective_prop(ref, intern->ce, obj);
+	}
+
 	zend_class_entry *scope;
 	if (get_ce_from_scope_name(&scope, scope_name, execute_data) == FAILURE) {
 		RETURN_THROWS();
@@ -6739,37 +6749,48 @@ ZEND_METHOD(ReflectionProperty, isReadable)
 		}
 	}
 
+	if (obj) {
+		zval *prop_val = OBJ_PROP(obj, prop->offset);
+		if (Z_TYPE_P(prop_val) != IS_UNDEF && !(Z_PROP_FLAG_P(prop_val) & IS_PROP_REINITABLE)) {
+			RETURN_FALSE;
+		}
+	}
+
 	RETURN_TRUE;
 }
 
 ZEND_METHOD(ReflectionProperty, isWritable)
 {
 	reflection_object *intern;
 	property_reference *ref;
-	zend_object *obj;
+	zend_object *obj = NULL;
 	zend_string *scope_name = ZSTR_KNOWN(ZEND_STR_STATIC);
 
-	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_OBJ(obj)
+	ZEND_PARSE_PARAMETERS_START(0, 2)
 		Z_PARAM_OPTIONAL
+		Z_PARAM_OBJ_OR_NULL(obj)
 		Z_PARAM_STR_OR_NULL(scope_name)
 	ZEND_PARSE_PARAMETERS_END();
 
 	GET_REFLECTION_OBJECT_PTR(ref);
 	zend_property_info *prop = ref->prop;
 	if (!prop) {
-		_DO_THROW("May not use isReadable on dynamic properties");
+		_DO_THROW("May not use isWritable on dynamic properties");
 		RETURN_THROWS();
 	}
 
+	if (obj) {
+		if (!instanceof_function(obj->ce, prop->ce)) {
+			_DO_THROW("Given object is not an instance of the class this property was declared in");
+			RETURN_THROWS();
+		}
+		prop = reflection_property_get_effective_prop(ref, intern->ce, obj);
+	}
+
 	zend_class_entry *scope;
 	if (get_ce_from_scope_name(&scope, scope_name, execute_data) == FAILURE) {
 		RETURN_THROWS();
 	}
-	if (!instanceof_function(obj->ce, prop->ce)) {
-		_DO_THROW("Given object is not an instance of the class this property was declared in");
-		RETURN_THROWS();
-	}
 
 	uint32_t set_visibility = prop->flags & ZEND_ACC_PPP_SET_MASK;
 	if (!set_visibility) {
@@ -6786,7 +6807,7 @@ ZEND_METHOD(ReflectionProperty, isWritable)
 		}
 	}
 
-	if (prop->flags & ZEND_ACC_READONLY) {
+	if (obj && (prop->flags & ZEND_ACC_READONLY)) {
 		ZEND_ASSERT(prop->offset != ZEND_VIRTUAL_PROPERTY_OFFSET);
 		zval *prop_val = OBJ_PROP(obj, prop->offset);
 		if (Z_TYPE_P(prop_val) != IS_UNDEF && !(Z_PROP_FLAG_P(prop_val) & IS_PROP_REINITABLE)) {

ext/reflection/php_reflection.stub.php

@@ -572,9 +572,9 @@ public function getHook(PropertyHookType $type): ?ReflectionMethod {}
 
     public function isFinal(): bool {}
 
-    public function isReadable(?string $scope = 'static'): bool {}
+    public function isReadable(?object $object = null, ?string $scope = 'static'): bool {}
 
-    public function isWritable(object $object, ?string $scope = 'static'): bool {}
+    public function isWritable(?object $object = null, ?string $scope = 'static'): bool {}
 }
 
 /** @not-serializable */

ext/reflection/php_reflection_arginfo.h

@@ -20,7 +20,7 @@ $test = static function ($scope) {
     $rc = new ReflectionClass(B::class);
     foreach ($rc->getProperties() as $rp) {
         echo $rp->getName() . ' from ' . ($scope ?? 'global') . ': ';
-        var_dump($rp->isReadable($scope));
+        var_dump($rp->isReadable(null, $scope));
     }
 };