Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcd49146

Browse files
committed
[Console] Remove CompletionInterface
Signed-off-by: Alexander M. Turek <me@derrabus.de>
1 parentec34dd5 commitcd49146

File tree

11 files changed

+19
-52
lines changed

11 files changed

+19
-52
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
useSymfony\Bundle\FrameworkBundle\Secrets\AbstractVault;
1515
useSymfony\Component\Console\Command\Command;
1616
useSymfony\Component\Console\Completion\CompletionInput;
17-
useSymfony\Component\Console\Completion\CompletionInterface;
1817
useSymfony\Component\Console\Completion\CompletionSuggestions;
1918
useSymfony\Component\Console\Input\InputArgument;
2019
useSymfony\Component\Console\Input\InputInterface;
@@ -29,7 +28,7 @@
2928
*
3029
* @internal
3130
*/
32-
finalclass SecretsRemoveCommandextends Commandimplements CompletionInterface
31+
finalclass SecretsRemoveCommandextends Command
3332
{
3433
protectedstatic$defaultName ='secrets:remove';
3534
protectedstatic$defaultDescription ='Remove a secret from the vault';

‎src/Symfony/Component/Console/Application.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
useSymfony\Component\Console\Command\SignalableCommandInterface;
2121
useSymfony\Component\Console\CommandLoader\CommandLoaderInterface;
2222
useSymfony\Component\Console\Completion\CompletionInput;
23-
useSymfony\Component\Console\Completion\CompletionInterface;
2423
useSymfony\Component\Console\Completion\CompletionSuggestions;
2524
useSymfony\Component\Console\Event\ConsoleCommandEvent;
2625
useSymfony\Component\Console\Event\ConsoleErrorEvent;
@@ -69,7 +68,7 @@
6968
*
7069
* @author Fabien Potencier <fabien@symfony.com>
7170
*/
72-
class Applicationimplements ResetInterface, CompletionInterface
71+
class Applicationimplements ResetInterface
7372
{
7473
private$commands = [];
7574
private$wantHelps =false;
@@ -356,7 +355,7 @@ public function getDefinition()
356355
}
357356

358357
/**
359-
*{@inheritdoc}
358+
*Adds suggestions to $suggestions for the current completion input (e.g. option or argument).
360359
*/
361360
publicfunctioncomplete(CompletionInput$input,CompletionSuggestions$suggestions):void
362361
{

‎src/Symfony/Component/Console/Command/Command.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
useSymfony\Component\Console\Application;
1515
useSymfony\Component\Console\Attribute\AsCommand;
16+
useSymfony\Component\Console\Completion\CompletionInput;
17+
useSymfony\Component\Console\Completion\CompletionSuggestions;
1618
useSymfony\Component\Console\Exception\ExceptionInterface;
1719
useSymfony\Component\Console\Exception\InvalidArgumentException;
1820
useSymfony\Component\Console\Exception\LogicException;
@@ -303,6 +305,13 @@ public function run(InputInterface $input, OutputInterface $output)
303305
returnis_numeric($statusCode) ? (int)$statusCode :0;
304306
}
305307

308+
/**
309+
* Adds suggestions to $suggestions for the current completion input (e.g. option or argument).
310+
*/
311+
publicfunctioncomplete(CompletionInput$input,CompletionSuggestions$suggestions):void
312+
{
313+
}
314+
306315
/**
307316
* Sets the code to execute when running this command.
308317
*

‎src/Symfony/Component/Console/Command/CompleteCommand.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespaceSymfony\Component\Console\Command;
1313

1414
useSymfony\Component\Console\Completion\CompletionInput;
15-
useSymfony\Component\Console\Completion\CompletionInterface;
1615
useSymfony\Component\Console\Completion\CompletionSuggestions;
1716
useSymfony\Component\Console\Completion\Output\BashCompletionOutput;
1817
useSymfony\Component\Console\Exception\CommandNotFoundException;
@@ -107,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
107106
$this->log(' Completing option names for the <comment>'.\get_class($commandinstanceof LazyCommand ?$command->getCommand() :$command).'</> command.');
108107

109108
$suggestions->suggestOptions($command->getDefinition()->getOptions());
110-
}elseif ($commandinstanceof CompletionInterface) {
109+
}else {
111110
$this->log([
112111
' Completing using the <comment>'.\get_class($command).'</> class.',
113112
' Completing <comment>'.$completionInput->getCompletionType().'</> for <comment>'.$completionInput->getCompletionName().'</>',

‎src/Symfony/Component/Console/Command/DumpCompletionCommand.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespaceSymfony\Component\Console\Command;
1313

1414
useSymfony\Component\Console\Completion\CompletionInput;
15-
useSymfony\Component\Console\Completion\CompletionInterface;
1615
useSymfony\Component\Console\Completion\CompletionSuggestions;
1716
useSymfony\Component\Console\Input\InputArgument;
1817
useSymfony\Component\Console\Input\InputInterface;
@@ -26,7 +25,7 @@
2625
*
2726
* @author Wouter de Jong <wouter@wouterj.nl>
2827
*/
29-
finalclass DumpCompletionCommandextends Commandimplements CompletionInterface
28+
finalclass DumpCompletionCommandextends Command
3029
{
3130
protectedstatic$defaultName ='completion';
3231
protectedstatic$defaultDescription ='Dump the shell completion script';

‎src/Symfony/Component/Console/Command/HelpCommand.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespaceSymfony\Component\Console\Command;
1313

1414
useSymfony\Component\Console\Completion\CompletionInput;
15-
useSymfony\Component\Console\Completion\CompletionInterface;
1615
useSymfony\Component\Console\Completion\CompletionSuggestions;
1716
useSymfony\Component\Console\Descriptor\ApplicationDescription;
1817
useSymfony\Component\Console\Helper\DescriptorHelper;
@@ -26,7 +25,7 @@
2625
*
2726
* @author Fabien Potencier <fabien@symfony.com>
2827
*/
29-
class HelpCommandextends Commandimplements CompletionInterface
28+
class HelpCommandextends Command
3029
{
3130
private$command;
3231

‎src/Symfony/Component/Console/Command/LazyCommand.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
useSymfony\Component\Console\Application;
1515
useSymfony\Component\Console\Completion\CompletionInput;
16-
useSymfony\Component\Console\Completion\CompletionInterface;
1716
useSymfony\Component\Console\Completion\CompletionSuggestions;
1817
useSymfony\Component\Console\Helper\HelperSet;
1918
useSymfony\Component\Console\Input\InputDefinition;
@@ -23,7 +22,7 @@
2322
/**
2423
* @author Nicolas Grekas <p@tchwork.com>
2524
*/
26-
finalclass LazyCommandextends Commandimplements CompletionInterface
25+
finalclass LazyCommandextends Command
2726
{
2827
private$command;
2928
private$isEnabled;
@@ -74,9 +73,7 @@ public function run(InputInterface $input, OutputInterface $output): int
7473

7574
publicfunctioncomplete(CompletionInput$input,CompletionSuggestions$suggestions):void
7675
{
77-
if ($this->getCommand()instanceof CompletionInterface) {
78-
$this->getCommand()->complete($input,$suggestions);
79-
}
76+
$this->getCommand()->complete($input,$suggestions);
8077
}
8178

8279
/**

‎src/Symfony/Component/Console/Command/ListCommand.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespaceSymfony\Component\Console\Command;
1313

1414
useSymfony\Component\Console\Completion\CompletionInput;
15-
useSymfony\Component\Console\Completion\CompletionInterface;
1615
useSymfony\Component\Console\Completion\CompletionSuggestions;
1716
useSymfony\Component\Console\Descriptor\ApplicationDescription;
1817
useSymfony\Component\Console\Helper\DescriptorHelper;
@@ -26,7 +25,7 @@
2625
*
2726
* @author Fabien Potencier <fabien@symfony.com>
2827
*/
29-
class ListCommandextends Commandimplements CompletionInterface
28+
class ListCommandextends Command
3029
{
3130
/**
3231
* {@inheritdoc}

‎src/Symfony/Component/Console/Completion/CompletionInterface.php‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/Symfony/Component/Console/Tester/CommandCompletionTester.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
useSymfony\Component\Console\Command\Command;
1515
useSymfony\Component\Console\Completion\CompletionInput;
16-
useSymfony\Component\Console\Completion\CompletionInterface;
1716
useSymfony\Component\Console\Completion\CompletionSuggestions;
1817

1918
/**
@@ -35,10 +34,6 @@ public function __construct(Command $command)
3534
*/
3635
publicfunctioncomplete(array$input):array
3736
{
38-
if (!$this->commandinstanceof CompletionInterface) {
39-
thrownew \LogicException(sprintf('Command "%s" must implement "%s" to support completion.',\get_class($this->command), CompletionInput::class));
40-
}
41-
4237
$currentIndex =\count($input);
4338
if ('' ===end($input)) {
4439
array_pop($input);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp