Implement some changes based on parent branch PR review

.gitignore

@@ -6,3 +6,4 @@ testing/
 nbproject/private/
 test/log
 build
+.phpunit.result.cache

src/Provider/AbstractProvider.php

@@ -37,7 +37,7 @@
  *
  * @link http://tools.ietf.org/html/rfc6749#section-1.1 Roles (RFC 6749, §1.1)
  */
-abstract class AbstractProvider
+abstract class AbstractProvider implements ClockAwareInterface
 {
     use ArrayAccessorTrait;
     use GuardedPropertyTrait;
@@ -265,11 +265,10 @@ public function getOptionProvider()
     /**
      * Sets the clock.
      *
-     * @param  Clock $clock
-     *
+     * @param ClockInterface $clock the clock
      * @return self
      */
-    public function setClock(Clock $clock)
+    public function setClock(ClockInterface $clock)
     {
         $this->clock = $clock;
 
@@ -284,7 +283,7 @@ public function setClock(Clock $clock)
      */
     public function getClock()
     {
-        return $this->clock;
+        return $this->clock ? $this->clock : new Clock();
     }
 
     /**

src/Provider/Clock.php

@@ -5,7 +5,7 @@
 /**
  * Represents an implementation of a Clock.
  */
-class Clock
+final class Clock implements ClockInterface
 {
 
   /**

src/Provider/ClockAwareInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace League\OAuth2\Client\Provider;
+
+interface ClockAwareInterface
+{
+    /**
+     * Get the clock.
+     *
+     * @return ClockInterface
+     */
+    public function getClock();
+}

src/Provider/ClockInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace League\OAuth2\Client\Provider;
+
+/**
+ * A common interface for accessing the clock.
+ *
+ * NOTE: We don't have a return type hint because this library still supports PHP 5.6.
+ * @see https://github.com/php-fig/fig-standards/blob/master/proposed/clock.md
+ */
+interface ClockInterface
+{
+    /**
+     * Return the current time as a DateTimeImmutable Object.
+     *
+     * @return \DateTimeImmutable
+     */
+    public function now(); /* \DateTimeImmutable */
+}

src/Token/AccessToken.php

@@ -16,14 +16,18 @@
 
 use InvalidArgumentException;
 use League\OAuth2\Client\Provider\Clock;
+use League\OAuth2\Client\Provider\ClockAwareInterface;
+use League\OAuth2\Client\Provider\ClockInterface;
 use RuntimeException;
 
+
+
 /**
  * Represents an access token.
  *
  * @link http://tools.ietf.org/html/rfc6749#section-1.4 Access Token (RFC 6749, §1.4)
  */
-class AccessToken implements AccessTokenInterface, ResourceOwnerAccessTokenInterface
+class AccessToken implements AccessTokenInterface, ResourceOwnerAccessTokenInterface, ClockAwareInterface
 {
     /**
      * @var string
@@ -50,61 +54,19 @@ class AccessToken implements AccessTokenInterface, ResourceOwnerAccessTokenInter
      */
     protected $values = [];
 
-    /**
-     * The current time, or NULL to get the true current time via PHP.
-     *
-     * @var int|null
-     */
-    private static $timeNow;
-
     /**
      * The clock.
      *
-     * @var Clock
+     * @var ClockInterface
      */
     protected $clock;
 
     /**
-     * Sets the current time.
-     *
-     * @param int $timeNow the time in seconds since epoch
-     * @return void
-     */
-    public static function setTimeNow($timeNow)
-    {
-        self::$timeNow = $timeNow;
-    }
-
-    /**
-     * Reset the current time so the true current time via PHP is used.
-     *
-     * @return void
+     * {@inheritDoc}
      */
-    public static function resetTimeNow()
+    public function getClock()
     {
-        self::$timeNow = null;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function setClock(Clock $clock)
-    {
-        $this->clock = $clock;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getTimeNow()
-    {
-        if (self::$timeNow) {
-            return self::$timeNow;
-        } elseif (isset($this->clock)) {
-            return $this->clock->now()->getTimestamp();
-        } else {
-            return time();
-        }
+        return $this->clock ? $this->clock : new Clock();
     }
 
     /**
@@ -134,6 +96,8 @@ public function __construct(array $options = [])
             $this->clock = $options['clock'];
         }
 
+        $ts = $this->getClock()->now()->getTimestamp();
+
         // We need to know when the token expires. Show preference to
         // 'expires_in' since it is defined in RFC6749 Section 5.1.
         // Defer to 'expires' if it is provided instead.
@@ -142,14 +106,14 @@ public function __construct(array $options = [])
                 throw new \InvalidArgumentException('expires_in value must be an integer');
             }
 
-            $this->expires = $options['expires_in'] != 0 ? $this->getTimeNow() + $options['expires_in'] : 0;
+            $this->expires = $options['expires_in'] != 0 ? $ts + $options['expires_in'] : 0;
         } elseif (!empty($options['expires'])) {
             // Some providers supply the seconds until expiration rather than
             // the exact timestamp. Take a best guess at which we received.
             $expires = $options['expires'];
 
             if (!$this->isExpirationTimestamp($expires)) {
-                $expires += $this->getTimeNow();
+                $expires += $ts;
             }
 
             $this->expires = $expires;
@@ -224,7 +188,7 @@ public function hasExpired()
             throw new RuntimeException('"expires" is not set on the token');
         }
 
-        return $expires < $this->getTimeNow();
+        return $expires < $this->getClock()->now()->getTimestamp();
     }
 
     /**

src/Token/AccessTokenInterface.php

@@ -15,7 +15,7 @@
 namespace League\OAuth2\Client\Token;
 
 use JsonSerializable;
-use League\OAuth2\Client\Provider\Clock;
+use League\OAuth2\Client\Provider\ClockInterface;
 use RuntimeException;
 
 interface AccessTokenInterface extends JsonSerializable
@@ -70,20 +70,4 @@ public function __toString();
      * @return array
      */
     public function jsonSerialize();
-
-    /**
-     * Sets the clock.
-     *
-     * @param Clock $clock a clock.
-     *
-     * @return void
-     */
-    public function setClock(Clock $clock);
-
-    /**
-     * Get the current time, whether real or simulated.
-     *
-     * @return int
-     */
-    public function getTimeNow();
 }

src/Tool/MacAuthorizationTrait.php

@@ -14,7 +14,7 @@
 
 namespace League\OAuth2\Client\Tool;
 
-use League\OAuth2\Client\Provider\Clock;
+use League\OAuth2\Client\Provider\ClockInterface;
 use League\OAuth2\Client\Token\AccessToken;
 use League\OAuth2\Client\Token\AccessTokenInterface;
 

test/src/Provider/AbstractProviderTest.php

@@ -571,7 +571,7 @@ public function testGetAccessToken($method)
         $newTime = new \DateTimeImmutable('2nd February 2013 1pm');
         $clock->setTime($newTime);
 
-        $this->assertEquals($newTime->getTimestamp(), $token->getTimeNow());
+        $this->assertEquals($newTime->getTimestamp(), $token->getClock()->now()->getTimestamp());
 
         $client
             ->shouldHaveReceived('send')

test/src/Provider/FrozenClock.php

@@ -3,11 +3,13 @@
 namespace League\OAuth2\Client\Test\Provider;
 
 use League\OAuth2\Client\Provider\Clock;
+use League\OAuth2\Client\Provider\ClockInterface;
+
 
 /**
  * A clock with a frozen time for testing.
  */
-class FrozenClock extends Clock
+class FrozenClock implements ClockInterface
 {
 
     /**

test/src/Provider/ProgrammableClock.php

@@ -2,12 +2,13 @@
 
 namespace League\OAuth2\Client\Test\Provider;
 
-use League\OAuth2\Client\Provider\Clock;
+use League\OAuth2\Client\Provider\ClockInterface;
+
 
 /**
  * A clock which must be initialised, and may be changed at any time.
  */
-class ProgrammableClock extends Clock
+class ProgrammableClock implements ClockInterface
 {
 
     /**
@@ -38,4 +39,14 @@ public function setTime($time)
 
         return $this;
     }
+
+    /**
+     * @param int $time seconds since epoch
+     * @return self
+     */
+    public static function newFromTimestamp($time)
+    {
+        return (new self())
+            ->setTime(new \DateTimeImmutable('@' . $time));
+    }
 }