Use %twig.default_path% parameter and search in old folder structure too

Pascal Montoya · Pascal Montoya · commit 94629b8686f0 · 2018-04-16T09:32:24.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -32,14 +32,18 @@ class DebugCommand extends Command
     private $twig;
     private $projectDir;
     private $bundlesMetadata;
+    private $twigDefaultPath;
+    private $rootDir;
 
-    public function __construct(Environment $twig, string $projectDir = null, array $bundlesMetadata = array())
+    public function __construct(Environment $twig, string $projectDir = null, array $bundlesMetadata = array(), string $twigDefaultPath = null, string $rootDir = null)
     {
         parent::__construct();
 
         $this->twig = $twig;
         $this->projectDir = $projectDir;
         $this->bundlesMetadata = $bundlesMetadata;
+        $this->twigDefaultPath = $twigDefaultPath;
+        $this->rootDir = $rootDir;
     }
 
     protected function configure()
@@ -85,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $data['tests'] = array_keys($data['tests']);
             $data['loader_paths'] = $this->getLoaderPaths();
             $io->writeln(json_encode($data));
-            $this->displayAlternatives($this->findWrongBundleOverrides($data['loader_paths']), $io);
+            $this->displayAlternatives($this->findWrongBundleOverrides(), $io);
 
             return 0;
         }
@@ -111,8 +115,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $rows = array();
-        $loaderPaths = $this->getLoaderPaths();
-        foreach ($loaderPaths as $namespace => $paths) {
+        foreach ($this->getLoaderPaths() as $namespace => $paths) {
             if (count($paths) > 1) {
                 $rows[] = array('', '');
             }
@@ -127,7 +130,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         array_pop($rows);
         $io->section('Loader Paths');
         $io->table(array('Namespace', 'Paths'), $rows);
-        $this->displayAlternatives($this->findWrongBundleOverrides($loaderPaths), $io);
+        $this->displayAlternatives($this->findWrongBundleOverrides(), $io);
 
         return 0;
     }
@@ -248,25 +251,45 @@ private function getPrettyMetadata($type, $entity)
         }
     }
 
-    private function findWrongBundleOverrides($loaderPaths)
+    private function findWrongBundleOverrides(): array
     {
         $alternatives = array();
-        $paths = array_unique($loaderPaths['(None)']);
         $bundleNames = array();
-        foreach ($paths as $path) {
-            $relativePath = $path.'/bundles/';
-            if (file_exists($dir = $this->projectDir.'/'.$relativePath)) {
-                $folders = glob($dir.'*', GLOB_ONLYDIR);
-                $bundleNames = array_reduce($folders, function ($carry, $absolutePath) use ($relativePath) {
+
+        if ($this->rootDir) {
+            $folders = glob($this->rootDir.'/Resources/*/views', GLOB_ONLYDIR);
+            $relativePath = ltrim(substr($this->rootDir.'/Resources/', \strlen($this->projectDir)), DIRECTORY_SEPARATOR);
+            $bundleNames = array_reduce(
+                $folders,
+                function ($carry, $absolutePath) use ($relativePath) {
+                    if (null !== $this->projectDir && 0 === strpos($absolutePath, $this->projectDir)) {
+                        $name = basename(\dirname($absolutePath));
+                        $path = $relativePath.$name;
+                        $carry[$name] = $path;
+                    }
+
+                    return $carry;
+                },
+                $bundleNames
+            );
+        }
+
+        if ($this->twigDefaultPath) {
+            $folders = glob($this->twigDefaultPath.'/bundles/*', GLOB_ONLYDIR);
+            $relativePath = ltrim(substr($this->twigDefaultPath.'/bundles', \strlen($this->projectDir)), DIRECTORY_SEPARATOR);
+            $bundleNames = array_reduce(
+                $folders,
+                function ($carry, $absolutePath) use ($relativePath) {
                     if (null !== $this->projectDir && 0 === strpos($absolutePath, $this->projectDir)) {
                         $path = ltrim(substr($absolutePath, \strlen($this->projectDir)), DIRECTORY_SEPARATOR);
                         $name = ltrim(substr($path, \strlen($relativePath)), DIRECTORY_SEPARATOR);
                         $carry[$name] = $path;
                     }
 
                     return $carry;
-                }, $bundleNames);
-            }
+                },
+                $bundleNames
+            );
         }
 
         if (\count($bundleNames)) {
@@ -289,7 +312,7 @@ private function findWrongBundleOverrides($loaderPaths)
         return $alternatives;
     }
 
-    private function displayAlternatives(array $wrongBundles, SymfonyStyle $io)
+    private function displayAlternatives(array $wrongBundles, SymfonyStyle $io): void
     {
         foreach ($wrongBundles as $path => $alternatives) {
             $message = sprintf('Path "%s" not matching any bundle found', $path);
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/console.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/console.xml
@@ -11,6 +11,8 @@
             <argument type="service" id="twig" />
             <argument>%kernel.project_dir%</argument>
             <argument>%kernel.bundles_metadata%</argument>
+            <argument>%twig.default_path%</argument>
+            <argument>%kernel.root_dir%</argument>
             <tag name="console.command" command="debug:twig" />
         </service>
 
