Skip to content

feat: add OCC command to list all routes (incl. fixing the Router) #52919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
susnux wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

feat: add OCC command to list all routes (incl. fixing the Router) #52919

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09589b7
fix(Router): correctly add routes to separate collections
susnux May 16, 2025
4c74911
feat: add command to list all routes registered
susnux May 16, 2025
14653ef
fixup! fix(Router): correctly add routes to separate collections
susnux May 17, 2025
129983f
fixup! fixup! fix(Router): correctly add routes to separate collections
susnux May 17, 2025
0eabd9f
fix(router): Fix loading legacy routes in the correct collection
come-nc Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! fix(Router): correctly add routes to separate collections
  • Loading branch information
@susnux
susnux committed Jun 5, 2025
commit 14653ef24671dc842fbeab8a1f63560ac539ba28
14 changes: 8 additions & 6 deletions lib/private/Route/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,19 +136,21 @@ public function loadRoutes(?string $app = null): void {
}

$this->eventLogger->start('route:load:files', 'Loading Routes from files');
foreach ($routingFiles as $app => $file) {
if (isset($this->loadedApps[$app])) {
foreach ($routingFiles as $appId => $file) {
if (isset($this->loadedApps[$appId])) {
continue;
}
if (!$this->appManager->isAppLoaded($app)) {
if (!$this->appManager->isAppLoaded($appId)) {
// app MUST be loaded before app routes
// try again next time loadRoutes() is called
$this->loaded = false;
continue;
}

$this->loadedApps[$app] = true;
$this->requireRouteFile($file, $app);
$this->requireRouteFile($file, $appId);
// mark fully loaded app as loaded (route file + annotation)
if ($app === null || $app === $appId) {
$this->loadedApps[$appId] = true;
}
}
$this->eventLogger->end('route:load:files');

Expand Down