RouteCollector: Detect Duplicates Config

Renames configuration option for detect duplicates from `[RouteCollector::class]['detect_duplicates']` to `['router']['detect_duplicates']` Signed-off-by: George Steel <[email protected]>
mezzio · Jul 18, 2024 · 0e6b4d8 · 0e6b4d8
1 parent ed003a2
commit 0e6b4d8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/RouteCollectorFactory.php b/src/RouteCollectorFactory.php
@@ -9,6 +9,7 @@
 use Psr\Container\ContainerInterface;
 
 use function is_array;
+use function is_bool;
 use function sprintf;
 
 /**
@@ -21,6 +22,8 @@
  */
 final class RouteCollectorFactory
 {
+    private const DETECT_DUPLICATES_BY_DEFAULT = true;
+
     /**
      * @throws Exception\MissingDependencyException If the RouterInterface service is missing.
      */
@@ -42,24 +45,26 @@ public function __invoke(ContainerInterface $container): RouteCollector
     private function getDetectDuplicatesFlag(ContainerInterface $container): bool
     {
         if (! $container->has('config')) {
-            return true;
+            return self::DETECT_DUPLICATES_BY_DEFAULT;
         }
 
         $config = $container->get('config');
         if (! is_array($config) && ! $config instanceof ArrayAccess) {
             throw new LogicException(sprintf('Config must be an array or implement %s.', ArrayAccess::class));
         }
 
-        if (! isset($config[RouteCollector::class])) {
-            return true;
-        }
+        $options = $config['router'] ?? [];
 
-        $collectorOptions = $config[RouteCollector::class] ?? [];
+        if (! is_array($options)) {
+            return self::DETECT_DUPLICATES_BY_DEFAULT;
+        }
 
-        if (! is_array($collectorOptions) || ! isset($collectorOptions['detect_duplicates'])) {
-            return true;
+        if (! isset($options['detect_duplicates'])) {
+            return self::DETECT_DUPLICATES_BY_DEFAULT;
         }
 
-        return (bool) $collectorOptions['detect_duplicates'];
+        return is_bool($options['detect_duplicates'])
+            ? $options['detect_duplicates']
+            : self::DETECT_DUPLICATES_BY_DEFAULT;
     }
 }
diff --git a/test/RouteCollectorFactoryTest.php b/test/RouteCollectorFactoryTest.php
@@ -50,7 +50,7 @@ public function testFactoryProducesRouteCollectorWhenAllDependenciesPresent(): v
     public function testFactoryProducesRouteCollectorUsingDetectDuplicatesFlagFromArrayConfig(): void
     {
         $this->testFactoryProducesRouteCollectorUsingDetectDuplicatesFlagFromConfig([
-            RouteCollector::class => [
+            'router' => [
                 'detect_duplicates' => false,
             ],
         ]);
@@ -59,7 +59,7 @@ public function testFactoryProducesRouteCollectorUsingDetectDuplicatesFlagFromAr
     public function testFactoryProducesRouteCollectorUsingDetectDuplicatesFlagFromArrayObjectConfig(): void
     {
         $this->testFactoryProducesRouteCollectorUsingDetectDuplicatesFlagFromConfig(new ArrayObject([
-            RouteCollector::class => [
+            'router' => [
                 'detect_duplicates' => false,
             ],
         ]));
@@ -68,7 +68,7 @@ public function testFactoryProducesRouteCollectorUsingDetectDuplicatesFlagFromAr
     public function testFactoryProducesRouteCollectorUsingDetectDuplicatesFlagFromArrayIteratorConfig(): void
     {
         $this->testFactoryProducesRouteCollectorUsingDetectDuplicatesFlagFromConfig(new ArrayIterator([
-            RouteCollector::class => [
+            'router' => [
                 'detect_duplicates' => false,
             ],
         ]));