From bdc28b94535d24207089c0016ca9083be8bbbb4c Mon Sep 17 00:00:00 2001 From: Joey3000 Date: Thu, 21 Jan 2016 19:41:41 +0100 Subject: [PATCH] Cherry-picking cleanup of `use` operator usage Picked c9a80ff748d6b64a66cb3fc20db4608305279af2 to the 2.0 branch and resolved conflicts. --- phpseclib/Crypt/AES.php | 2 -- phpseclib/Crypt/Base.php | 2 -- phpseclib/Crypt/Blowfish.php | 2 -- phpseclib/Crypt/DES.php | 2 -- phpseclib/Crypt/RC2.php | 2 -- phpseclib/Crypt/RC4.php | 2 -- phpseclib/Crypt/RSA.php | 7 ------- phpseclib/Crypt/Random.php | 8 -------- phpseclib/Crypt/Rijndael.php | 2 -- phpseclib/Crypt/TripleDES.php | 3 --- phpseclib/Crypt/Twofish.php | 2 -- phpseclib/File/X509.php | 3 +-- phpseclib/Net/SCP.php | 3 --- phpseclib/Net/SFTP.php | 2 -- 14 files changed, 1 insertion(+), 41 deletions(-) diff --git a/phpseclib/Crypt/AES.php b/phpseclib/Crypt/AES.php index 2bb4d5e8..7d8cb8b0 100644 --- a/phpseclib/Crypt/AES.php +++ b/phpseclib/Crypt/AES.php @@ -49,8 +49,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\Rijndael; - /** * Pure-PHP implementation of AES. * diff --git a/phpseclib/Crypt/Base.php b/phpseclib/Crypt/Base.php index e1d0b8b2..f91fff68 100644 --- a/phpseclib/Crypt/Base.php +++ b/phpseclib/Crypt/Base.php @@ -36,8 +36,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\Hash; - /** * Base Class for all \phpseclib\Crypt\* cipher classes * diff --git a/phpseclib/Crypt/Blowfish.php b/phpseclib/Crypt/Blowfish.php index 138afe53..3949e812 100644 --- a/phpseclib/Crypt/Blowfish.php +++ b/phpseclib/Crypt/Blowfish.php @@ -37,8 +37,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\Base; - /** * Pure-PHP implementation of Blowfish. * diff --git a/phpseclib/Crypt/DES.php b/phpseclib/Crypt/DES.php index 93e583a7..ccd51102 100644 --- a/phpseclib/Crypt/DES.php +++ b/phpseclib/Crypt/DES.php @@ -42,8 +42,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\Base; - /** * Pure-PHP implementation of DES. * diff --git a/phpseclib/Crypt/RC2.php b/phpseclib/Crypt/RC2.php index bfe3bca4..32a12c0b 100644 --- a/phpseclib/Crypt/RC2.php +++ b/phpseclib/Crypt/RC2.php @@ -35,8 +35,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\Base; - /** * Pure-PHP implementation of RC2. * diff --git a/phpseclib/Crypt/RC4.php b/phpseclib/Crypt/RC4.php index b24129d2..05fff58e 100644 --- a/phpseclib/Crypt/RC4.php +++ b/phpseclib/Crypt/RC4.php @@ -44,8 +44,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\Base; - /** * Pure-PHP implementation of RC4. * diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php index ba2a8d83..fb1ab181 100644 --- a/phpseclib/Crypt/RSA.php +++ b/phpseclib/Crypt/RSA.php @@ -51,13 +51,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\AES; -use phpseclib\Crypt\Base; -use phpseclib\Crypt\DES; -use phpseclib\Crypt\Hash; -use phpseclib\Crypt\Random; -use phpseclib\Crypt\RSA; -use phpseclib\Crypt\TripleDES; use phpseclib\Math\BigInteger; /** diff --git a/phpseclib/Crypt/Random.php b/phpseclib/Crypt/Random.php index 586bd6c4..60884c5d 100644 --- a/phpseclib/Crypt/Random.php +++ b/phpseclib/Crypt/Random.php @@ -24,14 +24,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\AES; -use phpseclib\Crypt\Base; -use phpseclib\Crypt\Blowfish; -use phpseclib\Crypt\DES; -use phpseclib\Crypt\RC4; -use phpseclib\Crypt\TripleDES; -use phpseclib\Crypt\Twofish; - /** * Pure-PHP Random Number Generator * diff --git a/phpseclib/Crypt/Rijndael.php b/phpseclib/Crypt/Rijndael.php index e9723932..3648a197 100644 --- a/phpseclib/Crypt/Rijndael.php +++ b/phpseclib/Crypt/Rijndael.php @@ -54,8 +54,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\Base; - /** * Pure-PHP implementation of Rijndael. * diff --git a/phpseclib/Crypt/TripleDES.php b/phpseclib/Crypt/TripleDES.php index 91c5bc62..a2c41668 100644 --- a/phpseclib/Crypt/TripleDES.php +++ b/phpseclib/Crypt/TripleDES.php @@ -36,9 +36,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\Base; -use phpseclib\Crypt\DES; - /** * Pure-PHP implementation of Triple DES. * diff --git a/phpseclib/Crypt/Twofish.php b/phpseclib/Crypt/Twofish.php index 623e9a6a..ef71a54c 100644 --- a/phpseclib/Crypt/Twofish.php +++ b/phpseclib/Crypt/Twofish.php @@ -37,8 +37,6 @@ namespace phpseclib\Crypt; -use phpseclib\Crypt\Base; - /** * Pure-PHP implementation of Twofish. * diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php index 169a9ed9..14624c09 100644 --- a/phpseclib/File/X509.php +++ b/phpseclib/File/X509.php @@ -27,9 +27,8 @@ namespace phpseclib\File; use phpseclib\Crypt\Hash; -use phpseclib\Crypt\RSA; use phpseclib\Crypt\Random; -use phpseclib\File\ASN1; +use phpseclib\Crypt\RSA; use phpseclib\File\ASN1\Element; use phpseclib\Math\BigInteger; diff --git a/phpseclib/Net/SCP.php b/phpseclib/Net/SCP.php index 4db28857..b9efacf8 100644 --- a/phpseclib/Net/SCP.php +++ b/phpseclib/Net/SCP.php @@ -32,9 +32,6 @@ namespace phpseclib\Net; -use phpseclib\Net\SSH1; -use phpseclib\Net\SSH2; - /** * Pure-PHP implementations of SCP. * diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index 707808bb..f7015658 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -37,8 +37,6 @@ namespace phpseclib\Net; -use phpseclib\Net\SSH2; - /** * Pure-PHP implementations of SFTP. *