From 1c2796e3eb44eabc50188e217a3c0c5c7d0b96e6 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sat, 18 Jan 2014 17:29:25 +0000 Subject: [PATCH] Cleaned up whitespace --- composer.json | 2 +- phpseclib/Crypt/RC4.php | 4 ++-- phpseclib/File/ANSI.php | 6 +++--- phpseclib/File/X509.php | 8 ++++---- phpseclib/Net/SCP.php | 6 +++--- phpseclib/Net/SFTP/Stream.php | 6 +++--- phpseclib/openssl.cnf | 2 +- tests/Crypt/RSA/LoadKeyTest.php | 2 +- tests/Math/BigInteger/TestCase.php | 2 +- tests/Net/SSH2Test.php | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index 515a426a..9bb5cb4b 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "suggest": { "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.", "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", - "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP >= 4.3.3." + "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP >= 4.3.3." }, "include-path": ["phpseclib/"], "autoload": { diff --git a/phpseclib/Crypt/RC4.php b/phpseclib/Crypt/RC4.php index 7e5a6c59..148bee46 100644 --- a/phpseclib/Crypt/RC4.php +++ b/phpseclib/Crypt/RC4.php @@ -104,11 +104,11 @@ class Crypt_RC4 extends Crypt_Base /** * Block Length of the cipher * - * RC4 is a stream cipher + * RC4 is a stream cipher * so we the block_size to 0 * * @see Crypt_Base::block_size - * @var Integer + * @var Integer * @access private */ var $block_size = 0; diff --git a/phpseclib/File/ANSI.php b/phpseclib/File/ANSI.php index df22de81..0e0004ce 100644 --- a/phpseclib/File/ANSI.php +++ b/phpseclib/File/ANSI.php @@ -16,10 +16,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -557,4 +557,4 @@ class File_ANSI return '
' . $scrollback . '
'; } -} \ No newline at end of file +} diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php index c558bf49..9e7b0b3b 100644 --- a/phpseclib/File/X509.php +++ b/phpseclib/File/X509.php @@ -7,7 +7,7 @@ * * Encode and decode X.509 certificates. * - * The extensions are from {@link http://tools.ietf.org/html/rfc5280 RFC5280} and + * The extensions are from {@link http://tools.ietf.org/html/rfc5280 RFC5280} and * {@link http://web.archive.org/web/19961027104704/http://www3.netscape.com/eng/security/cert-exts.html Netscape Certificate Extensions}. * * Note that loading an X.509 certificate and resaving it may invalidate the signature. The reason being that the signature is based on a @@ -22,10 +22,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -248,7 +248,7 @@ class File_X509 * The signature subject * * There's no guarantee File_X509 is going to reencode an X.509 cert in the same way it was originally - * encoded so we take save the portion of the original cert that the signature would have made for. + * encoded so we take save the portion of the original cert that the signature would have made for. * * @var String * @access private diff --git a/phpseclib/Net/SCP.php b/phpseclib/Net/SCP.php index fcd43906..4cfa3570 100644 --- a/phpseclib/Net/SCP.php +++ b/phpseclib/Net/SCP.php @@ -29,10 +29,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -151,7 +151,7 @@ class Net_SCP * So, for example, if you set $data to 'filename.ext' and then do Net_SCP::get(), you will get a file, twelve bytes * long, containing 'filename.ext' as its contents. * - * Setting $mode to NET_SCP_LOCAL_FILE will change the above behavior. With NET_SCP_LOCAL_FILE, $remote_file will + * Setting $mode to NET_SCP_LOCAL_FILE will change the above behavior. With NET_SCP_LOCAL_FILE, $remote_file will * contain as many bytes as filename.ext does on your local filesystem. If your filename.ext is 1MB then that is how * large $remote_file will be, as well. * diff --git a/phpseclib/Net/SFTP/Stream.php b/phpseclib/Net/SFTP/Stream.php index 56a36627..48b79b3e 100644 --- a/phpseclib/Net/SFTP/Stream.php +++ b/phpseclib/Net/SFTP/Stream.php @@ -13,10 +13,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -517,7 +517,7 @@ class Net_SFTP_Stream * Open directory handle * * The only $options is "whether or not to enforce safe_mode (0x04)". Since safe mode was deprecated in 5.3 and - * removed in 5.4 I'm just going to ignore it + * removed in 5.4 I'm just going to ignore it * * @param String $path * @param Integer $options diff --git a/phpseclib/openssl.cnf b/phpseclib/openssl.cnf index 6baa5661..2b8b52f9 100644 --- a/phpseclib/openssl.cnf +++ b/phpseclib/openssl.cnf @@ -3,4 +3,4 @@ HOME = . RANDFILE = $ENV::HOME/.rnd -[ v3_ca ] \ No newline at end of file +[ v3_ca ] diff --git a/tests/Crypt/RSA/LoadKeyTest.php b/tests/Crypt/RSA/LoadKeyTest.php index 7ffbd4d6..9ef33065 100644 --- a/tests/Crypt/RSA/LoadKeyTest.php +++ b/tests/Crypt/RSA/LoadKeyTest.php @@ -120,4 +120,4 @@ U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ $this->assertTrue($rsa->loadKey($key)); } -} \ No newline at end of file +} diff --git a/tests/Math/BigInteger/TestCase.php b/tests/Math/BigInteger/TestCase.php index 01edc475..ceac1f4a 100644 --- a/tests/Math/BigInteger/TestCase.php +++ b/tests/Math/BigInteger/TestCase.php @@ -24,7 +24,7 @@ abstract class Math_BigInteger_TestCase extends PhpseclibTestCase public function testConstructorBase2() { // 2**65 = 36893488147419103232 - $this->assertSame('36893488147419103232', (string) $this->getInstance('1' . str_repeat('0', 65), 2)); + $this->assertSame('36893488147419103232', (string) $this->getInstance('1' . str_repeat('0', 65), 2)); } public function testConstructorBase10() diff --git a/tests/Net/SSH2Test.php b/tests/Net/SSH2Test.php index 3177a323..1f0eca9f 100644 --- a/tests/Net/SSH2Test.php +++ b/tests/Net/SSH2Test.php @@ -18,7 +18,7 @@ class Net_SSH2Test extends PhpseclibTestCase ->setMethods(array('__destruct')) ->getMock(); } - + public function formatLogDataProvider() { return array( @@ -46,7 +46,7 @@ class Net_SSH2Test extends PhpseclibTestCase $result = $ssh->_format_log($message_log, $message_number_log); $this->assertEquals($expected, $result); } - + public function generateIdentifierProvider() { return array(