Merge branch 'master' into php5

* master:
  CS: Each file MUST end with exactly one newline character

phpseclib/Crypt/AES.php

@@ -183,4 +183,3 @@ class Crypt_AES extends Crypt_Rijndael
         return;
     }
 }
-

phpseclib/Crypt/Base.php

@@ -1984,4 +1984,3 @@ class Crypt_Base
         return $functions;
     }
 }
-

phpseclib/Crypt/Blowfish.php

@@ -672,4 +672,3 @@ class Crypt_Blowfish extends Crypt_Base
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-

phpseclib/Crypt/DES.php

@@ -1533,4 +1533,3 @@ class Crypt_DES extends Crypt_Base
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-

phpseclib/Crypt/RC2.php

@@ -651,4 +651,3 @@ class Crypt_RC2 extends Crypt_Base
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-

phpseclib/Crypt/RC4.php

@@ -132,7 +132,6 @@ class Crypt_RC4 extends Crypt_Base
      */
     var $const_namespace = 'RC4';
 
-
     /**
      * The mcrypt specific name of the cipher
      *
@@ -332,4 +331,3 @@ class Crypt_RC4 extends Crypt_Base
         return $text;
     }
 }
-

phpseclib/Crypt/Rijndael.php

@@ -1369,4 +1369,3 @@ class Crypt_Rijndael extends Crypt_Base
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-

phpseclib/Crypt/TripleDES.php

@@ -417,4 +417,3 @@ class Crypt_TripleDES extends Crypt_DES
         parent::_setupKey();
     }
 }
-

phpseclib/Crypt/Twofish.php

@@ -919,4 +919,3 @@ class Crypt_Twofish extends Crypt_Base
         $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
-

tests/code_sniffer_ruleset.xml

@@ -47,6 +47,9 @@
  <!-- All code files MUST use only UTF-8 without BOM. -->
  <rule ref="Generic.Files.ByteOrderMark" />
 
+ <!-- Each file MUST end with exactly one newline character -->
+ <rule ref="PSR2.Files.EndFileNewline" />
+
  <!-- In the argument list, there MUST NOT be a space before each comma,
       and there MUST be one space after each comma. -->
  <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">