some update

Author: inhere

README.md

@@ -307,15 +307,15 @@ $route = SRouter::match($path, $method);
         // - defaults - 有可选参数时，可以设置默认值
         // 还可以自定义追加此路由的选项：如下经供参考
         // - domains 允许访问路由的域名
-        // - schema 允许访问路由的schema
+        // - schemas 允许访问路由的schema
         // - enter 进入路由的事件回调
         // ... ...
         'option' => [
             'params' => [],
             'defaults' => [],
 
             // 'domains' => null,
-            // 'schema' => null, // ['http','https'],
+            // 'schemas' => null, // ['http','https'],
             // route event. custom design ...
             // 'enter' => null,
             // 'leave' => null,

src/AbstractRouter.php

@@ -14,6 +14,19 @@
  */
 abstract class AbstractRouter implements RouterInterface
 {
+    /**
+     * some available patterns regex
+     * $router->get('/user/{num}', 'handler');
+     * @var array
+     */
+    protected static $globalParams = [
+        'any' => '[^/]+',   // match any except '/'
+        'num' => '[0-9]+',  // match a number
+        'id'  => '[1-9][0-9]*',  // match a ID number
+        'act' => '[a-zA-Z][\w-]+', // match a action name
+        'all' => '.*'
+    ];
+
     /**
      * validate and format arguments
      * @param string|array $methods
@@ -306,12 +319,39 @@ public static function convertNodeStr($str)
         return $str;
     }
 
+    /**
+     * @param array $params
+     */
+    public function addGlobalParams(array $params)
+    {
+        foreach ($params as $name => $pattern) {
+            $this->addGlobalParam($name, $pattern);
+        }
+    }
+
+    /**
+     * @param $name
+     * @param $pattern
+     */
+    public function addGlobalParam($name, $pattern)
+    {
+        $name = trim($name, '{} ');
+        self::$globalParams[$name] = $pattern;
+    }
+
+    /**
+     * @return array
+     */
+    public function getGlobalParams()
+    {
+        return self::$globalParams;
+    }
+
     /**
      * @return array
      */
     public static function getSupportedMethods()
     {
         return self::SUPPORTED_METHODS;
     }
-
 }

src/ORouter.php

@@ -26,17 +26,11 @@ class ORouter extends AbstractRouter
     /** @var int */
     private $routeCounter = 0;
 
-    /**
-     * some available patterns regex
-     * $router->get('/user/{num}', 'handler');
-     * @var array
-     */
-    private static $globalParams = [
-        'any' => '[^/]+',   // match any except '/'
-        'num' => '[0-9]+',  // match a number
-        'id'  => '[1-9][0-9]*',  // match a ID number
-        'act' => '[a-zA-Z][\w-]+', // match a action name
-        'all' => '.*'
+    /** @var array global Options */
+    private $globalOptions = [
+        // 'domains' => [ 'localhost' ], // allowed domains
+        // 'schemas' => [ 'http' ], // allowed schemas
+        // 'time' => ['12'],
     ];
 
     /** @var string */
@@ -277,7 +271,7 @@ public function group($prefix, \Closure $callback, array $opts = [])
      *     'params' => [ 'id' => '[0-9]+', ],
      *     'defaults' => [ 'id' => 10, ],
      *     'domains'  => [ 'a-domain.com', '*.b-domain.com'],
-     *     'schemes' => ['https'],
+     *     'schemas' => ['https'],
      * ]
      * @return static
      * @throws \LogicException
@@ -487,26 +481,6 @@ public function dispatch($dispatcher = null, $path = null, $method = null)
      * helper methods
      ******************************************************************************/
 
-    /**
-     * @param array $params
-     */
-    public function addGlobalParams(array $params)
-    {
-        foreach ($params as $name => $pattern) {
-            $this->addGlobalParam($name, $pattern);
-        }
-    }
-
-    /**
-     * @param $name
-     * @param $pattern
-     */
-    public function addGlobalParam($name, $pattern)
-    {
-        $name = trim($name, '{} ');
-        self::$globalParams[$name] = $pattern;
-    }
-
     /**
      * @return int
      */
@@ -571,22 +545,6 @@ public function getRouteCaches()
         return $this->routeCaches;
     }
 
-    /**
-     * @return array
-     */
-    public function getGlobalParams()
-    {
-        return self::$globalParams;
-    }
-
-    /**
-     * @return array
-     */
-    public static function getSupportedMethods()
-    {
-        return self::SUPPORTED_METHODS;
-    }
-
     /**
      * @param null|string $name
      * @param null|mixed $default

src/SRouter.php

@@ -27,19 +27,6 @@ class SRouter extends AbstractRouter
     /** @var int  */
     private static $routeCounter = 0;
 
-    /**
-     * some available patterns regex
-     * $router->get('/user/{num}', 'handler');
-     * @var array
-     */
-    private static $globalParams = [
-        'any' => '[^/]+',   // match any except '/'
-        'num' => '[0-9]+',  // match a number
-        'id'  => '[1-9][0-9]*',  // match a ID number
-        'act' => '[a-zA-Z][\w-]+', // match a action name
-        'all' => '.*'
-    ];
-
     /** @var string  */
     private static $currentGroupPrefix = '';
 
@@ -375,26 +362,6 @@ public static function dispatch($dispatcher = null, $path = null, $method = null
 /// helper methods
 //////////////////////////////////////////////////////////////////////
 
-    /**
-     * @param array $params
-     */
-    public static function addGlobalParams(array $params)
-    {
-        foreach ($params as $name => $pattern) {
-            self::addGlobalParam($name, $pattern);
-        }
-    }
-
-    /**
-     * @param $name
-     * @param $pattern
-     */
-    public static function addGlobalParam($name, $pattern)
-    {
-        $name = trim($name, '{} ');
-        self::$globalParams[$name] = $pattern;
-    }
-
     /**
      * @return int
      */
@@ -419,14 +386,6 @@ public static function getRegularRoutes()
         return self::$regularRoutes;
     }
 
-    /**
-     * @return array
-     */
-    public static function getVagueRoutes()
-    {
-        return self::$vagueRoutes;
-    }
-
     /**
      * @return array
      */