add .

Author: inhere

libs/Task/Server/OptionAndConfigTrait.php

@@ -57,8 +57,11 @@ protected function parseCommandAndConfig()
         $this->initConfigAndProperties($this->config);
 
         // Debug option to dump the config and exit
-        if (isset($result['D']) || isset($result['dump'])) {
-            $val = isset($result['D']) ? $result['D'] : (isset($result['dump']) ? $result['dump'] : '');
+        if (isset($this->cliOpts['D'])) {
+            $val = $this->cliOpts['D'];
+            $this->dumpInfo($val === 'all');
+        } elseif (isset($this->cliOpts['dump'])) {
+            $val = $this->cliOpts['dump'];
             $this->dumpInfo($val === 'all');
         }
     }
@@ -73,7 +76,7 @@ protected function parseCliOptions()
         ]);
         $this->fullScript = implode(' ', $GLOBALS['argv']);
         $this->script = strpos($result[0], '.php') ? "php {$result[0]}" : $result[0];
-        $this->command = $command = isset($result[1]) ? $result[1] : 'start';
+        $this->command = $result[1] ?? 'start';
 
         unset($result[0], $result[1]);
 
@@ -116,8 +119,8 @@ protected function dispatchCommand($command)
                 $this->reloadWorkers($masterPid);
                 break;
             case 'status':
-                $cmd = isset($result['cmd']) ? $result['cmd'] : 'status';
-                $this->showStatus($cmd, isset($result['watch-status']));
+                $cmd = $this->cliOpts['cmd'] ?? 'status';
+                $this->showStatus($cmd, isset($this->cliOpts['watch-status']));
                 break;
             default:
                 $this->showHelp("The command [{$command}] is don't supported!");

libs/Task/Worker/Manager.php

@@ -234,7 +234,7 @@ public function handleTask($data)
     /**
      * showVersion
      */
-    protected function showVersion()
+    public function showVersion()
     {
         printf("Gearman worker manager script tool. Version %s\n", Cli::color(self::VERSION, 'green'));
 
@@ -312,7 +312,7 @@ protected function showHelp($msg = '', $code = 0)
      * @param string $command
      * @param bool $watch
      */
-    protected function showStatus($command, $watch = false)
+    public function showStatus($command, $watch = false)
     {
         $this->stdout("un-completed! $command, $watch", true, 0);
     }
@@ -321,7 +321,7 @@ protected function showStatus($command, $watch = false)
      * dumpInfo
      * @param bool $allInfo
      */
-    protected function dumpInfo($allInfo = false)
+    public function dumpInfo($allInfo = false)
     {
         if ($allInfo) {
             $this->stdout("There are all information of the manager:\n" . PhpHelper::printVar($this));