Merge remote-tracking branch 'upstream/develop' into 4.6

Author: kenjis

system/Router/RouteCollection.php

@@ -1456,6 +1456,12 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
             $to = $this->processArrayCallableSyntax($from, $to);
         }
 
+        // Merge group filters.
+        if (isset($options['filter'])) {
+            $currentFilter     = (array) ($this->currentOptions['filter'] ?? []);
+            $options['filter'] = array_merge($currentFilter, (array) $options['filter']);
+        }
+
         $options = array_merge($this->currentOptions ?? [], $options ?? []);
 
         // Route priority detect

tests/system/Router/RouteCollectionTest.php

@@ -441,6 +441,22 @@ static function ($routes): void {
         $this->assertSame($expected, $routes->getRoutesOptions());
     }
 
+    public function testGroupFilterAndRouteFilter(): void
+    {
+        $routes = $this->getCollector();
+
+        $routes->group('admin', ['filter' => ['csrf']], static function ($routes): void {
+            $routes->get('profile', 'Admin\Profile::index', ['filter' => ['honeypot']]);
+        });
+
+        $expected = [
+            'admin/profile' => [
+                'filter' => ['csrf', 'honeypot'],
+            ],
+        ];
+        $this->assertSame($expected, $routes->getRoutesOptions());
+    }
+
     public function testGroupingWorksWithEmptyStringPrefix(): void
     {
         $routes = $this->getCollector();

user_guide_src/source/changelogs/v4.5.4.rst

@@ -30,6 +30,8 @@ Deprecations
 Bugs Fixed
 **********
 
+- **Routing:** Fixed a bug that filters passed to ``$routes->group()`` were not
+  merged into filters passed to the inner routes.
 - **CURLRequest:** Fixed a bug preventing the use of strings for ``version`` in the config array
   when making requests.
 

user_guide_src/source/general/configuration.rst

@@ -314,6 +314,10 @@ Registrars provide a means of altering a configuration at runtime across namespa
 Registrars work if :ref:`auto-discovery` is enabled in :doc:`Modules </general/modules>`.
 It alters configuration properties when the Config object is instantiated.
 
+.. note:: This feature is implemented in the ``CodeIgniter\Config\BaseConfig``
+    class. So it will not work with a few files in the **app/Config** folder
+    that do not extends the class.
+
 There are two ways to implement a Registrar: **implicit** and **explicit**.
 
 .. note:: Values from **.env** always take priority over Registrars.

user_guide_src/source/incoming/routing.rst

@@ -564,6 +564,9 @@ run the filter before or after the controller. This is especially handy during a
 
 The value for the filter must match one of the aliases defined within **app/Config/Filters.php**.
 
+.. note:: Prior to v4.5.4, due to a bug, filters passed to the ``group()`` were
+    not merged into the filters passed to the inner routes.
+
 Setting Other Options
 =====================