Tweak host port

src/Runtime/Runtime.php

@@ -457,12 +457,16 @@ class Runtime
      */
     public function getSSHConfig()
     {
-        $sshConfig = $this->getEnvOption('ssh', ['flags' => '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no']);
+        $sshConfig = $this->getEnvOption('ssh', ['port' => 22, 'flags' => '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no']);
 
-        if (!array_key_exists('port', $sshConfig)) {
+        if ($this->getHostPort() !== null) {
             $sshConfig['port'] = $this->getHostPort();
         }
 
+        if (!array_key_exists('port', $sshConfig)) {
+            $sshConfig['port'] = '22';
+        }
+
         if (!array_key_exists('flags', $sshConfig)) {
             $sshConfig['flags'] = '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no';
         }
@@ -478,7 +482,7 @@ class Runtime
     public function getHostPort()
     {
         $info = explode(':', $this->getWorkingHost());
-        return isset($info[1]) ? $info[1] : '22';
+        return isset($info[1]) ? $info[1] : null;
     }
 
     /**