up: upgrade support php8.4

Author: inhere

.github/workflows/php.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.0, 8.1, 8.2] # 7.3, 7.4,
+        php: [8.1, 8.2, 8.3, 8.4] # 7.3, 7.4,
 #        os: [ubuntu-latest] # windows-latest,
 #        include:
 #          - os: 'ubuntu-latest'
@@ -61,4 +61,4 @@ jobs:
       - name: Test build PHAR
         run: |
           php -d phar.readonly=0 examples/app phar pack -o=myapp.phar
-          php myapp.phar -h
+          php myapp.phar -h

src/AbstractApplication.php

@@ -148,7 +148,7 @@ abstract class AbstractApplication implements ApplicationInterface
      * @param Input|null  $input
      * @param Output|null $output
      */
-    public function __construct(array $config = [], Input $input = null, Output $output = null)
+    public function __construct(array $config = [], ?Input $input = null, ?Output $output = null)
     {
         $this->runtimeCheck();
         $this->setConfig($config);
@@ -672,7 +672,7 @@ public function getLogoText(): ?string
      * @param string      $logoTxt
      * @param string|null $style
      */
-    public function setLogo(string $logoTxt, string $style = null): void
+    public function setLogo(string $logoTxt, ?string $style = null): void
     {
         $this->config['logoText'] = $logoTxt;
 
@@ -848,6 +848,10 @@ public function isProfile(): bool
         $optKey  = GlobalOption::PROFILE;
         $default = (bool)$this->getParam($optKey, false);
 
+        if (!$this->flags->hasOpt($optKey)) {
+            return $default;
+        }
+
         // return $this->input->getBoolOpt($key, $def);
         return $this->flags->getOpt($optKey, $default);
     }

src/Application.php

@@ -52,7 +52,7 @@ class Application extends AbstractApplication
      * @param Input|null $input
      * @param Output|null $output
      */
-    public function __construct(array $config = [], Input $input = null, Output $output = null)
+    public function __construct(array $config = [], ?Input $input = null, ?Output $output = null)
     {
         Console::setApp($this);
 
@@ -294,7 +294,7 @@ protected function createController(array $info): Controller
      *
      * @return $this
      */
-    public function controller(string $name, ControllerInterface|string $class = null, array $config = []): static
+    public function controller(string $name, ControllerInterface|string|null $class = null, array $config = []): static
     {
         $this->logf(Console::VERB_CRAZY, 'register group controller: %s', $name);
         $this->router->addGroup($name, $class, $config);
@@ -312,7 +312,7 @@ public function controller(string $name, ControllerInterface|string $class = nul
      * @return static
      * @see controller()
      */
-    public function addGroup(string $name, ControllerInterface|string $class = null, array $config = []): static
+    public function addGroup(string $name, ControllerInterface|string|null $class = null, array $config = []): static
     {
         return $this->controller($name, $class, $config);
     }
@@ -325,7 +325,7 @@ public function addGroup(string $name, ControllerInterface|string $class = null,
      * @return $this
      * @see controller()
      */
-    public function addController(string $name, ControllerInterface|string $class = null, array $config = []): static
+    public function addController(string $name, ControllerInterface|string|null $class = null, array $config = []): static
     {
         return $this->controller($name, $class, $config);
     }
@@ -353,7 +353,7 @@ public function addControllers(array $controllers): void
      *
      * @return Application
      */
-    public function command(string $name, string|Closure|CommandInterface $handler = null, array $config = []): static
+    public function command(string $name, string|Closure|CommandInterface|null $handler = null, array $config = []): static
     {
         $this->logf(Console::VERB_CRAZY, 'register alone command: %s', $name);
         $this->router->addCommand($name, $handler, $config);
@@ -371,7 +371,7 @@ public function command(string $name, string|Closure|CommandInterface $handler =
      * @return Application
      * @see command()
      */
-    public function addCommand(string $name, string|Closure|CommandInterface $handler = null, array $config = []): static
+    public function addCommand(string $name, string|Closure|CommandInterface|null $handler = null, array $config = []): static
     {
         return $this->command($name, $handler, $config);
     }

src/Component/Router.php

@@ -115,7 +115,7 @@ class Router implements RouterInterface
      * @return static
      * @throws InvalidArgumentException
      */
-    public function addGroup(string $name, ControllerInterface|string $class = null, array $config = []): static
+    public function addGroup(string $name, ControllerInterface|string|null $class = null, array $config = []): static
     {
         /**
          * @var Controller $class name is an controller class
@@ -179,7 +179,7 @@ public function addGroup(string $name, ControllerInterface|string $class = null,
      *
      * @return static
      */
-    public function addCommand(string $name, string|Closure|CommandInterface $handler = null, array $config = []): static
+    public function addCommand(string $name, string|Closure|CommandInterface|null $handler = null, array $config = []): static
     {
         if (!$handler && class_exists($name)) {
             $handler = $name;

src/Console.php

@@ -117,8 +117,8 @@ public static function getOutput(): Output
      */
     public static function newApp(
         array $config = [],
-        Input $input = null,
-        Output $output = null
+        ?Input $input = null,
+        ?Output $output = null
     ): Application {
         return new Application($config, $input, $output);
     }

src/Contract/ApplicationInterface.php

@@ -65,7 +65,7 @@ public function stop(int $code = 0): void;
      * @return static
      * @throws InvalidArgumentException
      */
-    public function controller(string $name, ControllerInterface|string $class = null, array $config = []): static;
+    public function controller(string $name, ControllerInterface|string|null $class = null, array $config = []): ApplicationInterface;
 
     /**
      * Register a app independent console command
@@ -77,8 +77,11 @@ public function controller(string $name, ControllerInterface|string $class = nul
      * @return mixed
      * @throws InvalidArgumentException
      */
-    public function command(string $name, string|Closure|CommandInterface $handler = null, array $config = []): static;
+    public function command(string $name, string|Closure|CommandInterface|null $handler = null, array $config = []): ApplicationInterface;
 
+    /**
+     * @return void
+     */
     public function showCommandList();
 
     /**

src/Contract/RouterInterface.php

@@ -35,7 +35,7 @@ interface RouterInterface
      *
      * @return static
      */
-    public function addGroup(string $name, ControllerInterface|string $class = null, array $config = []): static;
+    public function addGroup(string $name, ControllerInterface|string|null $class = null, array $config = []): static;
 
     /**
      * Register a app independent console command
@@ -46,7 +46,7 @@ public function addGroup(string $name, ControllerInterface|string $class = null,
      *
      * @return static
      */
-    public function addCommand(string $name, string|Closure|CommandInterface $handler = null, array $config = []): static;
+    public function addCommand(string $name, string|Closure|CommandInterface|null $handler = null, array $config = []): static;
 
     /**
      * ```php

src/Controller.php

@@ -520,7 +520,7 @@ protected function beforeRenderCommandHelp(array &$help): void
      *
      * @return ?Generator
      */
-    protected function getAllCommandMethods(ReflectionClass $ref = null, bool $onlyName = false): ?Generator
+    protected function getAllCommandMethods(?ReflectionClass $ref = null, bool $onlyName = false): ?Generator
     {
         $ref = $ref ?: new ReflectionObject($this);
 

src/Decorate/SubCommandsWareTrait.php

@@ -157,7 +157,7 @@ protected function createSubCommand(array $subInfo): Command
      * @param class-string|CommandInterface|null $handler
      * @param array $config
      */
-    public function addSub(string $name, string|CommandInterface $handler = null, array $config = []): void
+    public function addSub(string $name, string|CommandInterface|null $handler = null, array $config = []): void
     {
         if (!$handler && class_exists($name)) {
             /** @var Command $name name is an command class */

src/Decorate/UserInteractAwareTrait.php

@@ -41,7 +41,7 @@ trait UserInteractAwareTrait
      * @return string
      * @see Interact::choice()
      */
-    public function select(string $description, array|string $options, int|string $default = null, bool $allowExit = true): string
+    public function select(string $description, array|string $options, int|string|null $default = null, bool $allowExit = true): string
     {
         return $this->choice($description, $options, $default, $allowExit);
     }
@@ -54,7 +54,7 @@ public function select(string $description, array|string $options, int|string $d
      *
      * @return string
      */
-    public function choice(string $description, array|string $options, int|string $default = null, bool $allowExit = true): string
+    public function choice(string $description, array|string $options, int|string|null $default = null, bool $allowExit = true): string
     {
         return Interact::choice($description, $options, $default, $allowExit);
     }
@@ -88,7 +88,7 @@ public function unConfirm(string $question, bool $default = true): bool
      *
      * @return string|null
      */
-    public function ask(string $question, string $default = '', Closure $validator = null): ?string
+    public function ask(string $question, string $default = '', ?Closure $validator = null): ?string
     {
         return $this->question($question, $default, $validator);
     }
@@ -100,7 +100,7 @@ public function ask(string $question, string $default = '', Closure $validator =
      *
      * @return string|null
      */
-    public function question(string $question, string $default = '', Closure $validator = null): ?string
+    public function question(string $question, string $default = '', ?Closure $validator = null): ?string
     {
         return Interact::question($question, $default, $validator);
     }
@@ -114,7 +114,7 @@ public function question(string $question, string $default = '', Closure $valida
      * @return string|null
      * @see Interact::limitedAsk()
      */
-    public function limitedAsk(string $question, string $default = '', Closure $validator = null, int $times = 3): ?string
+    public function limitedAsk(string $question, string $default = '', ?Closure $validator = null, int $times = 3): ?string
     {
         return Interact::limitedAsk($question, $default, $validator, $times);
     }
@@ -123,7 +123,7 @@ public function limitedAsk(string $question, string $default = '', Closure $vali
      * @param string $method
      * @param array  $args
      *
-     * @return int
+     * @return mixed
      * @throws LogicException
      */
     public function __call(string $method, array $args = [])