From 8ac32f57831190c46d11dd5d018a6a66a2b28b19 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 1 Mar 2017 17:37:21 +0000
Subject: [PATCH] Add strict return types to TokenService

---
 app/Services/TokenService.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/Services/TokenService.php b/app/Services/TokenService.php
index d650d12f..a2277acc 100644
--- a/app/Services/TokenService.php
+++ b/app/Services/TokenService.php
@@ -1,8 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Services;
 
 use RuntimeException;
+use Lcobucci\JWT\Token;
 use Lcobucci\JWT\Parser;
 use Lcobucci\JWT\Builder;
 use InvalidArgumentException;
@@ -27,7 +30,7 @@ class TokenService
             ->sign($signer, config('app.key'))
             ->getToken();
 
-        return $token;
+        return (string) $token;
     }
 
     /**
@@ -36,17 +39,19 @@ class TokenService
      * @param  string The token
      * @return mixed
      */
-    public function validateToken($token)
+    public function validateToken(string $token): ?Token
     {
         $signer = new Sha256();
         try {
             $token = (new Parser())->parse((string) $token);
         } catch (InvalidArgumentException | RuntimeException $e) {
-            return;
+            return null;
         }
         if ($token->verify($signer, config('app.key'))) {
             //signuture valid
             return $token;
         }
+
+        return null;
     }
 }