Fix StyleCI issues and remove phpdoc order from StyleCI

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

View File

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

View File

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

View File

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