ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-12-31 17:30:21 +05:30
Code Issues Packages Projects Releases Wiki Activity

Fix StyleCI issues and remove phpdoc order from StyleCI

Browse Source
This commit is contained in:
Andrew Millington 2018-02-28 20:01:01 +00:00
parent 00a7972f74
commit c9b07f386c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.styleci.yml
View File

@ -29,7 +29,6 @@ enabled:
- phpdoc_inline_tag - phpdoc_inline_tag
- phpdoc_no_access - phpdoc_no_access
- phpdoc_no_simplified_null_return - phpdoc_no_simplified_null_return
- phpdoc_order
- phpdoc_property - phpdoc_property
- phpdoc_scalar - phpdoc_scalar
- phpdoc_separation - phpdoc_separation

4
src/CryptTrait.php
View File

@ -33,7 +33,7 @@ trait CryptTrait
protected function encrypt($unencryptedData) protected function encrypt($unencryptedData)
{ {
try { try {
if($this->encryptionKey instanceof Key) { if ($this->encryptionKey instanceof Key) {
return Crypto::encrypt($unencryptedData, $this->encryptionKey); return Crypto::encrypt($unencryptedData, $this->encryptionKey);
} else { } else {
return Crypto::encryptWithPassword($unencryptedData, $this->encryptionKey); return Crypto::encryptWithPassword($unencryptedData, $this->encryptionKey);
@ -55,7 +55,7 @@ trait CryptTrait
protected function decrypt($encryptedData) protected function decrypt($encryptedData)
{ {
try { try {
if($this->encryptionKey instanceof Key) { if ($this->encryptionKey instanceof Key) {
return Crypto::decrypt($encryptedData, $this->encryptionKey); return Crypto::decrypt($encryptedData, $this->encryptionKey);
} else { } else {
return Crypto::decryptWithPassword($encryptedData, $this->encryptionKey); return Crypto::decryptWithPassword($encryptedData, $this->encryptionKey);

4
tests/Utils/CryptTraitTest.php
View File

@ -24,8 +24,8 @@ class CryptTraitTest extends TestCase
return $this->encryptDecrypt($cryptStub); return $this->encryptDecrypt($cryptStub);
} }
protected function encryptDecrypt(CryptTraitStub $cryptStub) { protected function encryptDecrypt(CryptTraitStub $cryptStub)
{
$payload = 'alex loves whisky'; $payload = 'alex loves whisky';
$encrypted = $cryptStub->doEncrypt($payload); $encrypted = $cryptStub->doEncrypt($payload);
$plainText = $cryptStub->doDecrypt($encrypted); $plainText = $cryptStub->doDecrypt($encrypted);