Better handling of corrupted tokens

When restoring an existing token from persistence, the token may be in an unreadable format, or otherwise corrupt. This commit ensures the corrupt file is discarded and a new access token is obtained.
kamermans · Oct 23, 2017 · 16152ae · 16152ae
1 parent 55e469f
commit 16152ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Persistence/DoctrineCacheTokenPersistence.php b/src/Persistence/DoctrineCacheTokenPersistence.php
@@ -32,7 +32,7 @@ public function restoreToken(TokenInterface $token)
     {
         $data = $this->cache->fetch($this->cacheKey);
 
-        if (false === $data) {
+        if (!is_array($data)) {
             return null;
         }
 

diff --git a/src/Persistence/FileTokenPersistence.php b/src/Persistence/FileTokenPersistence.php
@@ -27,9 +27,9 @@ public function restoreToken(TokenInterface $token)
             return null;
         }
 
-        $data = @json_decode(file_get_contents($this->filepath), true);
+        $data = @json_decode(@file_get_contents($this->filepath), true);
 
-        if (false === $data) {
+        if (!is_array($data)) {
             return null;
         }