diff --git a/config/routes.yaml b/config/routes.yaml index 7cb4a976..f06a8346 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -7,7 +7,10 @@ home: homeLocale: path: /{_locale} + requirements: + _locale: '%app_locales%' defaults: _controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction + _locale: '%locale%' route: homepage permanent: true diff --git a/src/EventSubscriber/DashboardSubscriber.php b/src/EventSubscriber/DashboardSubscriber.php index 53343b15..c2a6232f 100644 --- a/src/EventSubscriber/DashboardSubscriber.php +++ b/src/EventSubscriber/DashboardSubscriber.php @@ -73,7 +73,7 @@ class DashboardSubscriber implements EventSubscriberInterface public static function getSubscribedEvents(): array { return [ - DashboardEvent::DASHBOARD => ['onDashboardEvent', 100], + DashboardEvent::class => ['onDashboardEvent', 100], ]; } diff --git a/src/EventSubscriber/MenuBuilderSubscriber.php b/src/EventSubscriber/MenuBuilderSubscriber.php index 567d2cba..2a1c009d 100644 --- a/src/EventSubscriber/MenuBuilderSubscriber.php +++ b/src/EventSubscriber/MenuBuilderSubscriber.php @@ -71,7 +71,10 @@ class MenuBuilderSubscriber implements EventSubscriberInterface new MenuItemModel('system', 'menu.system', '') ); - $this->eventDispatcher->dispatch($menuEvent); + // error pages don't have a user and will fail when is_granted() is called + if (null !== $event->getRequest()->getUser()) { + $this->eventDispatcher->dispatch($menuEvent); + } if ($menuEvent->getAdminMenu()->hasChildren()) { $event->addItem(new MenuItemModel('admin', 'menu.admin', '')); diff --git a/src/EventSubscriber/MenuSubscriber.php b/src/EventSubscriber/MenuSubscriber.php index b02b48ea..d656596b 100644 --- a/src/EventSubscriber/MenuSubscriber.php +++ b/src/EventSubscriber/MenuSubscriber.php @@ -42,7 +42,7 @@ final class MenuSubscriber implements EventSubscriberInterface public static function getSubscribedEvents(): array { return [ - ConfigureMainMenuEvent::CONFIGURE => ['onMainMenuConfigure', 100], + ConfigureMainMenuEvent::class => ['onMainMenuConfigure', 100], ]; } diff --git a/src/EventSubscriber/UserPreferenceSubscriber.php b/src/EventSubscriber/UserPreferenceSubscriber.php index 258ea1a5..7e7e0aa5 100644 --- a/src/EventSubscriber/UserPreferenceSubscriber.php +++ b/src/EventSubscriber/UserPreferenceSubscriber.php @@ -57,7 +57,7 @@ class UserPreferenceSubscriber implements EventSubscriberInterface public static function getSubscribedEvents(): array { return [ - PrepareUserEvent::PREPARE => ['loadUserPreferences', 200] + PrepareUserEvent::class => ['loadUserPreferences', 200] ]; }