Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"

fabpot · fabpot · commit a3ee1c5c09da · 2015-05-29T16:42:01.000+02:00
This reverts commit 4d40852, reversing changes made to dd2fb85.
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\TwigBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\Config\Resource\DirectoryResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -67,26 +66,22 @@ public function load(array $configs, ContainerBuilder $container)
             } else {
                 $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
             }
-            $container->addResource(new DirectoryResource($path));
         }
 
         // register bundles as Twig namespaces
         foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
             if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$bundle.'/views')) {
                 $this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
-                $container->addResource(new DirectoryResource($dir));
             }
 
             $reflection = new \ReflectionClass($class);
             if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/views')) {
                 $this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
-                $container->addResource(new DirectoryResource($dir));
             }
         }
 
         if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {
             $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));
-            $container->addResource(new DirectoryResource($dir));
         }
 
         if (!empty($config['globals'])) {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Bundle\TwigBundle\DependencyInjection;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Config\FileLocator;`
`15`		`-use Symfony\Component\Config\Resource\DirectoryResource;`
`16`	`15`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`17`	`16`	`use Symfony\Component\DependencyInjection\Reference;`
`18`	`17`	`use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;`
`@@ -67,26 +66,22 @@ public function load(array $configs, ContainerBuilder $container)`
`67`	`66`	`} else {`
`68`	`67`	`$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));`
`69`	`68`	`}`
`70`		`- $container->addResource(new DirectoryResource($path));`
`71`	`69`	`}`
`72`	`70`
`73`	`71`	`// register bundles as Twig namespaces`
`74`	`72`	`foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {`
`75`	`73`	`if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$bundle.'/views')) {`
`76`	`74`	`$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);`
`77`		`- $container->addResource(new DirectoryResource($dir));`
`78`	`75`	`}`
`79`	`76`
`80`	`77`	`$reflection = new \ReflectionClass($class);`
`81`	`78`	`if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/views')) {`
`82`	`79`	`$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);`
`83`		`- $container->addResource(new DirectoryResource($dir));`
`84`	`80`	`}`
`85`	`81`	`}`
`86`	`82`
`87`	`83`	`if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {`
`88`	`84`	`$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));`
`89`		`- $container->addResource(new DirectoryResource($dir));`
`90`	`85`	`}`
`91`	`86`
`92`	`87`	`if (!empty($config['globals'])) {`