Fix PHP 8.4

Author: thekid

src/main/php/lang/meta/MetaInformation.class.php

@@ -193,7 +193,7 @@ public function propertyComment($reflect) {
   }
 
   /**
-   * Returns (non-literal) modifiers for a given property
+   * Returns modifiers for a given property, including non-declared
    *
    * @param  \ReflectionProperty $reflect
    * @return int
@@ -202,10 +202,10 @@ public function propertyModifiers($reflect) {
     $name= $reflect->getDeclaringClass()->name;
     $c= \xp::$cn[$name] ?? strtr($name, '\\', '.');
     if ($meta= \xp::$meta[$c][0][$reflect->getName()][DETAIL_ARGUMENTS] ?? null) {
-      return (int)$meta[0];
+      return $reflect->getModifiers() | (int)$meta[0];
     } else {
       $tags= $this->tags($reflect);
-      return isset($tags['final']) ? MODIFIER_FINAL : 0;
+      return $reflect->getModifiers() | isset($tags['final']) ? MODIFIER_FINAL : 0;
     }
   }
 

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

@@ -53,14 +53,9 @@ public function modifiers($hook= null) {
     ];
 
     // Readonly implies protected(set)
-    $bits= $this->reflect->getModifiers();
+    $bits= Reflection::meta()->propertyModifiers($this->reflect);
     $bits & Modifiers::IS_READONLY && $bits|= Modifiers::IS_PROTECTED_SET;
 
-    // Final properties cannot be declared in PHP < 8.4, fetch from meta information
-    if (PHP_VERSION_ID <= 80400) {
-      $bits|= Reflection::meta()->propertyModifiers($this->reflect);
-    }
-
     switch ($hook) {
       case null: return new Modifiers($bits);
       case 'get': return new Modifiers(($bits & ~Modifiers::SET_MASK) & Modifiers::GET_MASK);