Merge pull request #16 from utopia-php/fix-cli-readme

fixes for cli

Author: fogelito

README.md

@@ -18,18 +18,17 @@ composer require utopia-php/cli
 script.php
 ```php
 <?php
-
 require_once './vendor/autoload.php';
 
 use Utopia\CLI\CLI;
 use Utopia\CLI\Console;
-use Utopia\Validator\Email;
+use Utopia\Validator\Wildcard;
 
 $cli = new CLI();
 
 $cli
     ->task('command-name')
-    ->param('email', null, new Email())
+    ->param('email', null, new Wildcard())
     ->action(function ($email) {
         Console::success($email);
     });
@@ -70,8 +69,6 @@ Console::error('Red log message'); // stderr
 
 Function returns exit code (0 - OK, >0 - error) and writes stdout, stderr to reference variables. The timeout variable allows you to limit the number of seconds the command can run.
 
-
-
 ```php
 $stdout = '';
 $stderr = '';
@@ -109,7 +106,7 @@ include './vendor/autoload.php';
 
 Console::loop(function() {
     echo "Hello World\n";
-}, 200000 /* 200ms */);
+}, 1 /* 1 second */);
 ```
 
 ## System Requirements

src/CLI/Console.php

@@ -194,15 +194,15 @@ static public function isInteractive(): bool
 
     /**
      * @param callable $callback
-     * @param int $sleep in seconds
+     * @param float $sleep // in seconds!
      * @param callable $onError
      */
-    static public function loop(callable $callback, $sleep = 1 /* 1 second */, callable $onError = null): void
+    static public function loop(callable $callback, $sleep = 1 /* seconds */, callable $onError = null): void
     {
         gc_enable();
 
         $time = 0;
-        
+
         while (!connection_aborted() || PHP_SAPI == "cli") {
             try {
                 $callback();
@@ -214,12 +214,21 @@ static public function loop(callable $callback, $sleep = 1 /* 1 second */, calla
                 }
             }
 
-            sleep($sleep);
+            $intSeconds = intval($sleep);
+            $microSeconds = ($sleep - $intSeconds) * 1000000;
+
+            if($intSeconds > 0) {
+                sleep($intSeconds);
+            }
+
+            if($microSeconds > 0) {
+                usleep($microSeconds);
+            }
 
             $time = $time + $sleep;
 
             if (PHP_SAPI == "cli") {
-                if($time >= (1000000 * 300)) { // Every 5 minutes
+                if($time >= 60 * 5) { // Every 5 minutes
                     $time = 0;
                     gc_collect_cycles(); //Forces collection of any existing garbage cycles
                 }

src/CLI/Task.php

@@ -1,7 +1,8 @@
 <?php
-
 namespace Utopia\CLI;
 
+use Utopia\Validator;
+
 class Task
 {
     /**
@@ -80,13 +81,13 @@ public function action(callable $action): self
      *
      * @param string $key
      * @param mixed $default
-     * @param string $validator
+     * @param Validator $validator
      * @param string $description
      * @param bool $optional
      *
      * @return $this
      */
-    public function param(string $key, $default, $validator, string $description = '', bool $optional = false): self
+    public function param(string $key, $default, Validator $validator, string $description = '', bool $optional = false): self
     {
         $this->params[$key] = array(
             'default'       => $default,