bug #24199 [DI] Fix non-instantiables auto-discovery (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 46811fdd0135 · 2017-09-15T15:18:29.000+02:00
This PR was merged into the 3.3 branch. Discussion ---------- [DI] Fix non-instantiables auto-discovery | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24195 | License | MIT | Doc PR | - Commits ------- 8b7c7c1 [DI] Fix non-instantiables auto-discovery
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -133,7 +133,7 @@ private function findClasses($namespace, $pattern, $excludePattern)
                 throw new InvalidArgumentException(sprintf('Expected to find class "%s" in file "%s" while importing services from resource "%s", but it was not found! Check the namespace prefix used with the resource.', $class, $path, $pattern));
             }
 
-            if (!$r->isInterface() && !$r->isTrait() && !$r->isAbstract()) {
+            if ($r->isInstantiable()) {
                 $classes[] = $class;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ private function findClasses($namespace, $pattern, $excludePattern)`
`133`	`133`	`throw new InvalidArgumentException(sprintf('Expected to find class "%s" in file "%s" while importing services from resource "%s", but it was not found! Check the namespace prefix used with the resource.', $class, $path, $pattern));`
`134`	`134`	`}`
`135`	`135`
`136`		`- if (!$r->isInterface() && !$r->isTrait() && !$r->isAbstract()) {`
	`136`	`+ if ($r->isInstantiable()) {`
`137`	`137`	`$classes[] = $class;`
`138`	`138`	`}`
`139`	`139`	`}`