Merge branch 'master' of into 5.1

Author: sebastianfeldmann

.gitignore

@@ -3,6 +3,7 @@
 .idea
 .env
 .project
+.phpunit.result.cache
 .settings
 /backup/*
 /build/coverage

doc/config/sync/sftp.json

@@ -2,6 +2,7 @@
   "type": "sftp",
   "options": {
     "host": "backup.example.com",
+    "port": "22",
     "user": "user.name",
     "password": "mySecret",
     "key": "someDir/id_rsa",

doc/config/sync/sftp.xml

@@ -9,6 +9,9 @@
   <!-- optional, if key presented it is used as key password -->
   <option name="password" value="mysecret" />
 
+  <!-- optional, default 22 -->
+  <option name="port" value="22" />
+
   <!-- optional -->
   <option name="key" value="somedir/id_rsa" />
 

src/Backup/Sync/Sftp.php

@@ -34,6 +34,13 @@ class Sftp extends Xtp
      */
     protected $remotePath;
 
+    /**
+     * Remote port of sftp server
+     *
+     * @var string
+     */
+    protected $port;
+
     /**
      * @var int
      */
@@ -72,6 +79,7 @@ public function setup(array $config)
         }
         $this->privateKey = $privateKey;
         $this->remotePath = new Path($config['path'], $this->time);
+        $this->port       = Util\Arr::getValue($config, 'port', '22');
 
         $this->setUpCleanable($config);
     }
@@ -145,7 +153,7 @@ protected function createClient() : phpseclib\Net\SFTP
         if (!$this->sftp) {
             // silence phpseclib errors
             $old  = error_reporting(0);
-            $this->sftp = new phpseclib\Net\SFTP($this->host);
+            $this->sftp = new phpseclib\Net\SFTP($this->host, $this->port);
             $auth = $this->getAuth();
 
             if (!$this->sftp->login($this->user, $auth)) {