De-Couple twig templates from session and request objects (kevinpapst#250)

kevinpapst · web-flow · commit b608ff05a7ba · 2026-01-19T10:05:10.000+01:00
diff --git a/config/services.yml b/config/services.yml
@@ -3,6 +3,7 @@ services:
     KevinPapst\TablerBundle\Twig\RuntimeExtension:
         class: KevinPapst\TablerBundle\Twig\RuntimeExtension
         arguments:
+            - '@request_stack'
             - '@event_dispatcher'
             - '@tabler_bundle.context_helper'
             - '%tabler_bundle.routes%'
diff --git a/src/Twig/RuntimeExtension.php b/src/Twig/RuntimeExtension.php
@@ -15,7 +15,7 @@
 use KevinPapst\TablerBundle\Helper\ContextHelper;
 use KevinPapst\TablerBundle\Model\MenuItemInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Twig\Extension\RuntimeExtensionInterface;
 
 final class RuntimeExtension implements RuntimeExtensionInterface
@@ -25,6 +25,7 @@ final class RuntimeExtension implements RuntimeExtensionInterface
      * @param array<string, string> $icons
      */
     public function __construct(
+        private readonly RequestStack $requestStack,
         private readonly EventDispatcherInterface $eventDispatcher,
         private readonly ContextHelper $helper,
         private readonly array $routes,
@@ -66,16 +67,19 @@ public function containerClass(string $class = ''): string
     }
 
     /**
-     * @param Request $request
-     *
      * @return MenuItemInterface[]|null
      */
-    public function getMenu(Request $request): ?array
+    public function getMenu(): ?array
     {
         if (!$this->eventDispatcher->hasListeners(MenuEvent::class)) {
             return null;
         }
 
+        $request = $this->requestStack->getCurrentRequest();
+        if ($request === null) {
+            return null;
+        }
+
         /** @var MenuEvent $event */
         $event = $this->eventDispatcher->dispatch(new MenuEvent($request));
 
diff --git a/templates/components/flash.html.twig b/templates/components/flash.html.twig
@@ -14,11 +14,13 @@
 {% endmacro %}
 
 {% macro session_flash(close, use_raw, class, domain) %}
-    {% if app.session.flashbag.peekAll|length > 0 %}
-        {% for type, messages in app.session.flashbag.all %}
-            {% for message in messages %}
-                {{ _self.flash(type, message, close, use_raw, class, domain) }}
-            {% endfor %}
+    {{ _self.flashes(app.flashes, close, use_raw, class, domain) }}
+{% endmacro %}
+
+{% macro flashes(flashes, close, use_raw, class, domain) %}
+    {% for type, messages in flashes %}
+        {% for message in messages %}
+            {{ _self.flash(type, message, close, use_raw, class, domain) }}
         {% endfor %}
-    {% endif %}
+    {% endfor %}
 {% endmacro %}
diff --git a/templates/fullpage.html.twig b/templates/fullpage.html.twig
@@ -1,5 +1,5 @@
 <!doctype html{% block html_start %}{% endblock %}>
-<html lang="{{ app.request.locale }}"{% if tabler_bundle.isRightToLeft() %} dir="rtl"{% endif %} data-bs-theme="{{ tabler_theme() }}" data-bs-theme-base="{{ tabler_bundle.getThemeBase() }}" data-bs-theme-radius="{{ tabler_bundle.getThemeRadius() }}" data-bs-theme-primary="{{ tabler_bundle.getThemePrimary() }}">
+<html lang="{{ app.locale }}"{% if tabler_bundle.isRightToLeft() %} dir="rtl"{% endif %} data-bs-theme="{{ tabler_theme() }}" data-bs-theme-base="{{ tabler_bundle.getThemeBase() }}" data-bs-theme-radius="{{ tabler_bundle.getThemeRadius() }}" data-bs-theme-primary="{{ tabler_bundle.getThemePrimary() }}">
 <head>
     {% block head %}
         {% include '@Tabler/includes/html_head.html.twig' %}
diff --git a/templates/includes/flash_messages.html.twig b/templates/includes/flash_messages.html.twig
@@ -1,9 +1,10 @@
 {% import "@Tabler/components/flash.html.twig" as macro %}
 
-{% if app.session and app.session.started and app.session.flashbag.peekAll|length > 0 %}
+{% set flashes = app.flashes %}
+{% if flashes|length > 0 %}
     <div class="row">
         <div class="col-sm-12">
-            {{ macro.session_flash(true, false, '', 'flashmessages') }}
+            {{ macro.flashes(flashes, true, false, '', 'flashmessages') }}
         </div>
     </div>
 {% endif %}
diff --git a/templates/includes/menu.html.twig b/templates/includes/menu.html.twig
@@ -1,5 +1,5 @@
 {% if menu is not defined %}
-    {% set menu = tabler_menu(app.request) %}
+    {% set menu = tabler_menu() %}
 {% endif %}
 
 {% if menu is defined and menu is not null %}
diff --git a/templates/layout_horizontal.html.twig b/templates/layout_horizontal.html.twig
@@ -7,7 +7,7 @@ by adding this code to your own base template:
 Enjoy your theme!
 #}
 <!doctype html{% block html_start %}{% endblock %}>
-<html lang="{{ app.request.locale }}"{% if tabler_bundle.isRightToLeft() %} dir="rtl"{% endif %} data-bs-theme="{{ tabler_theme() }}" data-bs-theme-base="{{ tabler_bundle.getThemeBase() }}" data-bs-theme-radius="{{ tabler_bundle.getThemeRadius() }}" data-bs-theme-primary="{{ tabler_bundle.getThemePrimary() }}">
+<html lang="{{ app.locale }}"{% if tabler_bundle.isRightToLeft() %} dir="rtl"{% endif %} data-bs-theme="{{ tabler_theme() }}" data-bs-theme-base="{{ tabler_bundle.getThemeBase() }}" data-bs-theme-radius="{{ tabler_bundle.getThemeRadius() }}" data-bs-theme-primary="{{ tabler_bundle.getThemePrimary() }}">
 <head>
     {% block head %}
         {% include '@Tabler/includes/html_head.html.twig' %}
diff --git a/templates/layout_vertical.html.twig b/templates/layout_vertical.html.twig
@@ -7,7 +7,7 @@ by adding this code to your own base template:
 Enjoy your theme!
 #}
 <!doctype html{% block html_start %}{% endblock %}>
-<html lang="{{ app.request.locale }}"{% if tabler_bundle.isRightToLeft() %} dir="rtl"{% endif %} data-bs-theme="{{ tabler_theme() }}" data-bs-theme-base="{{ tabler_bundle.getThemeBase() }}" data-bs-theme-radius="{{ tabler_bundle.getThemeRadius() }}" data-bs-theme-primary="{{ tabler_bundle.getThemePrimary() }}">
+<html lang="{{ app.locale }}"{% if tabler_bundle.isRightToLeft() %} dir="rtl"{% endif %} data-bs-theme="{{ tabler_theme() }}" data-bs-theme-base="{{ tabler_bundle.getThemeBase() }}" data-bs-theme-radius="{{ tabler_bundle.getThemeRadius() }}" data-bs-theme-primary="{{ tabler_bundle.getThemePrimary() }}">
 <head>
     {% block head %}
         {% include '@Tabler/includes/html_head.html.twig' %}
diff --git a/templates/security.html.twig b/templates/security.html.twig
@@ -1,5 +1,5 @@
 <!doctype html{% block html_start %}{% endblock %}>
-<html lang="{{ app.request.locale }}"{% if tabler_bundle.isRightToLeft() %} dir="rtl"{% endif %} data-bs-theme="{{ tabler_theme() }}" data-bs-theme-base="{{ tabler_bundle.getThemeBase() }}" data-bs-theme-radius="{{ tabler_bundle.getThemeRadius() }}" data-bs-theme-primary="{{ tabler_bundle.getThemePrimary() }}">
+<html lang="{{ app.locale }}"{% if tabler_bundle.isRightToLeft() %} dir="rtl"{% endif %} data-bs-theme="{{ tabler_theme() }}" data-bs-theme-base="{{ tabler_bundle.getThemeBase() }}" data-bs-theme-radius="{{ tabler_bundle.getThemeRadius() }}" data-bs-theme-primary="{{ tabler_bundle.getThemePrimary() }}">
 <head>
     {% block head %}
         {% include '@Tabler/includes/html_head.html.twig' %}
diff --git a/tests/Twig/RuntimeExtensionTest.php b/tests/Twig/RuntimeExtensionTest.php
@@ -13,6 +13,7 @@
 use KevinPapst\TablerBundle\Twig\RuntimeExtension;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @covers \KevinPapst\TablerBundle\Twig\RuntimeExtension
@@ -41,8 +42,9 @@ private function getSut(array $options): RuntimeExtension
         ];
 
         $dispatcher = new EventDispatcher();
+        $requestStack = new RequestStack();
 
-        return new RuntimeExtension($dispatcher, $contextHelper, $routes, $icons);
+        return new RuntimeExtension($requestStack, $dispatcher, $contextHelper, $routes, $icons);
     }
 
     public function testGetRouteByAlias(): void
