support legacy naming

Author: koertho

src/Filesystem/TwigTemplateLocator.php

@@ -9,24 +9,20 @@
 namespace HeimrichHannot\TwigSupportBundle\Filesystem;
 
 use Contao\CoreBundle\Config\ResourceFinderInterface;
-use Contao\CoreBundle\ContaoCoreBundle;
 use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\CoreBundle\Routing\ScopeMatcher;
-use Contao\CoreBundle\Twig\ContaoTwigUtil;
 use Contao\CoreBundle\Twig\Finder\FinderFactory;
 use Contao\CoreBundle\Twig\Loader\TemplateLocator;
 use Contao\PageModel;
 use Contao\ThemeModel;
 use Contao\Validator;
 use HeimrichHannot\TwigSupportBundle\Cache\TemplateCache;
 use HeimrichHannot\TwigSupportBundle\Exception\TemplateNotFoundException;
-use http\Encoding\Stream\Inflate;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Finder\Exception\DirectoryNotFoundException;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -367,6 +363,8 @@ public function getTwigTemplatesInPath($dir, ?string $twigKey = null, bool $exte
      * - extension: (bool) Add extension to filename (array key)
      *
      * @param iterable|string $dir
+     *
+     * @deprecated Use Contao\CoreBundle\Twig\Loader\TemplateLocator::findTemplates()
      */
     public function getTemplatesInPath($dir, ?BundleInterface $bundle = null, array $options = []): array
     {
@@ -396,8 +394,6 @@ public function getTemplatesInPath($dir, ?BundleInterface $bundle = null, array
 
         $twigFiles = [];
 
-        $finder = $this->finderFactory->create();
-
         foreach ($files as $file) {
             /** @var SplFileInfo $file */
             $name = $file->getBasename();
@@ -414,28 +410,14 @@ public function getTemplatesInPath($dir, ?BundleInterface $bundle = null, array
             }
             elseif ('Contao' === $twigKey) {
                 $path = "@$twigKey/".$file->getBasename();
-
-
-
-                if (!$this->twig->getLoader()->exists($path)) {
-                    foreach ($finder->name($file->getRelativePathname())->getIterator() as $identifier => $extension) {
-
-                    }
-                }
-
-
-                foreach ($finder->name($file->getRelativePathname())->getIterator() as $identifier => $extension) {
-                    continue;
-                }
-
-
-                $path = "@$twigKey/".$file->getBasename();
                 $twigFiles[$name]['paths'][] = $path;
                 $twigFiles[$name]['pathInfo'][$path]['bundle'] = null;
                 $twigFiles[$name]['pathInfo'][$path]['pathname'] = $file->getPathname();
             } else {
                 $path = "@$twigKey/".$file->getRelativePathname();
-                $this->addPath($twigFiles, $name, $path, $bundle->getName(), $file->getPathname());
+                $twigFiles[$name]['paths'][] = $path;
+                $twigFiles[$name]['pathInfo'][$path]['bundle'] = $bundle->getName();
+                $twigFiles[$name]['pathInfo'][$path]['pathname'] = $file->getPathname();
             }
         }
         $this->stopwatch->stop($stopwatchname);
@@ -448,6 +430,10 @@ public function getTemplatesInPath($dir, ?BundleInterface $bundle = null, array
      */
     protected function generateContaoTwigTemplatePaths(bool $extension = false): array
     {
+        $stopwatchname = 'TwigTemplateLocator::generateContaoTwigTemplatePaths()';
+        $this->stopwatch->start($stopwatchname);
+
+
         $contaoResourcePaths = $this->templateLocator->findResourcesPaths();
         $bundles = $this->kernel->getBundles();
 
@@ -492,7 +478,7 @@ protected function generateContaoTwigTemplatePaths(bool $extension = false): arr
                     if (str_contains($path, '/contao/templates')) {
                         $namespace = 'Contao_'.$bundle;
                     } else {
-                        $namespace = $bundle;
+                        $namespace = preg_replace('/Bundle$/', '', $bundle);
                     }
                 }
 
@@ -503,65 +489,39 @@ protected function generateContaoTwigTemplatePaths(bool $extension = false): arr
 
                     $twigPath = ($namespace ? "@$namespace/" : '').$name;
 
-
-//                    Path::makeRelative($file->getPathname(), $this->kernel->getProjectDir().'/templates');
+                    if (!$extension) {
+                        if (str_ends_with($name, '.html.twig')) {
+                            $name = substr($name, 0, -10);
+                        }
+                    }
 
                     $this->addPath($twigFiles, $name, $twigPath, $bundle, $path);
-                }
-            }
-        }
-
-        return $twigFiles;
 
-        $twigFiles = [];
-
-        if (\is_array($bundles)) {
-            foreach ($bundles as $key => $bundle) {
-                $path = $bundle->getPath();
-
-                foreach (['/templates', '/Resources/views',] as $subpath) {
-                    if (!is_dir($dir = rtrim($path, '/').$subpath)) {
+                    // check for modern contao template paths and legacy fallback
+                    if (!str_contains($name, '/')) {
                         continue;
                     }
 
-                    $twigFiles = array_merge_recursive($twigFiles, $this->getTemplatesInPath($dir, $bundle, ['extension' => $extension]));
-                }
-            }
-        }
+                    $file = new \SplFileInfo($templatePath);
+                    $name = $file->getBasename();
+                    if (str_ends_with($name, '.html.twig')) {
+                        $name = substr($name, 0, -10);
+                    }
 
-        $bundle = null;
-        if (version_compare(\VERSION, '4.12', '>=')) {
-            $bundle = new class extends Bundle {
-                public function __construct()
-                {
-                    $this->name = 'Contao';
+                    $this->addPath($twigFiles, $name, $twigPath, $bundle, $path, true);
                 }
-            };
+            }
         }
 
-        // Bundle template folders
-        $twigFiles = array_merge_recursive($twigFiles, $this->getTemplatesInPath(
-            $this->contaoResourceFinder->findIn('templates')->name('*.twig')->getIterator(),
-            $bundle,
-            ['extension' => $extension]));
-
-        // Project template folders
-        $twigFiles = array_merge_recursive(
-            $twigFiles,
-            $this->getTemplatesInPath($this->kernel->getProjectDir().'/contao/templates', $bundle, ['extension' => $extension])
-        );
-        $twigFiles = array_merge_recursive(
-            $twigFiles,
-            $this->getTemplatesInPath($this->kernel->getProjectDir().'/templates', null, ['extension' => $extension])
-        );
-
+        $this->stopwatch->stop($stopwatchname);
         return $twigFiles;
     }
 
-    private function addPath(array &$pathData, string $name, string $twigPath, ?string $bundleName, string $absolutePath): void
+    private function addPath(array &$pathData, string $name, string $twigPath, ?string $bundleName, string $absolutePath, bool $deprecated = false): void
     {
         $pathData[$name]['paths'][]                     = $twigPath;
         $pathData[$name]['pathInfo'][$twigPath]['bundle']   = $bundleName;
         $pathData[$name]['pathInfo'][$twigPath]['pathname'] = $absolutePath;
+        $pathData[$name]['pathInfo'][$twigPath]['deprecatedPath'] = $deprecated;
     }
 }