fix: cannot setting params. Sometimes 'notFound' would be considered …

…'notAllowed'
swoft-cloud · May 2, 2018 · 1aef8f2 · 1aef8f2
1 parent 56e3cea
commit 1aef8f2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Router/HandlerMapping.php b/src/Router/HandlerMapping.php
@@ -164,7 +164,7 @@ protected function prepareForMap(string $route, $handler, array $opts): array
     protected function collectParamRoute(string $route, array $methods, array $conf)
     {
         $conf['original'] = $route;
-        $params = $this->getAvailableParams($opts['params'] ?? []);
+        $params = $this->getAvailableParams($conf['option']['params'] ?? []);
         list($first, $conf) = $this->parseParamRoute($route, $params, $conf);
 
         // route string have regular
@@ -366,7 +366,10 @@ protected function findInRegularRoutes(array $routesData, string $path, string $
             }
         }
 
-        return [self::NOT_FOUND, \explode(',', \trim($allowedMethods, ','))];
+        return [
+            self::NOT_FOUND,
+            $allowedMethods ? \explode(',', \rtrim($allowedMethods, ',')) : []
+        ];
     }
 
     /**