update

Author: inhere

libs/files/compress/PharCompressor.php

@@ -20,7 +20,7 @@ class PharCompressor extends AbstractCompressor
      */
     public function isSupported()
     {
-        // TODO: Implement isSupported() method.
+        return class_exists(\Phar::class, false);
     }
 
     /**

libs/log/ProcessLogger.php

@@ -9,7 +9,7 @@
 namespace Inhere\LibraryPlus\Log;
 
 use Inhere\Library\Files\Directory;
-use Inhere\Library\Helpers\CliHelper;
+use Inhere\Library\Helpers\Cli;
 use Inhere\Library\Helpers\FormatHelper;
 
 /**
@@ -178,7 +178,7 @@ public function log($msg, $level = self::INFO, array $data = [])
 
         if ($this->fileHandle) {
             $this->count++;
-            $this->cache[] = CliHelper::clearColor($logString);
+            $this->cache[] = Cli::clearColor($logString);
 
             if ($this->count >= $this->logThreshold || $this->fileIsChanged()) {
                 $this->flush();
@@ -332,7 +332,7 @@ public function getLogFileDate()
      */
     protected function stdout($text, $nl = true, $quit = false)
     {
-        CliHelper::stdout($text, $nl, $quit);
+        Cli::stdout($text, $nl, $quit);
     }
 
     /**
@@ -343,7 +343,7 @@ protected function stdout($text, $nl = true, $quit = false)
      */
     protected function stderr($text, $nl = true, $quit = -200)
     {
-        CliHelper::stderr($text, $nl, $quit);
+        Cli::stderr($text, $nl, $quit);
     }
 
     /**

libs/task/Base.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\LibraryPlus\Task;
 
-use Inhere\Library\Helpers\CliHelper;
+use Inhere\Library\Helpers\Cli;
 use Inhere\Library\process\ProcessLogger;
 use Inhere\Library\queue\QueueInterface;
 use Inhere\Library\Traits\ConfigTrait;
@@ -92,7 +92,7 @@ public function log($msg, $level = ProcessLogger::INFO, array $data = [])
      */
     protected function stdout($text, $nl = true, $quit = false)
     {
-        CliHelper::stdout($text, $nl, $quit);
+        Cli::stdout($text, $nl, $quit);
     }
 
     /**
@@ -103,7 +103,7 @@ protected function stdout($text, $nl = true, $quit = false)
      */
     protected function stderr($text, $nl = true, $quit = -200)
     {
-        CliHelper::stderr($text, $nl, $quit);
+        Cli::stderr($text, $nl, $quit);
     }
 
     /**

libs/task/server/OptionAndConfigTrait.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\LibraryPlus\Task\Server;
 
-use Inhere\Library\Helpers\CliHelper;
+use Inhere\Library\Helpers\Cli;
 
 /**
  * Class OptionAndConfigTrait
@@ -68,7 +68,7 @@ protected function parseCommandAndConfig()
      */
     protected function parseCliOptions()
     {
-        $result = CliHelper::parseOptArgs([
+        $result = Cli::parseOptArgs([
             'd', 'daemon', 'w', 'watch', 'h', 'help', 'V', 'version', 'no-test', 'watch-status'
         ]);
         $this->fullScript = implode(' ', $GLOBALS['argv']);

libs/task/worker/Manager.php

@@ -2,7 +2,7 @@
 
 namespace Inhere\LibraryPlus\Task\Worker;
 
-use Inhere\Library\Helpers\CliHelper;
+use Inhere\Library\Helpers\Cli;
 use Inhere\Library\Helpers\PhpHelper;
 use Inhere\Library\process\ProcessLogger;
 use Inhere\Library\queue\QueueFactory;
@@ -236,7 +236,7 @@ public function handleTask($data)
      */
     protected function showVersion()
     {
-        printf("Gearman worker manager script tool. Version %s\n", CliHelper::color(self::VERSION, 'green'));
+        printf("Gearman worker manager script tool. Version %s\n", Cli::color(self::VERSION, 'green'));
 
         $this->quit();
     }
@@ -248,16 +248,16 @@ protected function showVersion()
      */
     protected function showHelp($msg = '', $code = 0)
     {
-        $usage = CliHelper::color('USAGE:', 'brown');
-        $commands = CliHelper::color('COMMANDS:', 'brown');
-        $sOptions = CliHelper::color('SPECIAL OPTIONS:', 'brown');
-        $pOptions = CliHelper::color('PUBLIC OPTIONS:', 'brown');
-        $version = CliHelper::color(self::VERSION, 'green');
+        $usage = Cli::color('USAGE:', 'brown');
+        $commands = Cli::color('COMMANDS:', 'brown');
+        $sOptions = Cli::color('SPECIAL OPTIONS:', 'brown');
+        $pOptions = Cli::color('PUBLIC OPTIONS:', 'brown');
+        $version = Cli::color(self::VERSION, 'green');
         $script = $this->getScript();
 
         if ($msg) {
             $code = $code ?: self::CODE_UNKNOWN_ERROR;
-            echo CliHelper::color('ERROR:', 'light_red') . "\n  " . wordwrap($msg, 108, "\n  ") . "\n\n";
+            echo Cli::color('ERROR:', 'light_red') . "\n  " . wordwrap($msg, 108, "\n  ") . "\n\n";
         }
 
         echo <<<EOF

libs/task/worker/OptionAndConfigTrait.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\LibraryPlus\Task\Worker;
 
-use Inhere\Library\Helpers\CliHelper;
+use Inhere\Library\Helpers\Cli;
 
 /**
  * Class OptionAndConfigTrait
@@ -68,7 +68,7 @@ protected function parseCommandAndConfig()
      */
     protected function parseCliOptions()
     {
-        $result = CliHelper::parseOptArgs([
+        $result = Cli::parseOptArgs([
             'd', 'daemon', 'w', 'watch', 'h', 'help', 'V', 'version', 'no-test', 'watch-status'
         ]);
         $this->fullScript = implode(' ', $GLOBALS['argv']);

libs/task/worker/ProcessManageTrait.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\LibraryPlus\Task\Worker;
 
-use Inhere\Library\Helpers\CliHelper;
+use Inhere\Library\Helpers\Cli;
 use Inhere\Library\process\ProcessLogger;
 use Inhere\Library\process\ProcessUtil;
 use Inhere\Library\queue\QueueInterface;
@@ -215,7 +215,7 @@ protected function stopMaster($pid, $quit = true)
         ProcessUtil::killAndWait($pid, SIGTERM, 'manager');
 
         // stop success
-        $this->stdout(sprintf("\n%s\n"), CliHelper::color("The manager process stopped", CliHelper::FG_GREEN));
+        $this->stdout(sprintf("\n%s\n"), Cli::color("The manager process stopped", Cli::FG_GREEN));
 
         if ($quit) {
             $this->quit();