From ff26e225635a621b6d19501c5ce2a272211b4560 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Sun, 4 Jun 2023 11:12:11 -0500 Subject: [PATCH] CS adjustments --- phpseclib/Net/SFTP.php | 2 -- phpseclib/Net/SSH2.php | 3 +-- tests/Functional/Net/SSH2Test.php | 2 +- tests/Unit/Crypt/RSA/ModeTest.php | 6 ++---- tests/Unit/Math/PrimeFieldTest.php | 2 ++ 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index d87ee7d8..8fd740e2 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -309,8 +309,6 @@ class SFTP extends SSH2 * Default Constructor. * * Connects to an SFTP server - * - * @param mixed $host */ public function __construct($host, int $port = 22, int $timeout = 10) { diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index 096ca6c3..0f32265d 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -50,7 +50,6 @@ namespace phpseclib3\Net; use phpseclib3\Common\Functions\Strings; use phpseclib3\Crypt\Blowfish; use phpseclib3\Crypt\ChaCha20; -use phpseclib3\Crypt\Common\AsymmetricKey; use phpseclib3\Crypt\Common\PrivateKey; use phpseclib3\Crypt\Common\PublicKey; use phpseclib3\Crypt\Common\SymmetricKey; @@ -4530,7 +4529,7 @@ class SSH2 /** * Force multiple channels (even if phpseclib has decided to disable them) */ - public function forceMultipleChannels() + public function forceMultipleChannels(): void { $this->errorOnMultipleChannels = false; } diff --git a/tests/Functional/Net/SSH2Test.php b/tests/Functional/Net/SSH2Test.php index 9bcb63cb..7e2ab03f 100644 --- a/tests/Functional/Net/SSH2Test.php +++ b/tests/Functional/Net/SSH2Test.php @@ -539,7 +539,7 @@ class SSH2Test extends PhpseclibFunctionalTestCase ); } - public function testReadingOfClosedChannel() + public function testReadingOfClosedChannel(): void { $ssh = $this->getSSH2Login(); $this->assertSame(0, $ssh->getOpenChannelCount()); diff --git a/tests/Unit/Crypt/RSA/ModeTest.php b/tests/Unit/Crypt/RSA/ModeTest.php index 51b76903..b91a24cd 100644 --- a/tests/Unit/Crypt/RSA/ModeTest.php +++ b/tests/Unit/Crypt/RSA/ModeTest.php @@ -259,12 +259,10 @@ zUlir0ACPypC1Q== public function testSettingOnePadding(): void { - $pub = <<assertTrue((bool) ($rsa->getPadding() & RSA::SIGNATURE_PSS)); diff --git a/tests/Unit/Math/PrimeFieldTest.php b/tests/Unit/Math/PrimeFieldTest.php index 34b1dd81..0567fdbd 100644 --- a/tests/Unit/Math/PrimeFieldTest.php +++ b/tests/Unit/Math/PrimeFieldTest.php @@ -1,5 +1,7 @@