fix: revert workdir after run end

php-toolkit · Oct 12, 2021 · 594725f · 594725f
1 parent 6ff6fda
commit 594725f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/src/Exec.php b/src/Exec.php
@@ -14,6 +14,7 @@
 use function chdir;
 use function exec;
 use function function_exists;
+use function getcwd;
 use function implode;
 use function ob_get_clean;
 use function ob_start;
@@ -57,7 +58,9 @@ public static function exec(string $command, string $workDir = '', bool $outAsSt
      */
     public static function system(string $command, string $workDir = '', bool $allReturn = false): array
     {
+        $curDir = '';
         if ($workDir) {
+            $curDir = getcwd();
             chdir($workDir);
         }
 
@@ -70,6 +73,11 @@ public static function system(string $command, string $workDir = '', bool $allRe
             $output = system($command, $status);
         }
 
+        // fix: revert workdir after run end.
+        if ($curDir) {
+            chdir($curDir);
+        }
+
         return [$status, $output];
     }
 
@@ -81,11 +89,19 @@ public static function system(string $command, string $workDir = '', bool $allRe
      */
     public static function shellExec(string $command, string $workDir = ''): ?string
     {
+        $curDir = '';
         if ($workDir) {
+            $curDir = getcwd();
             chdir($workDir);
         }
 
-        return shell_exec($command);
+        $ret = shell_exec($command);
+        // fix: revert workdir after run end.
+        if ($curDir) {
+            chdir($curDir);
+        }
+
+        return $ret;
     }
 
     /**
@@ -143,8 +159,10 @@ public static function run(string $command, string $cwd = ''): array
     public static function auto(string $command, bool $returnStatus = true, string $cwd = '')
     {
         $status = 1;
+        $curDir = '';
 
         if ($cwd) {
+            $curDir = getcwd();
             chdir($cwd);
         }
 
@@ -166,6 +184,11 @@ public static function auto(string $command, bool $returnStatus = true, string $
             $output = 'Command execution not possible on this system';
         }
 
+        // fix: revert workdir after run end.
+        if ($curDir) {
+            chdir($curDir);
+        }
+
         if ($returnStatus) {
             return [
                 'output' => trim($output),

diff --git a/src/Proc/ProcWrapper.php b/src/Proc/ProcWrapper.php
@@ -12,7 +12,9 @@
 use InvalidArgumentException;
 use RuntimeException;
 use function array_keys;
+use function chdir;
 use function fclose;
+use function getcwd;
 use function proc_open;
 use function stream_get_contents;
 use const DIRECTORY_SEPARATOR;
@@ -226,9 +228,14 @@ public function open(): self
             throw new InvalidArgumentException('The want execute command is cannot be empty');
         }
 
+        $curDir = '';
         $workDir = $this->workDir ?: null;
         $options = $this->options;
 
+        if ($workDir) {
+            $curDir = getcwd();
+        }
+
         $options['suppress_errors'] = true;
         if ('\\' === DIRECTORY_SEPARATOR) { // windows
             $options['bypass_shell'] = true;
@@ -248,6 +255,11 @@ public function open(): self
             throw new RuntimeException("Can't open resource with proc_open.");
         }
 
+        // fix: revert workdir after run end.
+        if ($curDir) {
+            chdir($curDir);
+        }
+
         $this->process = $process;
         return $this;
     }