File tree Expand file tree Collapse file tree 2 files changed +18
-19
lines changed
system/Commands/Utilities Expand file tree Collapse file tree 2 files changed +18
-19
lines changed Original file line number Diff line number Diff line change 18
18
use CodeIgniter \Commands \Utilities \Routes \FilterCollector ;
19
19
use CodeIgniter \Commands \Utilities \Routes \SampleURIGenerator ;
20
20
use CodeIgniter \Router \DefinedRouteCollector ;
21
+ use Config \App ;
21
22
use Config \Feature ;
22
23
use Config \Routing ;
23
24
use Config \Services ;
@@ -119,7 +120,22 @@ public function run(array $params)
119
120
120
121
foreach ($ definedRouteCollector ->collect () as $ route ) {
121
122
$ 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
+ }
123
139
124
140
$ routeName = ($ route ['route ' ] === $ route ['name ' ]) ? '» ' : $ route ['name ' ];
125
141
Original file line number Diff line number Diff line change 15
15
use CodeIgniter \Filters \Filters ;
16
16
use CodeIgniter \HTTP \Exceptions \RedirectException ;
17
17
use CodeIgniter \Router \Router ;
18
- use Config \App ;
19
18
use Config \Feature ;
20
19
use Config \Services ;
21
20
@@ -51,15 +50,6 @@ public function find(string $uri): array
51
50
{
52
51
$ this ->filters ->reset ();
53
52
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
-
63
53
// Add route filters
64
54
try {
65
55
$ routeFilters = $ this ->getRouteFilters ($ uri );
@@ -74,14 +64,7 @@ public function find(string $uri): array
74
64
75
65
$ this ->filters ->initialize ($ uri );
76
66
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 ();
85
68
} catch (RedirectException $ e ) {
86
69
return [
87
70
'before ' => [],
You can’t perform that action at this time.
0 commit comments