Merge branch 'master' into php5

* master:
  CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.

phpseclib/Crypt/AES.php

@@ -129,7 +129,8 @@ define('CRYPT_AES_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
  * @access  public
  * @package Crypt_AES
  */
-class Crypt_AES extends Crypt_Rijndael {
+class Crypt_AES extends Crypt_Rijndael
+{
     /**
      * The namespace used by the cipher for its constants.
      *

phpseclib/Crypt/Base.php

@@ -120,7 +120,8 @@ define('CRYPT_MODE_MCRYPT', 2);
  * @access  public
  * @package Crypt_Base
  */
-class Crypt_Base {
+class Crypt_Base
+{
     /**
      * The Encryption Mode
      *

phpseclib/Crypt/Blowfish.php

@@ -125,7 +125,8 @@ define('CRYPT_BLOWFISH_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
  * @access  public
  * @package Crypt_Blowfish
  */
-class Crypt_Blowfish extends Crypt_Base {
+class Crypt_Blowfish extends Crypt_Base
+{
     /**
      * Block Length of the cipher
      *

phpseclib/Crypt/DES.php

@@ -143,7 +143,8 @@ define('CRYPT_DES_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
  * @access  public
  * @package Crypt_DES
  */
-class Crypt_DES extends Crypt_Base {
+class Crypt_DES extends Crypt_Base
+{
     /**
      * Block Length of the cipher
      *

phpseclib/Crypt/Hash.php

@@ -80,7 +80,8 @@ define('CRYPT_HASH_MODE_HASH',     3);
  * @access  public
  * @package Crypt_Hash
  */
-class Crypt_Hash {
+class Crypt_Hash
+{
     /**
      * Hash Parameter
      *

phpseclib/Crypt/RC2.php

@@ -120,7 +120,8 @@ define('CRYPT_RC2_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
  * @access  public
  * @package Crypt_RC2
  */
-class Crypt_RC2 extends Crypt_Base {
+class Crypt_RC2 extends Crypt_Base
+{
     /**
      * Block Length of the cipher
      *

phpseclib/Crypt/RC4.php

@@ -99,7 +99,8 @@ define('CRYPT_RC4_DECRYPT', 1);
  * @access  public
  * @package Crypt_RC4
  */
-class Crypt_RC4 extends Crypt_Base {
+class Crypt_RC4 extends Crypt_Base
+{
     /**
      * Block Length of the cipher
      *

phpseclib/Crypt/RSA.php

@@ -244,7 +244,8 @@ define('CRYPT_RSA_PUBLIC_FORMAT_PKCS1', 7);
  * @access  public
  * @package Crypt_RSA
  */
-class Crypt_RSA {
+class Crypt_RSA
+{
     /**
      * Precomputed Zero
      *

phpseclib/Crypt/Rijndael.php

@@ -140,7 +140,8 @@ define('CRYPT_RIJNDAEL_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
  * @access  public
  * @package Crypt_Rijndael
  */
-class Crypt_Rijndael extends Crypt_Base {
+class Crypt_Rijndael extends Crypt_Base
+{
     /**
      * The default password key_size used by setPassword()
      *

phpseclib/Crypt/TripleDES.php

@@ -81,7 +81,8 @@ define('CRYPT_DES_MODE_CBC3', CRYPT_DES_MODE_CBC);
  * @access  public
  * @package Crypt_TripleDES
  */
-class Crypt_TripleDES extends Crypt_DES {
+class Crypt_TripleDES extends Crypt_DES
+{
     /**
      * The default password key_size used by setPassword()
      *

phpseclib/Crypt/Twofish.php

@@ -125,7 +125,8 @@ define('CRYPT_TWOFISH_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
  * @access  public
  * @package Crypt_Twofish
  */
-class Crypt_Twofish extends Crypt_Base {
+class Crypt_Twofish extends Crypt_Base
+{
     /**
      * The namespace used by the cipher for its constants.
      *

phpseclib/File/ANSI.php

@@ -44,7 +44,8 @@
  * @access  public
  * @package File_ANSI
  */
-class File_ANSI {
+class File_ANSI
+{
     /**
      * Max Width
      *

phpseclib/File/ASN1.php

@@ -115,7 +115,8 @@ define('FILE_ASN1_TYPE_ANY',             -2);
  * @access  public
  * @package File_ASN1
  */
-class File_ASN1_Element {
+class File_ASN1_Element
+{
     /**
      * Raw element value
      *
@@ -145,7 +146,8 @@ class File_ASN1_Element {
  * @access  public
  * @package File_ASN1
  */
-class File_ASN1 {
+class File_ASN1
+{
     /**
      * ASN.1 object identifier
      *

phpseclib/File/X509.php

@@ -128,7 +128,8 @@ define('FILE_X509_ATTR_REPLACE', -3); // Clear first, then add a value.
  * @access  public
  * @package File_X509
  */
-class File_X509 {
+class File_X509
+{
     /**
      * ASN.1 syntax for X.509 certificates
      *

phpseclib/Math/BigInteger.php

@@ -178,7 +178,8 @@ define('MATH_BIGINTEGER_KARATSUBA_CUTOFF', 25);
  * @access  public
  * @package Math_BigInteger
  */
-class Math_BigInteger {
+class Math_BigInteger
+{
     /**
      * Holds the BigInteger's value.
      *

phpseclib/Net/SCP.php

@@ -86,7 +86,8 @@ define('NET_SCP_SSH2',  2);
  * @access  public
  * @package Net_SCP
  */
-class Net_SCP {
+class Net_SCP
+{
     /**
      * SSH Object
      *

phpseclib/Net/SFTP.php

@@ -120,7 +120,8 @@ define('NET_SFTP_RESUME_START',  8);
  * @access  public
  * @package Net_SFTP
  */
-class Net_SFTP extends Net_SSH2 {
+class Net_SFTP extends Net_SSH2
+{
     /**
      * Packet Types
      *

phpseclib/Net/SFTP/Stream.php

@@ -41,7 +41,8 @@
  * @access  public
  * @package Net_SFTP_Stream
  */
-class Net_SFTP_Stream {
+class Net_SFTP_Stream
+{
     /**
      * SFTP instances
      *

phpseclib/Net/SSH1.php

@@ -230,7 +230,8 @@ define('NET_SSH1_READ_REGEX', 2);
  * @access  public
  * @package Net_SSH1
  */
-class Net_SSH1 {
+class Net_SSH1
+{
     /**
      * The SSH identifier
      *

phpseclib/Net/SSH2.php

@@ -148,7 +148,8 @@ define('NET_SSH2_LOG_MAX_SIZE', 1024 * 1024);
  * @access  public
  * @package Net_SSH2
  */
-class Net_SSH2 {
+class Net_SSH2
+{
     /**
      * The SSH identifier
      *

tests/code_sniffer_ruleset.xml

@@ -13,7 +13,6 @@
  <rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma"><severity>0</severity></rule>
  <rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCapital"><severity>0</severity></rule>
  <rule ref="PEAR.NamingConventions.ValidFunctionName.NotCamelCaps"><severity>0</severity></rule>
- <rule ref="PEAR.Classes.ClassDeclaration.OpenBraceNewLine"><severity>0</severity></rule>
  <rule ref="PEAR.Commenting.ClassComment.InvalidVersion"><severity>0</severity></rule>
  <rule ref="PEAR.Commenting.ClassComment.MissingTag"><severity>0</severity></rule>
  <rule ref="PEAR.Commenting.ClassComment.WrongTagOrder"><severity>0</severity></rule>