diff --git a/tests/Functional/Net/SFTPLargeFileTest.php b/tests/Functional/Net/SFTPLargeFileTest.php index 47d2df2b..68c40149 100644 --- a/tests/Functional/Net/SFTPLargeFileTest.php +++ b/tests/Functional/Net/SFTPLargeFileTest.php @@ -42,7 +42,3 @@ class Functional_Net_SFTPLargeFileTest extends Functional_Net_SFTPTestCase ); } } - -class SFTPLargeFileTest extends Functional_Net_SFTPLargeFileTest -{ -} diff --git a/tests/Functional/Net/SFTPStreamTest.php b/tests/Functional/Net/SFTPStreamTest.php index 8601e5a3..5388269a 100644 --- a/tests/Functional/Net/SFTPStreamTest.php +++ b/tests/Functional/Net/SFTPStreamTest.php @@ -64,7 +64,3 @@ class Functional_Net_SFTPStreamTest extends Functional_Net_SFTPTestCase ); } } - -class SFTPStreamTest extends Functional_Net_SFTPStreamTest -{ -} diff --git a/tests/Functional/Net/SFTPUserStoryTest.php b/tests/Functional/Net/SFTPUserStoryTest.php index 235cc4cb..619e9a96 100644 --- a/tests/Functional/Net/SFTPUserStoryTest.php +++ b/tests/Functional/Net/SFTPUserStoryTest.php @@ -748,7 +748,3 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase $this->assertEquals($list_cache_enabled, $list_cache_disabled, 'The files should be the same regardless of stat cache', 0.0, 10, true); } } - -class SFTPUserStoryTest extends Functional_Net_SFTPUserStoryTest -{ -} diff --git a/tests/Functional/Net/SSH2AgentTest.php b/tests/Functional/Net/SSH2AgentTest.php index 94d5c398..99aaa95a 100644 --- a/tests/Functional/Net/SSH2AgentTest.php +++ b/tests/Functional/Net/SSH2AgentTest.php @@ -53,7 +53,3 @@ class Functional_Net_SSH2AgentTest extends PhpseclibFunctionalTestCase return $args; } } - -class SSH2AgentTest extends Functional_Net_SSH2AgentTest -{ -} diff --git a/tests/Functional/Net/SSH2Test.php b/tests/Functional/Net/SSH2Test.php index a5c437dd..1a9747c4 100644 --- a/tests/Functional/Net/SSH2Test.php +++ b/tests/Functional/Net/SSH2Test.php @@ -172,7 +172,3 @@ class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase $ssh->read(); } } - -class SSH2Test extends Functional_Net_SSH2Test -{ -} diff --git a/tests/Unit/Crypt/AES/EvalTest.php b/tests/Unit/Crypt/AES/EvalTest.php index 004eb227..5b0ad846 100644 --- a/tests/Unit/Crypt/AES/EvalTest.php +++ b/tests/Unit/Crypt/AES/EvalTest.php @@ -14,7 +14,3 @@ class Unit_Crypt_AES_EvalTest extends Unit_Crypt_AES_TestCase $this->engine = 'Eval'; } } - -class EvalTest extends Unit_Crypt_AES_EvalTest -{ -} diff --git a/tests/Unit/Crypt/AES/McryptTest.php b/tests/Unit/Crypt/AES/McryptTest.php index 81c6aeae..dcba5432 100644 --- a/tests/Unit/Crypt/AES/McryptTest.php +++ b/tests/Unit/Crypt/AES/McryptTest.php @@ -14,7 +14,3 @@ class Unit_Crypt_AES_McryptTest extends Unit_Crypt_AES_TestCase $this->engine = 'mcrypt'; } } - -class McryptTest extends Unit_Crypt_AES_McryptTest -{ -} diff --git a/tests/Unit/Crypt/AES/OpenSSLTest.php b/tests/Unit/Crypt/AES/OpenSSLTest.php index 1b78bb47..cb22c795 100644 --- a/tests/Unit/Crypt/AES/OpenSSLTest.php +++ b/tests/Unit/Crypt/AES/OpenSSLTest.php @@ -14,7 +14,3 @@ class Unit_Crypt_AES_OpenSSLTest extends Unit_Crypt_AES_TestCase $this->engine = 'OpenSSL'; } } - -class OpenSSLTest extends Unit_Crypt_AES_OpenSSLTest -{ -} diff --git a/tests/Unit/Crypt/AES/PurePHPTest.php b/tests/Unit/Crypt/AES/PurePHPTest.php index f380cb4e..43495088 100644 --- a/tests/Unit/Crypt/AES/PurePHPTest.php +++ b/tests/Unit/Crypt/AES/PurePHPTest.php @@ -14,7 +14,3 @@ class Unit_Crypt_AES_PurePHPTest extends Unit_Crypt_AES_TestCase $this->engine = 'PHP'; } } - -class PurePHPTest extends Unit_Crypt_AES_PurePHPTest -{ -} diff --git a/tests/Unit/Crypt/BlowfishTest.php b/tests/Unit/Crypt/BlowfishTest.php index 576f4167..5289c67f 100644 --- a/tests/Unit/Crypt/BlowfishTest.php +++ b/tests/Unit/Crypt/BlowfishTest.php @@ -131,7 +131,3 @@ class Unit_Crypt_BlowfishTest extends PhpseclibTestCase } } } - -class BlowfishTest extends Unit_Crypt_BlowfishTest -{ -} diff --git a/tests/Unit/Crypt/ChaCha20.php b/tests/Unit/Crypt/ChaCha20.php index 5a4899e2..efc17870 100644 --- a/tests/Unit/Crypt/ChaCha20.php +++ b/tests/Unit/Crypt/ChaCha20.php @@ -216,7 +216,3 @@ class Unit_Crypt_ChaCha20Test extends PhpseclibTestCase } } } - -class ChaCha20Test extends Unit_Crypt_ChaCha20Test -{ -} diff --git a/tests/Unit/Crypt/DHTest.php b/tests/Unit/Crypt/DHTest.php index 3f8c4a99..e6e15ba3 100644 --- a/tests/Unit/Crypt/DHTest.php +++ b/tests/Unit/Crypt/DHTest.php @@ -264,7 +264,3 @@ Q3ADAIcv9LEmTBnSAOsCs1K9ExAmSv/T2/4+9dW28UYb+p/uV477d1wf+nCWS6VU $this->assertSame($expected, DH::computeSecret($bobPrivate, $alicePublic)); } } - -class DHTest extends Unit_Crypt_DHTest -{ -} diff --git a/tests/Unit/Crypt/DSA/CreateKeyTest.php b/tests/Unit/Crypt/DSA/CreateKeyTest.php index c5a7223f..103be760 100644 --- a/tests/Unit/Crypt/DSA/CreateKeyTest.php +++ b/tests/Unit/Crypt/DSA/CreateKeyTest.php @@ -53,7 +53,3 @@ class Unit_Crypt_DSA_CreateKeyTest extends PhpseclibTestCase $this->assertInstanceOf(PublicKey::class, $privatekey->getPublicKey()); } } - -class CreateKeyTest extends Unit_Crypt_DSA_CreateKeyTest -{ -} diff --git a/tests/Unit/Crypt/DSA/LoadDSAKeyTest.php b/tests/Unit/Crypt/DSA/LoadDSAKeyTest.php index d04112b6..29b16693 100644 --- a/tests/Unit/Crypt/DSA/LoadDSAKeyTest.php +++ b/tests/Unit/Crypt/DSA/LoadDSAKeyTest.php @@ -256,22 +256,3 @@ dlN48qLbSmUgsO7gq/1vodebMSHcduV4JTq8ix5Ey87QAAABQhHEzWiduF4V0DestSnJ3q $this->assertTrue($key->verify('zzz', $sig)); } } - -class LoadDSAKeyTest extends Unit_Crypt_DSA_LoadDSAKeyTest -{ - /** - * @expectedException \phpseclib3\Exception\NoKeyLoadedException - */ - public function testBadKey() - { - parent::testBadKey(); - } - - /** - * @expectedException \phpseclib3\Exception\NoKeyLoadedException - */ - public function testPuTTYBadMAC() - { - parent::testPuTTYBadMac(); - } -} diff --git a/tests/Unit/Crypt/DSA/SignatureTest.php b/tests/Unit/Crypt/DSA/SignatureTest.php index c1e9b080..a624508f 100644 --- a/tests/Unit/Crypt/DSA/SignatureTest.php +++ b/tests/Unit/Crypt/DSA/SignatureTest.php @@ -122,7 +122,3 @@ kBniZHdFBAZBTE14YJUBkw== $this->assertTrue($dsa->verify($message, $signature)); } } - -class SignatureTest extends Unit_Crypt_DSA_SignatureTest -{ -} diff --git a/tests/Unit/Crypt/EC/CurveTest.php b/tests/Unit/Crypt/EC/CurveTest.php index 23e67e65..93d20d64 100644 --- a/tests/Unit/Crypt/EC/CurveTest.php +++ b/tests/Unit/Crypt/EC/CurveTest.php @@ -509,7 +509,3 @@ Private-MAC: b85ca0eb7c612df5d18af85128821bd53faaa3ef'); $this->assertTrue($public->verify($message, $signature, 'Raw')); } } - -class CurveTest extends Unit_Crypt_EC_CurveTest -{ -} diff --git a/tests/Unit/Crypt/EC/KeyTest.php b/tests/Unit/Crypt/EC/KeyTest.php index e3b2afa8..c9d642d5 100644 --- a/tests/Unit/Crypt/EC/KeyTest.php +++ b/tests/Unit/Crypt/EC/KeyTest.php @@ -508,7 +508,3 @@ lEIq93iMVzIArjGaKrFDAAAADHJvb3RAdmFncmFudAE= $this->assertTrue($key->withSignatureFormat('SSH2')->verify('zzz', $sig2)); } } - -class KeyTest extends Unit_Crypt_EC_KeyTest -{ -} diff --git a/tests/Unit/Crypt/GCMTest.php b/tests/Unit/Crypt/GCMTest.php index 3927c116..090f2152 100644 --- a/tests/Unit/Crypt/GCMTest.php +++ b/tests/Unit/Crypt/GCMTest.php @@ -235,7 +235,3 @@ class Unit_Crypt_GCMTest extends PhpseclibTestCase $this->assertEquals($plaintext, $aes->decrypt($ciphertext)); } } - -class GCMTest extends Unit_Crypt_GCMTest -{ -} diff --git a/tests/Unit/Crypt/RC2Test.php b/tests/Unit/Crypt/RC2Test.php index a05cc5fb..bd1ed161 100644 --- a/tests/Unit/Crypt/RC2Test.php +++ b/tests/Unit/Crypt/RC2Test.php @@ -127,7 +127,3 @@ class Unit_Crypt_RC2Test extends PhpseclibTestCase $this->assertEquals($result, $plaintext, "Failed asserting that decrypted result yielded $plaintext as a result in $engine engine"); } } - -class RC2Test extends Unit_Crypt_RC2Test -{ -} diff --git a/tests/Unit/Crypt/RC4Test.php b/tests/Unit/Crypt/RC4Test.php index 07c7f2b7..92df2c42 100644 --- a/tests/Unit/Crypt/RC4Test.php +++ b/tests/Unit/Crypt/RC4Test.php @@ -250,7 +250,3 @@ class Unit_Crypt_RC4Test extends PhpseclibTestCase } } } - -class RC4Test extends Unit_Crypt_RC4Test -{ -} diff --git a/tests/Unit/Crypt/RSA/LoadKeyTest.php b/tests/Unit/Crypt/RSA/LoadKeyTest.php index 1788513a..c778d777 100644 --- a/tests/Unit/Crypt/RSA/LoadKeyTest.php +++ b/tests/Unit/Crypt/RSA/LoadKeyTest.php @@ -1046,22 +1046,3 @@ n9dyFZYXxil/cgFG/PDMnuXy1Wcl8hb8iwQag4Y7ohiLXVTJa/0BAgMBAAE= $this->assertIsString($result); } } - -class LoadKeyTest extends Unit_Crypt_RSA_LoadKeyTest -{ - /** - * @expectedException \phpseclib3\Exception\NoKeyLoadedException - */ - public function testBadKey() - { - parent::testBadKey(); - } - - /** - * @expectedException \phpseclib3\Exception\UnsupportedFormatException - */ - public function testSavePasswordXML() - { - parent::testSavePasswordXML(); - } -} diff --git a/tests/Unit/Crypt/RSA/ModeTest.php b/tests/Unit/Crypt/RSA/ModeTest.php index 972892b1..bc4e12e4 100644 --- a/tests/Unit/Crypt/RSA/ModeTest.php +++ b/tests/Unit/Crypt/RSA/ModeTest.php @@ -184,14 +184,3 @@ HERE; $this->assertEquals('sha1', $rsa->getMGFHash()); } } - -class ModeTest extends Unit_Crypt_RSA_ModeTest -{ - /** - * @expectedException \LengthException - */ - public function testSmallModulo() - { - parent::testSmallModulo(); - } -} diff --git a/tests/Unit/Crypt/RandomTest.php b/tests/Unit/Crypt/RandomTest.php index 989b9c5f..5385826c 100644 --- a/tests/Unit/Crypt/RandomTest.php +++ b/tests/Unit/Crypt/RandomTest.php @@ -53,7 +53,3 @@ class Unit_Crypt_RandomTest extends PhpseclibTestCase return [$x]; } } - -class RandomTest extends Unit_Crypt_RandomTest -{ -} diff --git a/tests/Unit/Crypt/Salsa20.php b/tests/Unit/Crypt/Salsa20.php index 188d6fc9..974feba7 100644 --- a/tests/Unit/Crypt/Salsa20.php +++ b/tests/Unit/Crypt/Salsa20.php @@ -158,7 +158,3 @@ class Unit_Crypt_Salsa20Test extends PhpseclibTestCase $this->assertEquals(bin2hex($result), $expected, "Failed asserting that key $key / $iv yielded expected output in $engine engine"); } } - -class Salsa20Test extends Unit_Crypt_Salsa20Test -{ -} diff --git a/tests/Unit/Crypt/TripleDESTest.php b/tests/Unit/Crypt/TripleDESTest.php index e189523f..700bb211 100644 --- a/tests/Unit/Crypt/TripleDESTest.php +++ b/tests/Unit/Crypt/TripleDESTest.php @@ -201,7 +201,3 @@ class Unit_Crypt_TripleDESTest extends PhpseclibTestCase } } } - -class TripleDESTest extends Unit_Crypt_TripleDESTest -{ -} diff --git a/tests/Unit/Crypt/TwofishTest.php b/tests/Unit/Crypt/TwofishTest.php index 6044cc64..e9f3f78d 100644 --- a/tests/Unit/Crypt/TwofishTest.php +++ b/tests/Unit/Crypt/TwofishTest.php @@ -73,7 +73,3 @@ class Unit_Crypt_TwofishTest extends PhpseclibTestCase } } } - -class TwofishTest extends Unit_Crypt_TwofishTest -{ -} diff --git a/tests/Unit/File/ANSITest.php b/tests/Unit/File/ANSITest.php index 7775d7bd..0cc4a029 100644 --- a/tests/Unit/File/ANSITest.php +++ b/tests/Unit/File/ANSITest.php @@ -63,7 +63,3 @@ class Unit_File_ANSITest extends PhpseclibTestCase $this->assertSame(str_repeat('z', 80), $lines[22]); } } - -class ANSITest extends Unit_File_ANSITest -{ -} diff --git a/tests/Unit/File/ASN1Test.php b/tests/Unit/File/ASN1Test.php index c1b7a4ef..d9f80e8f 100644 --- a/tests/Unit/File/ASN1Test.php +++ b/tests/Unit/File/ASN1Test.php @@ -393,7 +393,3 @@ class Unit_File_ASN1Test extends PhpseclibTestCase $this->assertIsArray($a); } } - -class ASN1Test extends Unit_File_ASN1Test -{ -} diff --git a/tests/Unit/File/X509/CSRTest.php b/tests/Unit/File/X509/CSRTest.php index 93ce07b5..f2732471 100644 --- a/tests/Unit/File/X509/CSRTest.php +++ b/tests/Unit/File/X509/CSRTest.php @@ -121,7 +121,3 @@ U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ $x509->saveCSR($x509->signCSR(), X509::FORMAT_DER); } } - -class CSRTest extends Unit_File_X509_CSRTest -{ -} diff --git a/tests/Unit/File/X509/SPKACTest.php b/tests/Unit/File/X509/SPKACTest.php index 26678b33..fd1caeee 100644 --- a/tests/Unit/File/X509/SPKACTest.php +++ b/tests/Unit/File/X509/SPKACTest.php @@ -96,7 +96,3 @@ class Unit_File_X509_SPKACTest extends PhpseclibTestCase ); } } - -class SPKACTest extends Unit_File_X509_SPKACTest -{ -} diff --git a/tests/Unit/File/X509/X509Test.php b/tests/Unit/File/X509/X509Test.php index be32bd2f..76b85c35 100644 --- a/tests/Unit/File/X509/X509Test.php +++ b/tests/Unit/File/X509/X509Test.php @@ -1170,7 +1170,3 @@ mDaPrsUl15evEah6amsBfpQiWRbKpDLKs1kF $this->assertFalse($r); } } - -class X509Test extends Unit_File_X509_X509Test -{ -} diff --git a/tests/Unit/Math/BigInteger/BCMathTest.php b/tests/Unit/Math/BigInteger/BCMathTest.php index 2ed99056..1aab9ebd 100644 --- a/tests/Unit/Math/BigInteger/BCMathTest.php +++ b/tests/Unit/Math/BigInteger/BCMathTest.php @@ -27,7 +27,3 @@ class Unit_Math_BigInteger_BCMathTest extends Unit_Math_BigInteger_TestCase return 'phpseclib3\Math\BigInteger\Engines\BCMath'; } } - -class BCMathTest extends Unit_Math_BigInteger_BCMathTest -{ -} diff --git a/tests/Unit/Math/BigInteger/DefaultTest.php b/tests/Unit/Math/BigInteger/DefaultTest.php index cfc4fb48..640d06d4 100644 --- a/tests/Unit/Math/BigInteger/DefaultTest.php +++ b/tests/Unit/Math/BigInteger/DefaultTest.php @@ -19,7 +19,3 @@ class Unit_Math_BigInteger_DefaultTest extends Unit_Math_BigInteger_TestCase return 'phpseclib3\Math\BigInteger'; } } - -class DefaultTest extends Unit_Math_BigInteger_DefaultTest -{ -} diff --git a/tests/Unit/Math/BigInteger/GMPTest.php b/tests/Unit/Math/BigInteger/GMPTest.php index f7ba9808..bcbecdc3 100644 --- a/tests/Unit/Math/BigInteger/GMPTest.php +++ b/tests/Unit/Math/BigInteger/GMPTest.php @@ -27,7 +27,3 @@ class Unit_Math_BigInteger_GMPTest extends Unit_Math_BigInteger_TestCase return 'phpseclib3\Math\BigInteger\Engines\GMP'; } } - -class GMPTest extends Unit_Math_BigInteger_GMPTest -{ -} diff --git a/tests/Unit/Math/BigInteger/PHP32Test.php b/tests/Unit/Math/BigInteger/PHP32Test.php index 3d2b7637..c9b3cfdd 100644 --- a/tests/Unit/Math/BigInteger/PHP32Test.php +++ b/tests/Unit/Math/BigInteger/PHP32Test.php @@ -36,7 +36,3 @@ class Unit_Math_BigInteger_PHP32Test extends Unit_Math_BigInteger_TestCase return 'phpseclib3\Math\BigInteger\Engines\PHP32'; } } - -class PHP32Test extends Unit_Math_BigInteger_PHP32Test -{ -} diff --git a/tests/Unit/Math/BigInteger/PHP64OpenSSLTest.php b/tests/Unit/Math/BigInteger/PHP64OpenSSLTest.php index b8654a84..c4a28bcf 100644 --- a/tests/Unit/Math/BigInteger/PHP64OpenSSLTest.php +++ b/tests/Unit/Math/BigInteger/PHP64OpenSSLTest.php @@ -20,7 +20,3 @@ class Unit_Math_BigInteger_PHP64OpenSSLTest extends Unit_Math_BigInteger_PHP64Te } } } - -class PHP64OpenSSLTest extends Unit_Math_BigInteger_PHP64OpenSSLTest -{ -} diff --git a/tests/Unit/Math/BigInteger/PHP64Test.php b/tests/Unit/Math/BigInteger/PHP64Test.php index 13995a76..f1c89093 100644 --- a/tests/Unit/Math/BigInteger/PHP64Test.php +++ b/tests/Unit/Math/BigInteger/PHP64Test.php @@ -35,7 +35,3 @@ class Unit_Math_BigInteger_PHP64Test extends Unit_Math_BigInteger_TestCase return 'phpseclib3\Math\BigInteger\Engines\PHP64'; } } - -class PHP64Test extends Unit_Math_BigInteger_PHP64Test -{ -} diff --git a/tests/Unit/Math/BigIntegerTest.php b/tests/Unit/Math/BigIntegerTest.php index 632eb068..ee84d3a0 100644 --- a/tests/Unit/Math/BigIntegerTest.php +++ b/tests/Unit/Math/BigIntegerTest.php @@ -71,7 +71,3 @@ ENGINE static::assertSame($expectedEngineClass, $bigint->toString()); } } - -class BigIntegerTest extends Unit_Math_BigIntegerTest -{ -} diff --git a/tests/Unit/Net/SFTPStreamUnitTest.php b/tests/Unit/Net/SFTPStreamUnitTest.php index 8a365ad8..2aa7ab21 100644 --- a/tests/Unit/Net/SFTPStreamUnitTest.php +++ b/tests/Unit/Net/SFTPStreamUnitTest.php @@ -24,7 +24,3 @@ class Unit_Net_SFTPStreamUnitTest extends PhpseclibTestCase $this->assertTrue(stream_wrapper_unregister($protocol)); } } - -class SFTPStreamUnitTest extends Unit_Net_SFTPStreamUnitTest -{ -} diff --git a/tests/Unit/Net/SSH2UnitTest.php b/tests/Unit/Net/SSH2UnitTest.php index 2d2db708..824f52a3 100644 --- a/tests/Unit/Net/SSH2UnitTest.php +++ b/tests/Unit/Net/SSH2UnitTest.php @@ -133,7 +133,3 @@ class Unit_Net_SSH2UnitTest extends PhpseclibTestCase ->getMock(); } } - -class SSH2UnitTest extends Unit_Net_SSH2UnitTest -{ -} diff --git a/travis/run-phpunit.sh b/travis/run-phpunit.sh index 3e49318b..96f420e7 100755 --- a/travis/run-phpunit.sh +++ b/travis/run-phpunit.sh @@ -32,6 +32,12 @@ then find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsObject([^)]*)\)/\1: void/g' find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringContainsString([^)]*)\)/\1: void/g' find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringNotContainsString([^)]*)\)/\1: void/g' + find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_Crypt_\(AES\|Hash\|RSA\)_/class /g' + find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_File_\(X509\)_/class /g' + find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_Math_\(BigInteger\)_/class /g' + find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Unit_\(Crypt\|File\|Math\|Net\)_/class /g' + find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Functional_Net_/class /g' + find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/extends Unit_Crypt_Hash_\(SHA512Test\|SHA256Test\)/extends \1/g' fi if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '>=');"` = "1" ]