Support partial meta information

Author: thekid

ChangeLog.md

@@ -3,6 +3,10 @@ XP Reflection ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 2.14.0 / 2023-09-23
+
+* Added support for partial meta information - @thekid
+
 ## 2.13.6 / 2023-06-25
 
 * Fixed missing `xp::$sn` lookup when reflecting generics - @thekid

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

@@ -79,8 +79,9 @@ public function typeAnnotations($reflect) {
    * @return ?string
    */
   public function typeComment($reflect) {
-    if ($meta= \xp::$meta[\xp::$cn[$reflect->name] ?? strtr($reflect->name, '\\', '.')]['class'] ?? null) {
-      return $meta[DETAIL_COMMENT];
+    $c= \xp::$cn[$reflect->name] ?? strtr($reflect->name, '\\', '.');
+    if ($meta= \xp::$meta[$c]['class'][DETAIL_COMMENT] ?? null) {
+      return $meta;
     } else if (false === ($c= $reflect->getDocComment())) {
       return null;
     } else {
@@ -114,8 +115,8 @@ public function constantAnnotations($reflect) {
   public function constantType($reflect) {
     $name= $reflect->getDeclaringClass()->name;
     $c= \xp::$cn[$name] ?? strtr($name, '\\', '.');
-    if ($meta= \xp::$meta[$c][2][$reflect->name] ?? null) {
-      return $meta[DETAIL_RETURNS];
+    if ($meta= \xp::$meta[$c][2][$reflect->name][DETAIL_RETURNS] ?? null) {
+      return $meta;
     } else {
       $tags= $this->tags($reflect);
       return $tags['var'][0] ?? $tags['type'][0] ?? null;
@@ -131,8 +132,8 @@ public function constantType($reflect) {
   public function constantComment($reflect) {
     $name= $reflect->getDeclaringClass()->name;
     $c= \xp::$cn[$name] ?? strtr($name, '\\', '.');
-    if ($meta= \xp::$meta[$c][2][$reflect->name] ?? null) {
-      return $meta[DETAIL_COMMENT];
+    if ($meta= \xp::$meta[$c][2][$reflect->name][DETAIL_COMMENT] ?? null) {
+      return $meta;
     } else if (false === ($c= $reflect->getDocComment())) {
       return null;
     } else {
@@ -165,8 +166,8 @@ public function propertyAnnotations($reflect) {
   public function propertyType($reflect) {
     $name= $reflect->getDeclaringClass()->name;
     $c= \xp::$cn[$name] ?? strtr($name, '\\', '.');
-    if ($meta= \xp::$meta[$c][0][$reflect->name] ?? null) {
-      return $meta[DETAIL_RETURNS];
+    if ($meta= \xp::$meta[$c][0][$reflect->name][DETAIL_RETURNS] ?? null) {
+      return $meta;
     } else {
       $tags= $this->tags($reflect);
       return $tags['var'][0] ?? $tags['type'][0] ?? null;
@@ -182,8 +183,8 @@ public function propertyType($reflect) {
   public function propertyComment($reflect) {
     $name= $reflect->getDeclaringClass()->name;
     $c= \xp::$cn[$name] ?? strtr($name, '\\', '.');
-    if ($meta= \xp::$meta[$c][0][$reflect->name] ?? null) {
-      return $meta[DETAIL_COMMENT];
+    if ($meta= \xp::$meta[$c][0][$reflect->name][DETAIL_COMMENT] ?? null) {
+      return $meta;
     } else if (false === ($c= $reflect->getDocComment())) {
       return null;
     } else {
@@ -215,8 +216,8 @@ public function methodAnnotations($reflect) {
   public function methodReturns($reflect) {
     $name= $reflect->getDeclaringClass()->name;
     $c= \xp::$cn[$name] ?? strtr($name, '\\', '.');
-    if ($meta= \xp::$meta[$c][1][$reflect->name] ?? null) {
-      return $meta[DETAIL_RETURNS];
+    if ($meta= \xp::$meta[$c][1][$reflect->name][DETAIL_RETURNS] ?? null) {
+      return $meta;
     } else {
       return $this->tags($reflect)['return'][0] ?? null;
     }
@@ -231,8 +232,8 @@ public function methodReturns($reflect) {
   public function methodComment($reflect) {
     $name= $reflect->getDeclaringClass()->name;
     $c= \xp::$cn[$name] ?? strtr($name, '\\', '.');
-    if ($meta= \xp::$meta[$c][1][$reflect->name] ?? null) {
-      return $meta[DETAIL_COMMENT];
+    if ($meta= \xp::$meta[$c][1][$reflect->name][DETAIL_COMMENT] ?? null) {
+      return $meta;
     } else if (false === ($c= $reflect->getDocComment())) {
       return null;
     } else {
@@ -295,7 +296,7 @@ public function virtualProperties($reflect) {
       if ($meta= \xp::$meta[\xp::$cn[$reflect->name] ?? strtr($reflect->name, '\\', '.')][0] ?? null) {
         foreach ($meta as $name => $property) {
           if ($arg= $property[DETAIL_ARGUMENTS] ?? null) {
-            $r[$name]= [$arg[0], $property[DETAIL_RETURNS]];
+            $r[$name]= [$arg[0], $property[DETAIL_RETURNS] ?? null];
           }
         }
         continue;

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

@@ -105,4 +105,10 @@ public function with_constraint() {
       $this->declare('{ const string FIXTURE = "test"; }')->constant('FIXTURE')->constraint()
     );
   }
+
+  #[Test]
+  public function no_type() {
+    $type= $this->declare('{ const FIXTURE= 1; }');
+    Assert::equals(Type::$VAR, $type->constant('FIXTURE')->constraint()->type());
+  }
 }

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

@@ -152,6 +152,12 @@ public function returns_type_intersection_via_apidoc() {
     Assert::equals(new TypeIntersection([new XPClass('Countable'), new XPClass('Traversable')]), $returns->type());
   }
 
+  #[Test]
+  public function no_returns() {
+    $type= $this->declare('{ function fixture() { } }');
+    Assert::equals(Type::$VAR, $type->method('fixture')->returns()->type());
+  }
+
   #[Test]
   public function annotations() {
     $t= $this->declare('{

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

@@ -199,6 +199,12 @@ public function type_from_boolean_types($name) {
     );
   }
 
+  #[Test]
+  public function no_type() {
+    $type= $this->declare('{ public $fixture; }');
+    Assert::equals(Type::$VAR, $type->property('fixture')->constraint()->type());
+  }
+
   #[Test]
   public function string_representation_without_type() {
     $t= $this->declare('{ public $fixture; }');