symfony · fabpot · Oct 21, 2018 · Oct 16, 2018
diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md
@@ -257,6 +257,7 @@ TwigBundle
 ----------
 
  * The `transchoice` tag and filter have been deprecated, use the `trans` ones instead with a `%count%` parameter.
+ * Deprecated support for legacy templates directories `src/Resources/views/` and `src/Resources/<BundleName>/views/`, use `templates/` and `templates/bundles/<BundleName>/` instead.
 
 Validator
 ---------

diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -256,6 +256,7 @@ TwigBundle
 
  * The default value (`false`) of the `twig.strict_variables` configuration option has been changed to `%kernel.debug%`.
  * The `transchoice` tag and filter have been removed, use the `trans` ones instead with a `%count%` parameter.
+ * Removed support for legacy templates directories `src/Resources/views/` and `src/Resources/<BundleName>/views/`, use `templates/` and `templates/bundles/<BundleName>/` instead.
 
 Validator
 --------

diff --git a/...tional/app/Resources/views/base.html.twig → ...s/Functional/app/templates/base.html.twig b/...tional/app/Resources/views/base.html.twig → ...s/Functional/app/templates/base.html.twig
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -37,7 +37,7 @@
         "symfony/framework-bundle": "~4.2",
         "symfony/http-foundation": "~3.4|~4.0",
         "symfony/translation": "~3.4|~4.0",
-        "symfony/twig-bundle": "~3.4|~4.0",
+        "symfony/twig-bundle": "~4.2",
         "symfony/twig-bridge": "~3.4|~4.0",
         "symfony/process": "~3.4|~4.0",
         "symfony/validator": "~3.4|~4.0",
@@ -49,6 +49,7 @@
     },
     "conflict": {
         "symfony/browser-kit": "<4.2",
+        "symfony/twig-bundle": "<4.2",
         "symfony/var-dumper": "<3.4",
         "symfony/event-dispatcher": "<3.4",
         "symfony/framework-bundle": "<4.2",

diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+4.2.0
+-----
+
+ * deprecated support for legacy templates directories `src/Resources/views/` and `src/Resources/<BundleName>/views/`, use `templates/` and `templates/bundles/<BundleName>/` instead.
+
 4.1.0
 -----
 

diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -74,6 +74,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter('twig.form.resources', $config['form_themes']);
         $container->setParameter('twig.default_path', $config['default_path']);
+        $defaultTwigPath = $container->getParameterBag()->resolveValue($config['default_path']);
 
         $envConfiguratorDefinition = $container->getDefinition('twig.configurator.environment');
         $envConfiguratorDefinition->replaceArgument(0, $config['date']['format']);
@@ -115,14 +116,18 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if (file_exists($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {
+            if ($dir !== $defaultTwigPath) {
+                @trigger_error(sprintf('Templates directory "%s" is deprecated since Symfony 4.2, use "%s" instead.', $dir, $defaultTwigPath), E_USER_DEPRECATED);
+            }
+
             $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));
         }
         $container->addResource(new FileExistenceResource($dir));
 
-        if (file_exists($dir = $container->getParameterBag()->resolveValue($config['default_path']))) {
-            $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));
+        if (file_exists($defaultTwigPath)) {
+            $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($defaultTwigPath));
         }
-        $container->addResource(new FileExistenceResource($dir));
+        $container->addResource(new FileExistenceResource($defaultTwigPath));
 
         if (!empty($config['globals'])) {
             $def = $container->getDefinition('twig');
@@ -164,15 +169,19 @@ private function getBundleTemplatePaths(ContainerBuilder $container, array $conf
     {
         $bundleHierarchy = array();
         foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
+            $defaultOverrideBundlePath = $container->getParameterBag()->resolveValue($config['default_path']).'/bundles/'.$name;
+
             if (file_exists($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views')) {
+                @trigger_error(sprintf('Templates directory "%s" is deprecated since Symfony 4.2, use "%s" instead.', $dir, $defaultOverrideBundlePath), E_USER_DEPRECATED);
+
                 $bundleHierarchy[$name][] = $dir;
             }
             $container->addResource(new FileExistenceResource($dir));
 
-            if (file_exists($dir = $container->getParameterBag()->resolveValue($config['default_path']).'/bundles/'.$name)) {
-                $bundleHierarchy[$name][] = $dir;
+            if (file_exists($defaultOverrideBundlePath)) {
+                $bundleHierarchy[$name][] = $defaultOverrideBundlePath;
             }
-            $container->addResource(new FileExistenceResource($dir));
+            $container->addResource(new FileExistenceResource($defaultOverrideBundlePath));
 
             if (file_exists($dir = $bundle['path'].'/Resources/views')) {
                 $bundleHierarchy[$name][] = $dir;

diff --git a/...TwigBundle/Tests/DependencyInjection/Fixtures/Resources/TwigBundle/views/layout.html.twig b/...TwigBundle/Tests/DependencyInjection/Fixtures/Resources/TwigBundle/views/layout.html.twig
diff --git a/...ony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Resources/views/layout.html.twig b/...ony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Resources/views/layout.html.twig
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -193,11 +193,46 @@ public function testTwigLoaderPaths($format)
             array('namespaced_path1', 'namespace1'),
             array('namespaced_path2', 'namespace2'),
             array('namespaced_path3', 'namespace3'),
-            array(__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'),
             array(__DIR__.'/Fixtures/templates/bundles/TwigBundle', 'Twig'),
             array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
             array(realpath(__DIR__.'/../..').'/Resources/views', '!Twig'),
-            array(__DIR__.'/Fixtures/Resources/views'),
+            array(__DIR__.'/Fixtures/templates'),
+        ), $paths);
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider getFormats
+     * @expectedDeprecation Templates directory "%s/Resources/TwigBundle/views" is deprecated since Symfony 4.2, use "%s/templates/bundles/TwigBundle" instead.
+     * @expectedDeprecation Templates directory "%s/Resources/views" is deprecated since Symfony 4.2, use "%s/templates" instead.
+     */
+    public function testLegacyTwigLoaderPaths($format)
+    {
+        $container = $this->createContainer(__DIR__.'/../Fixtures/templates');
+        $container->registerExtension(new TwigExtension());
+        $this->loadFromFile($container, 'full', $format);
+        $this->loadFromFile($container, 'extra', $format);
+        $this->compileContainer($container);
+
+        $def = $container->getDefinition('twig.loader.native_filesystem');
+        $paths = array();
+        foreach ($def->getMethodCalls() as $call) {
+            if ('addPath' === $call[0] && false === strpos($call[1][0], 'Form')) {
+                $paths[] = $call[1];
+            }
+        }
+
+        $this->assertEquals(array(
+            array('path1'),
+            array('path2'),
+            array('namespaced_path1', 'namespace1'),
+            array('namespaced_path2', 'namespace2'),
+            array('namespaced_path3', 'namespace3'),
+            array(__DIR__.'/../Fixtures/templates/Resources/TwigBundle/views', 'Twig'),
+            array(__DIR__.'/Fixtures/templates/bundles/TwigBundle', 'Twig'),
+            array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
+            array(realpath(__DIR__.'/../..').'/Resources/views', '!Twig'),
+            array(__DIR__.'/../Fixtures/templates/Resources/views'),
             array(__DIR__.'/Fixtures/templates'),
         ), $paths);
     }
@@ -271,11 +306,11 @@ public function testRuntimeLoader()
         $this->assertEquals('foo', $args['FooClass']->getValues()[0]);
     }
 
-    private function createContainer()
+    private function createContainer(string $rootDir = __DIR__.'/Fixtures')
     {
         $container = new ContainerBuilder(new ParameterBag(array(
             'kernel.cache_dir' => __DIR__,
-            'kernel.root_dir' => __DIR__.'/Fixtures',
+            'kernel.root_dir' => $rootDir,
             'kernel.project_dir' => __DIR__,
             'kernel.charset' => 'UTF-8',
             'kernel.debug' => false,

diff --git a/...ny/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/TwigBundle/views/layout.html.twig b/...ny/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/TwigBundle/views/layout.html.twig
@@ -0,0 +1 @@
+{# Twig template #}
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
@@ -66,8 +66,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                     'secret' => '$ecret',
                     'form' => array('enabled' => false),
                 ))
-                ->loadFromExtension('twig', array( // to be removed in 5.0 relying on default
-                    'strict_variables' => false,
+                ->loadFromExtension('twig', array(
+                    'strict_variables' => false, // to be removed in 5.0 relying on default
+                    'default_path' => __DIR__.'/templates',
                 ))
             ;
         });

diff --git a/...unctional/Resources/views/index.html.twig → ...ests/Functional/templates/index.html.twig b/...unctional/Resources/views/index.html.twig → ...ests/Functional/templates/index.html.twig
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
@@ -24,10 +24,10 @@ public function testGetSourceContext()
         $locator
             ->expects($this->once())
             ->method('locate')
-            ->will($this->returnValue(__DIR__.'/../DependencyInjection/Fixtures/Resources/views/layout.html.twig'))
+            ->will($this->returnValue(__DIR__.'/../DependencyInjection/Fixtures/templates/layout.html.twig'))
         ;
         $loader = new FilesystemLoader($locator, $parser);
-        $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/Resources/views', 'namespace');
+        $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/templates', 'namespace');
 
         // Twig-style
         $this->assertEquals("This is a layout\n", $loader->getSourceContext('@namespace/layout.html.twig')->getCode());
@@ -44,7 +44,7 @@ public function testExists()
         $locator
             ->expects($this->once())
             ->method('locate')
-            ->will($this->returnValue($template = __DIR__.'/../DependencyInjection/Fixtures/Resources/views/layout.html.twig'))
+            ->will($this->returnValue($template = __DIR__.'/../DependencyInjection/Fixtures/templates/layout.html.twig'))
         ;
         $loader = new FilesystemLoader($locator, $parser);
 
@@ -101,15 +101,15 @@ public function testTwigErrorIfLocatorReturnsFalse()
 
     /**
      * @expectedException \Twig\Error\LoaderError
-     * @expectedExceptionMessageRegExp /Unable to find template "name\.format\.engine" \(looked into: .*Tests.Loader.\.\..DependencyInjection.Fixtures.Resources.views\)/
+     * @expectedExceptionMessageRegExp /Unable to find template "name\.format\.engine" \(looked into: .*Tests.Loader.\.\..DependencyInjection.Fixtures.templates\)/
      */
     public function testTwigErrorIfTemplateDoesNotExist()
     {
         $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
         $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
 
         $loader = new FilesystemLoader($locator, $parser);
-        $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/Resources/views');
+        $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/templates');
 
         $method = new \ReflectionMethod('Symfony\Bundle\TwigBundle\Loader\FilesystemLoader', 'findTemplate');
         $method->setAccessible(true);
@@ -122,7 +122,7 @@ public function testTwigSoftErrorIfTemplateDoesNotExist()
         $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
 
         $loader = new FilesystemLoader($locator, $parser);
-        $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/Resources/views');
+        $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/templates');
 
         $method = new \ReflectionMethod('Symfony\Bundle\TwigBundle\Loader\FilesystemLoader', 'findTemplate');
         $method->setAccessible(true);
-Original file line number
+Diff line change
@@ Expand Up / @@ -257,6 +257,7 @@ TwigBundle @@
     ----------
      * The `transchoice` tag and filter have been deprecated, use the `trans` ones instead with a `%count%` parameter.
+     * Deprecated support for legacy templates directories `src/Resources/views/` and `src/Resources/<BundleName>/views/`, use `templates/` and `templates/bundles/<BundleName>/` instead.
     Validator
     ---------
@@ Expand Down @@