Added abillity to get the value of static properties

betterphp · betterphp · commit 99babba70dbd · 2016-12-10T14:34:46.000Z
diff --git a/tests/test_classes/example_child_class.php b/tests/test_classes/example_child_class.php
@@ -4,6 +4,8 @@
 
 class example_child_class extends example_class {
 
+    private static $example_child_static_property = 'very private, such static, wow';
+
     private $example_child_string_property;
 
     public function __construct() {
@@ -23,6 +25,18 @@ public function get_value($property_name) {
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public static function get_static_value(string $property_name) {
+        // Note the variable variable here
+        if (!isset(static::$$property_name)) {
+            return parent::get_static_value($property_name);
+        } else {
+            return static::$$property_name;
+        }
+    }
+
     private function example_child_method(int $number) {
         return ($number * 20);
     }
diff --git a/tests/test_classes/example_class.php b/tests/test_classes/example_class.php
@@ -4,6 +4,8 @@
 
 class example_class {
 
+    private static $example_static_property = 'very private, such static, wow';
+
     private $example_string_property;
     private $example_array_property;
 
@@ -24,6 +26,18 @@ public function get_value($property_name) {
         return $this->{$property_name};
     }
 
+    /**
+     * Similar to get_value() except this will access static properties
+     *
+     * @param string $property_name The name of the property
+     *
+     * @return mixed The property value
+     */
+    public static function get_static_value(string $property_name) {
+        // Note the variable variable here
+        return static::$$property_name;
+    }
+
     private function example_method(int $number) {
         return ($number * 10);
     }
diff --git a/tests/utils/ReflectionTest.php b/tests/utils/ReflectionTest.php
@@ -132,6 +132,24 @@ public function dataGetPropertyFromChild(): array {
         );
     }
 
+    public function testGetStaticProperty() {
+        $property_name = 'example_static_property';
+        $reflected_value = reflection::get_property(example_class::class, $property_name);
+        $actual_value = example_class::get_static_value($property_name);
+
+        $this->assertInternalType('string', $reflected_value);
+        $this->assertSame($actual_value, $reflected_value);
+    }
+
+    public function testGetChildStaticProperty() {
+        $property_name = 'example_child_static_property';
+        $reflected_value = reflection::get_property(example_child_class::class, $property_name);
+        $actual_value = example_child_class::get_static_value($property_name);
+
+        $this->assertInternalType('string', $reflected_value);
+        $this->assertSame($actual_value, $reflected_value);
+    }
+
     public function testSetProperty() {
         $expected_value = 'wow such value';
         $property_name = 'example_string_property';
diff --git a/utils/reflection.php b/utils/reflection.php
@@ -60,34 +60,43 @@ private static function resolve_method_class(string $class_name, string $method_
     /**
      * Gets the value of an object property
      *
-     * @param object $object The object to get the value from
+     * @param mixed $object The object to get the value from or the class name for static properties
      * @param string $property_name The name of the property
      *
      * @return mixed The value
      */
     public static function get_property($object, string $property_name) {
-        $class_name = static::resolve_property_class(get_class($object), $property_name);
+        $class_name = (is_object($object)) ? get_class($object) : $object;
+        $class_name = static::resolve_property_class($class_name, $property_name);
         $property = new \ReflectionProperty($class_name, $property_name);
         $property->setAccessible(true);
 
-        return $property->getValue($object);
+        if (is_object($object)) {
+            return $property->getValue($object);
+        } else {
+            $class = $property->getDeclaringClass();
+            $values = $class->getStaticProperties();
+
+            return $values[$property_name];
+        }
     }
 
     /**
      * Sets the value of an object property
      *
-     * @param object $object The object to update
+     * @param mixed $object The object to update or the name of the class for static properties
      * @param string $property_name The name of the property
      * @param mixed $value The new value to set
      *
      * @return void
      */
     public static function set_property($object, string $property_name, $value) {
-        $class_name = static::resolve_property_class(get_class($object), $property_name);
+        $class_name = (is_object($object)) ? get_class($object) : $object;
+        $class_name = static::resolve_property_class($class_name, $property_name);
         $property = new \ReflectionProperty($class_name, $property_name);
         $property->setAccessible(true);
 
-        $property->setValue($object, $value);
+        $property->setValue((is_object($object)) ? $object : null, $value);
     }
 
     /**
