Merge branch '2.0-class-rename' into 3.0-class-rename

tests/Functional/Net/SFTPLargeFileTest.php

@@ -42,7 +42,3 @@ class Functional_Net_SFTPLargeFileTest extends Functional_Net_SFTPTestCase
         );
     }
 }
-
-class SFTPLargeFileTest extends Functional_Net_SFTPLargeFileTest
-{
-}

tests/Functional/Net/SFTPStreamTest.php

@@ -64,7 +64,3 @@ class Functional_Net_SFTPStreamTest extends Functional_Net_SFTPTestCase
         );
     }
 }
-
-class SFTPStreamTest extends Functional_Net_SFTPStreamTest
-{
-}

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
-{
-}

tests/Functional/Net/SSH2AgentTest.php

@@ -53,7 +53,3 @@ class Functional_Net_SSH2AgentTest extends PhpseclibFunctionalTestCase
         return $args;
     }
 }
-
-class SSH2AgentTest extends Functional_Net_SSH2AgentTest
-{
-}

tests/Functional/Net/SSH2Test.php

@@ -172,7 +172,3 @@ class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase
         $ssh->read();
     }
 }
-
-class SSH2Test extends Functional_Net_SSH2Test
-{
-}

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
-{
-}

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
-{
-}

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
-{
-}

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
-{
-}

tests/Unit/Crypt/BlowfishTest.php

@@ -131,7 +131,3 @@ class Unit_Crypt_BlowfishTest extends PhpseclibTestCase
         }
     }
 }
-
-class BlowfishTest extends Unit_Crypt_BlowfishTest
-{
-}

tests/Unit/Crypt/ChaCha20.php

@@ -216,7 +216,3 @@ class Unit_Crypt_ChaCha20Test extends PhpseclibTestCase
         }
     }
 }
-
-class ChaCha20Test extends Unit_Crypt_ChaCha20Test
-{
-}

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
-{
-}

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
-{
-}

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();
-    }
-}

tests/Unit/Crypt/DSA/SignatureTest.php

@@ -122,7 +122,3 @@ kBniZHdFBAZBTE14YJUBkw==
         $this->assertTrue($dsa->verify($message, $signature));
     }
 }
-
-class SignatureTest extends Unit_Crypt_DSA_SignatureTest
-{
-}

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
-{
-}

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
-{
-}

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
-{
-}

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
-{
-}

tests/Unit/Crypt/RC4Test.php

@@ -250,7 +250,3 @@ class Unit_Crypt_RC4Test extends PhpseclibTestCase
         }
     }
 }
-
-class RC4Test extends Unit_Crypt_RC4Test
-{
-}

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();
-    }
-}

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();
-    }
-}

tests/Unit/Crypt/RandomTest.php

@@ -53,7 +53,3 @@ class Unit_Crypt_RandomTest extends PhpseclibTestCase
         return [$x];
     }
 }
-
-class RandomTest extends Unit_Crypt_RandomTest
-{
-}

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
-{
-}

tests/Unit/Crypt/TripleDESTest.php

@@ -201,7 +201,3 @@ class Unit_Crypt_TripleDESTest extends PhpseclibTestCase
         }
     }
 }
-
-class TripleDESTest extends Unit_Crypt_TripleDESTest
-{
-}

tests/Unit/Crypt/TwofishTest.php

@@ -73,7 +73,3 @@ class Unit_Crypt_TwofishTest extends PhpseclibTestCase
         }
     }
 }
-
-class TwofishTest extends Unit_Crypt_TwofishTest
-{
-}

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
-{
-}

tests/Unit/File/ASN1Test.php

@@ -393,7 +393,3 @@ class Unit_File_ASN1Test extends PhpseclibTestCase
         $this->assertIsArray($a);
     }
 }
-
-class ASN1Test extends Unit_File_ASN1Test
-{
-}

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
-{
-}

tests/Unit/File/X509/SPKACTest.php

@@ -96,7 +96,3 @@ class Unit_File_X509_SPKACTest extends PhpseclibTestCase
         );
     }
 }
-
-class SPKACTest extends Unit_File_X509_SPKACTest
-{
-}

tests/Unit/File/X509/X509Test.php

@@ -1170,7 +1170,3 @@ mDaPrsUl15evEah6amsBfpQiWRbKpDLKs1kF
         $this->assertFalse($r);
     }
 }
-
-class X509Test extends Unit_File_X509_X509Test
-{
-}

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
-{
-}

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
-{
-}

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
-{
-}

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
-{
-}

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
-{
-}

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
-{
-}

tests/Unit/Math/BigIntegerTest.php

@@ -71,7 +71,3 @@ ENGINE
 		static::assertSame($expectedEngineClass, $bigint->toString());
 	}
 }
-
-class BigIntegerTest extends Unit_Math_BigIntegerTest
-{
-}

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
-{
-}

tests/Unit/Net/SSH2UnitTest.php

@@ -133,7 +133,3 @@ class Unit_Net_SSH2UnitTest extends PhpseclibTestCase
             ->getMock();
     }
 }
-
-class SSH2UnitTest extends Unit_Net_SSH2UnitTest
-{
-}

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" ]