Рефакторинг сервисов Твига. Убраны устаревшие классы.

Author: ProklUng

Resources/config/twig.yaml

@@ -15,7 +15,7 @@ services:
 
   # Twig loader
   twig.loader:
-    class: Twig_Loader_Filesystem
+    class: Twig\Loader\FilesystemLoader
     arguments:
       - '%twig_paths%'
 
@@ -30,5 +30,13 @@ services:
 
   # Экземпляр Twig.
   twig.instance:
-    class: Twig_Environment
+    class: Twig\Environment
     factory: ['@twig', 'instance']
+
+  # Template cache warmer
+  Prokl\BitrixOrdinaryToolsBundle\Services\Twig\TemplateCacheWarmer:
+    autoconfigure: false
+    arguments:
+      - '@twig.instance'
+    class:Prokl\BitrixOrdinaryToolsBundle\Services\Twig\TemplateCacheWarmer
+    tags: [kernel.cache_warmer]

Services/Twig/TemplateCacheWarmer.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Prokl\BitrixOrdinaryToolsBundle\Services\Twig;
+
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
+use Twig\Error\Error;
+use Twig\Environment;
+
+/**
+ * Class TemplateCacheWarmer
+ * @package Prokl\BitrixOrdinaryToolsBundle\Services\Twig
+ *
+ * @since 03.08.2021
+ */
+class TemplateCacheWarmer implements CacheWarmerInterface
+{
+    /**
+     * @var Environment $router Twig.
+     */
+    private $twig;
+
+    /**
+     * TemplateCacheWarmer constructor.
+     *
+     * @param Environment $twig Twig.
+     */
+    public function __construct(Environment $twig)
+    {
+        $this->twig = $twig;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isOptional()
+    {
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function warmUp($cacheDir)
+    {
+        $paths = $this->twig->getLoader()->getPaths();
+        $phpFiles = [];
+
+        foreach ($paths as $path) {
+            $files = $this->findTemplatesInDirectory($path);
+            foreach ($files as $template) {
+                try {
+                    $template = $this->twig->load($template);
+
+                    if (\is_callable([$template, 'unwrap'])) {
+                        $phpFiles[] = (new \ReflectionClass($template->unwrap()))->getFileName();
+                    }
+                } catch (Error $e) {
+                    // problem during compilation, give up
+                    // might be a syntax error or a non-Twig template
+                }
+            }
+        }
+
+        return $phpFiles;
+    }
+
+    /**
+     * Find templates in the given directory.
+     *
+     * @param string       $dir        Директория.
+     * @param string|null $namespace   Пространство имен.
+     * @param array       $excludeDirs Исключенные директории.
+     * @return string[]
+     */
+    private function findTemplatesInDirectory(string $dir, string $namespace = null, array $excludeDirs = []): array
+    {
+        if (!is_dir($dir)) {
+            return [];
+        }
+
+        $templates = [];
+        foreach (Finder::create()->files()->followLinks()->in($dir)->exclude($excludeDirs) as $file) {
+            $templates[] = (null !== $namespace ? '@'.$namespace.'/' : '').str_replace('\\', '/', $file->getRelativePathname());
+        }
+
+        return $templates;
+    }
+}

Services/Twig/TwigService.php

@@ -2,9 +2,9 @@
 
 namespace Prokl\BitrixOrdinaryToolsBundle\Services\Twig;
 
+use Twig\Environment;
 use Twig\Error\LoaderError;
-use Twig_Environment;
-use Twig_Loader_Filesystem;
+use Twig\Loader\FilesystemLoader;
 
 /**
  * Class TwigService
@@ -16,12 +16,12 @@
 class TwigService
 {
     /**
-     * @var Twig_Environment Twig.
+     * @var Environment Twig.
      */
     private $twigEnvironment;
 
     /**
-     * @var Twig_Loader_Filesystem $loader Загрузчик Twig.
+     * @var FilesystemLoader $loader Загрузчик Twig.
      */
     private $loader;
 
@@ -43,13 +43,13 @@ class TwigService
     /**
      * TwigService constructor.
      *
-     * @param Twig_Loader_Filesystem $loader      Загрузчик.
-     * @param string                 $debug       Среда.
-     * @param string                 $cachePath   Путь к кэшу (серверный).
-     * @param array|null             $twigOptions Опции Твига.
+     * @param FilesystemLoader $loader      Загрузчик.
+     * @param string           $debug       Среда.
+     * @param string           $cachePath   Путь к кэшу (серверный).
+     * @param array|null       $twigOptions Опции Твига.
      */
     public function __construct(
-        Twig_Loader_Filesystem $loader,
+        FilesystemLoader $loader,
         string $debug,
         string $cachePath,
         ?array $twigOptions = null
@@ -69,9 +69,9 @@ public function __construct(
     /**
      * Инстанс Твига.
      *
-     * @return Twig_Environment
+     * @return Environment
      */
-    public function instance() : Twig_Environment
+    public function instance() : Environment
     {
         return $this->twigEnvironment;
     }
@@ -113,19 +113,19 @@ public function addPath(string $path) : void
     /**
      * Инициализация.
      *
-     * @param Twig_Loader_Filesystem $loader    Загрузчик.
-     * @param string                 $debug     Среда.
-     * @param string                 $cachePath Путь к кэшу (серверный).
+     * @param FilesystemLoader $loader    Загрузчик.
+     * @param string           $debug     Среда.
+     * @param string           $cachePath Путь к кэшу (серверный).
      *
-     * @return Twig_Environment
+     * @return Environment
      */
     private function initTwig(
-        Twig_Loader_Filesystem $loader,
+        FilesystemLoader $loader,
         string $debug,
         string $cachePath
-    ) : Twig_Environment {
+    ) : Environment {
 
-        return new Twig_Environment(
+        return new Environment(
             $loader,
             [
                 'debug' => (bool)$debug,