Upgrade coding standard

Author: natanfelles

composer.json

@@ -39,7 +39,7 @@
     },
     "require-dev": {
         "ext-xdebug": "*",
-        "aplus/coding-standard": "^2.1",
+        "aplus/coding-standard": "^2.8",
         "ergebnis/composer-normalize": "^2.25",
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",

src/CLI.php

@@ -13,6 +13,7 @@
 use Framework\CLI\Styles\ForegroundColor;
 use Framework\CLI\Styles\Format;
 use JetBrains\PhpStorm\Pure;
+use Stringable;
 use ValueError;
 
 /**
@@ -64,7 +65,7 @@ public static function getWidth(int $default = 80) : int
      *
      * @return string Returns the wrapped text
      */
-    public static function wrap(string $text, int $width = null) : string
+    public static function wrap(string $text, ?int $width = null) : string
     {
         $width ??= static::getWidth();
         return \wordwrap($text, $width, \PHP_EOL, true);
@@ -108,8 +109,8 @@ public static function strlen(string $text) : int
      */
     public static function style(
         string $text,
-        ForegroundColor | string $color = null,
-        BackgroundColor | string $background = null,
+        ForegroundColor | string | null $color = null,
+        BackgroundColor | string | null $background = null,
         array $formats = []
     ) : string {
         $string = '';
@@ -146,9 +147,9 @@ public static function style(
      */
     public static function write(
         string $text,
-        ForegroundColor | string $color = null,
-        BackgroundColor | string $background = null,
-        int $width = null
+        ForegroundColor | string | null $color = null,
+        BackgroundColor | string | null $background = null,
+        ?int $width = null
     ) : void {
         if ($width !== null) {
             $text = static::wrap($text, $width);
@@ -310,7 +311,7 @@ public static function getInput(string $prepend = '') : string
      *
      * @return string The answer
      */
-    public static function prompt(string $question, array | string $options = null) : string
+    public static function prompt(string $question, array | string | null $options = null) : string
     {
         if ($options !== null) {
             $options = \is_array($options)
@@ -356,8 +357,8 @@ public static function secret(string $question) : string
     /**
      * Creates a well formatted table.
      *
-     * @param array<array<scalar|\Stringable>> $tbody Table body rows
-     * @param array<scalar|\Stringable> $thead Table head fields
+     * @param array<array<Stringable|scalar>> $tbody Table body rows
+     * @param array<Stringable|scalar> $thead Table head fields
      */
     public static function table(array $tbody, array $thead = []) : void
     {

src/Command.php

@@ -54,7 +54,7 @@ abstract class Command
      *
      * @param Console|null $console
      */
-    public function __construct(Console $console = null)
+    public function __construct(?Console $console = null)
     {
         if ($console) {
             $this->console = $console;

src/Console.php

@@ -56,7 +56,7 @@ class Console
      *
      * @param Language|null $language
      */
-    public function __construct(Language $language = null)
+    public function __construct(?Language $language = null)
     {
         if ($language) {
             $this->setLanguage($language);
@@ -136,7 +136,7 @@ public function getArgument(int $position) : ?string
      *
      * @return static
      */
-    public function setLanguage(Language $language = null) : static
+    public function setLanguage(?Language $language = null) : static
     {
         $this->language = $language ?? new Language();
         $this->language->addDirectory(__DIR__ . '/Languages');
@@ -159,7 +159,7 @@ public function getLanguage() : Language
     /**
      * Add a command to the console.
      *
-     * @param class-string<Command>|Command $command A Command instance or the class FQN
+     * @param Command|class-string<Command> $command A Command instance or the class FQN
      *
      * @return static
      */
@@ -176,7 +176,7 @@ public function addCommand(Command | string $command) : static
     /**
      * Add many commands to the console.
      *
-     * @param array<class-string<Command>|Command> $commands A list of Command
+     * @param array<Command|class-string<Command>> $commands A list of Command
      * instances or the classes FQN
      *
      * @return static