Skip to content

Commit 231a748

Browse files
committed
fix: Move code to routes command
1 parent 674d875 commit 231a748

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

system/Commands/Utilities/Routes.php

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use CodeIgniter\Commands\Utilities\Routes\FilterCollector;
1919
use CodeIgniter\Commands\Utilities\Routes\SampleURIGenerator;
2020
use CodeIgniter\Router\DefinedRouteCollector;
21+
use Config\App;
2122
use Config\Feature;
2223
use Config\Routing;
2324
use Config\Services;
@@ -119,7 +120,22 @@ public function run(array $params)
119120

120121
foreach ($definedRouteCollector->collect() as $route) {
121122
$sampleUri = $uriGenerator->get($route['route']);
122-
$filters = $filterCollector->get($route['method'], $sampleUri);
123+
124+
// Fix for the search filters command
125+
$isSupportedLocaleOnly = false;
126+
127+
if (strpos($sampleUri, '{locale}') !== false && Services::routes()->shouldUseSupportedLocalesOnly()) {
128+
$isSupportedLocaleOnly = true;
129+
130+
$sampleUri = str_replace('{locale}', config(App::class)->defaultLocale, $sampleUri);
131+
}
132+
133+
$filters = $filterCollector->get($route['method'], $sampleUri);
134+
135+
if ($isSupportedLocaleOnly) {
136+
$filters['before'] = array_map(static fn ($filter) => '!' . $filter, $filters['before']);
137+
$filters['after'] = array_map(static fn ($filter) => '!' . $filter, $filters['after']);
138+
}
123139

124140
$routeName = ($route['route'] === $route['name']) ? '»' : $route['name'];
125141

system/Commands/Utilities/Routes/FilterFinder.php

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use CodeIgniter\Filters\Filters;
1616
use CodeIgniter\HTTP\Exceptions\RedirectException;
1717
use CodeIgniter\Router\Router;
18-
use Config\App;
1918
use Config\Feature;
2019
use Config\Services;
2120

@@ -51,15 +50,6 @@ public function find(string $uri): array
5150
{
5251
$this->filters->reset();
5352

54-
// Fix for the search filters command
55-
$isSupportedLocaleOnly = false;
56-
57-
if (strpos($uri, '{locale}') !== false && Services::routes()->shouldUseSupportedLocalesOnly()) {
58-
$isSupportedLocaleOnly = true;
59-
60-
$uri = str_replace('{locale}', config(App::class)->defaultLocale, $uri);
61-
}
62-
6353
// Add route filters
6454
try {
6555
$routeFilters = $this->getRouteFilters($uri);
@@ -74,14 +64,7 @@ public function find(string $uri): array
7464

7565
$this->filters->initialize($uri);
7666

77-
$filters = $this->filters->getFilters();
78-
79-
if ($isSupportedLocaleOnly) {
80-
$filters['before'] = array_map(static fn ($filter) => '!' . $filter, $filters['before']);
81-
$filters['after'] = array_map(static fn ($filter) => '!' . $filter, $filters['after']);
82-
}
83-
84-
return $filters;
67+
return $this->filters->getFilters();
8568
} catch (RedirectException $e) {
8669
return [
8770
'before' => [],

0 commit comments

Comments
 (0)