midllewaretrailingslash

rueduphp · Nov 3, 2017 · fd2dbd0 · fd2dbd0
1 parent 28abf93
commit fd2dbd0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/lib/fast.php b/lib/fast.php
@@ -599,9 +599,7 @@ public function addModule($moduleClass)
 
         public function router()
         {
-            if ($router = $this->define('router')) {
-                $this->define('router', $router);
-            } else {
+            if (!$this->define('router')) {
                 $this->define('router', new FastRouter);
             }
 

diff --git a/lib/fastmiddlewaretrailingslash.php b/lib/fastmiddlewaretrailingslash.php
@@ -13,7 +13,7 @@ public function process(ServerRequestInterface $request, DelegateInterface $next
 
             $uri = $request->getUri()->getPath();
 
-            if (!empty($uri) && fnmatch('*/', $uri)) {
+            if (!empty($uri) && '/' !== $uri && fnmatch('*/', $uri)) {
                 return $app->redirectResponse(substr($uri, 0, -1));
             }
 

diff --git a/lib/lib.php b/lib/lib.php
@@ -1,10 +1,7 @@
 <?php
     namespace Octo;
 
-    use function call_user_func_array;
-    use function func_get_args;
     use Illuminate\Support\Debug\Dumper;
-    use function is_null;
     use Psr\Http\Message\ServerRequestInterface;
     use Zend\Expressive\Router\FastRouteRouter;