Performance improvements

composer.json

@@ -30,7 +30,7 @@
         "hslavich/oneloginsaml-bundle": "^1.4",
         "jms/metadata": "^2.0",
         "jms/serializer-bundle": "^3.2",
-        "kevinpapst/adminlte-bundle": "^3.0",
+        "kevinpapst/adminlte-bundle": "dev-master",
         "kimai/user-bundle": "^1.1",
         "laravolt/avatar": "^3.0",
         "league/csv": "^9.4",

src/EventSubscriber/ThemeOptionsSubscriber.php

@@ -20,22 +20,17 @@
 /**
  * Allows dynamic injection of theme related options.
  */
-class ThemeOptionsSubscriber implements EventSubscriberInterface
+final class ThemeOptionsSubscriber implements EventSubscriberInterface
 {
     /**
      * @var TokenStorageInterface
      */
-    protected $storage;
-
+    private $storage;
     /**
      * @var ContextHelper
      */
-    protected $helper;
+    private $helper;
 
-    /**
-     * @param TokenStorageInterface $storage
-     * @param ContextHelper $helper
-     */
     public function __construct(TokenStorageInterface $storage, ContextHelper $helper)
     {
         $this->storage = $storage;
@@ -52,18 +47,24 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    /**
-     * @param KernelEvent $event
-     */
-    public function setThemeOptions(KernelEvent $event)
+    public function setThemeOptions(KernelEvent $event): void
     {
-        if (!$this->canHandleEvent($event)) {
+        // Ignore sub-requests
+        if (!$event->isMasterRequest()) {
+            return;
+        }
+
+        // ignore events like the toolbar where we do not have a token
+        if (null === $this->storage->getToken()) {
             return;
         }
 
-        /** @var User $user */
         $user = $this->storage->getToken()->getUser();
 
+        if (!($user instanceof User)) {
+            return;
+        }
+
         /** @var UserPreference $ref */
         foreach ($user->getPreferences() as $ref) {
             $name = $ref->getName();
@@ -90,26 +91,4 @@ public function setThemeOptions(KernelEvent $event)
             }
         }
     }
-
-    /**
-     * @param KernelEvent $event
-     * @return bool
-     */
-    protected function canHandleEvent(KernelEvent $event): bool
-    {
-        // Ignore sub-requests
-        if (!$event->isMasterRequest()) {
-            return false;
-        }
-
-        // ignore events like the toolbar where we do not have a token
-        if (null === $this->storage->getToken()) {
-            return false;
-        }
-
-        /** @var User $user */
-        $user = $this->storage->getToken()->getUser();
-
-        return ($user instanceof User);
-    }
 }

src/EventSubscriber/UserEnvironmentSubscriber.php

@@ -10,13 +10,15 @@
 namespace App\EventSubscriber;
 
 use App\Entity\User;
+use App\Event\PrepareUserEvent;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
-class UserEnvironmentSubscriber implements EventSubscriberInterface
+final class UserEnvironmentSubscriber implements EventSubscriberInterface
 {
     /**
      * @var TokenStorageInterface
@@ -26,38 +28,47 @@ class UserEnvironmentSubscriber implements EventSubscriberInterface
      * @var AuthorizationCheckerInterface
      */
     private $auth;
+    /**
+     * @var EventDispatcherInterface
+     */
+    private $eventDispatcher;
 
-    public function __construct(TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $auth)
+    public function __construct(TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $auth, EventDispatcherInterface $dispatcher)
     {
         $this->storage = $tokenStorage;
         $this->auth = $auth;
+        $this->eventDispatcher = $dispatcher;
     }
 
     public static function getSubscribedEvents(): array
     {
         return [
-            KernelEvents::REQUEST => ['prepareEnvironment', -100],
+            KernelEvents::REQUEST => ['prepareEnvironment', 200],
         ];
     }
 
-    public function prepareEnvironment(RequestEvent $event)
+    public function prepareEnvironment(RequestEvent $event): void
     {
         if (!$event->isMasterRequest()) {
             return;
         }
 
+        // the locale depends on the request, not on the user configuration
+        \Locale::setDefault($event->getRequest()->getLocale());
+
         if (null === $this->storage->getToken()) {
             return;
         }
 
         $user = $this->storage->getToken()->getUser();
+        if (!($user instanceof User)) {
+            return;
+        }
 
-        // the locale depends on the request, not on the user configuration
-        \Locale::setDefault($event->getRequest()->getLocale());
+        date_default_timezone_set($user->getTimezone());
+        $user->initCanSeeAllData($this->auth->isGranted('view_all_data'));
 
-        if ($user instanceof User) {
-            date_default_timezone_set($user->getTimezone());
-            $user->initCanSeeAllData($this->auth->isGranted('view_all_data'));
-        }
+        $event = new PrepareUserEvent($user);
+        $this->eventDispatcher->dispatch($event);
     }
 }