Merge pull request #8974 from kenjis/fix-spark-routes-BadRequestExcep…

…tion fix: `spark routes` may show BadRequestException when a route has a regexp
codeigniter4 · Jun 19, 2024 · cd46db1 · cd46db1
2 parents c8b8995 + 4ad4bd3
commit cd46db1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/system/Commands/Utilities/Routes/FilterFinder.php b/system/Commands/Utilities/Routes/FilterFinder.php
@@ -15,6 +15,7 @@
 
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\Filters\Filters;
+use CodeIgniter\HTTP\Exceptions\BadRequestException;
 use CodeIgniter\HTTP\Exceptions\RedirectException;
 use CodeIgniter\Router\Router;
 use Config\Feature;
@@ -72,7 +73,7 @@ public function find(string $uri): array
                 'before' => [],
                 'after'  => [],
             ];
-        } catch (PageNotFoundException) {
+        } catch (BadRequestException|PageNotFoundException) {
             return [
                 'before' => ['<unknown>'],
                 'after'  => ['<unknown>'],

diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
@@ -346,6 +346,8 @@ public static function serviceExists(string $name): ?string
      * Reset shared instances and mocks for testing.
      *
      * @return void
+     *
+     * @testTag only available to test code
      */
     public static function reset(bool $initAutoloader = true)
     {
@@ -362,6 +364,8 @@ public static function reset(bool $initAutoloader = true)
      * Resets any mock and shared instances for a single service.
      *
      * @return void
+     *
+     * @testTag only available to test code
      */
     public static function resetSingle(string $name)
     {
@@ -375,6 +379,8 @@ public static function resetSingle(string $name)
      * @param object $mock
      *
      * @return void
+     *
+     * @testTag only available to test code
      */
     public static function injectMock(string $name, $mock)
     {

diff --git a/system/Router/Router.php b/system/Router/Router.php
@@ -187,6 +187,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
      *
      * @return (Closure(mixed...): (ResponseInterface|string|void))|string Controller classname or Closure
      *
+     * @throws BadRequestException
      * @throws PageNotFoundException
      * @throws RedirectException
      */

diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php
@@ -240,4 +240,18 @@ public function testRoutesCommandRouteLegacy(): void
             EOL;
         $this->assertStringContainsString($expected, $this->getBuffer());
     }
+
+    public function testRoutesCommandRouteWithRegexp(): void
+    {
+        $routes = Services::routes();
+        $routes->resetRoutes();
+        $routes->options('picker/(.+)', 'Options::index');
+
+        command('routes');
+
+        $expected = <<<'EOL'
+            | OPTIONS | picker/(.+) | »             | \App\Controllers\Options::index        | <unknown>      | <unknown>     |
+            EOL;
+        $this->assertStringContainsString($expected, $this->getBuffer());
+    }
 }