Be explicit about internal and final components

src/BadRouteException.php

@@ -7,6 +7,7 @@
 
 use function sprintf;
 
+/** @final */
 class BadRouteException extends LogicException
 {
     public static function alreadyRegistered(string $route, string $method): self

src/DataGenerator/CharCountBased.php

@@ -6,6 +6,7 @@
 use function count;
 use function implode;
 
+/** @final */
 class CharCountBased extends RegexBasedAbstract
 {
     protected function getApproxChunkSize(): int

src/DataGenerator/GroupCountBased.php

@@ -8,6 +8,7 @@
 use function max;
 use function str_repeat;
 
+/** @final */
 class GroupCountBased extends RegexBasedAbstract
 {
     protected function getApproxChunkSize(): int

src/DataGenerator/GroupPosBased.php

@@ -6,6 +6,7 @@
 use function count;
 use function implode;
 
+/** @final */
 class GroupPosBased extends RegexBasedAbstract
 {
     protected function getApproxChunkSize(): int

src/DataGenerator/MarkBased.php

@@ -5,6 +5,7 @@
 
 use function implode;
 
+/** @final */
 class MarkBased extends RegexBasedAbstract
 {
     protected function getApproxChunkSize(): int

src/DataGenerator/RegexBasedAbstract.php

@@ -17,13 +17,15 @@
 use function round;
 
 /**
+ * @internal
+ *
  * @phpstan-import-type StaticRoutes from DataGenerator
  * @phpstan-import-type DynamicRouteChunk from DataGenerator
  * @phpstan-import-type DynamicRoutes from DataGenerator
  * @phpstan-import-type RouteData from DataGenerator
  * @phpstan-import-type ExtraParameters from DataGenerator
  */
 abstract class RegexBasedAbstract implements DataGenerator
 {
     /** @var StaticRoutes */
     protected array $staticRoutes = [];

src/Dispatcher/CharCountBased.php

@@ -9,6 +9,7 @@
 use function end;
 use function preg_match;
 
+/** @final */
 class CharCountBased extends RegexBasedAbstract
 {
     /** @inheritDoc */

src/Dispatcher/GroupCountBased.php

@@ -8,6 +8,7 @@
 use function count;
 use function preg_match;
 
+/** @final */
 class GroupCountBased extends RegexBasedAbstract
 {
     /** @inheritDoc */

src/Dispatcher/GroupPosBased.php

@@ -8,6 +8,7 @@
 use function assert;
 use function preg_match;
 
+/** @final */
 class GroupPosBased extends RegexBasedAbstract
 {
     /** @inheritDoc */

src/Dispatcher/MarkBased.php

@@ -7,6 +7,7 @@
 
 use function preg_match;
 
+/** @final */
 class MarkBased extends RegexBasedAbstract
 {
     /** @inheritDoc */

src/Dispatcher/RegexBasedAbstract.php

@@ -10,13 +10,15 @@
 use FastRoute\Dispatcher\Result\NotMatched;
 
 /**
+ * @internal
+ *
  * @phpstan-import-type StaticRoutes from DataGenerator
  * @phpstan-import-type DynamicRouteChunk from DataGenerator
  * @phpstan-import-type DynamicRouteChunks from DataGenerator
  * @phpstan-import-type DynamicRoutes from DataGenerator
  * @phpstan-import-type RouteData from DataGenerator
  */
 abstract class RegexBasedAbstract implements Dispatcher
 {
     /** @var StaticRoutes */
     protected array $staticRouteMap = [];

src/Route.php

@@ -7,8 +7,12 @@
 use function preg_match;
 use function preg_quote;
 
-/** @phpstan-import-type ExtraParameters from DataGenerator */
+/**
+ * @internal
+ *
+ * @phpstan-import-type ExtraParameters from DataGenerator
+ */
 class Route
 {
     public readonly string $regex;
 

src/RouteCollector.php

@@ -6,6 +6,7 @@
 /**
  * @phpstan-import-type RouteData from DataGenerator
  * @phpstan-import-type ExtraParameters from DataGenerator
+ * @final
  */
 class RouteCollector
 {

src/RouteParser/Std.php

@@ -14,8 +14,8 @@
 use function preg_match_all;
 use function preg_split;
 use function rtrim;
+use function str_contains;
 use function strlen;
-use function strpos;
 use function substr;
 use function trim;
 
@@ -26,6 +26,8 @@
  * Parses route strings of the following form:
  *
  * "/user/{name}[/{id:[0-9]+}]"
+ *
+ * @final
  */
 class Std implements RouteParser
 {
@@ -135,7 +137,7 @@ private function parsePlaceholders(string $route): array
     private function guardAgainstCapturingGroupUsage(string $regex, string $variableName): void
     {
         // Needs to have at least a ( to contain a capturing group
-        if (strpos($regex, '(') === false) {
+        if (! str_contains($regex, '(')) {
             return;
         }
 

test/RouteCollectorTest.php

@@ -3,15 +3,23 @@
 
 namespace FastRoute\Test;
 
+use FastRoute\DataGenerator;
+use FastRoute\RouteCollector;
+use FastRoute\RouteParser\Std;
 use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
-class RouteCollectorTest extends TestCase
+use function assert;
+use function count;
+use function is_string;
+
+final class RouteCollectorTest extends TestCase
 {
     #[PHPUnit\Test]
     public function shortcutsCanBeUsedToRegisterRoutes(): void
     {
-        $r = new DummyRouteCollector();
+        $dataGenerator = self::dummyDataGenerator();
+        $r = new RouteCollector(new Std(), $dataGenerator);
 
         $r->any('/any', 'any');
         $r->delete('/delete', 'delete');
@@ -33,13 +41,15 @@ public function shortcutsCanBeUsedToRegisterRoutes(): void
             ['OPTIONS', '/options', 'options', ['_route' => '/options']],
         ];
 
-        self::assertSame($expected, $r->routes);
+        self::assertObjectHasProperty('routes', $dataGenerator);
+        self::assertSame($expected, $dataGenerator->routes);
     }
 
     #[PHPUnit\Test]
     public function routesCanBeGrouped(): void
     {
-        $r = new DummyRouteCollector();
+        $dataGenerator = self::dummyDataGenerator();
+        $r = new RouteCollector(new Std(), $dataGenerator);
 
         $r->delete('/delete', 'delete');
         $r->get('/get', 'get');
@@ -49,7 +59,7 @@ public function routesCanBeGrouped(): void
         $r->put('/put', 'put');
         $r->options('/options', 'options');
 
-        $r->addGroup('/group-one', static function (DummyRouteCollector $r): void {
+        $r->addGroup('/group-one', static function (RouteCollector $r): void {
             $r->delete('/delete', 'delete');
             $r->get('/get', 'get');
             $r->head('/head', 'head');
@@ -58,7 +68,7 @@ public function routesCanBeGrouped(): void
             $r->put('/put', 'put');
             $r->options('/options', 'options');
 
-            $r->addGroup('/group-two', static function (DummyRouteCollector $r): void {
+            $r->addGroup('/group-two', static function (RouteCollector $r): void {
                 $r->delete('/delete', 'delete');
                 $r->get('/get', 'get');
                 $r->head('/head', 'head');
@@ -69,10 +79,10 @@ public function routesCanBeGrouped(): void
             });
         });
 
-        $r->addGroup('/admin', static function (DummyRouteCollector $r): void {
+        $r->addGroup('/admin', static function (RouteCollector $r): void {
             $r->get('-some-info', 'admin-some-info');
         });
-        $r->addGroup('/admin-', static function (DummyRouteCollector $r): void {
+        $r->addGroup('/admin-', static function (RouteCollector $r): void {
             $r->get('more-info', 'admin-more-info');
         });
 
@@ -102,6 +112,30 @@ public function routesCanBeGrouped(): void
             ['GET', '/admin-more-info', 'admin-more-info', ['_route' => '/admin-more-info']],
         ];
 
-        self::assertSame($expected, $r->routes);
+        self::assertObjectHasProperty('routes', $dataGenerator);
+        self::assertSame($expected, $dataGenerator->routes);
+    }
+
+    private static function dummyDataGenerator(): DataGenerator
+    {
+        return new class implements DataGenerator
+        {
+            /** @var list<array{string, string, mixed, array<string, bool|float|int|string>}> */
+            public array $routes = [];
+
+            /** @inheritDoc */
+            public function getData(): array
+            {
+                return [[], []];
+            }
+
+            /** @inheritDoc */
+            public function addRoute(string $httpMethod, array $routeData, mixed $handler, array $extraParameters = []): void
+            {
+                assert(count($routeData) === 1 && is_string($routeData[0]));
+
+                $this->routes[] = [$httpMethod, $routeData[0], $handler, $extraParameters];
+            }
+        };
     }
 }