From c9a80ff748d6b64a66cb3fc20db4608305279af2 Mon Sep 17 00:00:00 2001 From: Joey3000 Date: Mon, 18 Jan 2016 05:05:31 +0100 Subject: [PATCH] Cleanup of `use` operator usage This does the following: 1. Removes superfluous usage of the `use` operator. Specifically, that operator is not needed to use classes in the same `namespace` as the object (see https://secure.php.net/manual/en/language.namespaces.rules.php). 2. While at it, also sorted the `use` operators alphabetically, for a better overview. --- 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 | 2 +- phpseclib/Crypt/RSA/PKCS.php | 4 ++-- phpseclib/Crypt/RSA/PKCS1.php | 7 +++---- phpseclib/Crypt/RSA/PKCS8.php | 5 ++--- phpseclib/Crypt/RSA/PuTTY.php | 3 +-- phpseclib/Crypt/Random.php | 8 -------- phpseclib/Crypt/Rijndael.php | 2 -- phpseclib/Crypt/TripleDES.php | 3 --- phpseclib/Crypt/Twofish.php | 2 -- phpseclib/File/X509.php | 5 ++--- phpseclib/Net/SCP.php | 2 -- phpseclib/Net/SFTP.php | 1 - phpseclib/System/SSH/Agent.php | 2 +- phpseclib/System/SSH/Agent/Identity.php | 2 +- 20 files changed, 13 insertions(+), 47 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 cbc2b0cf..ac9ad95b 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 947ce1c9..bf8f4ca9 100644 --- a/phpseclib/Crypt/RSA.php +++ b/phpseclib/Crypt/RSA.php @@ -45,8 +45,8 @@ namespace phpseclib\Crypt; -use phpseclib\Math\BigInteger; use phpseclib\File\ASN1; +use phpseclib\Math\BigInteger; /** * Pure-PHP PKCS#1 compliant implementation of RSA. diff --git a/phpseclib/Crypt/RSA/PKCS.php b/phpseclib/Crypt/RSA/PKCS.php index 6f5ba33b..c019b52b 100644 --- a/phpseclib/Crypt/RSA/PKCS.php +++ b/phpseclib/Crypt/RSA/PKCS.php @@ -14,10 +14,10 @@ namespace phpseclib\Crypt\RSA; -use phpseclib\Crypt\Base; use phpseclib\Crypt\AES; -use phpseclib\Crypt\TripleDES; +use phpseclib\Crypt\Base; use phpseclib\Crypt\DES; +use phpseclib\Crypt\TripleDES; use phpseclib\Math\BigInteger; /** diff --git a/phpseclib/Crypt/RSA/PKCS1.php b/phpseclib/Crypt/RSA/PKCS1.php index 8ce8b115..26291612 100644 --- a/phpseclib/Crypt/RSA/PKCS1.php +++ b/phpseclib/Crypt/RSA/PKCS1.php @@ -22,12 +22,11 @@ namespace phpseclib\Crypt\RSA; -use phpseclib\Math\BigInteger; -use phpseclib\Crypt\RSA\PKCS; -use phpseclib\Crypt\Random; use phpseclib\Crypt\AES; -use phpseclib\Crypt\TripleDES; use phpseclib\Crypt\DES; +use phpseclib\Crypt\Random; +use phpseclib\Crypt\TripleDES; +use phpseclib\Math\BigInteger; /** * PKCS#1 Formatted RSA Key Handler diff --git a/phpseclib/Crypt/RSA/PKCS8.php b/phpseclib/Crypt/RSA/PKCS8.php index 84a473d3..9de3ca01 100644 --- a/phpseclib/Crypt/RSA/PKCS8.php +++ b/phpseclib/Crypt/RSA/PKCS8.php @@ -24,10 +24,9 @@ namespace phpseclib\Crypt\RSA; -use phpseclib\Math\BigInteger; -use phpseclib\Crypt\RSA\PKCS; -use phpseclib\Crypt\Random; use phpseclib\Crypt\DES; +use phpseclib\Crypt\Random; +use phpseclib\Math\BigInteger; /** * PKCS#8 Formatted RSA Key Handler diff --git a/phpseclib/Crypt/RSA/PuTTY.php b/phpseclib/Crypt/RSA/PuTTY.php index 5e8596db..02828cbe 100644 --- a/phpseclib/Crypt/RSA/PuTTY.php +++ b/phpseclib/Crypt/RSA/PuTTY.php @@ -14,10 +14,9 @@ namespace phpseclib\Crypt\RSA; -use phpseclib\Math\BigInteger; use phpseclib\Crypt\AES; use phpseclib\Crypt\Hash; -use phpseclib\Crypt\RSA\OpenSSH; +use phpseclib\Math\BigInteger; /** * PuTTY Formatted RSA Key Handler diff --git a/phpseclib/Crypt/Random.php b/phpseclib/Crypt/Random.php index 84972d62..b900ece7 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 6986b327..81eba7ee 100644 --- a/phpseclib/File/X509.php +++ b/phpseclib/File/X509.php @@ -27,12 +27,11 @@ 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\Exception\UnsupportedAlgorithmException; use phpseclib\File\ASN1\Element; use phpseclib\Math\BigInteger; -use phpseclib\Exception\UnsupportedAlgorithmException; /** * Pure-PHP X.509 Parser diff --git a/phpseclib/Net/SCP.php b/phpseclib/Net/SCP.php index a2818970..4c28d8b0 100644 --- a/phpseclib/Net/SCP.php +++ b/phpseclib/Net/SCP.php @@ -32,8 +32,6 @@ namespace phpseclib\Net; -use phpseclib\Net\SSH1; -use phpseclib\Net\SSH2; use phpseclib\Exception\FileNotFoundException; /** diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index 3c92ae3d..8b753202 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -37,7 +37,6 @@ namespace phpseclib\Net; -use phpseclib\Net\SSH2; use phpseclib\Exception\FileNotFoundException; /** diff --git a/phpseclib/System/SSH/Agent.php b/phpseclib/System/SSH/Agent.php index 54f09545..a4dad183 100644 --- a/phpseclib/System/SSH/Agent.php +++ b/phpseclib/System/SSH/Agent.php @@ -34,8 +34,8 @@ namespace phpseclib\System\SSH; use phpseclib\Crypt\RSA; -use phpseclib\System\SSH\Agent\Identity; use phpseclib\Exception\BadConfigurationException; +use phpseclib\System\SSH\Agent\Identity; /** * Pure-PHP ssh-agent client identity factory diff --git a/phpseclib/System/SSH/Agent/Identity.php b/phpseclib/System/SSH/Agent/Identity.php index a074d4d0..30ab11d1 100644 --- a/phpseclib/System/SSH/Agent/Identity.php +++ b/phpseclib/System/SSH/Agent/Identity.php @@ -15,9 +15,9 @@ namespace phpseclib\System\SSH\Agent; -use phpseclib\System\SSH\Agent; use phpseclib\Crypt\RSA; use phpseclib\Exception\UnsupportedAlgorithmException; +use phpseclib\System\SSH\Agent; /** * Pure-PHP ssh-agent client identity object