merged branch havvg/hotfix/fix-bundle-command-instantiation (PR #8182)

fabpot · fabpot · commit 18f55ffe5e7f · 2013-06-04T17:00:11.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [HttpKernel] instantiate valid commands only | Q | A | ------------- | --- | Bug fix? | yes | New feature? | debatable .. | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT This skips the default behavior to instantiate `Command` that cannot simply be instantiated. The respective commands have to be registered by other means. Commits ------- afad9c7 instantiate valid commands only
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -189,7 +189,7 @@ public function registerCommands(Application $application)
                 $ns .= '\\'.strtr($relativePath, '/', '\\');
             }
             $r = new \ReflectionClass($ns.'\\'.$file->getBasename('.php'));
-            if ($r->isSubclassOf('Symfony\\Component\\Console\\Command\\Command') && !$r->isAbstract()) {
+            if ($r->isSubclassOf('Symfony\\Component\\Console\\Command\\Command') && !$r->isAbstract() && !$r->getConstructor()->getNumberOfRequiredParameters()) {
                 $application->add($r->newInstance());
             }
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/Command/BarCommand.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/Command/BarCommand.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command;
+
+use Symfony\Component\Console\Command\Command;
+
+/**
+ * This command has a required parameter on the constructor and will be ignored by the default Bundle implementation.
+ *
+ * @see Symfony\Component\HttpKernel\Bundle\Bundle::registerCommands
+ */
+class BarCommand extends Command
+{
+    public function __construct($example, $name = 'bar')
+    {
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public function registerCommands(Application $application)`
`189`	`189`	`$ns .= '\\'.strtr($relativePath, '/', '\\');`
`190`	`190`	`}`
`191`	`191`	`$r = new \ReflectionClass($ns.'\\'.$file->getBasename('.php'));`
`192`		`- if ($r->isSubclassOf('Symfony\\Component\\Console\\Command\\Command') && !$r->isAbstract()) {`
	`192`	`+ if ($r->isSubclassOf('Symfony\\Component\\Console\\Command\\Command') && !$r->isAbstract() && !$r->getConstructor()->getNumberOfRequiredParameters()) {`
`193`	`193`	`$application->add($r->newInstance());`
`194`	`194`	`}`
`195`	`195`	`}`