Upgrade the minimum php version to 8.0 for circuit-breaker and command. (#4206)

Author: limingxinleo

src/Annotation/Command.php

@@ -14,10 +14,6 @@
 use Attribute;
 use Hyperf\Di\Annotation\AbstractAnnotation;
 
-/**
- * @Annotation
- * @Target({"CLASS"})
- */
 #[Attribute(Attribute::TARGET_CLASS)]
 class Command extends AbstractAnnotation
 {

src/Command.php

@@ -19,6 +19,7 @@
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Helper\TableStyle;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -32,58 +33,39 @@ abstract class Command extends SymfonyCommand
 
     /**
      * The name of the command.
-     *
-     * @var string
      */
-    protected $name;
+    protected ?string $name = null;
 
-    /**
-     * @var InputInterface
-     */
-    protected $input;
+    protected ?InputInterface $input = null;
 
     /**
-     * @var SymfonyStyle
+     * @var null|SymfonyStyle
      */
-    protected $output;
+    protected ?OutputInterface $output = null;
 
     /**
      * The default verbosity of output commands.
-     *
-     * @var int
      */
-    protected $verbosity = OutputInterface::VERBOSITY_NORMAL;
+    protected int $verbosity = OutputInterface::VERBOSITY_NORMAL;
 
     /**
      * Execution in a coroutine environment.
-     *
-     * @var bool
      */
-    protected $coroutine = true;
+    protected bool $coroutine = true;
 
-    /**
-     * @var null|EventDispatcherInterface
-     */
-    protected $eventDispatcher;
+    protected ?EventDispatcherInterface $eventDispatcher = null;
 
-    /**
-     * @var int
-     */
-    protected $hookFlags;
+    protected int $hookFlags = -1;
 
     /**
      * The name and signature of the command.
-     *
-     * @var null|string
      */
-    protected $signature;
+    protected ?string $signature = null;
 
     /**
-     * The mapping between human readable verbosity levels and Symfony's OutputInterface.
-     *
-     * @var array
+     * The mapping between human-readable verbosity levels and Symfony's OutputInterface.
      */
-    protected $verbosityMap
+    protected array $verbosityMap
         = [
             'v' => OutputInterface::VERBOSITY_VERBOSE,
             'vv' => OutputInterface::VERBOSITY_VERY_VERBOSE,
@@ -94,25 +76,21 @@ abstract class Command extends SymfonyCommand
 
     /**
      * The exit code of the command.
-     *
-     * @var int
      */
-    protected $exitCode = 0;
+    protected int $exitCode = 0;
 
     public function __construct(string $name = null)
     {
-        if (! $name && $this->name) {
-            $name = $this->name;
-        }
+        $this->name = $name ?? $this->name;
 
-        if (! is_int($this->hookFlags)) {
+        if ($this->hookFlags < 0) {
             $this->hookFlags = swoole_hook_flags();
         }
 
         if (isset($this->signature)) {
             $this->configureUsingFluentDefinition();
         } else {
-            parent::__construct($name);
+            parent::__construct($this->name);
         }
 
         $this->addEnableDispatcherOption();
@@ -138,28 +116,26 @@ public function confirm(string $question, bool $default = false): bool
 
     /**
      * Prompt the user for input.
-     *
-     * @param null|mixed $default
      */
-    public function ask(string $question, $default = null)
+    public function ask(string $question, string $default = null)
     {
         return $this->output->ask($question, $default);
     }
 
     /**
-     * Prompt the user for input with auto completion.
+     * Prompt the user for input with auto-completion.
      *
-     * @param null|mixed $default
+     * @param null|bool|float|int|string $default
      */
     public function anticipate(string $question, array $choices, $default = null)
     {
         return $this->askWithCompletion($question, $choices, $default);
     }
 
     /**
-     * Prompt the user for input with auto completion.
+     * Prompt the user for input with auto-completion.
      *
-     * @param null|mixed $default
+     * @param null|bool|float|int|string $default
      */
     public function askWithCompletion(string $question, array $choices, $default = null)
     {
@@ -184,7 +160,7 @@ public function secret(string $question, bool $fallback = true)
 
     /**
      * Give the user a multiple choice from an array of answers.
-     * @param null|mixed $default
+     * @param mixed $default
      */
     public function choiceMultiple(
         string $question,
@@ -202,7 +178,7 @@ public function choiceMultiple(
     /**
      * Give the user a single choice from an array of answers.
      *
-     * @param null|mixed $default
+     * @param mixed $default
      */
     public function choice(
         string $question,
@@ -215,19 +191,16 @@ public function choice(
 
     /**
      * Format input to textual table.
-     *
-     * @param mixed $rows
-     * @param mixed $tableStyle
      */
-    public function table(array $headers, $rows, $tableStyle = 'default', array $columnStyles = []): void
+    public function table(array $headers, array|Arrayable $rows, TableStyle|string $tableStyle = 'default', array $columnStyles = []): void
     {
         $table = new Table($this->output);
 
         if ($rows instanceof Arrayable) {
             $rows = $rows->toArray();
         }
 
-        $table->setHeaders((array) $headers)->setRows($rows)->setStyle($tableStyle);
+        $table->setHeaders($headers)->setRows($rows)->setStyle($tableStyle);
 
         foreach ($columnStyles as $columnIndex => $columnStyle) {
             $table->setColumnStyle($columnIndex, $columnStyle);
@@ -375,7 +348,7 @@ protected function createInputFromArguments(array $arguments): ArrayInput
     }
 
     /**
-     * Get all of the context passed to the command.
+     * Get all the context passed to the command.
      */
     protected function context(): array
     {
@@ -395,9 +368,9 @@ protected function context(): array
      */
     protected function specifyParameters(): void
     {
-        // We will loop through all of the arguments and options for the command and
+        // We will loop through all the arguments and options for the command and
         // set them all on the base command instance. This specifies what can get
-        // passed into these commands as "parameters" to control the execution.
+        // past into these commands as "parameters" to control the execution.
         if (method_exists($this, 'getArguments')) {
             foreach ($this->getArguments() ?? [] as $arguments) {
                 call_user_func_array([$this, 'addArgument'], $arguments);

src/EnableEventDispatcher.php

@@ -26,7 +26,8 @@ public function addEnableDispatcherOption()
     public function enableDispatcher(InputInterface $input)
     {
         if ($input->getOption('enable-event-dispatcher')) {
-            $this->eventDispatcher = ApplicationContext::getContainer()->get(EventDispatcherInterface::class);
+            $dispatcher = ApplicationContext::getContainer()->get(EventDispatcherInterface::class);
+            $this->eventDispatcher = $dispatcher instanceof EventDispatcherInterface ? $dispatcher : null;
         }
     }
 }

src/Event/Event.php

@@ -15,14 +15,8 @@
 
 abstract class Event
 {
-    /**
-     * @var Command
-     */
-    protected $command;
-
-    public function __construct(Command $command)
+    public function __construct(protected Command $command)
     {
-        $this->command = $command;
     }
 
     public function getCommand(): Command

src/Event/FailToHandle.php

@@ -16,16 +16,9 @@
 
 class FailToHandle extends Event
 {
-    /**
-     * @var Throwable
-     */
-    protected $throwable;
-
-    public function __construct(Command $command, Throwable $throwable)
+    public function __construct(Command $command, protected Throwable $throwable)
     {
         parent::__construct($command);
-
-        $this->throwable = $throwable;
     }
 
     public function getThrowable(): Throwable

src/Parser.php

@@ -51,7 +51,7 @@ protected static function name(string $expression): string
     }
 
     /**
-     * Extract all of the parameters from the tokens.
+     * Extract all the parameters from the tokens.
      */
     protected static function parameters(array $tokens): array
     {

tests/Command/SwooleFlagsCommand.php

@@ -15,7 +15,7 @@
 
 class SwooleFlagsCommand extends Command
 {
-    protected $hookFlags = SWOOLE_HOOK_CURL | SWOOLE_HOOK_ALL;
+    protected int $hookFlags = SWOOLE_HOOK_CURL | SWOOLE_HOOK_ALL;
 
     public function handle()
     {

tests/CommandTest.php

@@ -48,7 +48,7 @@ public function testHookFlags()
     public function testExitCodeWhenThrowException()
     {
         /** @var FooExceptionCommand $command */
-        $command = new ClassInvoker(new FooExceptionCommand());
+        $command = new ClassInvoker(new FooExceptionCommand('foo'));
         $input = Mockery::mock(InputInterface::class);
         $input->shouldReceive('getOption')->andReturnFalse();
         $exitCode = $command->execute($input, Mockery::mock(OutputInterface::class));