Make Reflection::package() accept instances, types and reflection

Author: thekid

src/main/php/lang/Reflection.class.php

@@ -59,17 +59,28 @@ public static function type($arg) {
   /**
    * Returns a reflection package for a given argument.
    *
-   * @param  string
+   * @param  string|object|lang.XPClass|lang.reflection.Type|ReflectionClass $arg
    * @return lang.reflection.Type
    * @throws lang.IllegalArgumentException
    */
   public static function package($arg) {
-    $cl= ClassLoader::getDefault();
-    $name= strtr($arg, '\\', '.');
-    if ($cl->providesPackage($name)) {
-      return new Package($name);
+    if ($arg instanceof XPClass) {
+      return new Package($arg->getPackage()->getName());
+    } else if ($arg instanceof \ReflectionClass) {
+      return new Package($arg->getNamespaceName());
+    } else if ($arg instanceof Type) {
+      return $arg->package();
+    } else if (is_object($arg)) {
+      $class= get_class($arg);
+      return new Package(substr($class, 0, strrpos($class, '\\')));
+    } else {
+      $cl= ClassLoader::getDefault();
+      $name= strtr($arg, '\\', '.');
+      if ($cl->providesPackage($name)) {
+        return new Package($name);
+      }
+      throw new IllegalArgumentException('No package named '.$name);
     }
-    throw new IllegalArgumentException('No package named '.$name);
   }
 
   /**

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

@@ -21,8 +21,13 @@ private function arguments() {
 
   /** @return iterable */
   private function packages() {
-    yield ['lang.reflection.unittest', 'lang.reflection.unittest'];
-    yield [__NAMESPACE__, 'lang.reflection.unittest'];
+    yield [__NAMESPACE__, 'namespace literal'];
+    yield ['lang.reflection.unittest', 'namespace name'];
+    yield [$this, 'instance'];
+    yield [Type::forName(self::class), 'type'];
+    yield [Reflection::of(self::class), 'reflection'];
+    yield [new ReflectionClass($this), 'reflection class'];
+    yield [new ReflectionObject($this), 'reflection object'];
   }
 
   #[Test, Values(from: 'arguments')]
@@ -36,8 +41,8 @@ public function type($argument) {
   }
 
   #[Test, Values(from: 'packages')]
-  public function package($argument, $expected) {
-    Assert::equals(new Package($expected), Reflection::package($argument));
+  public function package($argument) {
+    Assert::equals(new Package('lang.reflection.unittest'), Reflection::package($argument));
   }
 
   #[Test]