up: fix some code syntax error on php 8.4

Author: inhere

.github/workflows/php.yml

@@ -54,7 +54,7 @@ jobs:
 
       - name: Run unit tests
         run: |
-          phpunit -v --debug
+          phpunit --debug
           php examples/alone -h
           php examples/app --help
 

README.en.md

@@ -1,7 +1,7 @@
 # PHP Console
 
 [![License](https://img.shields.io/packagist/l/inhere/console.svg?style=flat-square)](LICENSE)
-[![Php Version](https://img.shields.io/badge/php-%3E=8.0-brightgreen.svg?maxAge=2592000)](https://packagist.org/packages/inhere/console)
+[![Php Version](https://img.shields.io/packagist/php-v/inhere/console?maxAge=2592000)](https://packagist.org/packages/inhere/console)
 [![Latest Stable Version](http://img.shields.io/packagist/v/inhere/console.svg)](https://packagist.org/packages/inhere/console)
 [![Github Actions Status](https://github.com/inhere/php-console/workflows/Unit-tests/badge.svg)](https://github.com/inhere/php-console/actions)
 [![zh-CN readme](https://img.shields.io/badge/Readme-中文-brightgreen.svg?maxAge=2592000)](README.md)

README.md

@@ -1,7 +1,7 @@
 # PHP Console
 
 [![License](https://img.shields.io/packagist/l/inhere/console.svg?style=flat-square)](LICENSE)
-[![Php Version](https://img.shields.io/badge/php-%3E=8.0-brightgreen.svg?maxAge=2592000)](https://packagist.org/packages/inhere/console)
+[![Php Version](https://img.shields.io/packagist/php-v/inhere/console?maxAge=2592000)](https://packagist.org/packages/inhere/console)
 [![Latest Stable Version](http://img.shields.io/packagist/v/inhere/console.svg)](https://packagist.org/packages/inhere/console)
 [![Github Actions Status](https://github.com/inhere/php-console/workflows/Unit-tests/badge.svg)](https://github.com/inhere/php-console/actions)
 [![English](https://img.shields.io/badge/Readme-English-brightgreen.svg?maxAge=2592000)](README.en.md)

composer.json

@@ -22,7 +22,7 @@
     }
   ],
   "require": {
-    "php": ">8.0.1",
+    "php": ">8.1",
     "toolkit/cli-utils": "~2.0",
     "toolkit/fsutil": "~2.0",
     "toolkit/pflag": "~2.0",

src/Component/ErrorHandler.php

@@ -88,6 +88,7 @@ public function handle(Throwable $e): void
             $file = $e->getFile();
             $prev = $e->getPrevious();
 
+            // var_dump($e);
             $snippet = Highlighter::create()->snippet(file_get_contents($file), $line, 3, 3);
             $message = sprintf(
                 $tpl, // $e->getCode(),

src/Component/Interact/LimitedAsk.php

@@ -63,7 +63,7 @@ class LimitedAsk extends InteractiveHandle
     public static function ask(
         string $question,
         string $default = '',
-        Closure $validator = null,
+        ?Closure $validator = null,
         int $times = 3
     ): string {
         if (!$question = trim($question)) {

src/Component/Interact/Question.php

@@ -62,7 +62,7 @@ class Question extends InteractiveHandle
      *  echo "Your input: $answer";
      * ```
      */
-    public static function ask(string $question, string $default = '', Closure $validator = null): string
+    public static function ask(string $question, string $default = '', ?Closure $validator = null): string
     {
         if (!$question = trim($question)) {
             Show::error('Please provide a question text!', 1);

src/Component/Symbol/ArtFont.php

@@ -109,7 +109,7 @@ public function showInternal(string $name, array $opts = []): int
      *
      * @return int
      */
-    public function showItalic(string $name, string $group = null, array $opts = []): int
+    public function showItalic(string $name, ?string $group = null, array $opts = []): int
     {
         $opts['type'] = 'italic';
 
@@ -129,7 +129,7 @@ public function showItalic(string $name, string $group = null, array $opts = [])
      *
      * @return int
      */
-    public function show(string $name, string $group = null, array $opts = []): int
+    public function show(string $name, ?string $group = null, array $opts = []): int
     {
         $opts = array_merge([
             'type'   => '',
@@ -175,7 +175,7 @@ public function show(string $name, string $group = null, array $opts = []): int
      *
      * @return string
      */
-    public function font(string $name, string $group = null): string
+    public function font(string $name, ?string $group = null): string
     {
         return '';
     }
@@ -227,7 +227,7 @@ public function setGroup(string $group, string $path): self
      *
      * @return $this
      */
-    public function addFont(string $name, string $file, string $group = null): self
+    public function addFont(string $name, string $file, ?string $group = null): self
     {
         $group = $group ?: self::DEFAULT_GROUP;
 

src/Decorate/RuntimeProfileTrait.php

@@ -81,7 +81,7 @@ public static function profile($name, array $context = [], string $category = 'a
      *
      * @return bool|array
      */
-    public static function profileEnd(string $msg = null, array $context = []): bool|array
+    public static function profileEnd(?string $msg = null, array $context = []): bool|array
     {
         if (!$latestKey = array_pop(self::$keyQueue)) {
             return false;
@@ -114,7 +114,7 @@ public static function profileEnd(string $msg = null, array $context = []): bool
      *
      * @return array
      */
-    public static function getProfileData(string $name = null, string $category = 'application'): array
+    public static function getProfileData(?string $name = null, string $category = 'application'): array
     {
         if ($name) {
             return self::$profiles[$category][$name] ?? [];

src/Util/Interact.php

@@ -180,7 +180,7 @@ public static function unConfirm(string $question, bool $default = true): bool
      *
      * @return bool
      */
-    public static function answerIsYes(bool $default = null): bool
+    public static function answerIsYes(?bool $default = null): bool
     {
         $mark = ' [yes|no]: ';
 
@@ -216,7 +216,7 @@ public static function answerIsYes(bool $default = null): bool
      *
      * @return string|null
      */
-    public static function ask(string $question, string $default = '', Closure $validator = null): ?string
+    public static function ask(string $question, string $default = '', ?Closure $validator = null): ?string
     {
         return self::question($question, $default, $validator);
     }
@@ -231,7 +231,7 @@ public static function ask(string $question, string $default = '', Closure $vali
      * @return string
      * @see Question::ask()
      */
-    public static function question(string $question, string $default = '', Closure $validator = null): string
+    public static function question(string $question, string $default = '', ?Closure $validator = null): string
     {
         return Question::ask($question, $default, $validator);
     }
@@ -250,7 +250,7 @@ public static function question(string $question, string $default = '', Closure
     public static function limitedAsk(
         string $question,
         string $default = '',
-        Closure $validator = null,
+        ?Closure $validator = null,
         int $times = 3
     ): string {
         return LimitedAsk::ask($question, $default, $validator, $times);