bug #41675 [Runtime] fix overriding --env|-e with single-command apps (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 74de6ec2cef9 · 2021-06-12T11:01:02.000+02:00
This PR was merged into the 5.3 branch. Discussion ---------- [Runtime] fix overriding --env|-e with single-command apps | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #41658 | License | MIT | Doc PR | - Commits ------- 25fb2f7 [Runtime] fix overriding --env|-e with single-command apps
diff --git a/src/Symfony/Component/Runtime/SymfonyRuntime.php b/src/Symfony/Component/Runtime/SymfonyRuntime.php
@@ -131,6 +131,7 @@ public function getRunner(?object $application): RunnerInterface
             }
 
             $console->setDefaultCommand($application->getName(), true);
+            $console->getDefinition()->addOptions($application->getDefinition()->getOptions());
 
             return $this->getRunner($console);
         }
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/command.php b/src/Symfony/Component/Runtime/Tests/phpt/command.php
@@ -2,14 +2,15 @@
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 require __DIR__.'/autoload.php';
 
 return function (Command $command, InputInterface $input, OutputInterface $output, array $context) {
-    $command->setCode(function () use ($output, $context) {
-        $output->write('OK Command '.$context['SOME_VAR']);
-    });
+    $command->addOption('hello', 'e', InputOption::VALUE_REQUIRED, 'How should I greet?', 'OK');
 
-    return $command;
+    return $command->setCode(function () use ($input, $output, $context) {
+        $output->write($input->getOption('hello').' Command '.$context['SOME_VAR']);
+    });
 };

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ public function getRunner(?object $application): RunnerInterface`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`$console->setDefaultCommand($application->getName(), true);`
	`134`	`+ $console->getDefinition()->addOptions($application->getDefinition()->getOptions());`
`134`	`135`
`135`	`136`	`return $this->getRunner($console);`
`136`	`137`	`}`