From a56acc8dd09bc91c66a6ea2b0610128ec764863c Mon Sep 17 00:00:00 2001
From: Andrew Millington <andrew@noexceptions.io>
Date: Wed, 28 Feb 2018 20:33:19 +0000
Subject: [PATCH] Minor code tidy up

---
 src/AuthorizationServer.php                 |  5 +++--
 src/CryptTrait.php                          |  8 +++----
 src/Grant/GrantTypeInterface.php            |  3 ++-
 src/ResponseTypes/ResponseTypeInterface.php |  3 ++-
 tests/Utils/CryptTraitTest.php              | 23 +++++++++++++--------
 5 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/AuthorizationServer.php b/src/AuthorizationServer.php
index 51cf6905..f1e96146 100644
--- a/src/AuthorizationServer.php
+++ b/src/AuthorizationServer.php
@@ -9,6 +9,7 @@
 
 namespace League\OAuth2\Server;
 
+use Defuse\Crypto\Key;
 use League\Event\EmitterAwareInterface;
 use League\Event\EmitterAwareTrait;
 use League\OAuth2\Server\Exception\OAuthServerException;
@@ -68,7 +69,7 @@ class AuthorizationServer implements EmitterAwareInterface
     private $scopeRepository;
 
     /**
-     * @var string|\Defuse\Crypto\Key
+     * @var string|Key
      */
     private $encryptionKey;
 
@@ -84,7 +85,7 @@ class AuthorizationServer implements EmitterAwareInterface
      * @param AccessTokenRepositoryInterface $accessTokenRepository
      * @param ScopeRepositoryInterface       $scopeRepository
      * @param CryptKey|string                $privateKey
-     * @param string|\Defuse\Crypto\Key      $encryptionKey
+     * @param string|Key                     $encryptionKey
      * @param null|ResponseTypeInterface     $responseType
      */
     public function __construct(
diff --git a/src/CryptTrait.php b/src/CryptTrait.php
index be6f5a03..c9a6d7a6 100644
--- a/src/CryptTrait.php
+++ b/src/CryptTrait.php
@@ -35,9 +35,9 @@ trait CryptTrait
         try {
             if ($this->encryptionKey instanceof Key) {
                 return Crypto::encrypt($unencryptedData, $this->encryptionKey);
-            } else {
-                return Crypto::encryptWithPassword($unencryptedData, $this->encryptionKey);
             }
+
+            return Crypto::encryptWithPassword($unencryptedData, $this->encryptionKey);
         } catch (\Exception $e) {
             throw new \LogicException($e->getMessage());
         }
@@ -57,9 +57,9 @@ trait CryptTrait
         try {
             if ($this->encryptionKey instanceof Key) {
                 return Crypto::decrypt($encryptedData, $this->encryptionKey);
-            } else {
-                return Crypto::decryptWithPassword($encryptedData, $this->encryptionKey);
             }
+
+            return Crypto::decryptWithPassword($encryptedData, $this->encryptionKey);
         } catch (\Exception $e) {
             throw new \LogicException($e->getMessage());
         }
diff --git a/src/Grant/GrantTypeInterface.php b/src/Grant/GrantTypeInterface.php
index 56f1ee99..2aee367f 100644
--- a/src/Grant/GrantTypeInterface.php
+++ b/src/Grant/GrantTypeInterface.php
@@ -11,6 +11,7 @@
 
 namespace League\OAuth2\Server\Grant;
 
+use Defuse\Crypto\Key;
 use League\Event\EmitterAwareInterface;
 use League\OAuth2\Server\CryptKey;
 use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
@@ -136,7 +137,7 @@ interface GrantTypeInterface extends EmitterAwareInterface
     /**
      * Set the encryption key
      *
-     * @param string|\Defuse\Crypto\Key|null $key
+     * @param string|Key|null $key
      */
     public function setEncryptionKey($key = null);
 }
diff --git a/src/ResponseTypes/ResponseTypeInterface.php b/src/ResponseTypes/ResponseTypeInterface.php
index f76eaa6f..5eddd607 100644
--- a/src/ResponseTypes/ResponseTypeInterface.php
+++ b/src/ResponseTypes/ResponseTypeInterface.php
@@ -11,6 +11,7 @@
 
 namespace League\OAuth2\Server\ResponseTypes;
 
+use Defuse\Crypto\Key;
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -37,7 +38,7 @@ interface ResponseTypeInterface
     /**
      * Set the encryption key
      *
-     * @param string|\Defuse\Crypto\Key|null $key
+     * @param string|Key|null $key
      */
     public function setEncryptionKey($key = null);
 }
diff --git a/tests/Utils/CryptTraitTest.php b/tests/Utils/CryptTraitTest.php
index 6b0d592b..c517cec2 100644
--- a/tests/Utils/CryptTraitTest.php
+++ b/tests/Utils/CryptTraitTest.php
@@ -8,27 +8,32 @@ use PHPUnit\Framework\TestCase;
 
 class CryptTraitTest extends TestCase
 {
+    protected $cryptStub;
+
+    protected function setUp()
+    {
+        $this->cryptStub = new CryptTraitStub();
+    }
+
     public function testEncryptDecryptWithPassword()
     {
-        $cryptStub = new CryptTraitStub();
-        $cryptStub->setEncryptionKey(base64_encode(random_bytes(36)));
+        $this->cryptStub->setEncryptionKey(base64_encode(random_bytes(36)));
 
-        return $this->encryptDecrypt($cryptStub);
+        $this->encryptDecrypt();
     }
 
     public function testEncryptDecryptWithKey()
     {
-        $cryptStub = new CryptTraitStub();
-        $cryptStub->setEncryptionKey(Key::createNewRandomKey());
+        $this->cryptStub->setEncryptionKey(Key::createNewRandomKey());
 
-        return $this->encryptDecrypt($cryptStub);
+        $this->encryptDecrypt();
     }
 
-    protected function encryptDecrypt(CryptTraitStub $cryptStub) 
+    private function encryptDecrypt()
     {
         $payload = 'alex loves whisky';
-        $encrypted = $cryptStub->doEncrypt($payload);
-        $plainText = $cryptStub->doDecrypt($encrypted);
+        $encrypted = $this->cryptStub->doEncrypt($payload);
+        $plainText = $this->cryptStub->doDecrypt($encrypted);
 
         $this->assertNotEquals($payload, $encrypted);
         $this->assertEquals($payload, $plainText);