Use requestStack to access current request when needed.

src/Canonical.php

@@ -24,7 +24,7 @@ class Canonical
     private $urlGenerator;
 
     /** @var Request */
-    private $request;
+    private $request = null;
 
     /** @var string */
     private $scheme = null;
@@ -44,27 +44,45 @@ class Canonical
     /** @var RouterInterface */
     private $router;
 
+    /** @var RequestStack */
+    private $requestStack;
+
     public function __construct(Config $config, UrlGeneratorInterface $urlGenerator, RequestStack $requestStack, RouterInterface $router, string $defaultLocale)
     {
         $this->config = $config;
         $this->urlGenerator = $urlGenerator;
-        $this->request = $requestStack->getCurrentRequest() ?? Request::createFromGlobals();
         $this->defaultLocale = $defaultLocale;
         $this->router = $router;
+        $this->requestStack = $requestStack;
+    }
+
+    public function getRequest(): Request
+    {
+        if ($this->request === null) {
+            // Use default value.
+            $this->setRequest();
+        }
 
-        $this->init();
+        return $this->request;
     }
 
-    public function init(): void
+    public function setRequest(?Request $request = null): void
     {
-        // Ensure in request cycle (even for override).
+        // Default to current request (if any).
+        if ($request === null) {
+            $request = $this->requestStack->getCurrentRequest() ?? Request::createFromGlobals();
+        }
+
+        $this->request = $request;
+
+        // Nothing to do if request is empty.
         if ($this->request === null || $this->request->getHost() === '') {
             return;
         }
 
         $requestUrl = parse_url($this->request->getSchemeAndHttpHost());
 
-        $configCanonical = (string) $this->config->get('general/canonical', $this->request->getSchemeAndHttpHost());
+        $configCanonical = (string) $this->config->get('general/canonical', $this->getRequest()->getSchemeAndHttpHost());
 
         if (mb_strpos($configCanonical, 'http') !== 0) {
             $configCanonical = $requestUrl['scheme'] . '://' . $configCanonical;
@@ -83,7 +101,7 @@ public function init(): void
     public function get(?string $route = null, array $params = [], bool $absolute = true): ?string
     {
         // Ensure request has been matched
-        if (! $this->request->attributes->get('_route')) {
+        if (! $this->getRequest()->attributes->get('_route')) {
             return null;
         }
 
@@ -153,8 +171,8 @@ public function setHost(string $host): void
     public function getPath(): string
     {
         if ($this->path === null) {
-            $route = $this->request->attributes->get('_route');
-            $params = $this->request->attributes->get('_route_params');
+            $route = $this->getRequest()->attributes->get('_route');
+            $params = $this->getRequest()->attributes->get('_route_params');
 
             $this->path = $this->generateLink($route, $params, false);
         }
@@ -164,10 +182,10 @@ public function getPath(): string
 
     public function setPath(?string $route = null, array $params = []): void
     {
-        if (! $route && ! $this->request->attributes->has('_route')) {
+        if (! $route && ! $this->getRequest()->attributes->has('_route')) {
             return;
         } elseif (! $route) {
-            $route = $this->request->attributes->get('_route');
+            $route = $this->getRequest()->attributes->get('_route');
         }
 
         $this->path = $this->generateLink($route, $params, false);
@@ -207,7 +225,7 @@ public function generateLink(?string $route, ?array $params, $canonical = false)
             );
         } catch (InvalidParameterException | MissingMandatoryParametersException | RouteNotFoundException | \TypeError $e) {
             // Just use the current URL /shrug
-            return $canonical ? $this->request->getUri() : $this->request->getPathInfo();
+            return $canonical ? $this->getRequest()->getUri() : $this->getRequest()->getPathInfo();
         }
     }
 

src/Event/Subscriber/CanonicalSubscriber.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Bolt\Event\Subscriber;
+
+use Bolt\Canonical;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class CanonicalSubscriber implements EventSubscriberInterface
+{
+    private $canonical;
+
+    public function __construct(Canonical $canonical)
+    {
+        $this->canonical = $canonical;
+    }
+
+    public function onKernelRequest(RequestEvent $event)
+    {
+        // ensure initialization with real request
+        $this->canonical->getRequest();
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            KernelEvents::REQUEST => [
+                ['onKernelRequest', 0],
+            ],
+        ];
+    }
+}

src/Menu/FrontendMenu.php

@@ -21,29 +21,29 @@ final class FrontendMenu implements FrontendMenuBuilderInterface
     /** @var FrontendMenuBuilder */
     private $menuBuilder;
 
-    /** @var Request */
-    private $request;
-
     /** @var Stopwatch */
     private $stopwatch;
 
     /** @var Config */
     private $config;
 
+    /** @var RequestStack */
+    private $requestStack;
+
     public function __construct(FrontendMenuBuilder $menuBuilder, TagAwareCacheInterface $cache, RequestStack $requestStack, Stopwatch $stopwatch, Config $config)
     {
         $this->cache = $cache;
         $this->menuBuilder = $menuBuilder;
-        $this->request = $requestStack->getCurrentRequest();
         $this->stopwatch = $stopwatch;
         $this->config = $config;
+        $this->requestStack = $requestStack;
     }
 
     public function buildMenu(Environment $twig, ?string $name = null): array
     {
         $this->stopwatch->start('bolt.frontendMenu');
 
-        $key = 'bolt.frontendMenu_' . ($name ?: 'main') . '_' . $this->request->getLocale();
+        $key = 'bolt.frontendMenu_' . ($name ?: 'main') . '_' . $this->requestStack->getCurrentRequest()->getLocale();
 
         $menu = $this->cache->get($key, function (ItemInterface $item) use ($name, $twig) {
             $item->expiresAfter($this->config->get('general/caching/frontend_menu'));