Merge branch 'master' of github.com:bushbaby/BsbFlysystem

# By Didier Belot # Via Bas Kamer (1) and Didier Belot (1) * 'master' of github.com:bushbaby/BsbFlysystem: sftp options, adjusting tests Allowing no password option if privateKey is set
bushbaby · Apr 2, 2015 · 0badec3 · 0badec3
2 parents f0186ee + af243dc
commit 0badec3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Adapter/Factory/SftpAdapterFactory.php b/src/Adapter/Factory/SftpAdapterFactory.php
@@ -44,8 +44,8 @@ protected function validateConfig()
             throw new UnexpectedValueException("Missing 'username' as option");
         }
 
-        if (!isset($this->options['password'])) {
-            throw new UnexpectedValueException("Missing 'password' as option");
+        if (!isset($this->options['password']) && !isset($this->options['privateKey'])) {
+            throw new UnexpectedValueException("Missing either 'password' or 'privateKey' as option");
         }
     }
 }
diff --git a/test/Adapter/Factory/SftpAdapterFactoryTest.php b/test/Adapter/Factory/SftpAdapterFactoryTest.php
@@ -90,12 +90,16 @@ public function validateConfigProvider()
                 ['host' => 'foo', 'port' => 'foo', 'username' => 'foo'],
                 false,
                 'UnexpectedValueException',
-                "Missing 'password' as option"
+                "Missing either 'password' or 'privateKey' as option"
             ],
             [
                 ['host' => 'foo', 'port' => 'foo', 'username' => 'foo', 'password' => 'foo'],
                 ['host' => 'foo', 'port' => 'foo', 'username' => 'foo', 'password' => 'foo'],
             ],
+            [
+                ['host' => 'foo', 'port' => 'foo', 'username' => 'foo', 'privateKey' => 'foo'],
+                ['host' => 'foo', 'port' => 'foo', 'username' => 'foo', 'privateKey' => 'foo'],
+            ],
         ];
     }
 }