Доработки

Author: ProklUng

Resources/config/twig.yaml

@@ -13,6 +13,12 @@ services:
     Twig\Extension\ExtensionInterface:
       tags: ['twig.extension']
 
+    Twig\Loader\LoaderInterface:
+      tags: [ 'twig.loader' ]
+
+    Twig\Extension\RuntimeExtensionInterface:
+      tags: [ 'twig.runtime' ]
+
   # Twig loader
   twig.loader:
     class: Twig\Loader\FilesystemLoader
@@ -27,6 +33,8 @@ services:
       - '%debug%'
       - '%twig_cache_dir%'
       - '%twig_config%'
+    calls:
+      - setContainer: ['@service_container']
 
   # Экземпляр Twig.
   twig.instance:

Services/Twig/TwigService.php

@@ -2,6 +2,7 @@
 
 namespace Prokl\BitrixOrdinaryToolsBundle\Services\Twig;
 
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Twig\Environment;
 use Twig\Error\LoaderError;
 use Twig\Loader\FilesystemLoader;
@@ -15,6 +16,8 @@
  */
 class TwigService
 {
+    use ContainerAwareTrait;
+
     /**
      * @var Environment Twig.
      */
@@ -47,6 +50,8 @@ class TwigService
      * @param string           $debug       Среда.
      * @param string           $cachePath   Путь к кэшу (серверный).
      * @param array|null       $twigOptions Опции Твига.
+     *
+     * @throws LoaderError Ошибки Твига.
      */
     public function __construct(
         FilesystemLoader $loader,
@@ -60,7 +65,7 @@ public function __construct(
         $this->cachePath = $cachePath;
 
         $this->twigEnvironment = $this->initTwig(
-            $loader,
+            $this->loader,
             $debug,
             $cachePath
         );
@@ -142,6 +147,21 @@ private function initTwig(
             }
         }
 
+        if (!empty($this->twigOptions['globals'])) {
+            foreach ($this->twigOptions['globals'] as $key => $global) {
+                if (isset($global['type']) && 'service' === $global['type']) {
+                    $this->twigEnvironment->addGlobal($key, $this->container->get($global['id']));
+                } else {
+                    $this->twigEnvironment->addGlobal($key, $global['value']);
+                }
+            }
+        }
+
+        if (isset($this->twigOptions['autoescape_service']) && isset($this->twigOptions['autoescape_service_method'])) {
+            $service = $this->container->get($this->twigOptions['autoescape_service']);
+            $this->twigOptions['autoescape'] = [$service, $this->twigOptions['autoescape_service']['autoescape_service_method']];
+        }
+
         return new Environment(
             $loader,
             [