Refactoring + Tests + MSI 100%

infection.json.dist

@@ -12,5 +12,6 @@
     },
     "mutators": {
         "@default": true
-    }
+    },
+    "minMsi": 100
 }

src/FileRouter.php

@@ -155,61 +155,57 @@ private function parseRequestPath(ServerRequestInterface $request): Generator
             }
         }
 
-        $possibleAction = null;
-
         if ($path === '/') {
             yield [
-                $this->cleanClassname(
-                    $this->namespace . '\\' . $this->baseControllerDirectory . '\\' . $this->defaultControllerName . $this->classPostfix
-                ),
-                $possibleAction,
+                $this->makeClassName($this->defaultControllerName),
+                null,
             ];
             return;
         }
 
         $controllerName = preg_replace_callback(
-            '#(/.)#u',
-            static fn(array $matches) => mb_strtoupper($matches[1]),
+            '#/.#u',
+            static fn(array $matches) => mb_strtoupper($matches[0]),
             $path,
         );
 
-        if (!preg_match('#^(.*?)/([^/]+)/?$#', $controllerName, $matches)) {
+        if (!preg_match('#^/?(.*?)/([^/]+)/?$#', $controllerName, $matches)) {
             return;
         }
 
-        $directoryPath = $matches[1];
-        $controllerName = $matches[2];
+        [$_, $directoryPath, $controllerName] = $matches;
 
         yield [
-            $this->cleanClassname(
-                $this->namespace . '\\' . $this->baseControllerDirectory . '\\' . $directoryPath . '\\' . $controllerName . $this->classPostfix
-            ),
-            $possibleAction,
+            $this->makeClassName($controllerName, $directoryPath),
+            null,
         ];
 
-        if (preg_match('#^(.*?)/([^/]+)/?$#', $directoryPath, $matches)) {
-            $possibleAction = strtolower($controllerName);
-            $directoryPath = $matches[1];
-            $controllerName = $matches[2];
+        if ($directoryPath === '') {
+            yield [
+                $this->makeClassName($this->defaultControllerName, $controllerName),
+                null,
+            ];
         } else {
-            $directoryPath = $controllerName;
-            $controllerName = $this->defaultControllerName;
+            yield [
+                $this->makeClassName($directoryPath),
+                strtolower($controllerName),
+            ];
         }
-
-        yield [
-            $this->cleanClassname(
-                $this->namespace . '\\' . $this->baseControllerDirectory . '\\' . $directoryPath . '\\' . $controllerName . $this->classPostfix
-            ),
-            $possibleAction,
-        ];
     }
 
-    private function cleanClassname(string $className): string
+    private function makeClassName(string $controllerName, string $directoryPath = ''): string
     {
-        return str_replace(
-            ['\\/\\', '\\/', '\\\\'],
-            '\\',
-            $className,
-        );
+        $parts = [];
+        if ($this->namespace !== '') {
+            $parts[] = $this->namespace;
+        }
+        if ($this->baseControllerDirectory !== '') {
+            $parts[] = $this->baseControllerDirectory;
+        }
+        if ($directoryPath !== '') {
+            $parts[] = str_replace('/', '\\', $directoryPath);
+        }
+        $parts[] = str_replace('/', '\\', $controllerName) . $this->classPostfix;
+        return implode('\\', $parts);
     }
 }

tests/FileRouterTest.php

@@ -17,6 +17,7 @@
 use Yiisoft\FileRouter\Tests\Support\App3;
 use Yiisoft\FileRouter\Tests\Support\App4;
 use Yiisoft\FileRouter\Tests\Support\App5;
+use Yiisoft\FileRouter\Tests\Support\App6;
 use Yiisoft\FileRouter\Tests\Support\HeaderMiddleware;
 use Yiisoft\Middleware\Dispatcher\MiddlewareDispatcher;
 use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
@@ -103,6 +104,26 @@ public static function dataRouter(): iterable
             '/user',
             'Hello, delete!',
         ];
+        yield 'HEAD /user' => [
+            'HEAD',
+            '/user',
+            'Hello, head!',
+        ];
+        yield 'OPTIONS /user' => [
+            'OPTIONS',
+            '/user',
+            'Hello, options!',
+        ];
+        yield 'GET /user/profile/view' => [
+            'GET',
+            '/user/profile/view',
+            'Hello, User\Profile\IndexController!',
+        ];
+        yield 'GET /user/blog/view' => [
+            'GET',
+            '/user/blog/view',
+            'Hello, blog view!',
+        ];
     }
 
     public function testUnsupportedMethod(): void
@@ -272,19 +293,41 @@ public function testRoutesCollision(string $method, string $uri, string $expecte
 
     public static function dataRoutesCollision(): iterable
     {
-        yield 'direct' => [
+        yield 'direct get' => [
             'GET',
             '/user',
-            'Hello, Controller/UserController!',
+            'Hello, index Controller/UserController!',
+        ];
+        yield 'direct delete' => [
+            'DELETE',
+            '/user',
+            'Hello, delete Controller/UserController!',
         ];
 
-        yield 'indirect' => [
+        yield 'indirect post' => [
             'POST',
             '/user',
-            'Hello, Controller/User/IndexController!',
+            'Hello, create Controller/User/IndexController!',
         ];
     }
 
+    public function testActions(): void
+    {
+        $router = $this->createRouter();
+        $router = $router->withNamespace('Yiisoft\FileRouter\Tests\Support\App6');
+
+        $handler = $this->createExceptionHandler();
+        $request = new ServerRequest(
+            method: 'POST',
+            uri: '/user',
+        );
+
+        $response = $router->process($request, $handler);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('Hello, create Controller/User/IndexController!', (string) $response->getBody());
+    }
+
     #[DataProvider('dataUnicodeRoutes')]
     public function testTestUnicodeRoutes(string $method, string $uri, string $expectedResponse): void
     {
@@ -370,6 +413,13 @@ public static function dataModularity(): iterable
             '/m/o/d/u/l/e/index',
             'Hello, module2!',
         ];
+        yield 'модуль3 /index' => [
+            'Yiisoft\\FileRouter\\Tests\\Support\\App5\\Модуль3',
+            '/Модуль3',
+            'GET',
+            '/Модуль3/index',
+            'Hello, модуль3!',
+        ];
     }
 
     public function testModularityFastPath(): void
@@ -407,6 +457,7 @@ private function createRouter(): FileRouter
         $container = new SimpleContainer([
             HeaderMiddleware::class => new HeaderMiddleware(),
 
+            App1\Controller\User\Profile\ViewController::class => new  App1\Controller\User\Profile\ViewController(),
             App1\Controller\User\BlogController::class => new App1\Controller\User\BlogController(),
             App1\Controller\UserController::class => new App1\Controller\UserController(),
             App1\Controller\IndexController::class => new App1\Controller\IndexController(),
@@ -421,6 +472,10 @@ private function createRouter(): FileRouter
 
             App5\Module1\Controller\IndexController::class => new App5\Module1\Controller\IndexController(),
             App5\Module2\Controller\IndexController::class => new App5\Module2\Controller\IndexController(),
+            App5\Модуль3\Controller\Index\IndexController::class => new App5\Модуль3\Controller\Index\IndexController(),
+
+            App6\Controller\UserController::class => new App6\Controller\UserController(),
+            App6\Controller\User\IndexController::class => new App6\Controller\User\IndexController(),
         ]);
 
         return new FileRouter(

tests/Support/App1/Controller/User/BlogController.php

@@ -20,4 +20,9 @@ public function index(): ResponseInterface
     {
         return new TextResponse('Hello, index!');
     }
+
+    public function view(): ResponseInterface
+    {
+        return new TextResponse('Hello, blog view!');
+    }
 }

tests/Support/App1/Controller/User/Profile/ViewController.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\FileRouter\Tests\Support\App1\Controller\User\Profile;
+
+use HttpSoft\Response\TextResponse;
+use Psr\Http\Message\ResponseInterface;
+
+final class ViewController
+{
+    public function index(): ResponseInterface
+    {
+        return new TextResponse('Hello, User\Profile\IndexController!', 200);
+    }
+}

tests/Support/App1/Controller/UserController.php

@@ -21,6 +21,16 @@ public function index(): ResponseInterface
         return new TextResponse('Hello, index!');
     }
 
+    public function head(): ResponseInterface
+    {
+        return new TextResponse('Hello, head!');
+    }
+
+    public function options(): ResponseInterface
+    {
+        return new TextResponse('Hello, options!');
+    }
+
     public function create(): ResponseInterface
     {
         return new TextResponse('Hello, create!');

tests/Support/App3/Controller/User/IndexController.php

@@ -11,11 +11,11 @@ class IndexController
 {
     public function index(): ResponseInterface
     {
-        return new TextResponse('Hello, Controller/User/IndexController!');
+        return new TextResponse('Hello, index Controller/User/IndexController!');
     }
 
     public function create(): ResponseInterface
     {
-        return new TextResponse('Hello, Controller/User/IndexController!');
+        return new TextResponse('Hello, create Controller/User/IndexController!');
     }
 }

tests/Support/App3/Controller/UserController.php

@@ -11,6 +11,11 @@ class UserController
 {
     public function index(): ResponseInterface
     {
-        return new TextResponse('Hello, Controller/UserController!');
+        return new TextResponse('Hello, index Controller/UserController!');
+    }
+
+    public function delete(): ResponseInterface
+    {
+        return new TextResponse('Hello, delete Controller/UserController!');
     }
 }

tests/Support/App5/Модуль3/Controller/Index/IndexController.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\FileRouter\Tests\Support\App5\Модуль3\Controller\Index;
+
+use HttpSoft\Response\TextResponse;
+use Psr\Http\Message\ResponseInterface;
+
+class IndexController
+{
+    public function index(): ResponseInterface
+    {
+        return new TextResponse('Hello, модуль3!', 200);
+    }
+}

tests/Support/App6/Controller/User/IndexController.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\FileRouter\Tests\Support\App6\Controller\User;
+
+use HttpSoft\Response\TextResponse;
+use Psr\Http\Message\ResponseInterface;
+
+class IndexController
+{
+    public function create(): ResponseInterface
+    {
+        return new TextResponse('Hello, create Controller/User/IndexController!');
+    }
+}

tests/Support/App6/Controller/UserController.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\FileRouter\Tests\Support\App6\Controller;
+
+use HttpSoft\Response\TextResponse;
+use Psr\Http\Message\ResponseInterface;
+
+class UserController
+{
+    public static array $actions = [
+        'GET' => 'index',
+    ];
+
+    public function index(): ResponseInterface
+    {
+        return new TextResponse('Hello, index Controller/UserController!');
+    }
+
+    public function create(): ResponseInterface
+    {
+        return new TextResponse('Hello, create Controller/UserController!');
+    }
+}