class import fix. add test for RouterManager

Author: inhere

README.md

@@ -13,25 +13,29 @@
 - 支持自动匹配路由到控制器就像 Yii 一样, 请参看配置项 `autoRoute` (不推荐)
 - 压测对比数据请看[路由测试](#ab-test)
 
-多个版本：
+**多个版本：**
 
 > 不同的版本有稍微的区别以适应不同的场景
 
 - `ORouter` 基础版本，也是后几个版本的基础类。
-- `SRouter` 静态类版本。 `ORouter` 的简单包装，通过静态方法使用(方便小应用快速使用)
+- `SRouter` 静态类版本。`ORouter` 的简单包装，通过静态方法使用(方便小应用快速使用)
 - `CachedRouter` 继承自`ORouter`，支持路由缓存的版本. 适合fpm使用(有缓存将会省去每次的路由收集和解析消耗) 
 - `PreMatchRouter` 继承自`ORouter`，预匹配路由器。当应用的静态路由较多时，将拥有更快的匹配速度
     - fpm 应用中，实际上我们在收集路由之前，已经知道了路由path和请求动作METHOD
 - `ServerRouter` 继承自`ORouter`，服务器路由。内置支持动态路由临时缓存. 适合swoole等常驻内存应用使用
     - 最近请求过的动态路由将会缓存为一个静态路由信息，下次相同路由将会直接匹配命中
 
-内置调度器：
+**内置调度器：**
 
 - 支持事件: `found` `notFound` `execStart` `execEnd` `execError`. 当触发事件时你可以做一些事情(比如记录日志等)
 - 支持动态获取`action`名。支持设置方法执行器(`actionExecutor`)，通过方法执行器来自定义调用真实请求方法. 
 - 支持通过方法 `$router->dispatch($path, $method)` 手动调度一个路由
 - 你即使不配置任何东西, 它也能很好的工作
 
+**路由器管理**
+
+`RouterManager` 当需要在一个项目里处理多个域名下的请求时，方便的根据不同域名配置多个路由器
+
 **[EN README](README_en.md)**
 
 ## 项目地址
@@ -61,8 +65,8 @@ composer require inhere/sroute
 
 ```bash
 git clone https://github.com/inhere/php-srouter.git // github
-git clone https://gitee.com/inhere/php-srouter.git // git@osc
 ```
+
 <a name="ab-test"></a>
 ## 压测
 

src/Base/AbstractRouter.php

@@ -24,6 +24,11 @@
  */
 abstract class AbstractRouter implements RouterInterface
 {
+    /**
+     * @var string
+     */
+    private $name = '';
+
     /**
      * some available patterns regex
      * $router->get('/user/{id}', 'handler');
@@ -208,7 +213,8 @@ public function setConfig(array $config)
             throw new \LogicException('Routing has been added, and configuration is not allowed!');
         }
 
-        static $props = [
+        $props = [
+            'name' => 1,
             'ignoreLastSlash' => 1,
             'tmpCacheNumber' => 1,
             'notAllowedAsNotFound' => 1,
@@ -267,7 +273,7 @@ public function __call($method, array $args)
      * @throws \LogicException
      * @throws \InvalidArgumentException
      */
-    public function rest($prefix, $controllerClass, array $map = [], array $opts = []): AbstractRouter
+    public function rest(string $prefix, string $controllerClass, array $map = [], array $opts = []): AbstractRouter
     {
         $map = array_merge([
             'index' => ['GET'],
@@ -324,7 +330,7 @@ public function rest($prefix, $controllerClass, array $map = [], array $opts = [
      * @throws \LogicException
      * @throws \InvalidArgumentException
      */
-    public function ctrl($prefix, $controllerClass, array $map = [], array $opts = []): AbstractRouter
+    public function ctrl(string $prefix, string $controllerClass, array $map = [], array $opts = []): AbstractRouter
     {
         foreach ($map as $action => $method) {
             if (!$method || !\is_string($action)) {
@@ -404,7 +410,7 @@ public function validateArguments($methods, $handler): array
      * @param string $route
      * @return bool
      */
-    public static function isStaticRoute($route): bool
+    public static function isStaticRoute(string $route): bool
     {
         return strpos($route, '{') === false && strpos($route, '[') === false;
     }
@@ -414,7 +420,7 @@ public static function isStaticRoute($route): bool
      * @param bool $ignoreLastSlash
      * @return string
      */
-    protected function formatUriPath($path, $ignoreLastSlash): string
+    protected function formatUriPath(string $path, $ignoreLastSlash): string
     {
         // clear '//', '///' => '/'
         if (false !== strpos($path, '//')) {
@@ -691,6 +697,22 @@ public static function getSupportedMethods(): array
         return self::ALLOWED_METHODS;
     }
 
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function setName(string $name)
+    {
+        $this->name = $name;
+    }
+
     /**
      * @param array $staticRoutes
      */

src/Dispatcher/Dispatcher.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\Route\Dispatcher;
 
-use Inhere\Route\RouterInterface;
+use Inhere\Route\Base\RouterInterface;
 
 /**
  * Class Dispatcher

src/Dispatcher/DispatcherInterface.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\Route\Dispatcher;
 
-use Inhere\Route\RouterInterface;
+use Inhere\Route\Base\RouterInterface;
 
 /**
  * Interface DispatcherInterface

src/Dispatcher/SimpleDispatcher.php

@@ -9,7 +9,7 @@
 namespace Inhere\Route\Dispatcher;
 
 use Inhere\Route\ORouter;
-use Inhere\Route\RouterInterface;
+use Inhere\Route\Base\RouterInterface;
 
 /**
  * Class SimpleDispatcher

src/PreMatchRouter.php

@@ -57,7 +57,9 @@ public function __construct(array $config = [], string $path = null, string $met
      */
     public function setRequest(string $path = null, string $method = null)
     {
-        $path = $path ?: $_SERVER['REQUEST_URI'];
+        if (!$path) {
+            $path = $_SERVER['REQUEST_URI'] ?? '';
+        }
 
         if (strpos($path, '?')) {
             $path = parse_url($path, PHP_URL_PATH);

src/RouterManager.php

@@ -47,11 +47,11 @@ class RouterManager
      * @var array[]
      * [
      *  'default' => 'main-site', // this is default router.
-     *
      *  'main-site' => [
      *      'driver' => 'default',
      *      'conditions' => [
-     *          'domain' => 'domain.com',
+     *          'domains' => 'abc.com',
+     *          'schemes' => ['https'],
      *      ],
      *      'options' => [
      *          // some setting for router.
@@ -61,7 +61,7 @@ class RouterManager
      *  'doc-site' => [
      *      'driver' => 'cached',
      *      'conditions' => [
-     *          'domain' => 'docs.domain.com',
+     *          'domains' => 'docs.abc.com',
      *      ],
      *      'options' => [
      *          'cacheFile' => '/path/to/routes-cache.php',
@@ -75,12 +75,29 @@ class RouterManager
     /**
      * @var array
      * [
-     *  'condition ID' => 'name',
-     *  'condition ID1' => 'main-site'
+     *  'main-site' => [
+     *      'domains' => 'abc.com',
+     *      'schemes' => ['https'],
+     *  ],
+     *  'doc-site' => [
+     *       'domains' => 'docs.abc.com',
+     *       'schemes' => ['https'],
+     *   ],
+     *  'th3-site' => [
+     *       'domains' => 'th3.abc.com',
+     *   ],
      * ]
      */
     private $conditions = [];
 
+    /**
+     * @var array
+     */
+    private $supportedConditions = [
+        'domains' => 'domain',
+        'schemes' => 'scheme',
+    ];
+
     /**
      * @var array
      */
@@ -112,23 +129,61 @@ public function __construct(array $configs = [])
 
     /**
      * get router by condition
-     * @param array $conditions
+     * @param array|string $condition
+     * array:
      * [
-     *  'domain' => 'domain.com'
+     *  'domain' => 'abc.com',
+     *  'scheme' => 'https',
      * ]
+     * string:
+     *  get by name. same of call getByName()
      * @return AbstractRouter|RouterInterface
      * @throws \InvalidArgumentException
      */
-    public function get($conditions = null): AbstractRouter
+    public function get($condition = null): AbstractRouter
     {
-        if (!$conditions) {
+        if (!$condition) {
             return $this->getDefault();
         }
 
-        $key = $this->genConditionID($conditions);
-        $name = $this->conditions[$key] ?? self::DEFAULT_ROUTER;
+        // alias of getByName()
+        if (\is_string($condition)) {
+            return $this->getByName($condition);
+        }
+
+        $useName = self::DEFAULT_ROUTER;
+
+        foreach ($this->conditions as $name => $cond) {
+            if ($this->compareArray($cond, $condition)) {
+                $useName = $name;
+                break;
+            }
+        }
 
-        return $this->getByName($name);
+        return $this->getByName($useName);
+    }
+
+    /**
+     * @param array $define
+     * @param array $input
+     * @return bool
+     */
+    protected function compareArray(array $define, array $input): bool
+    {
+        $match = true;
+
+        foreach ($this->supportedConditions as $def => $key) {
+            if (isset($define[$def], $input[$key])) {
+                $defValues = (array)$define[$def];
+
+                if (!\in_array($input[$key], $defValues, true)) {
+                    $match = false;
+                    break;
+                }
+            }
+        }
+
+        return $match;
     }
 
     /**
@@ -158,7 +213,7 @@ public function getByName(string $name): AbstractRouter
             $config = $this->configs[$config];
         }
 
-        return ($this->routers[$name] = $this->createRouter($config));
+        return ($this->routers[$name] = $this->createRouter($config, $name));
     }
 
     /**
@@ -169,21 +224,13 @@ public function getDefault(): AbstractRouter
         return $this->getByName(self::DEFAULT_ROUTER);
     }
 
-    /**
-     * @param string|array $conditions
-     * @return string
-     */
-    private function genConditionID($conditions): string
-    {
-        return \md5(\is_array($conditions) ? \json_encode($conditions) : $conditions);
-    }
-
     /**
      * @param array $config
+     * @param string $name
      * @return AbstractRouter
      * @throws \InvalidArgumentException
      */
-    private function createRouter(array $config): AbstractRouter
+    private function createRouter(array $config, string $name = ''): AbstractRouter
     {
         $driver = $config['driver'] ?? self::DEFAULT_ROUTER;
         $options = $config['options'] ?? [];
@@ -192,6 +239,10 @@ private function createRouter(array $config): AbstractRouter
             throw new \InvalidArgumentException("The router driver name '$driver' does not exists!");
         }
 
+        if ($name && !isset($options['name'])) {
+            $options['name'] = $name;
+        }
+
         return new $class($options);
     }
 
@@ -237,8 +288,7 @@ public function setConfigs(array $configs)
 
         foreach ($configs as $name => $config) {
             if (isset($config['conditions'])) {
-                $key = $this->genConditionID($config['conditions']);
-                $this->conditions[$key] = $name;
+                $this->conditions[$name] = $config['conditions'];
             }
         }
     }

test/PreMatchRouterTest.php

@@ -9,7 +9,7 @@
 namespace Inhere\Route\Test;
 
 use Inhere\Route\PreMatchRouter;
-use Inhere\Route\RouterInterface;
+use Inhere\Route\Base\RouterInterface;
 use PHPUnit\Framework\TestCase;
 
 /**