Refactored isValidAccessToken()

Author: doekenorg

src/Guard.php

@@ -113,10 +113,13 @@ protected function hasValidProvider($tokenable)
      */
     protected function isValidAccessToken($accessToken): bool
     {
-        $is_valid = $accessToken && (
-                ($this->expiration && $accessToken->created_at->gt(now()->subMinutes($this->expiration)))
-                || $this->hasValidProvider($accessToken->tokenable)
-            );
+        if (!$accessToken) {
+            return false;
+        }
+
+        $is_valid =
+            (!$this->expiration || $accessToken->created_at->gt(now()->subMinutes($this->expiration)))
+            && $this->hasValidProvider($accessToken->tokenable);
 
         if (is_callable(Sanctum::$validateCallback)) {
             $is_valid = (bool) (Sanctum::$validateCallback)($accessToken, $is_valid);

src/Sanctum.php

@@ -28,7 +28,7 @@ class Sanctum
      *
      * @var callable|null
      */
-    public static $validateCallback = null;
+    public static $validateCallback;
 
     /**
      * Set the current user for the application with the given abilities.