update cli command builder

inhere · Dec 12, 2021 · 352a273 · 352a273
1 parent e673071
commit 352a273
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 42 deletions.
diff --git a/app/Common/Cmd.php b/app/Common/Cmd.php
@@ -10,42 +10,6 @@
  */
 class Cmd extends CmdBuilder
 {
-    /**
-     * @var string
-     */
-    protected string $cmdline  = '';
-
-    /**
-     * @param string $cmdline
-     *
-     * @return Cmd
-     */
-    public function setCmdline(string $cmdline): Cmd
-    {
-        $this->cmdline = $cmdline;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCmdline(): string
-    {
-        return $this->cmdline;
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildCommandLine(): string
-    {
-        if ($this->cmdline) {
-            return $this->cmdline;
-        }
-
-        return parent::buildCommandLine();
-    }
-
     /**
      * @param string $msg
      * @param string $scene

diff --git a/app/Common/CmdRunner.php b/app/Common/CmdRunner.php
@@ -51,7 +51,7 @@ public function __construct($command = null, string $workDir = '')
         parent::__construct('', $workDir);
 
         if (is_string($command)) {
-            $this->command = $command;
+            $this->cmdline = $command;
         } elseif (is_array($command)) {
             $this->commands = (array)$command;
         }
@@ -99,7 +99,7 @@ public function do(bool $printOutput = false): self
      */
     public function afterDo(string $cmd): self
     {
-        return $this->setCommand($cmd)->do($this->printOutput);
+        return $this->setCmdline($cmd)->do($this->printOutput);
     }
 
     /**
@@ -112,7 +112,7 @@ public function whereDo(string $cmd, callable $whereFunc): self
     {
         // only run on return TRUE
         if (true === $whereFunc()) {
-            $this->setCommand($cmd)->do($this->printOutput);
+            $this->setCmdline($cmd)->do($this->printOutput);
         }
 
         return $this;
@@ -134,7 +134,7 @@ public function afterOkDo(string $cmd, string $workDir = null): self
             $this->workDir = $workDir;
         }
 
-        return $this->setCommand($cmd)->do($this->printOutput);
+        return $this->setCmdline($cmd)->do($this->printOutput);
     }
 
     /**************************************************************************
@@ -251,10 +251,10 @@ public function addByArray(array $config, string $key = ''): self
      *
      * @return $this
      */
-    public function run(bool $printOutput = false): AbstractCmdBuilder
+    public function run(bool $printOutput = false): static
     {
         $this->printOutput = $printOutput;
-        if ($command = $this->command) {
+        if ($command = $this->cmdline) {
             $this->innerExecute($command, $this->workDir);
 
             // stop on error