Rewrite FromDirectory source to use lang.reflection.Type::instantiable()

...instead of checking for interfaces, traits and abstract classes

Author: thekid

ChangeLog.md

@@ -3,6 +3,12 @@
 
 ## ?.?.? / ????-??-??
 
+## 2.1.0 / 2024-03-28
+
+* Made `FromDirectory` consistent with other source implementations in
+  regard to how it filters the types returned
+  (@thekid)
+
 ## 2.0.0 / 2024-03-23
 
 This second major release upgrades this library to support only the latest

src/main/php/test/source/FromDirectory.class.php

@@ -1,7 +1,7 @@
 <?php namespace test\source;
 
 use io\{Folder, Path};
-use lang\{ClassLoader, FileSystemClassLoader, IllegalArgumentException};
+use lang\{ClassLoader, FileSystemClassLoader, IllegalArgumentException, Reflection};
 use test\execution\TestClass;
 
 class FromDirectory extends Source {
@@ -42,7 +42,7 @@ private function testClassesIn($cl, $folder) {
       } else if (($p= strpos($entry->name(), '.')) && 0 === substr_compare($entry->name(), 'Test', $p - 4, 4)) {
         $uri= $entry->asURI();
         if ($loader= $cl->findUri($uri)) {
-          yield $loader->loadUri($uri);
+          yield Reflection::type($loader->loadUri($uri));
         }
       }
     }
@@ -51,8 +51,9 @@ private function testClassesIn($cl, $folder) {
   /** @return iterable */
   public function groups() {
     foreach ($this->testClassesIn(ClassLoader::getDefault(), $this->folder) as $class) {
-      if ($class->isInterface() || $class->isTrait() || $class->getModifiers() & MODIFIER_ABSTRACT) continue;
-      yield new TestClass($class);
+      if ($class->instantiable()) {
+        yield new TestClass($class);
+      }
     }
   }
 

src/main/php/test/source/FromFile.class.php

@@ -17,19 +17,19 @@ public function __construct($arg) {
     }
 
     if ($loader= ClassLoader::getDefault()->findUri($this->path)) {
-      $this->type= $loader->loadUri($this->path);
+      $this->type= Reflection::type($loader->loadUri($this->path));
       return;
     }
 
     throw new IllegalArgumentException($this->path.' is not in class path');
   }
 
   /** Returns the type discovered from the file */
-  public function type(): Type { return Reflection::type($this->type); }
+  public function type(): Type { return $this->type; }
 
   /** @return iterable */
   public function groups() {
-    yield new TestClass($this->type());
+    yield new TestClass($this->type);
   }
 
   /** @return string */

src/main/php/test/source/FromPackage.class.php

@@ -35,7 +35,9 @@ private function typesIn($package) {
   /** @return iterable */
   public function groups() {
     foreach ($this->typesIn($this->package) as $type) {
-      if ($type->instantiable() && 0 === substr_compare($type->name(), 'Test', -4, 4)) yield new TestClass($type);
+      if ($type->instantiable() && 0 === substr_compare($type->name(), 'Test', -4, 4)) {
+        yield new TestClass($type);
+      }
     }
   }