From c9b07f386cf1c9454bc024906952e76f9398b2c9 Mon Sep 17 00:00:00 2001 From: Andrew Millington Date: Wed, 28 Feb 2018 20:01:01 +0000 Subject: [PATCH] Fix StyleCI issues and remove phpdoc order from StyleCI --- .styleci.yml | 1 - src/CryptTrait.php | 4 ++-- tests/Utils/CryptTraitTest.php | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.styleci.yml b/.styleci.yml index 6caf80c5..d3498157 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -29,7 +29,6 @@ enabled: - phpdoc_inline_tag - phpdoc_no_access - phpdoc_no_simplified_null_return - - phpdoc_order - phpdoc_property - phpdoc_scalar - phpdoc_separation diff --git a/src/CryptTrait.php b/src/CryptTrait.php index c8713ff3..be6f5a03 100644 --- a/src/CryptTrait.php +++ b/src/CryptTrait.php @@ -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); diff --git a/tests/Utils/CryptTraitTest.php b/tests/Utils/CryptTraitTest.php index e0954508..6b0d592b 100644 --- a/tests/Utils/CryptTraitTest.php +++ b/tests/Utils/CryptTraitTest.php @@ -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);