Merge pull request #66 from adhocore/php8

PHP8

Author: adhocore

.travis.yml

@@ -1,11 +1,8 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4
+  - 8.0
+  - 8.1
 
 install:
   - composer install --prefer-dist

composer.json

@@ -3,7 +3,7 @@
     "description": "Command line interface library for PHP",
     "type": "library",
     "keywords": [
-        "php7",
+        "php8",
         "command",
         "argv-parser",
         "cli",
@@ -37,10 +37,10 @@
         }
     },
     "require": {
-        "php": ">=7.0"
+        "php": ">=8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0"
+        "phpunit/phpunit": "^9.0"
     },
     "scripts": {
         "test": "phpunit",

src/Application.php

@@ -27,49 +27,34 @@
 class Application
 {
     /** @var Command[] */
-    protected $commands = [];
+    protected array $commands = [];
 
     /** @var array Raw argv sent to parse() */
-    protected $argv = [];
+    protected array $argv = [];
 
     /** @var array Command aliases [alias => cmd] */
-    protected $aliases = [];
-
-    /** @var string */
-    protected $name;
-
-    /** @var string App version */
-    protected $version = '';
+    protected array $aliases = [];
 
     /** @var string Ascii art logo */
-    protected $logo = '';
+    protected string $logo = '';
 
-    protected $default = '__default__';
+    protected string $default = '__default__';
 
     /** @var Interactor */
-    protected $io;
+    protected Interactor $io;
 
     /** @var callable The callable to perform exit */
     protected $onExit;
 
-    public function __construct(string $name, string $version = '0.0.1', callable $onExit = null)
+    public function __construct(protected string $name, protected string $version = '0.0.1', callable $onExit = null)
     {
-        $this->name    = $name;
-        $this->version = $version;
-
-        // @codeCoverageIgnoreStart
-        $this->onExit = $onExit ?? function ($exitCode = 0) {
-            exit($exitCode);
-        };
-        // @codeCoverageIgnoreEnd
+        $this->onExit = $onExit ?? fn (int $exitCode = 0) => exit($exitCode);
 
         $this->command('__default__', 'Default command', '', true)->on([$this, 'showHelp'], 'help');
     }
 
     /**
      * Get the name.
-     *
-     * @return string
      */
     public function name(): string
     {
@@ -78,8 +63,6 @@ public function name(): string
 
     /**
      * Get the version.
-     *
-     * @return string
      */
     public function version(): string
     {
@@ -102,8 +85,6 @@ public function commands(): array
 
     /**
      * Get the raw argv.
-     *
-     * @return array
      */
     public function argv(): array
     {
@@ -130,14 +111,6 @@ public function logo(string $logo = null)
 
     /**
      * Add a command by its name desc alias etc.
-     *
-     * @param string $name
-     * @param string $desc
-     * @param string $alias
-     * @param bool   $allowUnknown
-     * @param bool   $default
-     *
-     * @return Command
      */
     public function command(
         string $name,
@@ -155,12 +128,6 @@ public function command(
 
     /**
      * Add a prepred command.
-     *
-     * @param Command $command
-     * @param string  $alias
-     * @param bool    $default
-     *
-     * @return self
      */
     public function add(Command $command, string $alias = '', bool $default = false): self
     {
@@ -192,17 +159,13 @@ public function add(Command $command, string $alias = '', bool $default = false)
 
     /**
      * Gets matching command for given argv.
-     *
-     * @param array $argv
-     *
-     * @return Command
      */
     public function commandFor(array $argv): Command
     {
         $argv += [null, null, null];
 
         return
-             // cmd
+            // cmd
             $this->commands[$argv[1]]
             // cmd alias
             ?? $this->commands[$this->aliases[$argv[1]] ?? null]
@@ -262,12 +225,8 @@ public function parse(array $argv): Command
 
     /**
      * Handle the request, invoke action and call exit handler.
-     *
-     * @param array $argv
-     *
-     * @return mixed
      */
-    public function handle(array $argv)
+    public function handle(array $argv): mixed
     {
         if (\count($argv) < 2) {
             return $this->showHelp();
@@ -288,10 +247,6 @@ public function handle(array $argv)
 
     /**
      * Get aliases for given command.
-     *
-     * @param Command $command
-     *
-     * @return array
      */
     protected function aliasesFor(Command $command): array
     {
@@ -309,10 +264,8 @@ protected function aliasesFor(Command $command): array
 
     /**
      * Show help of all commands.
-     *
-     * @return mixed
      */
-    public function showHelp()
+    public function showHelp(): mixed
     {
         $writer = $this->io()->writer();
         $header = "{$this->name}, version {$this->version}";
@@ -336,12 +289,8 @@ protected function outputHelper(): OutputHelper
 
     /**
      * Invoke command action.
-     *
-     * @param Command $command
-     *
-     * @return mixed
      */
-    protected function doAction(Command $command)
+    protected function doAction(Command $command): mixed
     {
         if ($command->name() === '__default__') {
             return $this->notFound();
@@ -351,7 +300,7 @@ protected function doAction(Command $command)
         $command->interact($this->io());
 
         if (!$command->action() && !\method_exists($command, 'execute')) {
-            return;
+            return null;
         }
 
         $params = [];
@@ -368,10 +317,8 @@ protected function doAction(Command $command)
 
     /**
      * Command not found handler.
-     *
-     * @return mixed
      */
-    protected function notFound()
+    protected function notFound(): mixed
     {
         $available = \array_keys($this->commands() + $this->aliases);
         $this->outputHelper()->showCommandNotFound($this->argv[1], $available);

src/Helper/InflectsString.php

@@ -23,10 +23,6 @@ trait InflectsString
 {
     /**
      * Convert a string to camel case.
-     *
-     * @param string $string
-     *
-     * @return string
      */
     public function toCamelCase(string $string): string
     {
@@ -39,10 +35,6 @@ public function toCamelCase(string $string): string
 
     /**
      * Convert a string to capitalized words.
-     *
-     * @param string $string
-     *
-     * @return string
      */
     public function toWords(string $string): string
     {

src/Helper/Normalizer.php

@@ -26,10 +26,6 @@ class Normalizer
 {
     /**
      * Normalize argv args. Like splitting `-abc` and `--xyz=...`.
-     *
-     * @param array $args
-     *
-     * @return array
      */
     public function normalizeArgs(array $args): array
     {
@@ -53,13 +49,8 @@ public function normalizeArgs(array $args): array
 
     /**
      * Normalizes value as per context and runs thorugh filter if possible.
-     *
-     * @param Parameter   $parameter
-     * @param string|null $value
-     *
-     * @return mixed
      */
-    public function normalizeValue(Parameter $parameter, string $value = null)
+    public function normalizeValue(Parameter $parameter, string $value = null): mixed
     {
         if ($parameter instanceof Option && $parameter->bool()) {
             return !$parameter->default();