调整路由map的参数顺序，添加load加载路由配置方法

Author: ueaner

src/Soli/Router.php

@@ -26,55 +26,68 @@ class Router extends Component
      */
     protected $dispatcher;
 
+    /**
+     * Load routes config.
+     */
+    public function load(array $routesConfig)
+    {
+        foreach ($routesConfig as $route) {
+            $pattern = $route[0];
+            $handler = $route[1] ?? null;
+            $methods = $route[2] ?? '*';
+            $this->map($pattern, $handler, $methods);
+        }
+        return $this->routes;
+    }
+
     /**
      * Add route.
      *
-     * @param string|string[] $methods 'GET' or ['GET', 'POST']
      * @param string $pattern
-     * @param array $handler
+     * @param array|string $handler
+     * @param string|string[] $methods 'GET' or ['GET', 'POST']
      */
-    public function map($methods, $pattern, array $handler)
+    public function map($pattern, $handler = null, $methods = '*')
     {
-        $this->routes[] = [
-            'methods' => $methods,
-            'pattern' => $pattern,
+        $this->routes[$pattern] = [
             'handler' => $handler,
+            'methods' => $methods,
         ];
     }
 
     public function get($pattern, $handler)
     {
-        $this->map('GET', $pattern, $handler);
+        $this->map($pattern, $handler, 'GET');
     }
 
     public function post($pattern, $handler)
     {
-        $this->map('POST', $pattern, $handler);
+        $this->map($pattern, $handler, 'POST');
     }
 
     public function put($pattern, $handler)
     {
-        $this->map('PUT', $pattern, $handler);
+        $this->map($pattern, $handler, 'PUT');
     }
 
     public function delete($pattern, $handler)
     {
-        $this->map('DELETE', $pattern, $handler);
+        $this->map($pattern, $handler, 'DELETE');
     }
 
     public function head($pattern, $handler)
     {
-        $this->map('HEAD', $pattern, $handler);
+        $this->map($pattern, $handler, 'HEAD');
     }
 
     public function trace($pattern, $handler)
     {
-        $this->map('TRACE', $pattern, $handler);
+        $this->map($pattern, $handler, 'TRACE');
     }
 
     public function options($pattern, $handler)
     {
-        $this->map('OPTIONS', $pattern, $handler);
+        $this->map($pattern, $handler, 'OPTIONS');
     }
 
     public function setDefaults(array $defaults)
@@ -136,8 +149,12 @@ public function handle($uri = null)
     protected function createDispatcher()
     {
         return $this->dispatcher ?: \FastRoute\simpleDispatcher(function (\FastRoute\RouteCollector $r) {
-            foreach ($this->routes as $route) {
-                $r->addRoute($route['methods'], $route['pattern'], $route['handler']);
+            // 默认路由
+            if (!isset($this->routes['/'])) {
+                $this->map('/', [], '*');
+            }
+            foreach ($this->routes as $pattern => $route) {
+                $r->addRoute($route['methods'], $pattern, $route['handler']);
             }
         });
     }
@@ -170,27 +187,57 @@ protected function handleDispatcherResponse($routeInfo)
      */
     protected function handleFoundRoute($routeInfo)
     {
+        $routeInfo = $this->formatRouteInfo($routeInfo);
+
         $handler = $routeInfo[1];
         $params  = $routeInfo[2];
 
-        $handler = array_merge($params, $handler);
-
         // 存储控制器、方法及参数
-        if (isset($handler['namespace'])) {
+        if ($handler['namespace']) {
             $this->namespaceName = $handler['namespace'];
         }
 
-        if (isset($handler['controller'])) {
+        if ($handler['controller']) {
             $this->controllerName = $handler['controller'];
         }
 
-        if (isset($handler['action'])) {
+        if ($handler['action']) {
             $this->actionName = $handler['action'];
         }
 
         $this->params = $params;
     }
 
+    protected function formatRouteInfo($routeInfo)
+    {
+        $handler = $routeInfo[1];
+        $params  = $routeInfo[2];
+
+        // $router->map('PUT', '/users/{id}', 'user::update');
+        // $router->map('PUT', '/users/{id}', 'App\Controllers\User::update');
+        if (is_string($handler)) {
+            $tmp = explode('::', $handler);
+            $handler = [
+                'controller' => $tmp[0] ?? null,
+                'action'     => $tmp[1] ?? null,
+            ];
+        }
+
+        $routeInfo[1] = [
+            'namespace'  => $handler['namespace'] ?? $params['namespace'] ?? null,
+            'controller' => $handler['controller'] ?? $params['controller'] ?? null,
+            'action'     => $handler['action'] ?? $params['action'] ?? null,
+        ];
+
+        unset($params['namespace']);
+        unset($params['controller']);
+        unset($params['action']);
+
+        $routeInfo[2] = $params;
+
+        return $routeInfo;
+    }
+
     protected function getRewriteUri()
     {
         $uri = $_GET['_uri'] ?? rawurldecode($_SERVER['REQUEST_URI']);

tests/ApplicationTest.php

@@ -29,9 +29,9 @@ protected function createApplication()
                 'params' => []
             ]);
 
-            $router->map('TEST', 'index/responseInstance', ['action' => 'responseInstance']);
-            $router->map('TEST', 'index/hello/{name}', ['action' => 'hello']);
-            $router->map('TEST', 'index/responseFalse', ['action' => 'responseFalse']);
+            $router->map('index/responseInstance', ['action' => 'responseInstance'], 'TEST');
+            $router->map('index/hello/{name}', ['action' => 'hello'], 'TEST');
+            $router->map('index/responseFalse', ['action' => 'responseFalse'], 'TEST');
 
             return $router;
         });

tests/RouterTest.php

@@ -38,10 +38,10 @@ protected function initRouter()
     {
         $this->router = $this->container->get(Router::class);
 
-        $this->router->map('GET', '/hello/{name}', $this->routeData());
+        $this->router->map('/hello/{name}', $this->routeHandler(), 'GET');
     }
 
-    protected function routeData()
+    protected function routeHandler()
     {
         return [
             'namespace' => "Soli\\Tests\\Handlers\\",
@@ -63,9 +63,9 @@ public function testGetters()
         $this->initRouter();
         $this->router->handle();
 
-        $this->assertEquals($this->routeData()['namespace'], $this->router->getNamespaceName());
-        $this->assertEquals($this->routeData()['controller'], $this->router->getControllerName());
-        $this->assertEquals($this->routeData()['action'], $this->router->getActionName());
+        $this->assertEquals($this->routeHandler()['namespace'], $this->router->getNamespaceName());
+        $this->assertEquals($this->routeHandler()['controller'], $this->router->getControllerName());
+        $this->assertEquals($this->routeHandler()['action'], $this->router->getActionName());
 
         $this->assertEquals('soliphp', $this->router->getParams()['name']);
     }