[TwigBundle] remove legacy template dirs from iterator

Tobion · Tobion · commit d1137f96c8c3 · 2019-06-04T17:16:43.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -46,9 +46,9 @@ public function process(ContainerBuilder $container)
             $coreThemePath = \dirname(\dirname($reflClass->getFileName())).'/Resources/views/Form';
             $container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', [$coreThemePath]);
 
-            $paths = $container->getDefinition('twig.template_iterator')->getArgument(2);
+            $paths = $container->getDefinition('twig.template_iterator')->getArgument(1);
             $paths[$coreThemePath] = null;
-            $container->getDefinition('twig.template_iterator')->replaceArgument(2, $paths);
+            $container->getDefinition('twig.template_iterator')->replaceArgument(1, $paths);
         }
 
         if ($container->has('router')) {
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\TwigBundle\DependencyInjection;
 
-use Symfony\Bundle\TwigBundle\Loader\NativeFilesystemLoader;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileExistenceResource;
 use Symfony\Component\Console\Application;
@@ -97,7 +96,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         // paths are modified in ExtensionPass if forms are enabled
-        $container->getDefinition('twig.template_iterator')->replaceArgument(2, $config['paths']);
+        $container->getDefinition('twig.template_iterator')->replaceArgument(1, $config['paths']);
 
         foreach ($this->getBundleTemplatePaths($container, $config) as $name => $paths) {
             $namespace = $this->normalizeBundleName($name);
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -31,7 +31,6 @@
 
         <service id="twig.template_iterator" class="Symfony\Bundle\TwigBundle\TemplateIterator">
             <argument type="service" id="kernel" />
-            <argument>%kernel.root_dir%</argument>
             <argument type="collection" /> <!-- Twig paths -->
             <argument>%twig.default_path%</argument>
         </service>
diff --git a/src/Symfony/Bundle/TwigBundle/TemplateIterator.php b/src/Symfony/Bundle/TwigBundle/TemplateIterator.php
@@ -24,21 +24,18 @@
 class TemplateIterator implements \IteratorAggregate
 {
     private $kernel;
-    private $rootDir;
     private $templates;
     private $paths;
     private $defaultPath;
 
     /**
      * @param KernelInterface $kernel      A KernelInterface instance
-     * @param string          $rootDir     The directory where global templates can be stored
      * @param array           $paths       Additional Twig paths to warm
      * @param string|null     $defaultPath The directory where global templates can be stored
      */
-    public function __construct(KernelInterface $kernel, string $rootDir, array $paths = [], string $defaultPath = null)
+    public function __construct(KernelInterface $kernel, array $paths = [], string $defaultPath = null)
     {
         $this->kernel = $kernel;
-        $this->rootDir = $rootDir;
         $this->paths = $paths;
         $this->defaultPath = $defaultPath;
     }
@@ -52,14 +49,8 @@ public function getIterator()
             return $this->templates;
         }
 
-        $templates = $this->findTemplatesInDirectory($this->rootDir.'/Resources/views');
+        $templates = null !== $this->defaultPath ? $this->findTemplatesInDirectory($this->defaultPath, null, ['bundles']) : [];
 
-        if (null !== $this->defaultPath) {
-            $templates = array_merge(
-                $templates,
-                $this->findTemplatesInDirectory($this->defaultPath, null, ['bundles'])
-            );
-        }
         foreach ($this->kernel->getBundles() as $bundle) {
             $name = $bundle->getName();
             if ('Bundle' === substr($name, -6)) {
@@ -69,14 +60,8 @@ public function getIterator()
             $templates = array_merge(
                 $templates,
                 $this->findTemplatesInDirectory($bundle->getPath().'/Resources/views', $name),
-                $this->findTemplatesInDirectory($this->rootDir.'/Resources/'.$bundle->getName().'/views', $name)
+                null !== $this->defaultPath ? $this->findTemplatesInDirectory($this->defaultPath.'/bundles/'.$bundle->getName(), $name) : []
             );
-            if (null !== $this->defaultPath) {
-                $templates = array_merge(
-                    $templates,
-                    $this->findTemplatesInDirectory($this->defaultPath.'/bundles/'.$bundle->getName(), $name)
-                );
-            }
         }
 
         foreach ($this->paths as $dir => $namespace) {
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/BarBundle/views/base.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/BarBundle/views/base.html.twig
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/views/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/views/layout.html.twig
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/views/sub/sub.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/views/sub/sub.html.twig
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php b/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
@@ -25,18 +25,16 @@ public function testGetIterator()
         $kernel->expects($this->any())->method('getBundles')->willReturn([
             $bundle,
         ]);
-        $iterator = new TemplateIterator($kernel, __DIR__.'/Fixtures/templates', [__DIR__.'/Fixtures/templates/Foo' => 'Foo'], __DIR__.'/DependencyInjection/Fixtures/templates');
+        $iterator = new TemplateIterator($kernel, [__DIR__.'/Fixtures/templates/Foo' => 'Foo'], __DIR__.'/DependencyInjection/Fixtures/templates');
 
         $sorted = iterator_to_array($iterator);
         sort($sorted);
         $this->assertEquals(
             [
-                '@Bar/base.html.twig',
                 '@Bar/index.html.twig',
                 '@Bar/layout.html.twig',
                 '@Foo/index.html.twig',
                 'layout.html.twig',
-                'sub/sub.html.twig',
             ],
             $sorted
         );
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -32,7 +32,7 @@
         "symfony/finder": "^4.4|^5.0",
         "symfony/form": "^4.4|^5.0",
         "symfony/routing": "^4.4|^5.0",
-        "symfony/translation": "^4.4|^5.0",
+        "symfony/translation": "^5.0",
         "symfony/yaml": "^4.4|^5.0",
         "symfony/framework-bundle": "^5.0",
         "symfony/web-link": "^4.4|^5.0",
@@ -42,7 +42,7 @@
     "conflict": {
         "symfony/dependency-injection": "<4.4",
         "symfony/framework-bundle": "<5.0",
-        "symfony/translation": "<4.4"
+        "symfony/translation": "<5.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" },
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
@@ -68,7 +68,7 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $paths = array_keys($container->getDefinition('twig.template_iterator')->getArgument(2));
+        $paths = array_keys($container->getDefinition('twig.template_iterator')->getArgument(1));
         if ($container->hasDefinition($this->debugCommandServiceId)) {
             $definition = $container->getDefinition($this->debugCommandServiceId);
             $definition->replaceArgument(4, $container->getParameter('twig.default_path'));
diff --git a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationPassTest.php b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationPassTest.php
@@ -68,7 +68,7 @@ public function testValidCommandsViewPathsArgument()
             ->setArguments([null, null, null, null, null, null, [], []])
         ;
         $container->register('twig.template_iterator')
-            ->setArguments([null, null, ['other/templates' => null, 'tpl' => 'App']])
+            ->setArguments([null, ['other/templates' => null, 'tpl' => 'App']])
         ;
         $container->setParameter('twig.default_path', 'templates');
 
@@ -109,7 +109,7 @@ public function testCommandsViewPathsArgumentsAreIgnoredWithOldServiceDefinition
             ])
         ;
         $container->register('twig.template_iterator')
-            ->setArguments([null, null, ['other/templates' => null, 'tpl' => 'App']])
+            ->setArguments([null, ['other/templates' => null, 'tpl' => 'App']])
         ;
         $container->setParameter('twig.default_path', 'templates');
 
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
@@ -35,6 +35,7 @@
     "conflict": {
         "symfony/config": "<4.4",
         "symfony/dependency-injection": "<4.4",
+        "symfony/twig-bundle": "<5.0",
         "symfony/yaml": "<4.4"
     },
     "provide": {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function process(ContainerBuilder $container)`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`	`70`
`71`		`- $paths = array_keys($container->getDefinition('twig.template_iterator')->getArgument(2));`
	`71`	`+ $paths = array_keys($container->getDefinition('twig.template_iterator')->getArgument(1));`
`72`	`72`	`if ($container->hasDefinition($this->debugCommandServiceId)) {`
`73`	`73`	`$definition = $container->getDefinition($this->debugCommandServiceId);`
`74`	`74`	`$definition->replaceArgument(4, $container->getParameter('twig.default_path'));`