Handle dynamic properties, fix order & optionality

Author: iluuu1994

ext/reflection/php_reflection.c

@@ -6682,20 +6682,22 @@ ZEND_METHOD(ReflectionProperty, isReadable)
 {
 	reflection_object *intern;
 	property_reference *ref;
+	zend_string *scope_name;
 	zend_object *obj = NULL;
-	zend_string *scope_name = ZSTR_KNOWN(ZEND_STR_STATIC);
 
-	ZEND_PARSE_PARAMETERS_START(0, 2)
+	ZEND_PARSE_PARAMETERS_START(1, 2)
+		Z_PARAM_STR_OR_NULL(scope_name)
 		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");
-		RETURN_THROWS();
+		if (!obj->properties) {
+			RETURN_FALSE;
+		}
+		RETURN_BOOL(zend_hash_find_ptr(obj->properties, ref->unmangled_name) != NULL);
 	}
 
 	if (obj) {
@@ -6751,20 +6753,22 @@ ZEND_METHOD(ReflectionProperty, isWritable)
 {
 	reflection_object *intern;
 	property_reference *ref;
+	zend_string *scope_name;
 	zend_object *obj = NULL;
-	zend_string *scope_name = ZSTR_KNOWN(ZEND_STR_STATIC);
 
-	ZEND_PARSE_PARAMETERS_START(0, 2)
+	ZEND_PARSE_PARAMETERS_START(1, 2)
+		Z_PARAM_STR_OR_NULL(scope_name)
 		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 isWritable on dynamic properties");
-		RETURN_THROWS();
+		if (obj->ce->ce_flags & ZEND_ACC_NO_DYNAMIC_PROPERTIES) {
+			RETURN_FALSE;
+		}
+		RETURN_TRUE;
 	}
 
 	if (obj) {

ext/reflection/php_reflection.stub.php

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

ext/reflection/php_reflection_arginfo.h

@@ -0,0 +1,25 @@
+--TEST--
+Test ReflectionProperty::isReadable() dynamic
+--FILE--
+<?php
+
+#[AllowDynamicProperties]
+class A {}
+
+$a = new A;
+
+$a->a = 'a';
+$r = new ReflectionProperty($a, 'a');
+
+var_dump($r->isReadable(null, $a));
+unset($a->a);
+var_dump($r->isReadable(null, $a));
+
+$a = new A;
+var_dump($r->isReadable(null, $a));
+
+?>
+--EXPECT--
+bool(true)
+bool(false)
+bool(false)

ext/reflection/tests/ReflectionProperty_isReadable_dynamic.phpt

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

ext/reflection/tests/ReflectionProperty_isReadable_hooks.phpt

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

ext/reflection/tests/ReflectionProperty_isReadable_init.phpt

@@ -18,7 +18,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(null, $scope));
+        var_dump($rp->isReadable($scope, null));
     }
 };
 

ext/reflection/tests/ReflectionProperty_isReadable_visibility.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Test ReflectionProperty::isWritable() dynamic
+--FILE--
+<?php
+
+#[AllowDynamicProperties]
+class A {
+    private $a;
+}
+
+$a = new A;
+
+$r = new ReflectionProperty($a, 'a');
+var_dump($r->isWritable(null, $a));
+
+$a->b = 'b';
+$r = new ReflectionProperty($a, 'b');
+var_dump($r->isWritable(null, $a));
+
+$a = new A;
+var_dump($r->isWritable(null, $a));
+
+?>
+--EXPECT--
+bool(false)
+bool(true)
+bool(true)

ext/reflection/tests/ReflectionProperty_isWritable_dynamic.phpt

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

ext/reflection/tests/ReflectionProperty_isWritable_hooks.phpt

@@ -22,7 +22,7 @@ function test($instance) {
     $rc = new ReflectionClass($instance);
     foreach ($rc->getProperties() as $rp) {
         echo $rp->getName() . ' from A: ';
-        var_dump($rp->isWritable($instance, $instance::class));
+        var_dump($rp->isWritable($instance::class, $instance));
     }
 }