Merge pull request #12 from yiisoft/optimization

Add optimisation
yiisoft · Jan 11, 2024 · 39f6c34 · 39f6c34
2 parents 1fa398a + 74f3376
commit 39f6c34
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/FileRouter.php b/src/FileRouter.php
@@ -129,16 +129,20 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
     private function parseRequestPath(ServerRequestInterface $request): iterable
     {
-        $possibleAction = null;
         $path = urldecode($request->getUri()->getPath());
 
-        if ($this->routePrefix !== '' && str_starts_with($path, $this->routePrefix)) {
-            $path = mb_substr($path, strlen($this->routePrefix));
+        if ($this->routePrefix !== '') {
+            if (!str_starts_with($path, $this->routePrefix)) {
+                return;
+            }
+            $path = mb_substr($path, mb_strlen($this->routePrefix));
             if ($path === '') {
                 $path = '/';
             }
         }
 
+        $possibleAction = null;
+
         if ($path === '/') {
             yield [
                 $this->cleanClassname(

diff --git a/tests/FileRouterTest.php b/tests/FileRouterTest.php
@@ -377,6 +377,25 @@ public static function dataModularity(): iterable
         ];
     }
 
+    public function testModularityFastPath(): void
+    {
+        $router = $this->createRouter();
+        $router = $router
+            ->withNamespace('Yiisoft\\FileRouter\\Tests\\Support\\App5\\Module1')
+            ->withRoutePrefix('/module1');
+
+
+        $handler = $this->createExceptionHandler();
+        $request = new ServerRequest(
+            method: 'GET',
+            uri: '/module2',
+        );
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Not implemented from tests.');
+        $router->process($request, $handler);
+    }
+
     private function createRouter(): FileRouter
     {
         $container = new SimpleContainer([