diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index df999d2435e8..5b4ec4390409 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -13,6 +13,7 @@
use Symfony\Component\Console\Descriptor\TextDescriptor;
use Symfony\Component\Console\Descriptor\XmlDescriptor;
+use Symfony\Component\Console\Exception\ExceptionInterface;
use Symfony\Component\Console\Helper\DebugFormatterHelper;
use Symfony\Component\Console\Helper\ProcessHelper;
use Symfony\Component\Console\Helper\QuestionHelper;
@@ -880,6 +881,14 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
return $command->run($input, $output);
}
+ // bind before the console.command event, so the listeners have access to input options/arguments
+ try {
+ $command->mergeApplicationDefinition();
+ $input->bind($command->getDefinition());
+ } catch (ExceptionInterface $e) {
+ // ignore invalid options/arguments for now, to allow the event listeners to customize the InputDefinition
+ }
+
$event = new ConsoleCommandEvent($command, $input, $output);
$this->dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 5ff7ab9b97d1..21b069268d92 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -13,6 +13,7 @@
use Symfony\Component\Console\Descriptor\TextDescriptor;
use Symfony\Component\Console\Descriptor\XmlDescriptor;
+use Symfony\Component\Console\Exception\ExceptionInterface;
use Symfony\Component\Console\Input\InputDefinition;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputArgument;
@@ -231,7 +232,7 @@ public function run(InputInterface $input, OutputInterface $output)
// bind the input against the command specific arguments/options
try {
$input->bind($this->definition);
- } catch (\Exception $e) {
+ } catch (ExceptionInterface $e) {
if (!$this->ignoreValidationErrors) {
throw $e;
}
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index dc2651537a4f..4f6e000f8ebc 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -943,6 +943,63 @@ public function testRunWithDispatcherSkippingCommand()
$this->assertEquals(ConsoleCommandEvent::RETURN_CODE_DISABLED, $exitCode);
}
+ public function testRunWithDispatcherAccessingInputOptions()
+ {
+ $noInteractionValue = null;
+ $quietValue = null;
+
+ $dispatcher = $this->getDispatcher();
+ $dispatcher->addListener('console.command', function (ConsoleCommandEvent $event) use (&$noInteractionValue, &$quietValue) {
+ $input = $event->getInput();
+
+ $noInteractionValue = $input->getOption('no-interaction');
+ $quietValue = $input->getOption('quiet');
+ });
+
+ $application = new Application();
+ $application->setDispatcher($dispatcher);
+ $application->setAutoExit(false);
+
+ $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+ $output->write('foo.');
+ });
+
+ $tester = new ApplicationTester($application);
+ $tester->run(array('command' => 'foo', '--no-interaction' => true));
+
+ $this->assertTrue($noInteractionValue);
+ $this->assertFalse($quietValue);
+ }
+
+ public function testRunWithDispatcherAddingInputOptions()
+ {
+ $extraValue = null;
+
+ $dispatcher = $this->getDispatcher();
+ $dispatcher->addListener('console.command', function (ConsoleCommandEvent $event) use (&$extraValue) {
+ $definition = $event->getCommand()->getDefinition();
+ $input = $event->getInput();
+
+ $definition->addOption(new InputOption('extra', null, InputOption::VALUE_REQUIRED));
+ $input->bind($definition);
+
+ $extraValue = $input->getOption('extra');
+ });
+
+ $application = new Application();
+ $application->setDispatcher($dispatcher);
+ $application->setAutoExit(false);
+
+ $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+ $output->write('foo.');
+ });
+
+ $tester = new ApplicationTester($application);
+ $tester->run(array('command' => 'foo', '--extra' => 'some test value'));
+
+ $this->assertEquals('some test value', $extraValue);
+ }
+
public function testTerminalDimensions()
{
$application = new Application();
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