Merge pull request #8 from shadowhand/fix/expanded-http-routing

Author: mnapoli

src/Router.php

@@ -4,13 +4,53 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 
+use function is_array;
+
 /**
  * Reproduces API Gateway routing for local development.
  *
  * @internal
  */
 class Router
 {
+    public static function fromServerlessConfig(array $serverlessConfig): self
+    {
+        $routes = [];
+        foreach ($serverlessConfig['functions'] as $function) {
+            $pattern = $function['events'][0]['httpApi'] ?? null;
+
+            if (! $pattern) {
+                continue;
+            }
+
+            if (is_array($pattern)) {
+                $pattern = self::patternToString($pattern);
+            }
+
+            $routes[$pattern] = $function['handler'];
+        }
+
+        return new self($routes);
+    }
+
+    private static function patternToString(array $pattern): string
+    {
+        $method = $pattern['method'] ?? '*';
+        $path = $pattern['path'] ?? '*';
+
+        // Special "any" method MUST be converted to star.
+        if ($method === 'any') {
+            $method = '*';
+        }
+
+        // Alternative catch-all MUST be converted to standard catch-all.
+        if ($method === '*' && $path === '*') {
+            return '*';
+        }
+
+        return $method . ' ' . $path;
+    }
+
     /** @var array<string,string> */
     private array $routes;
 
@@ -22,17 +62,6 @@ public function __construct(array $routes)
         $this->routes = $routes;
     }
 
-    public static function fromServerlessConfig(array $serverlessConfig): self
-    {
-        $routes = [];
-        foreach ($serverlessConfig['functions'] as $function) {
-            $pattern = $function['events'][0]['httpApi'] ?? null;
-            if (! $pattern) continue;
-            $routes[$pattern] = $function['handler'];
-        }
-        return new self($routes);
-    }
-
     /**
      * @return array{0: ?string, 1: ServerRequestInterface}
      */
@@ -58,7 +87,7 @@ private function matchesMethod(ServerRequestInterface $request, string $method):
     {
         $method = strtolower($method);
 
-        return ($method === 'any') || ($method === strtolower($request->getMethod()));
+        return ($method === '*') || ($method === strtolower($request->getMethod()));
     }
 
     private function matchesPath(ServerRequestInterface $request, string $pathPattern): bool

tests/RouterTest.php

@@ -6,6 +6,7 @@
 use Nyholm\Psr7\ServerRequest;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
+use Symfony\Component\Yaml\Yaml;
 
 class RouterTest extends TestCase
 {
@@ -48,6 +49,30 @@ public function test routing path parameters(): void
         self::assertEquals('def', $router->match($this->request('GET', '/abc/def'))[0]);
     }
 
+    /**
+     * @test
+     */
+    public function test_routing_expanded_config(): void
+    {
+        $config = <<<YAML
+        functions:
+          api:
+            handler: api.php
+            events:
+              - httpApi:
+                  method: '*'
+                  path: '*'
+        YAML;
+
+        $config = Yaml::parse($config);
+        $router = Router::fromServerlessConfig($config);
+
+        self::assertSame('api.php', $router->match($this->request('GET', '/'))[0]);
+        self::assertSame('api.php', $router->match($this->request('POST', '/'))[0]);
+        self::assertSame('api.php', $router->match($this->request('GET', '/tests/1'))[0]);
+        self::assertSame('api.php', $router->match($this->request('PUT', '/tests/1'))[0]);
+    }
+
     private function request(string $method, string $path): ServerRequestInterface
     {
         return new ServerRequest($method, $path);