diff --git a/phpunit.xml.dist b/phpunit.xml.dist index be8fed61f..1b0996a2a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -16,4 +16,9 @@ + + + legacy + + diff --git a/src/PhpseclibV2/ConnectionProvider.php b/src/PhpseclibV2/ConnectionProvider.php index 0b9dd2286..c9a3c942e 100644 --- a/src/PhpseclibV2/ConnectionProvider.php +++ b/src/PhpseclibV2/ConnectionProvider.php @@ -6,6 +6,9 @@ use phpseclib\Net\SFTP; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\ConnectionProvider" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\ConnectionProvider" instead. + */ interface ConnectionProvider { public function provideConnection(): SFTP; diff --git a/src/PhpseclibV2/ConnectivityChecker.php b/src/PhpseclibV2/ConnectivityChecker.php index cb035e3b6..523f41710 100644 --- a/src/PhpseclibV2/ConnectivityChecker.php +++ b/src/PhpseclibV2/ConnectivityChecker.php @@ -6,6 +6,9 @@ use phpseclib\Net\SFTP; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\ConnectivityChecker" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\ConnectivityChecker" instead. + */ interface ConnectivityChecker { public function isConnected(SFTP $connection): bool; diff --git a/src/PhpseclibV2/FixatedConnectivityChecker.php b/src/PhpseclibV2/FixatedConnectivityChecker.php index f2faedaa9..d74fc7c3c 100644 --- a/src/PhpseclibV2/FixatedConnectivityChecker.php +++ b/src/PhpseclibV2/FixatedConnectivityChecker.php @@ -6,6 +6,9 @@ use phpseclib\Net\SFTP; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\FixatedConnectivityChecker" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\FixatedConnectivityChecker" instead. + */ class FixatedConnectivityChecker implements ConnectivityChecker { /** diff --git a/src/PhpseclibV2/README.md b/src/PhpseclibV2/README.md index 8f42466ff..23361618c 100644 --- a/src/PhpseclibV2/README.md +++ b/src/PhpseclibV2/README.md @@ -1,3 +1,5 @@ +# CAUTION: This package is deprecated since Flysystem 3.0 Instead, use the [Flysystem for SFTP v3](https://github.com/thephpleague/flysystem-sftp-v3) + ## Sub-split of Flysystem for SFTP using phpseclib2. > ⚠️ this is a sub-split, for pull requests and issues, visit: https://github.com/thephpleague/flysystem diff --git a/src/PhpseclibV2/SftpAdapter.php b/src/PhpseclibV2/SftpAdapter.php index 601edef37..efc56181d 100644 --- a/src/PhpseclibV2/SftpAdapter.php +++ b/src/PhpseclibV2/SftpAdapter.php @@ -29,6 +29,9 @@ use function rtrim; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\SftpAdapter" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\SftpAdapter" instead. + */ class SftpAdapter implements FilesystemAdapter { /** diff --git a/src/PhpseclibV2/SftpAdapterTest.php b/src/PhpseclibV2/SftpAdapterTest.php index 462e6de0b..745d7f98b 100644 --- a/src/PhpseclibV2/SftpAdapterTest.php +++ b/src/PhpseclibV2/SftpAdapterTest.php @@ -17,6 +17,7 @@ /** * @group sftp + * @group legacy */ class SftpAdapterTest extends FilesystemAdapterTestCase { diff --git a/src/PhpseclibV2/SftpConnectionProvider.php b/src/PhpseclibV2/SftpConnectionProvider.php index c04a12ede..8dd06c9c1 100644 --- a/src/PhpseclibV2/SftpConnectionProvider.php +++ b/src/PhpseclibV2/SftpConnectionProvider.php @@ -9,6 +9,9 @@ use phpseclib\System\SSH\Agent; use Throwable; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\SftpConnectionProvider" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\SftpConnectionProvider" instead. + */ class SftpConnectionProvider implements ConnectionProvider { /** diff --git a/src/PhpseclibV2/SftpConnectionProviderTest.php b/src/PhpseclibV2/SftpConnectionProviderTest.php index e2f9b776d..eb71442ee 100644 --- a/src/PhpseclibV2/SftpConnectionProviderTest.php +++ b/src/PhpseclibV2/SftpConnectionProviderTest.php @@ -12,6 +12,7 @@ /** * @group sftp * @group sftp-connection + * @group legacy */ class SftpConnectionProviderTest extends TestCase { diff --git a/src/PhpseclibV2/SftpStub.php b/src/PhpseclibV2/SftpStub.php index aaa9c4f6a..ab4dcde40 100644 --- a/src/PhpseclibV2/SftpStub.php +++ b/src/PhpseclibV2/SftpStub.php @@ -8,6 +8,8 @@ /** * @internal This is only used for testing purposes. + * + * @deprecated The "League\Flysystem\PhpseclibV2\SftpStub" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\SftpStub" instead. */ class SftpStub extends SFTP { diff --git a/src/PhpseclibV2/SimpleConnectivityChecker.php b/src/PhpseclibV2/SimpleConnectivityChecker.php index 913a39366..424b165e9 100644 --- a/src/PhpseclibV2/SimpleConnectivityChecker.php +++ b/src/PhpseclibV2/SimpleConnectivityChecker.php @@ -6,6 +6,9 @@ use phpseclib\Net\SFTP; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\SimpleConnectivityChecker" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\SimpleConnectivityChecker" instead. + */ class SimpleConnectivityChecker implements ConnectivityChecker { public function isConnected(SFTP $connection): bool diff --git a/src/PhpseclibV2/StubSftpConnectionProvider.php b/src/PhpseclibV2/StubSftpConnectionProvider.php index 22498ca66..bb979de07 100644 --- a/src/PhpseclibV2/StubSftpConnectionProvider.php +++ b/src/PhpseclibV2/StubSftpConnectionProvider.php @@ -6,6 +6,9 @@ use phpseclib\Net\SFTP; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\StubSftpConnectionProvider" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\StubSftpConnectionProvider" instead. + */ class StubSftpConnectionProvider implements ConnectionProvider { /** diff --git a/src/PhpseclibV2/UnableToAuthenticate.php b/src/PhpseclibV2/UnableToAuthenticate.php index 599406e8a..7d696b4de 100644 --- a/src/PhpseclibV2/UnableToAuthenticate.php +++ b/src/PhpseclibV2/UnableToAuthenticate.php @@ -7,6 +7,9 @@ use League\Flysystem\FilesystemException; use RuntimeException; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\UnableToAuthenticate" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\UnableToAuthenticate" instead. + */ class UnableToAuthenticate extends RuntimeException implements FilesystemException { public static function withPassword(): UnableToAuthenticate diff --git a/src/PhpseclibV2/UnableToConnectToSftpHost.php b/src/PhpseclibV2/UnableToConnectToSftpHost.php index ae74c69d3..695a657bd 100644 --- a/src/PhpseclibV2/UnableToConnectToSftpHost.php +++ b/src/PhpseclibV2/UnableToConnectToSftpHost.php @@ -7,6 +7,9 @@ use League\Flysystem\FilesystemException; use RuntimeException; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\UnableToConnectToSftpHost" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\UnableToConnectToSftpHost" instead. + */ class UnableToConnectToSftpHost extends RuntimeException implements FilesystemException { public static function atHostname(string $host): UnableToConnectToSftpHost diff --git a/src/PhpseclibV2/UnableToEstablishAuthenticityOfHost.php b/src/PhpseclibV2/UnableToEstablishAuthenticityOfHost.php index 757316904..a2d050419 100644 --- a/src/PhpseclibV2/UnableToEstablishAuthenticityOfHost.php +++ b/src/PhpseclibV2/UnableToEstablishAuthenticityOfHost.php @@ -7,6 +7,9 @@ use League\Flysystem\FilesystemException; use RuntimeException; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\UnableToEstablishAuthenticityOfHost" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\UnableToEstablishAuthenticityOfHost" instead. + */ class UnableToEstablishAuthenticityOfHost extends RuntimeException implements FilesystemException { public static function becauseTheAuthenticityCantBeEstablished(string $host): UnableToEstablishAuthenticityOfHost diff --git a/src/PhpseclibV2/UnableToLoadPrivateKey.php b/src/PhpseclibV2/UnableToLoadPrivateKey.php index e06642144..c392ec846 100644 --- a/src/PhpseclibV2/UnableToLoadPrivateKey.php +++ b/src/PhpseclibV2/UnableToLoadPrivateKey.php @@ -7,6 +7,9 @@ use League\Flysystem\FilesystemException; use RuntimeException; +/** + * @deprecated The "League\Flysystem\PhpseclibV2\UnableToLoadPrivateKey" class is deprecated since Flysystem 3.0, use "League\Flysystem\PhpseclibV3\UnableToLoadPrivateKey" instead. + */ class UnableToLoadPrivateKey extends RuntimeException implements FilesystemException { public function __construct(string $message = "Unable to load private key.") diff --git a/src/PhpseclibV2/composer.json b/src/PhpseclibV2/composer.json index a167dd587..5bd1b0165 100644 --- a/src/PhpseclibV2/composer.json +++ b/src/PhpseclibV2/composer.json @@ -19,5 +19,6 @@ "name": "Frank de Jonge", "email": "info@frankdejonge.nl" } - ] + ], + "abandoned": "league/flysystem-sftp-v3" }