some bug fixed

Author: inhere

src/Base/AbstractRouter.php

@@ -361,7 +361,7 @@ public function ctrl(string $prefix, string $controllerClass, array $map = [], a
     public function group(string $prefix, \Closure $callback, array $opts = [])
     {
         $previousGroupPrefix = $this->currentGroupPrefix;
-        $this->currentGroupPrefix = $previousGroupPrefix . '/' . trim($prefix, '/');
+        $this->currentGroupPrefix = $previousGroupPrefix . '/' . \trim($prefix, '/');
 
         $previousGroupOption = $this->currentGroupOption;
         $this->currentGroupOption = $opts;

src/ServerRouter.php

@@ -27,7 +27,7 @@ final class ServerRouter extends ORouter
      * The param route cache number.
      * @var int
      */
-    public $tmpCacheNumber = 100;
+    public $tmpCacheNumber = 300;
 
     /**
      * There are last route caches. like static routes
@@ -229,11 +229,11 @@ public function match(string $path, string $method = 'GET'): array
     protected function findInStaticRoutes(string $path, string $method)
     {
         // if flattenStatic is TRUE
-        if ($this->flattenStatic) {
+        if ($this->flatStaticRoutes) {
             $key = $path . '#' . $method;
 
             if (isset($this->flatStaticRoutes[$key])) {
-                return $this->staticRoutes[$key];
+                return $this->flatStaticRoutes[$key];
             }
         } elseif (isset($this->staticRoutes[$path][$method])) {
             return $this->staticRoutes[$path][$method];

test/ORouterTest.php

@@ -92,8 +92,6 @@ public function testComplexRoute()
 
         $ret = $router->match('/my/tom/not-match', 'GET');
         $this->assertSame(ORouter::NOT_FOUND, $ret[0]);
-
-
     }
 
     public function testStaticRoute()
@@ -158,7 +156,7 @@ public function testParamRoute()
         $ret = $router->match('/hi/tom', 'GET');
 
         $this->assertCount(3, $ret);
-        // var_dump($ret, $router->getRegularRoutes());die;
+
         list($status, $path, $route) = $ret;
 
         $this->assertSame(ORouter::FOUND, $status);