bug #35772 [Config] don't throw on missing excluded paths (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 212841b3e69d · 2020-02-19T18:19:43.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Config] don't throw on missing excluded paths | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 2f65a7a [Config] don't throw on missing excluded paths
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -110,7 +110,7 @@ private function findClasses($namespace, $pattern, $excludePattern)
         $excludePrefix = null;
         if ($excludePattern) {
             $excludePattern = $parameterBag->unescapeValue($parameterBag->resolveValue($excludePattern));
-            foreach ($this->glob($excludePattern, true, $resource) as $path => $info) {
+            foreach ($this->glob($excludePattern, true, $resource, true) as $path => $info) {
                 if (null === $excludePrefix) {
                     $excludePrefix = $resource->getPrefix();
                 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -134,6 +134,13 @@ public function testRegisterClassesWithExclude()
             ],
             array_keys($container->getAliases())
         );
+
+        $loader->registerClasses(
+            new Definition(),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\',
+            'Prototype/*',
+            'Prototype/NotExistingDir'
+        );
     }
 
     public function testNestedRegisterClasses()

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ private function findClasses($namespace, $pattern, $excludePattern)`
`110`	`110`	`$excludePrefix = null;`
`111`	`111`	`if ($excludePattern) {`
`112`	`112`	`$excludePattern = $parameterBag->unescapeValue($parameterBag->resolveValue($excludePattern));`
`113`		`- foreach ($this->glob($excludePattern, true, $resource) as $path => $info) {`
	`113`	`+ foreach ($this->glob($excludePattern, true, $resource, true) as $path => $info) {`
`114`	`114`	`if (null === $excludePrefix) {`
`115`	`115`	`$excludePrefix = $resource->getPrefix();`
`116`	`116`	`}`