Use ProcessUtils::escapeArgument() instead of escapeshellarg() for be…

…tter compatibility with Windows.
pantheon-systems · Jan 21, 2017 · 6a17ac3 · 6a17ac3
1 parent 9a7001a
commit 6a17ac3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Commands/Remote/SSHBaseCommand.php b/src/Commands/Remote/SSHBaseCommand.php
@@ -66,7 +66,7 @@ function ($type, $buffer) use ($output) {
         $this->log()->notice('Command: {site}.{env} -- {command} [Exit: {exit}]', [
             'site'    => $this->site->get('name'),
             'env'     => $this->environment->id,
-            'command' => escapeshellarg($command_line),
+            'command' => ProcessUtils::escapeArgument($command_line),
             'exit'    => $exit,
         ]);
 

diff --git a/src/Models/Environment.php b/src/Models/Environment.php
@@ -14,6 +14,7 @@
 use Robo\Common\ConfigAwareTrait;
 use Robo\Contract\ConfigAwareInterface;
 use Pantheon\Terminus\Exceptions\TerminusException;
+use Symfony\Component\Process\ProcessUtils;
 
 /**
  * Class Environment
@@ -733,7 +734,7 @@ public function sendCommandViaSsh($command, $callback = null)
         $sftp = $this->sftpConnectionInfo();
         $ssh_command = vsprintf(
             'ssh -T %s@%s -p %s -o "AddressFamily inet" %s',
-            [$sftp['username'], $sftp['host'], $sftp['port'], escapeshellarg($command),]
+            [$sftp['username'], $sftp['host'], $sftp['port'], ProcessUtils::escapeArgument($command),]
         );
 
         // Catch Terminus running in test mode