Mask out all other modifiers when modifiers([get|set]) is called

Author: thekid

src/main/php/lang/reflection/Modifiers.class.php

@@ -20,6 +20,9 @@ class Modifiers implements Value {
   const IS_PRIVATE_SET   = 0x1000;
   const IS_NATIVE        = 0x10000;
 
+  const GET_MASK         = 0x0007; // PUBLIC | PROTECTED | PRIVATE
+  const SET_MASK         = 0x1c00; // PUBLIC_SET | PROTECTED_SET | PRIVATE_SET
+
   private static $names= [
     'public'         => self::IS_PUBLIC,
     'protected'      => self::IS_PROTECTED,

src/main/php/lang/reflection/Property.class.php

@@ -55,8 +55,8 @@ public function modifiers($hook= null) {
     $bits= $this->reflect->getModifiers();
     switch ($hook) {
       case null: return new Modifiers($bits);
-      case 'get': return new Modifiers($bits & ~0x1c00);
-      case 'set': return new Modifiers($set[$bits & 0x1c00] ?? $bits);
+      case 'get': return new Modifiers(($bits & ~Modifiers::SET_MASK) & Modifiers::GET_MASK);
+      case 'set': return new Modifiers($set[$bits & Modifiers::SET_MASK] ?? $bits & Modifiers::GET_MASK);
       default: throw new IllegalArgumentException('Unknown hook '.$hook);
     }
   }

src/test/php/lang/reflection/unittest/PropertiesTest.class.php

@@ -49,6 +49,22 @@ public function set_modifiers($modifier) {
     );
   }
 
+  #[Test]
+  public function get_modifiers_erases_static() {
+    Assert::equals(
+      new Modifiers('public'),
+      $this->declare('{ public static int $fixture; }')->property('fixture')->modifiers('get')
+    );
+  }
+
+  #[Test]
+  public function set_modifiers_erases_static() {
+    Assert::equals(
+      new Modifiers('public'),
+      $this->declare('{ public static int $fixture; }')->property('fixture')->modifiers('set')
+    );
+  }
+
   #[Test, Expect(IllegalArgumentException::class)]
   public function modifiers_unknown_hook() {
     $this->declare('{ private $fixture; }')->property('fixture')->modifiers('@unknown');