Make SessionConfig an http listener instead of just legacy provider

dependency_injection/legacyConfigProviders.php

@@ -56,7 +56,6 @@
      */
 
     $services->set(LegacyConfigurators\CleanPHPSelfParam::class)->tag($tagName, ['priority' => 150]);
-    $services->set(LegacyConfigurators\SessionConfig::class)->tag($tagName, ['priority' => 130]);
 
     // FIXME: This class MUST stay at the end until the entire config is revamped.
     $services->set(LegacyConfigurators\ConfigRest::class)->tag($tagName, ['priority' => 10]);

src/Glpi/Config/LegacyConfigurators/SessionConfig.php → src/Glpi/Http/Listener/SessionVariables.php

@@ -32,41 +32,48 @@
  * ---------------------------------------------------------------------
  */
 
-namespace Glpi\Config\LegacyConfigurators;
+namespace Glpi\Http\Listener;
 
-use Glpi\Config\ConfigProviderHasRequestTrait;
-use Glpi\Config\ConfigProviderWithRequestInterface;
-use Glpi\Config\LegacyConfigProviderInterface;
+use Glpi\Kernel\ListenersPriority;
 use Glpi\Toolbox\URL;
 use Session;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
 
-final class SessionConfig implements LegacyConfigProviderInterface, ConfigProviderWithRequestInterface
+final class SessionVariables implements EventSubscriberInterface
 {
-    use ConfigProviderHasRequestTrait;
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            KernelEvents::REQUEST => ['onKernelRequest', ListenersPriority::REQUEST_LISTENERS_PRIORITIES[self::class]],
+        ];
+    }
 
-    public function execute(): void
+    public function onKernelRequest(RequestEvent $event): void
     {
-        if (!isset($_SESSION["MESSAGE_AFTER_REDIRECT"])) {
-            $_SESSION["MESSAGE_AFTER_REDIRECT"] = [];
+        if (!$event->isMainRequest()) {
+            return;
         }
 
-        $request = $this->getRequest();
+        $request = $event->getRequest();
 
         // Manage force tab
         if ($request->query->has('forcetab')) {
             $itemtype = URL::extractItemtypeFromUrlPath($request->getPathInfo());
             if ($itemtype !== null) {
-                Session::setActiveTab($itemtype, $_REQUEST['forcetab']);
+                Session::setActiveTab($itemtype, $request->get('forcetab'));
             }
         }
 
         // Manage tabs
-        if (isset($_REQUEST['glpi_tab']) && isset($_REQUEST['itemtype'])) {
-            Session::setActiveTab($_REQUEST['itemtype'], $_REQUEST['glpi_tab']);
+        if ($request->get('glpi_tab') && $request->get('itemtype')) {
+            Session::setActiveTab($request->get('itemtype'), $request->get('glpi_tab'));
         }
+
         // Override list-limit if choosen
-        if (isset($_REQUEST['glpilist_limit'])) {
-            $_SESSION['glpilist_limit'] = $_REQUEST['glpilist_limit'];
+        if ($request->get('glpilist_limit')) {
+            $_SESSION['glpilist_limit'] = $request->get('glpilist_limit');
         }
     }
 }

src/Glpi/Kernel/ListenersPriority.php

@@ -85,15 +85,23 @@ final class ListenersPriority
         HttpListener\LegacyItemtypeRouteListener::class => 375,
 
         // Legacy URLs redirections.
-        HttpListener\RedirectLegacyRouteListener::class => 350,
+        // Must be executed before the Symfony router, to prevent `NotFoundHttpException` to be thrown.
+        //
+        // Symfony's Router priority is 32.
+        // @see \Symfony\Component\HttpKernel\EventListener\RouterListener::getSubscribedEvents()
+        HttpListener\RedirectLegacyRouteListener::class => 33,
 
         // This listener allows matching plugins routes at runtime,
         //   that's why it's executed right after Symfony's Router,
         //   and also after GLPI's config is set.
         //
         // Symfony's Router priority is 32.
         // @see \Symfony\Component\HttpKernel\EventListener\RouterListener::getSubscribedEvents()
-        HttpListener\PluginsRouterListener::class => 31,
+        HttpListener\PluginsRouterListener::class       => 31,
+
+        // Update session variables according to request parameters.
+        // Must be called as late as possible, just before controllers execution.
+        HttpListener\SessionVariables::class            => 0,
     ];
 
     private function __construct()

src/Session.php

@@ -272,6 +272,11 @@ public static function start()
         if (!isset($_SESSION['glpilanguage'])) {
             $_SESSION['glpilanguage'] = Session::getPreferredLanguage();
         }
+
+        // Init messages array
+        if (!isset($_SESSION["MESSAGE_AFTER_REDIRECT"])) {
+            $_SESSION["MESSAGE_AFTER_REDIRECT"] = [];
+        }
     }
 
 

tests/functional/Session.php

@@ -50,13 +50,13 @@ public function testAddMessageAfterRedirect()
         $warn_msg = 'There was a warning. Be carefull.';
         $info_msg = 'All goes well. Or not... Who knows ;)';
 
-        $this->array($_SESSION)->notHasKey('MESSAGE_AFTER_REDIRECT');
+        $this->array($_SESSION['MESSAGE_AFTER_REDIRECT'])->isEmpty();
 
        //test add message in cron mode
         $_SESSION['glpicronuserrunning'] = 'cron_phpunit';
         \Session::addMessageAfterRedirect($err_msg, false, ERROR);
        //adding a message in "cron mode" does not add anything in the session
-        $this->array($_SESSION)->notHasKey('MESSAGE_AFTER_REDIRECT');
+        $this->array($_SESSION['MESSAGE_AFTER_REDIRECT'])->isEmpty();
 
        //set not running from cron
         unset($_SESSION['glpicronuserrunning']);