merged branch henrikbjorn/2.0 (PR #5137)

Commits
-------

0b78fdf Only call registerCommand on bundles that is an instance of Bundle

Discussion
----------

Only call registerCommand on bundles that is an instance of Bundle

Fixes GH-5133

---------------------------------------------------------------------------

by travisbot at 2012-08-01T09:41:05Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/2008252) (merged 0b78fdff into 1da896dc).

---------------------------------------------------------------------------

by henrikbjorn at 2012-08-01T10:05:00Z

Build failed because of HTTP request error.

---------------------------------------------------------------------------

by lsmith77 at 2012-08-01T11:31:08Z

wondering if it would be good if you could include the commit from #5133 in this PR .. then we get the test and the fix at once.
This commit is contained in:
Fabien Potencier 2012-08-03 10:19:10 +02:00
commit 13c60bdeaf

View File

@ -17,6 +17,7 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\HttpKernel\KernelInterface;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\HttpKernel\Bundle;
/**
* Application.
@ -78,8 +79,11 @@ class Application extends BaseApplication
protected function registerCommands()
{
$this->kernel->boot();
foreach ($this->kernel->getBundles() as $bundle) {
$bundle->registerCommands($this);
if ($bundle instanceof Bundle) {
$bundle->registerCommands($this);
}
}
}
}