diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
index d10db38f37fa8..7119d5a3d3648 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -11,14 +11,14 @@
namespace Symfony\Bundle\FrameworkBundle\Console;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\Console\Application as BaseApplication;
use Symfony\Component\Console\Input\InputInterface;
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\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\KernelInterface;
/**
* Application.
@@ -69,12 +69,6 @@ public function doRun(InputInterface $input, OutputInterface $output)
{
$this->kernel->boot();
- if (!$this->commandsRegistered) {
- $this->registerCommands();
-
- $this->commandsRegistered = true;
- }
-
$container = $this->kernel->getContainer();
foreach ($this->all() as $command) {
@@ -96,8 +90,36 @@ public function doRun(InputInterface $input, OutputInterface $output)
return parent::doRun($input, $output);
}
+ /**
+ * {@inheritdoc}
+ */
+ public function get($name)
+ {
+ $this->registerCommands();
+
+ return parent::get($name);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function all($namespace = null)
+ {
+ $this->registerCommands();
+
+ return parent::all($namespace);
+ }
+
protected function registerCommands()
{
+ if ($this->commandsRegistered) {
+ return;
+ }
+
+ $this->commandsRegistered = true;
+
+ $this->kernel->boot();
+
$container = $this->kernel->getContainer();
foreach ($this->kernel->getBundles() as $bundle) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
index 612d6325dd26d..b2413e3b198a6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -11,8 +11,9 @@
namespace Symfony\Bundle\FrameworkBundle\Tests\Console;
-use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Output\NullOutput;
use Symfony\Component\Console\Tester\ApplicationTester;
@@ -38,6 +39,69 @@ public function testBundleCommandsAreRegistered()
$application = new Application($kernel);
$application->doRun(new ArrayInput(array('list')), new NullOutput());
+
+ // Calling twice: registration should only be done once.
+ $application->doRun(new ArrayInput(array('list')), new NullOutput());
+ }
+
+ public function testBundleCommandsAreRetrievable()
+ {
+ $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
+ $bundle->expects($this->once())->method('registerCommands');
+
+ $kernel = $this->getKernel(array($bundle), false);
+
+ $application = new Application($kernel);
+ $application->all();
+
+ // Calling twice: registration should only be done once.
+ $application->all();
+ }
+
+ public function testBundleSingleCommandIsRetrievable()
+ {
+ $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
+ $bundle->expects($this->once())->method('registerCommands');
+
+ $kernel = $this->getKernel(array($bundle), false);
+
+ $application = new Application($kernel);
+
+ $command = new Command('example');
+ $application->add($command);
+
+ $this->assertSame($command, $application->get('example'));
+ }
+
+ public function testBundleCommandCanBeFound()
+ {
+ $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
+ $bundle->expects($this->once())->method('registerCommands');
+
+ $kernel = $this->getKernel(array($bundle), false);
+
+ $application = new Application($kernel);
+
+ $command = new Command('example');
+ $application->add($command);
+
+ $this->assertSame($command, $application->find('example'));
+ }
+
+ public function testBundleCommandCanBeFoundByAlias()
+ {
+ $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
+ $bundle->expects($this->once())->method('registerCommands');
+
+ $kernel = $this->getKernel(array($bundle), false);
+
+ $application = new Application($kernel);
+
+ $command = new Command('example');
+ $command->setAliases(array('alias'));
+ $application->add($command);
+
+ $this->assertSame($command, $application->find('alias'));
}
public function testBundleCommandsHaveRightContainer()
@@ -59,21 +123,23 @@ public function testBundleCommandsHaveRightContainer()
$tester->run(array('command' => 'foo'));
}
- private function getKernel(array $bundles)
+ private function getKernel(array $bundles, $withDispatcher = true)
{
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $dispatcher
- ->expects($this->atLeastOnce())
- ->method('dispatch')
- ;
-
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
- $container
- ->expects($this->atLeastOnce())
- ->method('get')
- ->with($this->equalTo('event_dispatcher'))
- ->will($this->returnValue($dispatcher))
- ;
+
+ if ($withDispatcher) {
+ $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $dispatcher
+ ->expects($this->atLeastOnce())
+ ->method('dispatch');
+
+ $container
+ ->expects($this->atLeastOnce())
+ ->method('get')
+ ->with($this->equalTo('event_dispatcher'))
+ ->will($this->returnValue($dispatcher));
+ }
+
$container
->expects($this->once())
->method('hasParameter')
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy