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

fabpot · fabpot · commit 4d408525962b · 2015-05-16T16:20:38.000+02:00
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #14262). Discussion ---------- [TwigBundle] Refresh twig paths when resources change. | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Fixed tickets | ~ | Tests pass? | yes | License | MIT Commits ------- cafb0d7 [TwigBundle] Refresh twig paths when resources change.
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -12,6 +12,7 @@
 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;
@@ -66,22 +67,26 @@ 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,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Bundle\TwigBundle\DependencyInjection;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Config\FileLocator;`
	`15`	`+use Symfony\Component\Config\Resource\DirectoryResource;`
`15`	`16`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`17`	`use Symfony\Component\DependencyInjection\Reference;`
`17`	`18`	`use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;`
`@@ -66,22 +67,26 @@ public function load(array $configs, ContainerBuilder $container)`
`66`	`67`	`} else {`
`67`	`68`	`$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));`
`68`	`69`	`}`
	`70`	`+ $container->addResource(new DirectoryResource($path));`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`// register bundles as Twig namespaces`
`72`	`74`	`foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {`
`73`	`75`	`if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$bundle.'/views')) {`
`74`	`76`	`$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);`
	`77`	`+ $container->addResource(new DirectoryResource($dir));`
`75`	`78`	`}`
`76`	`79`
`77`	`80`	`$reflection = new \ReflectionClass($class);`
`78`	`81`	`if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/views')) {`
`79`	`82`	`$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);`
	`83`	`+ $container->addResource(new DirectoryResource($dir));`
`80`	`84`	`}`
`81`	`85`	`}`
`82`	`86`
`83`	`87`	`if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {`
`84`	`88`	`$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));`
	`89`	`+ $container->addResource(new DirectoryResource($dir));`
`85`	`90`	`}`
`86`	`91`
`87`	`92`	`if (!empty($config['globals'])) {`