[DI] Use GlobResource for non-tracked directories

vudaltsov · nicolas-grekas · commit e9ea24f17ffb · 2017-08-22T13:09:25.000+02:00
Thanks @nicolas-grekas
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1346,7 +1346,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
                 $fileRecorder('yml', $file);
             }
 
-            if ($container->fileExists($dir = $dirname.'/Resources/config/serialization')) {
+            if ($container->fileExists($dir = $dirname.'/Resources/config/serialization', '/^$/')) {
                 $this->registerMappingFilesFromDir($dir, $fileRecorder);
             }
         }
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -13,6 +13,7 @@
 
 use Symfony\Bridge\Twig\Extension\WebLinkExtension;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\FileExistenceResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -118,7 +119,8 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
 
-        if ($container->fileExists($dir = $container->getParameter('kernel.root_dir').'/Resources/views', false)) {
+        if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {
+            $container->addResource(new FileExistenceResource($dir));
             $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));
         }
 
@@ -178,11 +180,13 @@ private function getBundleHierarchy(ContainerBuilder $container)
                 );
             }
 
-            if ($container->fileExists($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views', false)) {
+            if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views')) {
+                $container->addResource(new FileExistenceResource($dir));
                 $bundleHierarchy[$name]['paths'][] = $dir;
             }
 
-            if ($container->fileExists($dir = $bundle['path'].'/Resources/views', false)) {
+            if (is_dir($dir = $bundle['path'].'/Resources/views')) {
+                $container->addResource(new FileExistenceResource($dir));
                 $bundleHierarchy[$name]['paths'][] = $dir;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -407,12 +407,14 @@ public function fileExists($path, $trackContents = true)
             return $exists;
         }
 
-        if ($trackContents) {
-            if (is_dir($path)) {
+        if (is_dir($path)) {
+            if ($trackContents) {
                 $this->addResource(new DirectoryResource($path, is_string($trackContents) ? $trackContents : null));
             } else {
-                $this->addResource(new FileResource($path));
+                $this->addResource(new GlobResource($path, '/*', false));
             }
+        } elseif ($trackContents) {
+            $this->addResource(new FileResource($path));
         }
 
         return $exists;

Original file line number	Diff line number	Diff line change
`@@ -1346,7 +1346,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1346`	`1346`	`$fileRecorder('yml', $file);`
`1347`	`1347`	`}`
`1348`	`1348`
`1349`		`- if ($container->fileExists($dir = $dirname.'/Resources/config/serialization')) {`
	`1349`	`+ if ($container->fileExists($dir = $dirname.'/Resources/config/serialization', '/^$/')) {`
`1350`	`1350`	`$this->registerMappingFilesFromDir($dir, $fileRecorder);`
`1351`	`1351`	`}`
`1352`	`1352`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Bridge\Twig\Extension\WebLinkExtension;`
`15`	`15`	`use Symfony\Component\Config\FileLocator;`
	`16`	`+use Symfony\Component\Config\Resource\FileExistenceResource;`
`16`	`17`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`17`	`18`	`use Symfony\Component\DependencyInjection\Reference;`
`18`	`19`	`use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;`
`@@ -118,7 +119,8 @@ public function load(array $configs, ContainerBuilder $container)`
`118`	`119`	`}`
`119`	`120`	`}`
`120`	`121`
`121`		`- if ($container->fileExists($dir = $container->getParameter('kernel.root_dir').'/Resources/views', false)) {`
	`122`	`+ if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {`
	`123`	`+ $container->addResource(new FileExistenceResource($dir));`
`122`	`124`	`$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));`
`123`	`125`	`}`
`124`	`126`
`@@ -178,11 +180,13 @@ private function getBundleHierarchy(ContainerBuilder $container)`
`178`	`180`	`);`
`179`	`181`	`}`
`180`	`182`
`181`		`- if ($container->fileExists($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views', false)) {`
	`183`	`+ if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views')) {`
	`184`	`+ $container->addResource(new FileExistenceResource($dir));`
`182`	`185`	`$bundleHierarchy[$name]['paths'][] = $dir;`
`183`	`186`	`}`
`184`	`187`
`185`		`- if ($container->fileExists($dir = $bundle['path'].'/Resources/views', false)) {`
	`188`	`+ if (is_dir($dir = $bundle['path'].'/Resources/views')) {`
	`189`	`+ $container->addResource(new FileExistenceResource($dir));`
`186`	`190`	`$bundleHierarchy[$name]['paths'][] = $dir;`
`187`	`191`	`}`
`188`	`192`
Original file line number	Diff line number	Diff line change
`@@ -407,12 +407,14 @@ public function fileExists($path, $trackContents = true)`
`407`	`407`	`return $exists;`
`408`	`408`	`}`
`409`	`409`
`410`		`- if ($trackContents) {`
`411`		`- if (is_dir($path)) {`
	`410`	`+ if (is_dir($path)) {`
	`411`	`+ if ($trackContents) {`
`412`	`412`	`$this->addResource(new DirectoryResource($path, is_string($trackContents) ? $trackContents : null));`
`413`	`413`	`} else {`
`414`		`- $this->addResource(new FileResource($path));`
	`414`	`+ $this->addResource(new GlobResource($path, '/*', false));`
`415`	`415`	`}`
	`416`	`+ } elseif ($trackContents) {`
	`417`	`+ $this->addResource(new FileResource($path));`
`416`	`418`	`}`
`417`	`419`
`418`	`420`	`return $exists;`