Merge pull request #27 from bretrzaun/master

SFTP adapter: fix wrong naming of privateKey option
thephpleague · Oct 31, 2019 · 94015d2 · 94015d2
2 parents 870cd12 + b96488f
commit 94015d2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/docs/3-interacting-with-ftp-and-sftp-servers.md b/docs/3-interacting-with-ftp-and-sftp-servers.md
@@ -54,7 +54,7 @@ flysystem:
                 port: 22
                 username: 'username'
                 password: 'password'
-                private_key: 'path/to/or/contents/of/privatekey'
+                privateKey: 'path/to/or/contents/of/privatekey'
                 root: '/path/to/root'
                 timeout: 10
                 directoryPerm: 0744

diff --git a/docs/B-configuration-reference.md b/docs/B-configuration-reference.md
@@ -92,7 +92,7 @@ flysystem:
                 port: 22
                 username: 'username'
                 password: 'password'
-                private_key: 'path/to/or/contents/of/privatekey'
+                privateKey: 'path/to/or/contents/of/privatekey'
                 root: '/path/to/root'
                 timeout: 10
 

diff --git a/src/Adapter/Builder/SftpAdapterDefinitionBuilder.php b/src/Adapter/Builder/SftpAdapterDefinitionBuilder.php
@@ -51,8 +51,8 @@ protected function configureOptions(OptionsResolver $resolver)
         $resolver->setDefault('root', '');
         $resolver->setAllowedTypes('root', 'string');
 
-        $resolver->setDefault('private_key', null);
-        $resolver->setAllowedTypes('private_key', ['string', 'null']);
+        $resolver->setDefault('privateKey', null);
+        $resolver->setAllowedTypes('privateKey', ['string', 'null']);
 
         $resolver->setDefault('timeout', 90);
         $resolver->setAllowedTypes('timeout', 'scalar');

diff --git a/tests/Adapter/Builder/SftpAdapterDefinitionBuilderTest.php b/tests/Adapter/Builder/SftpAdapterDefinitionBuilderTest.php
@@ -36,7 +36,7 @@ public function provideValidOptions()
             'password' => 'password',
             'port' => 22,
             'root' => '/path/to/root',
-            'private_key' => '/path/to/or/contents/of/privatekey',
+            'privateKey' => '/path/to/or/contents/of/privatekey',
             'timeout' => 30,
         ]];
     }
@@ -57,7 +57,7 @@ public function testOptionsBehavior()
             'password' => 'password',
             'port' => 22,
             'root' => '/path/to/root',
-            'private_key' => '/path/to/or/contents/of/privatekey',
+            'privateKey' => '/path/to/or/contents/of/privatekey',
             'timeout' => 30,
             'directoryPerm' => 0755,
             'permPrivate' => 0700,
@@ -67,7 +67,7 @@ public function testOptionsBehavior()
         $expected = [
             'port' => 22,
             'root' => '/path/to/root',
-            'private_key' => '/path/to/or/contents/of/privatekey',
+            'privateKey' => '/path/to/or/contents/of/privatekey',
             'timeout' => 30,
             'directoryPerm' => 0755,
             'permPrivate' => 0700,

diff --git a/tests/Adapter/options.yaml b/tests/Adapter/options.yaml
@@ -84,7 +84,7 @@ fs_sftp:
         port: 22
         username: 'username'
         password: 'password'
-        private_key: 'path/to/or/contents/of/privatekey'
+        privateKey: 'path/to/or/contents/of/privatekey'
         root: '/path/to/root'
         timeout: 10
 

diff --git a/tests/Kernel/config/flysystem.yaml b/tests/Kernel/config/flysystem.yaml
@@ -89,7 +89,7 @@ flysystem:
                 port: 22
                 username: 'username'
                 password: 'password'
-                private_key: 'path/to/or/contents/of/privatekey'
+                privateKey: 'path/to/or/contents/of/privatekey'
                 root: '/path/to/root'
                 timeout: 10
                 directoryPerm: 0755