From a3ee1c5c09da142f8eb9e85cd38d6cb21c18de1a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 29 May 2015 16:42:01 +0200 Subject: [PATCH] Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)" This reverts commit 4d408525962b78abbb9f40d699d1b959aae2f8f1, reversing changes made to dd2fb850a7795c1092c8f6efe1db959f09b4ac02. --- .../Bundle/TwigBundle/DependencyInjection/TwigExtension.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php index a8c89f3b9d..9b6f806f04 100644 --- 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 @@ class TwigExtension extends Extension } 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'])) {