malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: use DefinedRouteCollector in spark routes

Browse Source
This commit is contained in:
kenjis 2023-07-04 11:31:17 +09:00
parent d19a393062
commit d1224ccd97
No known key found for this signature in database
GPG Key ID: BD254878922AF198
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
system/Commands/Utilities/Routes.php
View File

@ -18,6 +18,7 @@ use CodeIgniter\Commands\Utilities\Routes\AutoRouteCollector;
use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\AutoRouteCollector as AutoRouteCollectorImproved;
use CodeIgniter\Commands\Utilities\Routes\FilterCollector;
use CodeIgniter\Commands\Utilities\Routes\SampleURIGenerator;
use CodeIgniter\Router\DefinedRouteCollector;
use Config\Feature;
use Config\Routing;
use Config\Services;
@ -115,29 +116,23 @@ class Routes extends BaseCommand
$uriGenerator = new SampleURIGenerator();
$filterCollector = new FilterCollector();
foreach ($methods as $method) {
$routes = $collection->getRoutes($method);
$definedRouteCollector = new DefinedRouteCollector($collection);
foreach ($routes as $route => $handler) {
if (is_string($handler) || $handler instanceof Closure) {
$sampleUri = $uriGenerator->get($route);
$filters = $filterCollector->get($method, $sampleUri);
foreach ($definedRouteCollector->collect() as $route) {
if (is_string($route['handler']) || $route['handler'] instanceof Closure) {
$sampleUri = $uriGenerator->get($route['route']);
$filters = $filterCollector->get($route['method'], $sampleUri);
if ($handler instanceof Closure) {
$handler = '(Closure)';
}
$routeName = ($route['route'] === $route['name']) ? '»' : $route['route'];
$routeName = $collection->getRoutesOptions($route)['as'] ?? '»';
$tbody[] = [
strtoupper($method),
$route,
$routeName,
$handler,
implode(' ', array_map('class_basename', $filters['before'])),
implode(' ', array_map('class_basename', $filters['after'])),
];
}
$tbody[] = [
strtoupper($route['method']),
$route['route'],
$routeName,
$route['handler'],
implode(' ', array_map('class_basename', $filters['before'])),
implode(' ', array_map('class_basename', $filters['after'])),
];
}
}