Support static properties

Author: iluuu1994

ext/reflection/php_reflection.c

@@ -6695,6 +6695,10 @@ ZEND_METHOD(ReflectionProperty, isReadable)
 
 	zend_property_info *prop = ref->prop;
 	if (prop && obj) {
+		if (prop->flags & ZEND_ACC_STATIC) {
+			_DO_THROW("null is expected as object argument for static properties");
+			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();
@@ -6733,7 +6737,10 @@ ZEND_METHOD(ReflectionProperty, isReadable)
 	}
 
 	if (!check_visibility(prop->flags & ZEND_ACC_PPP_MASK, prop->ce, scope)) {
-		goto handle_magic_get;
+		if (!(prop->flags & ZEND_ACC_STATIC)) {
+			goto handle_magic_get;
+		}
+		RETURN_FALSE;
 	}
 
 	if (prop->flags & ZEND_ACC_VIRTUAL) {
@@ -6749,6 +6756,12 @@ ZEND_METHOD(ReflectionProperty, isReadable)
 			}
 			RETURN_FALSE;
 		}
+	} else if (prop->flags & ZEND_ACC_STATIC) {
+		if (ce->default_static_members_count && !CE_STATIC_MEMBERS(ce)) {
+			zend_class_init_statics(ce);
+		}
+		zval *prop_val = CE_STATIC_MEMBERS(ce) + prop->offset;
+		RETURN_BOOL(!Z_ISUNDEF_P(prop_val));
 	}
 
 	RETURN_TRUE;
@@ -6771,6 +6784,10 @@ ZEND_METHOD(ReflectionProperty, isWritable)
 
 	zend_property_info *prop = ref->prop;
 	if (prop && obj) {
+		if (prop->flags & ZEND_ACC_STATIC) {
+			_DO_THROW("null is expected as object argument for static properties");
+			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();
@@ -6797,7 +6814,10 @@ ZEND_METHOD(ReflectionProperty, isWritable)
 	}
 
 	if (!check_visibility(prop->flags & ZEND_ACC_PPP_MASK, prop->ce, scope)) {
-		goto handle_magic_set;
+		if (!(prop->flags & ZEND_ACC_STATIC)) {
+			goto handle_magic_set;
+		}
+		RETURN_FALSE;
 	}
 	uint32_t set_visibility = prop->flags & ZEND_ACC_PPP_SET_MASK;
 	if (!set_visibility) {
@@ -6812,10 +6832,7 @@ ZEND_METHOD(ReflectionProperty, isWritable)
 		if (!prop->hooks[ZEND_PROPERTY_HOOK_SET]) {
 			RETURN_FALSE;
 		}
-	}
-
-	if (obj && (prop->flags & ZEND_ACC_READONLY)) {
-		ZEND_ASSERT(prop->offset != ZEND_VIRTUAL_PROPERTY_OFFSET);
+	} else if (obj && (prop->flags & ZEND_ACC_READONLY)) {
 		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;

ext/reflection/tests/ReflectionProperty_isReadable_static.phpt

@@ -0,0 +1,36 @@
+--TEST--
+Test ReflectionProperty::isReadable() static
+--FILE--
+<?php
+
+class A {
+    public static $a;
+    public static int $b;
+    public static int $c = 42;
+    protected static int $d = 42;
+    private static int $e = 42;
+    public private(set) static int $f = 42;
+}
+
+$r = new ReflectionProperty('A', 'a');
+try {
+    $r->isReadable(null, new A);
+} catch (Exception $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+$rc = new ReflectionClass('A');
+foreach ($rc->getProperties() as $rp) {
+    echo $rp->getName() . ' from global: ';
+    var_dump($rp->isReadable(null));
+}
+
+?>
+--EXPECT--
+ReflectionException: null is expected as object argument for static properties
+a from global: bool(true)
+b from global: bool(false)
+c from global: bool(true)
+d from global: bool(false)
+e from global: bool(false)
+f from global: bool(true)

ext/reflection/tests/ReflectionProperty_isWritable_static.phpt

@@ -0,0 +1,36 @@
+--TEST--
+Test ReflectionProperty::isWritable() static
+--FILE--
+<?php
+
+class A {
+    public static $a;
+    public static int $b;
+    public static int $c = 42;
+    protected static int $d = 42;
+    private static int $e = 42;
+    public private(set) static int $f = 42;
+}
+
+$r = new ReflectionProperty('A', 'a');
+try {
+    $r->isWritable(null, new A);
+} catch (Exception $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+$rc = new ReflectionClass('A');
+foreach ($rc->getProperties() as $rp) {
+    echo $rp->getName() . ' from global: ';
+    var_dump($rp->isWritable(null));
+}
+
+?>
+--EXPECT--
+ReflectionException: null is expected as object argument for static properties
+a from global: bool(true)
+b from global: bool(true)
+c from global: bool(true)
+d from global: bool(false)
+e from global: bool(false)
+f from global: bool(false)