Fixed a bug where classes without a Handler annotation where also mapped

WyriHaximus · Oct 14, 2018 · 0672ddb · 0672ddb
1 parent cde496b
commit 0672ddb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Mapper.php b/src/Mapper.php
@@ -22,7 +22,7 @@ public static function map(string $path, ?Reader $reader = null): iterable
         foreach (listClassesInDirectory($path) as $class) {
             $handler = self::getHandlerByCommand($class, $reader);
 
-            if ($handler !== null && !class_exists($handler)) {
+            if ($handler === null || !class_exists($handler)) {
                 continue;
             }
 

diff --git a/tests/MapperTest.php b/tests/MapperTest.php
@@ -14,7 +14,7 @@ final class MapperTest extends TestCase
 {
     public function testMapInstantiated()
     {
-        $path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'test-app' . DIRECTORY_SEPARATOR . 'Commands' . DIRECTORY_SEPARATOR;
+        $path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'test-app' . DIRECTORY_SEPARATOR;
         $map = iterator_to_array(Mapper::mapInstantiated($path));
 
         self::assertSame(1, count($map));
@@ -24,7 +24,7 @@ public function testMapInstantiated()
 
     public function testMap()
     {
-        $path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'test-app' . DIRECTORY_SEPARATOR . 'Commands' . DIRECTORY_SEPARATOR;
+        $path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'test-app' . DIRECTORY_SEPARATOR;
         $map = iterator_to_array(Mapper::map($path));
 
         self::assertSame(