TwigExtensionsBag

Author: ProklUng

Services/Twig/TwigExtensionsBag.php

@@ -2,7 +2,6 @@
 
 namespace Prokl\BitrixOrdinaryToolsBundle\Services\Twig;
 
-use Bitrix\Main\Event;
 use Bitrix\Main\EventResult;
 use Twig\Environment;
 
@@ -32,18 +31,15 @@ public function __construct($extensions)
     /**
      * Обработчик события onAfterTwigTemplateEngineInited.
      *
-     * @param Event $event Событие.
+     * @param Environment $twig Twig.
      *
      * @return EventResult
      */
-    public function handle(Event $event) : EventResult
+    public function handle(Environment $twig) : EventResult
     {
-        /** @var Environment $twig */
-        $twig = $event->getParameter('engine');
-
         foreach ($this->extensions as $extension) {
             if (!$twig->hasExtension(is_object($extension) ? get_class($extension) : $extension)) {
-                $twig->addExtension(is_object($extension) ? get_class($extension) : new $extension);
+                $twig->addExtension(is_object($extension) ? $extension : new $extension);
             }
         }