fix: Command routes with {locale} in route

codeigniter4 · Nov 6, 2023 · ebc2643 · ebc2643
1 parent b951a15
commit ebc2643
Showing 1 changed file with 15 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\Filters\Filters;
 use CodeIgniter\HTTP\Exceptions\RedirectException;
 use CodeIgniter\Router\Router;
+use Config\App;
 use Config\Feature;
 use Config\Services;
 
@@ -50,6 +51,12 @@ public function find(string $uri): array
     {
         $this->filters->reset();
 
+        $isLocaleExist = strpos($uri, '{locale}') !== false;
+
+        if ($isLocaleExist) {
+            $uri = str_replace('{locale}', config(App::class)->defaultLocale, $uri);
+        }
+
         // Add route filters
         try {
             $routeFilters = $this->getRouteFilters($uri);
@@ -64,7 +71,14 @@ public function find(string $uri): array
 
             $this->filters->initialize($uri);
 
-            return $this->filters->getFilters();
+            $filters = $this->filters->getFilters();
+
+            if ($isLocaleExist) {
+                $filters['before'] = array_map(static fn ($filter) => '!' . $filter, $filters['before']);
+                $filters['after']  = array_map(static fn ($filter) => '!' . $filter, $filters['after']);
+            }
+
+            return $filters;
         } catch (RedirectException $e) {
             return [
                 'before' => [],