minor #21631 [DI] Don't try to instantiate reflection class if it doesn't exist (chalasr)

fabpot · fabpot · commit c5bdfc542d9f · 2017-02-16T07:56:23.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Don't try to instantiate reflection class if it doesn't exist | Q | A | ------------- | --- | Branch? | master | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Introduced in #21419 so master only. It breaks on bundles that ~~do not use the convention for naming their `Configuration`~~ do not have configuration, e.g. SecurityBundle's FirewallEntryPointExtension for which tests are actually broken (see travis). Commits ------- f9b917a [DI] Don't instantiate unexisting reflection class
diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -82,7 +82,7 @@ public function getConfiguration(array $config, ContainerBuilder $container)
         $class = $container->getReflectionClass($class);
         $constructor = $class ? $class->getConstructor() : null;
 
-        if (!$constructor || !$constructor->getNumberOfRequiredParameters()) {
+        if ($class && (!$constructor || !$constructor->getNumberOfRequiredParameters())) {
             return $class->newInstance();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function getConfiguration(array $config, ContainerBuilder $container)`
`82`	`82`	`$class = $container->getReflectionClass($class);`
`83`	`83`	`$constructor = $class ? $class->getConstructor() : null;`
`84`	`84`
`85`		`- if (!$constructor \|\| !$constructor->getNumberOfRequiredParameters()) {`
	`85`	`+ if ($class && (!$constructor \|\| !$constructor->getNumberOfRequiredParameters())) {`
`86`	`86`	`return $class->newInstance();`
`87`	`87`	`}`
`88`	`88`	`}`