Fix multi classDirectories and tests

Author: marekskopal

src/Builder/RouterBuilder.php

@@ -32,16 +32,15 @@ public function build(): Router
             return $router;
         }
 
-        foreach ($this->classDirectories as $classDirectory) {
-            $routeProvider = new RouteProvider($classDirectory);
-
-            $routes = $routeProvider->getRoutes();
-
-            $this->mapRoutes($router, $routes);
+        $allRoutes = [];
 
-            $this->cache?->set($this->cacheKey, $routes);
+        foreach ($this->classDirectories as $classDirectory) {
+            $allRoutes = array_merge($allRoutes, (new RouteProvider($classDirectory))->getRoutes());
         }
 
+        $this->mapRoutes($router, $allRoutes);
+        $this->cache?->set($this->cacheKey, $allRoutes);
+
         return $router;
     }
 

tests/Builder/RouterBuilderTest.php

@@ -4,21 +4,80 @@
 
 namespace MarekSkopal\Router\Tests\Builder;
 
+use League\Route\Route;
 use League\Route\Router;
 use MarekSkopal\Router\Builder\RouterBuilder;
+use MarekSkopal\Router\Tests\TestFile\TestFileClassAndMethod;
+use MarekSkopal\Router\Tests\TestFile\TestFileOneClass;
+use MarekSkopal\Router\Tests\TestFile\TestFileOneMethod;
+use MarekSkopal\Router\Tests\TestFile\TestFileTwoMethod;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use ReflectionClass;
 
 #[CoversClass(RouterBuilder::class)]
 class RouterBuilderTest extends TestCase
 {
-    public function testConstruct(): void
+    public function testBuildReturnsRouter(): void
     {
-        $routerBuilder = new RouterBuilder();
-        $routerBuilder->setClassDirectories([__DIR__ . '/../TestFile']);
-
-        $router = $routerBuilder->build();
+        $router = (new RouterBuilder())
+            ->setClassDirectories([__DIR__ . '/../TestFile'])
+            ->build();
 
         self::assertInstanceOf(Router::class, $router);
     }
+
+    public function testBuildRegistersAllRoutes(): void
+    {
+        $router = (new RouterBuilder())
+            ->setClassDirectories([__DIR__ . '/../TestFile'])
+            ->build();
+
+        /** @var Route[] $routes */
+        $routes = (new ReflectionClass($router))->getProperty('routes')->getValue($router);
+        self::assertIsArray($routes);
+
+        self::assertCount(8, $routes);
+    }
+
+    public function testBuildMergesRoutesFromMultipleDirectories(): void
+    {
+        $testFileDir = __DIR__ . '/../TestFile';
+
+        // Same directory twice: identical class+method keys are merged, so count stays 8
+        $router = (new RouterBuilder())
+            ->setClassDirectories([$testFileDir, $testFileDir])
+            ->build();
+
+        /** @var Route[] $routes */
+        $routes = (new ReflectionClass($router))->getProperty('routes')->getValue($router);
+        self::assertIsArray($routes);
+
+        self::assertCount(8, $routes);
+    }
+
+    public function testBuildRegistersCorrectPaths(): void
+    {
+        $router = (new RouterBuilder())
+            ->setClassDirectories([__DIR__ . '/../TestFile'])
+            ->build();
+
+        /** @var Route[] $routes */
+        $routes = (new ReflectionClass($router))->getProperty('routes')->getValue($router);
+        self::assertIsArray($routes);
+
+        $pathsByHandler = [];
+        foreach ($routes as $route) {
+            $handler = (new ReflectionClass($route))->getProperty('handler')->getValue($route);
+            self::assertIsString($handler);
+            $pathsByHandler[$handler] = $route->getPath();
+        }
+
+        self::assertSame('/test-one-class', $pathsByHandler[TestFileOneClass::class . '::__invoke']);
+        self::assertSame('/action-get', $pathsByHandler[TestFileOneMethod::class . '::actionGet']);
+        self::assertSame('/action-get-one', $pathsByHandler[TestFileTwoMethod::class . '::actionGetOne']);
+        self::assertSame('/action-get-two', $pathsByHandler[TestFileTwoMethod::class . '::actionGetTwo']);
+        self::assertSame('/test-one-class', $pathsByHandler[TestFileClassAndMethod::class . '::__invoke']);
+        self::assertSame('/action', $pathsByHandler[TestFileClassAndMethod::class . '::action']);
+    }
 }

tests/RouteProvider/RouteProviderTest.php

@@ -5,6 +5,12 @@
 namespace MarekSkopal\Router\Tests\RouteProvider;
 
 use MarekSkopal\Router\Provider\RouteProvider;
+use MarekSkopal\Router\Tests\TestFile\TestFileClassAndMethod;
+use MarekSkopal\Router\Tests\TestFile\TestFileOneClass;
+use MarekSkopal\Router\Tests\TestFile\TestFileOneMethod;
+use MarekSkopal\Router\Tests\TestFile\TestFileThreeClass;
+use MarekSkopal\Router\Tests\TestFile\TestFileTwoClass;
+use MarekSkopal\Router\Tests\TestFile\TestFileTwoMethod;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
@@ -17,11 +23,13 @@ public function testGetRoutes(): void
         $routes = $routeProvider->getRoutes();
 
         $this->assertCount(8, $routes);
-        $this->assertArrayHasKey('MarekSkopal\Router\Tests\TestFile\TestFileOneClass::__invoke', $routes);
-        $this->assertArrayHasKey('MarekSkopal\Router\Tests\TestFile\TestFileTwoClass::__invoke', $routes);
-        $this->assertArrayHasKey('MarekSkopal\Router\Tests\TestFile\TestFileThreeClass::__invoke', $routes);
-        $this->assertArrayHasKey('MarekSkopal\Router\Tests\TestFile\TestFileOneMethod::actionGet', $routes);
-        $this->assertArrayHasKey('MarekSkopal\Router\Tests\TestFile\TestFileTwoMethod::actionGetOne', $routes);
-        $this->assertArrayHasKey('MarekSkopal\Router\Tests\TestFile\TestFileTwoMethod::actionGetTwo', $routes);
+        $this->assertArrayHasKey(TestFileOneClass::class . '::__invoke', $routes);
+        $this->assertArrayHasKey(TestFileTwoClass::class . '::__invoke', $routes);
+        $this->assertArrayHasKey(TestFileThreeClass::class . '::__invoke', $routes);
+        $this->assertArrayHasKey(TestFileOneMethod::class . '::actionGet', $routes);
+        $this->assertArrayHasKey(TestFileTwoMethod::class . '::actionGetOne', $routes);
+        $this->assertArrayHasKey(TestFileTwoMethod::class . '::actionGetTwo', $routes);
+        $this->assertArrayHasKey(TestFileClassAndMethod::class . '::__invoke', $routes);
+        $this->assertArrayHasKey(TestFileClassAndMethod::class . '::action', $routes);
     }
 }