Deprecating support for old templates directories

yceruto · yceruto · commit bb92d3dea90b · 2018-10-16T11:04:09.000-04:00
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 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 templates directories `src/Resources/views/` and `src/Resources/<BundleName>/views/`, use `templates/` and `templates/bundles/<BundleName>/` instead.
 
 Validator
 --------
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 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('"%s" This templates directory is deprecated since 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('"%s" This templates directory is deprecated since 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;
