Revert "bug #21841 [Console] Do not squash input changes made from console.command event (chalasr)"

chalasr · chalasr · commit 5af47c40dc67 · 2017-03-16T17:10:10.000+01:00
This reverts commit b8b6774, reversing changes made to 8279055.
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -859,10 +859,6 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
             // ignore invalid options/arguments for now, to allow the event listeners to customize the InputDefinition
         }
 
-        // don't bind the input again as it would override any input argument/option set from the command event in
-        // addition to being useless
-        $command->setInputBound(true);
-
         $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
@@ -42,7 +42,6 @@ class Command
     private $ignoreValidationErrors = false;
     private $applicationDefinitionMerged = false;
     private $applicationDefinitionMergedWithArgs = false;
-    private $inputBound = false;
     private $code;
     private $synopsis = array();
     private $usages = array();
@@ -219,13 +218,11 @@ public function run(InputInterface $input, OutputInterface $output)
         $this->mergeApplicationDefinition();
 
         // bind the input against the command specific arguments/options
-        if (!$this->inputBound) {
-            try {
-                $input->bind($this->definition);
-            } catch (ExceptionInterface $e) {
-                if (!$this->ignoreValidationErrors) {
-                    throw $e;
-                }
+        try {
+            $input->bind($this->definition);
+        } catch (ExceptionInterface $e) {
+            if (!$this->ignoreValidationErrors) {
+                throw $e;
             }
         }
 
@@ -681,14 +678,6 @@ public function asXml($asDom = false)
         return $output->fetch();
     }
 
-    /**
-     * @internal
-     */
-    public function setInputBound($inputBound)
-    {
-        $this->inputBound = $inputBound;
-    }
-
     /**
      * Validates a command name.
      *
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -1113,31 +1113,6 @@ public function testRunWithDispatcherAddingInputOptions()
         $this->assertEquals('some test value', $extraValue);
     }
 
-    public function testUpdateInputFromConsoleCommandEvent()
-    {
-        $dispatcher = $this->getDispatcher();
-        $dispatcher->addListener('console.command', function (ConsoleCommandEvent $event) {
-            $event->getInput()->setOption('extra', 'overriden');
-        });
-
-        $application = new Application();
-        $application->setDispatcher($dispatcher);
-        $application->setAutoExit(false);
-
-        $application
-            ->register('foo')
-            ->addOption('extra', null, InputOption::VALUE_REQUIRED)
-            ->setCode(function (InputInterface $input, OutputInterface $output) {
-                $output->write('foo.');
-            })
-        ;
-
-        $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo', '--extra' => 'original'));
-
-        $this->assertEquals('overriden', $tester->getInput()->getOption('extra'));
-    }
-
     public function testTerminalDimensions()
     {
         $application = new Application();

Original file line number	Diff line number	Diff line change
`@@ -859,10 +859,6 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`859`	`859`	`// ignore invalid options/arguments for now, to allow the event listeners to customize the InputDefinition`
`860`	`860`	`}`
`861`	`861`
`862`		`- // don't bind the input again as it would override any input argument/option set from the command event in`
`863`		`- // addition to being useless`
`864`		`- $command->setInputBound(true);`
`865`		`-`
`866`	`862`	`$event = new ConsoleCommandEvent($command, $input, $output);`
`867`	`863`	`$this->dispatcher->dispatch(ConsoleEvents::COMMAND, $event);`
`868`	`864`