Merge pull request #52 from sunrise-php/release/v2.2.0

Load routes from a folder for the CollectableFileLoader

README.md

@@ -12,7 +12,7 @@
 ## Installation
 
 ```bash
-composer require 'sunrise/http-router:^2.1'
+composer require 'sunrise/http-router:^2.2'
 ```
 
 ## QuickStart
@@ -66,6 +66,10 @@ $loader->attach('routes/api.php');
 $loader->attach('routes/admin.php');
 $loader->attach('routes/public.php');
 
+// or attach a directory...
+// [!] available from version 2.2
+$loader->attach('routes');
+
 $router = new Router();
 $router->load($loader);
 

src/Loader/CollectableFileLoader.php

@@ -25,6 +25,8 @@
 /**
  * Import functions
  */
+use function glob;
+use function is_dir;
 use function is_file;
 use function sprintf;
 
@@ -68,6 +70,16 @@ public function __construct(
      */
     public function attach($resource) : void
     {
+        if (is_dir($resource)) {
+            $resources = glob($resource . '/*.php');
+
+            foreach ($resources as $resource) {
+                $this->resources[] = $resource;
+            }
+
+            return;
+        }
+
         if (!is_file($resource)) {
             throw new InvalidLoaderResourceException(
                 sprintf('The resource "%s" is not found.', $resource)

tests/Fixture/collectable-routes.php → tests/Fixture/routes/bar.php

@@ -2,4 +2,4 @@
 
 use Sunrise\Http\Router\Tests\Fixture\BlankRequestHandler;
 
-$this->get('home', '/', new BlankRequestHandler());
+$this->get('bar', '/bar', new BlankRequestHandler());

tests/Fixture/routes/foo.php

@@ -0,0 +1,5 @@
+<?php declare(strict_types=1);
+
+use Sunrise\Http\Router\Tests\Fixture\BlankRequestHandler;
+
+$this->get('foo', '/foo', new BlankRequestHandler());

tests/Loader/CollectableFileLoaderTest.php

@@ -42,12 +42,24 @@ public function testAttachInvalidResource() : void
     /**
      * @return void
      */
-    public function testLoad() : void
+    public function testLoadFile() : void
     {
         $loader = new CollectableFileLoader();
 
-        $loader->attach(__DIR__ . '/../Fixture/collectable-routes.php');
+        $loader->attach(__DIR__ . '/../Fixture/routes/foo.php');
 
         $this->assertCount(1, $loader->load()->all());
     }
+
+    /**
+     * @return void
+     */
+    public function testLoadDirectory() : void
+    {
+        $loader = new CollectableFileLoader();
+
+        $loader->attach(__DIR__ . '/../Fixture/routes');
+
+        $this->assertCount(2, $loader->load()->all());
+    }
 }