fix: bug in route registration

$routes and $routesOptions are not the same structure.
$routesOptions don't have route names.
If there are two routes having the same `from` but not the same name,
the route and the option were not connected correctly.

Author: kenjis

system/Router/RouteCollection.php

@@ -110,7 +110,7 @@ class RouteCollection implements RouteCollectionInterface
      *     verb => [
      *         routeName => [
      *             'route' => [
-     *                 routeKey => handler,
+     *                 routeKey(or from) => handler,
      *             ]
      *         ]
      *     ],
@@ -133,6 +133,14 @@ class RouteCollection implements RouteCollectionInterface
      * Array of routes options
      *
      * @var array
+     *
+     * [
+     *     verb => [
+     *         routeKey(or from) => [
+     *             key => value,
+     *         ]
+     *     ],
+     * ]
      */
     protected $routesOptions = [];
 
@@ -1239,12 +1247,16 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
 
         $name = $options['as'] ?? $from;
 
+        helper('array');
+
         // Don't overwrite any existing 'froms' so that auto-discovered routes
         // do not overwrite any app/Config/Routes settings. The app
         // routes should always be the "source of truth".
         // this works only because discovered routes are added just prior
         // to attempting to route the request.
-        if (isset($this->routes[$verb][$name]) && ! $overwrite) {
+        $fromExists = (dot_array_search('*.route.' . $from, $this->routes[$verb] ?? []) === null)
+            ? false : true;
+        if ((isset($this->routes[$verb][$name]) || $fromExists) && ! $overwrite) {
             return;
         }
 

tests/system/Router/RouteCollectionTest.php

@@ -1189,6 +1189,35 @@ static function () {},
         $this->assertSame($options, ['as' => 'admin', 'foo' => 'baz']);
     }
 
+    public function testRoutesOptionsWithSameFromTwoRoutes()
+    {
+        $routes = $this->getCollector();
+
+        // This is the first route for `administrator`.
+        $options1 = [
+            'as'  => 'admin',
+            'foo' => 'options1',
+        ];
+        $routes->get(
+            'administrator',
+            static function () {},
+            $options1
+        );
+        // The second route for `administrator` should be ignored.
+        $options2 = [
+            'foo' => 'options2',
+        ];
+        $routes->get(
+            'administrator',
+            static function () {},
+            $options2
+        );
+
+        $options = $routes->getRoutesOptions('administrator');
+
+        $this->assertSame($options, $options1);
+    }
+
     public function testRoutesOptionsForDifferentVerbs()
     {
         $routes = $this->getCollector();