cleanup global context usage in widgets

src/Twig/EventExtensions.php

@@ -9,75 +9,19 @@
 
 namespace App\Twig;
 
-use App\Entity\User;
-use App\Event\ThemeEvent;
-use App\Security\CurrentUser;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use App\Twig\Runtime\ThemeEventExtension;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 class EventExtensions extends AbstractExtension
 {
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-    /**
-     * @var User
-     */
-    protected $user;
-
-    /**
-     * @param EventDispatcherInterface $dispatcher
-     * @param CurrentUser $user
-     */
-    public function __construct(EventDispatcherInterface $dispatcher, CurrentUser $user)
-    {
-        $this->eventDispatcher = $dispatcher;
-        $this->user = $user->getUser();
-    }
-
     /**
      * {@inheritdoc}
      */
     public function getFunctions()
     {
         return [
-            new TwigFunction('trigger', [$this, 'triggerEvent']),
+            new TwigFunction('trigger', [ThemeEventExtension::class, 'trigger']),
         ];
     }
-
-    /**
-     * @return EventDispatcherInterface
-     */
-    protected function getDispatcher()
-    {
-        return $this->eventDispatcher;
-    }
-
-    /**
-     * @param string $eventName
-     *
-     * @return bool
-     */
-    protected function hasListener($eventName)
-    {
-        return $this->getDispatcher()->hasListeners($eventName);
-    }
-
-    /**
-     * @param string $eventName
-     * @param mixed $payload
-     * @return ThemeEvent
-     */
-    public function triggerEvent(string $eventName, $payload = null)
-    {
-        $themeEvent = new ThemeEvent($this->user, $payload);
-
-        if ($this->hasListener($eventName)) {
-            $this->getDispatcher()->dispatch($themeEvent, $eventName);
-        }
-
-        return $themeEvent;
-    }
 }

src/Twig/MarkdownExtension.php

@@ -52,7 +52,7 @@ final class MarkdownExtension extends AbstractExtension
     /**
      * Transforms the entities comment (customer, project, activity ...) into HTML.
      *
-     * @param string $content
+     * @param string|null $content
      * @param bool $fullLength
      * @return string
      */

src/Twig/Runtime/ThemeEventExtension.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Twig\Runtime;
+
+use App\Event\ThemeEvent;
+use App\Security\CurrentUser;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Twig\Extension\RuntimeExtensionInterface;
+
+final class ThemeEventExtension implements RuntimeExtensionInterface
+{
+    /**
+     * @var EventDispatcherInterface
+     */
+    private $eventDispatcher;
+    /**
+     * @var CurrentUser
+     */
+    private $user;
+
+    public function __construct(EventDispatcherInterface $dispatcher, CurrentUser $user)
+    {
+        $this->eventDispatcher = $dispatcher;
+        $this->user = $user;
+    }
+
+    /**
+     * @param string $eventName
+     * @param mixed|null $payload
+     * @return ThemeEvent
+     */
+    public function trigger(string $eventName, $payload = null): ThemeEvent
+    {
+        $themeEvent = new ThemeEvent($this->user->getUser(), $payload);
+
+        if ($this->eventDispatcher->hasListeners($eventName)) {
+            $this->eventDispatcher->dispatch($themeEvent, $eventName);
+        }
+
+        return $themeEvent;
+    }
+}