Updated tests, CI, coding standard and added some minor fixes based on Psalm analysis.

Author: eldadfux

.travis.yml

@@ -1,16 +1,16 @@
 language: php
 
 php:
-- 7.1
-- 7.2
 - 7.3
 - 7.4
+- nightly
 
 notifications:
   email:
   - [email protected]
 
-before_script: composer install
+before_script: composer install --ignore-platform-reqs
 
 script:
 - vendor/bin/phpunit --configuration phpunit.xml < tests/input.txt 
+- vendor/bin/psalm --show-info=true

README.md

@@ -1,10 +1,10 @@
 # Utopia CLI
 
-[![Build Status](https://travis-ci.org/utopia-php/cli.svg?branch=master)](https://travis-ci.org/utopia-php/cli)
+[![Build Status](https://travis-ci.org/utopia-php/cli.svg?branch=master)](https://travis-ci.com/utopia-php/cli)
 ![Total Downloads](https://img.shields.io/packagist/dt/utopia-php/cli.svg)
-[![Discord](https://badgen.net/badge/discord/chat/green)](https://discord.gg/GSeTUeA)
+[![Discord](https://badgen.net/badge/discord/chat/green)](https://appwrite.io/discord)
 
-Utopia framework CLI library is simple and lite library for extending Utopia PHP Framework to be able to code command line applications. This library is aiming to be as simple and easy to learn and use.
+Utopia framework CLI library is simple and lite library for extending Utopia PHP Framework to be able to code command line applications. This library is aiming to be as simple and easy to learn and use. This library is maintained by the [Appwrite team](https://appwrite.io).
 
 Although this library is part of the [Utopia Framework](https://github.com/utopia-php/framework) project it is dependency free and can be used as standalone with any other PHP project or framework.
 

composer.json

@@ -18,7 +18,8 @@
         "utopia-php/framework": "0.*.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^9.3",
+        "vimeo/psalm": "4.0.1"
     },
     "minimum-stability": "dev"
 }

psalm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/CLI/CLI.php

@@ -39,7 +39,7 @@ class CLI {
      *
      * An error callback
      *
-     * @var callback
+     * @var callable
      */
     protected $error = null;
 
@@ -48,18 +48,18 @@ class CLI {
      *
      * A callback function that is initialized on application start
      *
-     * @var callback[]
+     * @var callable[]
      */
-    protected $init = array();
+    protected $init = [];
 
     /**
      * Shutdown
      *
      * A callback function that is initialized on application end
      *
-     * @var callback[]
+     * @var callable[]
      */
-    protected $shutdown = array();
+    protected $shutdown = [];
 
     /**
      * CLI constructor.
@@ -175,7 +175,7 @@ public function run()
         try {
             if($command) {
                 foreach($this->init as $init) {
-                    \call_user_func_array($init, array());
+                    \call_user_func_array($init, []);
                 }
 
                 $params = [];
@@ -193,7 +193,7 @@ public function run()
                 \call_user_func_array($command->getAction(), $params);
 
                 foreach($this->shutdown as $shutdown) {
-                    \call_user_func_array($shutdown, array());
+                    \call_user_func_array($shutdown, []);
                 }
             }
             else {

src/CLI/Console.php

@@ -137,9 +137,9 @@ static public function execute(string $cmd, string $stdin = null, string &$stdou
         $stderr = '';
 
         if (\is_resource($process)) {
-            \stream_set_blocking($pipes[0], 0);
-            \stream_set_blocking($pipes[1], 0);
-            \stream_set_blocking($pipes[2], 0);
+            \stream_set_blocking($pipes[0], false);
+            \stream_set_blocking($pipes[1], false);
+            \stream_set_blocking($pipes[2], false);
 
             \fwrite($pipes[0], $stdin);
             \fclose($pipes[0]);

src/CLI/Task.php

@@ -19,9 +19,9 @@ class Task
     /**
      * Action Callback
      *
-     * @var null|callback
+     * @var callable
      */
-    protected $action = null;
+    protected $action;
 
     /**
      * Parameters
@@ -30,7 +30,7 @@ class Task
      *
      * @var array
      */
-    protected $params = array();
+    protected $params = [];
 
     /**
      * Labels
@@ -39,13 +39,13 @@ class Task
      *
      * @var array
      */
-    protected $labels = array();
+    protected $labels = [];
 
     /**
      * Task constructor.
-     * @param $name
+     * @param string $name
      */
-    public function __construct($name)
+    public function __construct(string $name)
     {
         $this->name = $name;
     }
@@ -56,7 +56,7 @@ public function __construct($name)
      * @param string $desc
      * @return $this
      */
-    public function desc($desc)
+    public function desc($desc): self
     {
         $this->desc = $desc;
         return $this;
@@ -65,10 +65,10 @@ public function desc($desc)
     /**
      * Add Action
      *
-     * @param $action
+     * @param callable $action
      * @return $this
      */
-    public function action($action)
+    public function action(callable $action): self
     {
         $this->action = $action;
         return $this;
@@ -78,14 +78,14 @@ public function action($action)
      * Add Param
      *
      * @param string $key
-     * @param null $default
+     * @param mixed $default
      * @param string $validator
      * @param string $description
      * @param bool $optional
      *
      * @return $this
      */
-    public function param($key, $default, $validator, $description = '', $optional = false)
+    public function param(string $key, $default, $validator, string $description = '', bool $optional = false): self
     {
         $this->params[$key] = array(
             'default'       => $default,
@@ -106,7 +106,7 @@ public function param($key, $default, $validator, $description = '', $optional =
      *
      * @return $this
      */
-    public function label($key, $value)
+    public function label(string $key, $value): self
     {
         $this->labels[$key] = $value;
 
@@ -118,17 +118,17 @@ public function label($key, $value)
      *
      * @return string
      */
-    public function getDesc()
+    public function getDesc(): string
     {
         return $this->desc;
     }
 
     /**
      * Get Action
      *
-     * @return callable|null
+     * @return callable
      */
-    public function getAction()
+    public function getAction(): callable
     {
         return $this->action;
     }
@@ -138,7 +138,7 @@ public function getAction()
      *
      * @return array
      */
-    public function getParams()
+    public function getParams(): array
     {
         return $this->params;
     }
@@ -152,7 +152,7 @@ public function getParams()
      * @param mixed $default
      * @return mixed
      */
-    public function getLabel($key, $default)
+    public function getLabel(string $key, $default)
     {
         return (isset($this->labels[$key])) ? $this->labels[$key] : $default;
     }

tests/CLI/CLITest.php

@@ -69,7 +69,7 @@ public function testAppFailure()
         $this->assertEquals('', $result);
     }
 
-    public function testAppArray()
+    public function testApp[]
     {
         ob_start();