Add support for symfony/console of version ^7.0

yiisoft · Dec 26, 2023 · f59b50c · f59b50c
1 parent 8ea90e6
commit f59b50c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 24 deletions.
diff --git a/.phpunit-watcher.yml b/.phpunit-watcher.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 2.1.2 under development
 
-- no changes in this release.
+- Enh #189: Add support for `symfony/console` of version `^7.0` (@vjik)
 
 ## 2.1.1 November 05, 2023
 

diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "psr/container": "^1.0|^2.0",
         "psr/event-dispatcher": "^1.0",
         "psr/log": "^1.0|^2.0|^3.0",
-        "symfony/console": "^5.4|^6.0",
+        "symfony/console": "^5.4|^6.0|^7.0",
         "symfony/event-dispatcher-contracts": "^2.2|^3.0",
         "yiisoft/friendly-exception": "^1.0"
     },
@@ -40,7 +40,6 @@
         "phpunit/phpunit": "^9.5",
         "rector/rector": "^0.18.0",
         "roave/infection-static-analysis-plugin": "^1.16",
-        "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.30|^5.6",
         "yiisoft/config": "^1.3",
         "yiisoft/di": "^1.2",

diff --git a/src/Command/Game.php b/src/Command/Game.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Yii\Console\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
@@ -14,11 +15,9 @@
 /**
  * @codeCoverageIgnore
  */
+#[AsCommand('|yii', 'A Guessing Game')]
 final class Game extends Command
 {
-    protected static $defaultName = '|yii';
-    protected static $defaultDescription = 'A Guessing Game';
-
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $steps = 1;

diff --git a/src/Command/Serve.php b/src/Command/Serve.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Yii\Console\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Completion\CompletionSuggestions;
@@ -21,6 +22,7 @@
 use function is_dir;
 use function passthru;
 
+#[AsCommand('serve', 'Runs PHP built-in web server')]
 final class Serve extends Command
 {
     public const EXIT_CODE_NO_DOCUMENT_ROOT = 2;
@@ -33,9 +35,6 @@ final class Serve extends Command
     private string $defaultRouter;
     private int $defaultWorkers;
 
-    protected static $defaultName = 'serve';
-    protected static $defaultDescription = 'Runs PHP built-in web server';
-
     /**
      * @psalm-param array{
      *     address?:non-empty-string,

diff --git a/tests/Stub/ErrorCommand.php b/tests/Stub/ErrorCommand.php
@@ -4,22 +4,21 @@
 
 namespace Yiisoft\Yii\Console\Tests\Stub;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Yiisoft\Yii\Console\ExitCode;
 
+#[AsCommand('error', 'Error command tests')]
 final class ErrorCommand extends Command
 {
-    protected static $defaultName = 'error';
-    protected static $defaultDescription = 'Error command tests';
-
     public function __construct(private NonExistsClass $class)
     {
         parent::__construct();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         return ExitCode::OK;
     }