From 209336a7f8cbb87451b2783518ad6cdf53feb989 Mon Sep 17 00:00:00 2001 From: David Greminger Date: Fri, 2 Dec 2022 14:27:49 +0100 Subject: [PATCH 1/3] Replace V2 with V3 --- composer.json | 2 +- src/DependencyInjection/Factory/Adapter/SftpFactory.php | 2 +- src/Resources/config/adapters.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a201af3..c8d103a 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "league/flysystem-ftp": "^2.0 || ^3.0", "league/flysystem-google-cloud-storage": "^2.0 || ^3.0", "league/flysystem-memory": "^2.0 || ^3.0", - "league/flysystem-sftp": "^2.0 || ^3.0", + "league/flysystem-sftp-v3" :"^3.0", "league/flysystem-azure-blob-storage": "^3.0", "phpstan/phpstan": "^1.4", "phpunit/phpunit": "^9.5", diff --git a/src/DependencyInjection/Factory/Adapter/SftpFactory.php b/src/DependencyInjection/Factory/Adapter/SftpFactory.php index a5a1e2d..f5a5403 100644 --- a/src/DependencyInjection/Factory/Adapter/SftpFactory.php +++ b/src/DependencyInjection/Factory/Adapter/SftpFactory.php @@ -4,7 +4,7 @@ namespace Oneup\FlysystemBundle\DependencyInjection\Factory\Adapter; -use League\Flysystem\PhpseclibV2\SftpConnectionProvider; +use League\Flysystem\PhpseclibV3\SftpConnectionProvider; use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface; use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\DependencyInjection\ChildDefinition; diff --git a/src/Resources/config/adapters.xml b/src/Resources/config/adapters.xml index 3a7f304..dfed128 100644 --- a/src/Resources/config/adapters.xml +++ b/src/Resources/config/adapters.xml @@ -26,7 +26,7 @@ - + From 23b88d6d9aa59b29d0ec3c58221a29826806d526 Mon Sep 17 00:00:00 2001 From: David Greminger Date: Fri, 2 Dec 2022 14:35:27 +0100 Subject: [PATCH 2/3] Updated docs --- composer.json | 2 +- doc/adapter_sftp.md | 2 +- doc/index.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c8d103a..8355ca0 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "league/flysystem-ftp": "^2.0 || ^3.0", "league/flysystem-google-cloud-storage": "^2.0 || ^3.0", "league/flysystem-memory": "^2.0 || ^3.0", - "league/flysystem-sftp-v3" :"^3.0", + "league/flysystem-sftp-v3" :"^2.0 || ^3.0", "league/flysystem-azure-blob-storage": "^3.0", "phpstan/phpstan": "^1.4", "phpunit/phpunit": "^9.5", diff --git a/doc/adapter_sftp.md b/doc/adapter_sftp.md index 42b2916..be118fd 100644 --- a/doc/adapter_sftp.md +++ b/doc/adapter_sftp.md @@ -14,7 +14,7 @@ oneup_flysystem: root: '/upload' ``` -For more details on the other parameters, take a look at the [Flysystem documentation](https://flysystem.thephpleague.com/v2/docs/adapter/sftp/). +For more details on the other parameters, take a look at the [Flysystem documentation](https://flysystem.thephpleague.com/docs/adapter/sftp-v3/). ## More to know * [Create and use your filesystem](filesystem_create.md) diff --git a/doc/index.md b/doc/index.md index 9e8b389..8e7291c 100644 --- a/doc/index.md +++ b/doc/index.md @@ -23,7 +23,7 @@ Composer will now fetch and install this bundle in the vendor directory `vendor/ * The AwsS3v3 adapter requires `"league/flysystem-aws-s3-v3"` * The FTP adapter requires `"league/flysystem-ftp"` -* The SFTP adapter requires `"league/flysystem-sftp"` +* The SFTP (V3) adapter requires `"league/flysystem-sftp-v3"` * The Google Cloud Storage adapter requires `"league/flysystem-google-cloud-storage"` * The InMemory adapter requires `"league/flysystem-memory"` * The AsyncAwsS3 adapter requires `"league/flysystem-async-aws-s3"` From 58c490468b74bf25413244979d6067e77924d5d4 Mon Sep 17 00:00:00 2001 From: David Greminger Date: Fri, 2 Dec 2022 14:49:10 +0100 Subject: [PATCH 3/3] Fix composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8355ca0..ea6b6e9 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "league/flysystem-ftp": "^2.0 || ^3.0", "league/flysystem-google-cloud-storage": "^2.0 || ^3.0", "league/flysystem-memory": "^2.0 || ^3.0", - "league/flysystem-sftp-v3" :"^2.0 || ^3.0", + "league/flysystem-sftp-v3": "^2.0 || ^3.0", "league/flysystem-azure-blob-storage": "^3.0", "phpstan/phpstan": "^1.4", "phpunit/phpunit": "^9.5", @@ -59,7 +59,7 @@ "league/flysystem-async-aws-s3": "Use flysystem S3 adapter from AsyncAws", "league/flysystem-aws-s3-v3": "Use S3 storage with AWS SDK v3", "league/flysystem-google-cloud-storage": "Use Google Cloud Storage Adapter for Flysystem", - "league/flysystem-sftp": "Allows SFTP server storage via phpseclib", + "league/flysystem-sftp-v3": "Allows SFTP server storage via phpseclib", "royvoetman/flysystem-gitlab-storage": "Use Gitlab Storage filesystem for Flysystem" }, "config": {