Fixing a bug where abstract classes were wired

weaverryan · weaverryan · commit ae3ebc2948fd · 2017-05-10T09:29:39.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -108,7 +108,8 @@ private function findClasses($namespace, $pattern)
             if (!$r = $this->container->getReflectionClass($class)) {
                 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()) {
+            // skip interfaces, traits, abstract classes & private constructors
+            if ($r->isInstantiable()) {
                 $classes[] = $class;
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/NoLoadAbstractBar.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/NoLoadAbstractBar.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub;
+
+abstract class NoLoadAbstractBar
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/NoLoadBarInterface.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/NoLoadBarInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub;
+
+interface NoLoadBarInterface
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/NoLoadBarPrivateConstructor.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/NoLoadBarPrivateConstructor.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub;
+
+class NoLoadBarPrivateConstructor
+{
+    private function __construct()
+    {
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/NoLoadBarTrait.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Sub/NoLoadBarTrait.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub;
+
+trait NoLoadBarTrait
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -84,7 +84,10 @@ public function testRegisterClasses()
 
         $loader->registerClasses(new Definition(), 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\\', 'Prototype/%sub_dir%/*');
 
-        $this->assertTrue($container->has(Bar::class));
+        $this->assertEquals(
+            array('service_container', Bar::class),
+            array_keys($container->getDefinitions())
+        );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ private function findClasses($namespace, $pattern)`
`108`	`108`	`if (!$r = $this->container->getReflectionClass($class)) {`
`109`	`109`	`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));`
`110`	`110`	`}`
`111`		`- if (!$r->isInterface() && !$r->isTrait()) {`
	`111`	`+ // skip interfaces, traits, abstract classes & private constructors`
	`112`	`+ if ($r->isInstantiable()) {`
`112`	`113`	`$classes[] = $class;`
`113`	`114`	`}`
`114`	`115`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
++
 +namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub;
++
 +abstract class NoLoadAbstractBar
 +{
 +}
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,10 @@ public function testRegisterClasses()`
`84`	`84`
`85`	`85`	`$loader->registerClasses(new Definition(), 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\\', 'Prototype/%sub_dir%/*');`
`86`	`86`
`87`		`- $this->assertTrue($container->has(Bar::class));`
	`87`	`+ $this->assertEquals(`
	`88`	`+ array('service_container', Bar::class),`
	`89`	`+ array_keys($container->getDefinitions())`
	`90`	`+ );`
`88`	`91`	`}`
`89`	`92`
`90`	`93`	`/**`