From f0f029b2c176808c23d025d97c3cc48229994c41 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 11 Dec 2013 18:33:18 +0100 Subject: [PATCH] CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff. --- phpseclib/Crypt/AES.php | 2 +- phpseclib/Crypt/Base.php | 2 +- phpseclib/Crypt/Blowfish.php | 2 +- phpseclib/Crypt/DES.php | 2 +- phpseclib/Crypt/Hash.php | 2 +- phpseclib/Crypt/RC2.php | 2 +- phpseclib/Crypt/RC4.php | 2 +- phpseclib/Crypt/RSA.php | 2 +- phpseclib/Crypt/Rijndael.php | 2 +- phpseclib/Crypt/TripleDES.php | 2 +- phpseclib/Crypt/Twofish.php | 2 +- phpseclib/File/ANSI.php | 2 +- phpseclib/File/ASN1.php | 4 ++-- phpseclib/File/X509.php | 2 +- phpseclib/Math/BigInteger.php | 2 +- phpseclib/Net/SCP.php | 2 +- phpseclib/Net/SFTP.php | 2 +- phpseclib/Net/SFTP/Stream.php | 2 +- phpseclib/Net/SSH1.php | 2 +- phpseclib/Net/SSH2.php | 2 +- tests/code_sniffer_ruleset.xml | 1 - 21 files changed, 21 insertions(+), 22 deletions(-) diff --git a/phpseclib/Crypt/AES.php b/phpseclib/Crypt/AES.php index 206dc978..a00b2a9b 100644 --- a/phpseclib/Crypt/AES.php +++ b/phpseclib/Crypt/AES.php @@ -124,10 +124,10 @@ define('CRYPT_AES_MODE_MCRYPT', CRYPT_MODE_MCRYPT); /** * Pure-PHP implementation of AES. * + * @package Crypt_AES * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Crypt_AES */ class Crypt_AES extends Crypt_Rijndael { diff --git a/phpseclib/Crypt/Base.php b/phpseclib/Crypt/Base.php index a1de3aec..c458f267 100644 --- a/phpseclib/Crypt/Base.php +++ b/phpseclib/Crypt/Base.php @@ -114,11 +114,11 @@ define('CRYPT_MODE_MCRYPT', 2); /** * Base Class for all Crypt_* cipher classes * + * @package Crypt_Base * @author Jim Wigginton * @author Hans-Juergen Petrich * @version 1.0.0 * @access public - * @package Crypt_Base */ class Crypt_Base { diff --git a/phpseclib/Crypt/Blowfish.php b/phpseclib/Crypt/Blowfish.php index 5c52b1f6..67593e5a 100644 --- a/phpseclib/Crypt/Blowfish.php +++ b/phpseclib/Crypt/Blowfish.php @@ -119,11 +119,11 @@ define('CRYPT_BLOWFISH_MODE_MCRYPT', CRYPT_MODE_MCRYPT); /** * Pure-PHP implementation of Blowfish. * + * @package Crypt_Blowfish * @author Jim Wigginton * @author Hans-Juergen Petrich * @version 1.0 * @access public - * @package Crypt_Blowfish */ class Crypt_Blowfish extends Crypt_Base { diff --git a/phpseclib/Crypt/DES.php b/phpseclib/Crypt/DES.php index 36611767..465f2512 100644 --- a/phpseclib/Crypt/DES.php +++ b/phpseclib/Crypt/DES.php @@ -138,10 +138,10 @@ define('CRYPT_DES_MODE_MCRYPT', CRYPT_MODE_MCRYPT); /** * Pure-PHP implementation of DES. * + * @package Crypt_DES * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Crypt_DES */ class Crypt_DES extends Crypt_Base { diff --git a/phpseclib/Crypt/Hash.php b/phpseclib/Crypt/Hash.php index 0b1ca08a..06e47571 100644 --- a/phpseclib/Crypt/Hash.php +++ b/phpseclib/Crypt/Hash.php @@ -75,10 +75,10 @@ define('CRYPT_HASH_MODE_HASH', 3); /** * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions. * + * @package Crypt_Hash * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Crypt_Hash */ class Crypt_Hash { diff --git a/phpseclib/Crypt/RC2.php b/phpseclib/Crypt/RC2.php index ed3548f3..966a342d 100755 --- a/phpseclib/Crypt/RC2.php +++ b/phpseclib/Crypt/RC2.php @@ -116,9 +116,9 @@ define('CRYPT_RC2_MODE_MCRYPT', CRYPT_MODE_MCRYPT); /** * Pure-PHP implementation of RC2. * + * @package Crypt_RC2 * @version 0.1.1 * @access public - * @package Crypt_RC2 */ class Crypt_RC2 extends Crypt_Base { diff --git a/phpseclib/Crypt/RC4.php b/phpseclib/Crypt/RC4.php index deb6884f..7e5a6c59 100644 --- a/phpseclib/Crypt/RC4.php +++ b/phpseclib/Crypt/RC4.php @@ -94,10 +94,10 @@ define('CRYPT_RC4_DECRYPT', 1); /** * Pure-PHP implementation of RC4. * + * @package Crypt_RC4 * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Crypt_RC4 */ class Crypt_RC4 extends Crypt_Base { diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php index b54f95ab..4ce00456 100644 --- a/phpseclib/Crypt/RSA.php +++ b/phpseclib/Crypt/RSA.php @@ -239,10 +239,10 @@ define('CRYPT_RSA_PUBLIC_FORMAT_PKCS1', 7); /** * Pure-PHP PKCS#1 compliant implementation of RSA. * + * @package Crypt_RSA * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Crypt_RSA */ class Crypt_RSA { diff --git a/phpseclib/Crypt/Rijndael.php b/phpseclib/Crypt/Rijndael.php index 54a8e48c..5a557929 100644 --- a/phpseclib/Crypt/Rijndael.php +++ b/phpseclib/Crypt/Rijndael.php @@ -135,10 +135,10 @@ define('CRYPT_RIJNDAEL_MODE_MCRYPT', CRYPT_MODE_MCRYPT); /** * Pure-PHP implementation of Rijndael. * + * @package Crypt_Rijndael * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Crypt_Rijndael */ class Crypt_Rijndael extends Crypt_Base { diff --git a/phpseclib/Crypt/TripleDES.php b/phpseclib/Crypt/TripleDES.php index baac8aa4..ba2908fb 100644 --- a/phpseclib/Crypt/TripleDES.php +++ b/phpseclib/Crypt/TripleDES.php @@ -76,10 +76,10 @@ define('CRYPT_DES_MODE_CBC3', CRYPT_DES_MODE_CBC); /** * Pure-PHP implementation of Triple DES. * + * @package Crypt_TripleDES * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Crypt_TripleDES */ class Crypt_TripleDES extends Crypt_DES { diff --git a/phpseclib/Crypt/Twofish.php b/phpseclib/Crypt/Twofish.php index 220ee948..7dec037b 100644 --- a/phpseclib/Crypt/Twofish.php +++ b/phpseclib/Crypt/Twofish.php @@ -119,11 +119,11 @@ define('CRYPT_TWOFISH_MODE_MCRYPT', CRYPT_MODE_MCRYPT); /** * Pure-PHP implementation of Twofish. * + * @package Crypt_Twofish * @author Jim Wigginton * @author Hans-Juergen Petrich * @version 1.0 * @access public - * @package Crypt_Twofish */ class Crypt_Twofish extends Crypt_Base { diff --git a/phpseclib/File/ANSI.php b/phpseclib/File/ANSI.php index cf87617f..df22de81 100644 --- a/phpseclib/File/ANSI.php +++ b/phpseclib/File/ANSI.php @@ -39,10 +39,10 @@ /** * Pure-PHP ANSI Decoder * + * @package File_ANSI * @author Jim Wigginton * @version 0.3.0 * @access public - * @package File_ANSI */ class File_ANSI { diff --git a/phpseclib/File/ASN1.php b/phpseclib/File/ASN1.php index c099ca36..2890f27c 100644 --- a/phpseclib/File/ASN1.php +++ b/phpseclib/File/ASN1.php @@ -110,10 +110,10 @@ define('FILE_ASN1_TYPE_ANY', -2); * * Bypass normal encoding rules in File_ASN1::encodeDER() * + * @package File_ASN1 * @author Jim Wigginton * @version 0.3.0 * @access public - * @package File_ASN1 */ class File_ASN1_Element { @@ -141,10 +141,10 @@ class File_ASN1_Element /** * Pure-PHP ASN.1 Parser * + * @package File_ASN1 * @author Jim Wigginton * @version 0.3.0 * @access public - * @package File_ASN1 */ class File_ASN1 { diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php index ef19281b..21a3f0c4 100644 --- a/phpseclib/File/X509.php +++ b/phpseclib/File/X509.php @@ -123,10 +123,10 @@ define('FILE_X509_ATTR_REPLACE', -3); // Clear first, then add a value. /** * Pure-PHP X.509 Parser * + * @package File_X509 * @author Jim Wigginton * @version 0.3.1 * @access public - * @package File_X509 */ class File_X509 { diff --git a/phpseclib/Math/BigInteger.php b/phpseclib/Math/BigInteger.php index de25da2a..9cc8f6f5 100644 --- a/phpseclib/Math/BigInteger.php +++ b/phpseclib/Math/BigInteger.php @@ -173,10 +173,10 @@ define('MATH_BIGINTEGER_KARATSUBA_CUTOFF', 25); * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256 * numbers. * + * @package Math_BigInteger * @author Jim Wigginton * @version 1.0.0RC4 * @access public - * @package Math_BigInteger */ class Math_BigInteger { diff --git a/phpseclib/Net/SCP.php b/phpseclib/Net/SCP.php index c519fdd7..b53d34d9 100644 --- a/phpseclib/Net/SCP.php +++ b/phpseclib/Net/SCP.php @@ -81,10 +81,10 @@ define('NET_SCP_SSH2', 2); /** * Pure-PHP implementations of SCP. * + * @package Net_SCP * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Net_SCP */ class Net_SCP { diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index 4baf3aa1..23d73b50 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -115,10 +115,10 @@ define('NET_SFTP_RESUME_START', 8); /** * Pure-PHP implementations of SFTP. * + * @package Net_SFTP * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Net_SFTP */ class Net_SFTP extends Net_SSH2 { diff --git a/phpseclib/Net/SFTP/Stream.php b/phpseclib/Net/SFTP/Stream.php index 2f14d03c..56a36627 100644 --- a/phpseclib/Net/SFTP/Stream.php +++ b/phpseclib/Net/SFTP/Stream.php @@ -36,10 +36,10 @@ /** * SFTP Stream Wrapper * + * @package Net_SFTP_Stream * @author Jim Wigginton * @version 0.3.2 * @access public - * @package Net_SFTP_Stream */ class Net_SFTP_Stream { diff --git a/phpseclib/Net/SSH1.php b/phpseclib/Net/SSH1.php index 2513eefd..80fbbdc6 100644 --- a/phpseclib/Net/SSH1.php +++ b/phpseclib/Net/SSH1.php @@ -225,10 +225,10 @@ define('NET_SSH1_READ_REGEX', 2); /** * Pure-PHP implementation of SSHv1. * + * @package Net_SSH1 * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Net_SSH1 */ class Net_SSH1 { diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index 53c0743b..4f03ce61 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -143,10 +143,10 @@ define('NET_SSH2_LOG_MAX_SIZE', 1024 * 1024); /** * Pure-PHP implementation of SSHv2. * + * @package Net_SSH2 * @author Jim Wigginton * @version 0.1.0 * @access public - * @package Net_SSH2 */ class Net_SSH2 { diff --git a/tests/code_sniffer_ruleset.xml b/tests/code_sniffer_ruleset.xml index 032b8749..055318c8 100644 --- a/tests/code_sniffer_ruleset.xml +++ b/tests/code_sniffer_ruleset.xml @@ -14,7 +14,6 @@ 0 0 0 - 0 0 0 0