1
0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-11 16:49:41 +01:00

Merge branch 'master' into php5

* master:
  CS: Each file MUST end with exactly one newline character
This commit is contained in:
Andreas Fischer 2014-02-11 01:00:52 +01:00
commit 51d30ed66f
10 changed files with 3 additions and 10 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -47,6 +47,9 @@
<!-- All code files MUST use only UTF-8 without BOM. --> <!-- All code files MUST use only UTF-8 without BOM. -->
<rule ref="Generic.Files.ByteOrderMark" /> <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, <!-- In the argument list, there MUST NOT be a space before each comma,
and there MUST be one space after each comma. --> and there MUST be one space after each comma. -->
<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing"> <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">