🚿

Author: codemasher

src/Core/AccessToken.php

@@ -119,15 +119,15 @@ public function setExpiry(int $expires = null):AccessToken{
 			$expires =  intval($expires);
 		}
 
-		$this->expires = $this::EOL_UNKNOWN;
+		$this->expires = self::EOL_UNKNOWN;
 
-		if($expires === 0 || $expires === $this::EOL_NEVER_EXPIRES){
-			$this->expires = $this::EOL_NEVER_EXPIRES;
+		if($expires === 0 || $expires === self::EOL_NEVER_EXPIRES){
+			$this->expires = self::EOL_NEVER_EXPIRES;
 		}
 		elseif($expires > $now){
 			$this->expires = $expires;
 		}
-		elseif($expires > 0 && $expires < $this::EXPIRY_MAX){
+		elseif($expires > 0 && $expires < self::EXPIRY_MAX){
 			$this->expires = $now + $expires;
 		}
 
@@ -138,7 +138,7 @@ public function setExpiry(int $expires = null):AccessToken{
 	 * @return bool
 	 */
 	public function isExpired():bool{
-		return $this->expires !== $this::EOL_NEVER_EXPIRES && $this->expires !== $this::EOL_UNKNOWN && time() > $this->expires;
+		return $this->expires !== self::EOL_NEVER_EXPIRES && $this->expires !== self::EOL_UNKNOWN && time() > $this->expires;
 	}
 
 }

src/Core/OAuth2Provider.php

@@ -163,10 +163,10 @@ public function getAccessToken(string $code, string $state = null):AccessToken{
 	public function getRequestAuthorization(RequestInterface $request, AccessToken $token):RequestInterface{
 
 		if(array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_HEADER)){
-			$request = $request->withHeader('Authorization', $this::AUTH_METHODS_HEADER[$this->authMethod].$token->accessToken);
+			$request = $request->withHeader('Authorization', OAuth2Interface::AUTH_METHODS_HEADER[$this->authMethod].$token->accessToken);
 		}
 		elseif(array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_QUERY)){
-			$uri = Psr7\merge_query((string)$request->getUri(), [$this::AUTH_METHODS_QUERY[$this->authMethod] => $token->accessToken]);
+			$uri = Psr7\merge_query((string)$request->getUri(), [OAuth2Interface::AUTH_METHODS_QUERY[$this->authMethod] => $token->accessToken]);
 
 			$request = $request->withUri($this->uriFactory->createUri($uri));
 		}

src/Core/OAuthProvider.php

@@ -19,7 +19,7 @@
 use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\{RequestFactoryInterface, ResponseInterface, StreamFactoryInterface, StreamInterface, UriFactoryInterface};
-use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, NullLogger};
+use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger};
 use ReflectionClass;
 
 /**
@@ -118,15 +118,16 @@ abstract class OAuthProvider implements OAuthInterface, ApiClientInterface, Logg
 	 * @param \Psr\Http\Client\ClientInterface                $http
 	 * @param \chillerlan\OAuth\Storage\OAuthStorageInterface $storage
 	 * @param \chillerlan\Settings\SettingsContainerInterface $options
+	 * @param \Psr\Log\LoggerInterface|null                   $logger
 	 *
 	 * @throws \chillerlan\HTTP\MagicAPI\ApiClientException
 	 */
-	public function __construct(ClientInterface $http, OAuthStorageInterface $storage, SettingsContainerInterface $options){
+	public function __construct(ClientInterface $http, OAuthStorageInterface $storage, SettingsContainerInterface $options, LoggerInterface $logger = null){
 		$this->http    = $http;
 		$this->storage = $storage;
 		$this->options = $options;
+		$this->logger  = $logger ?? new NullLogger;
 
-		$this->logger         = new NullLogger;
 		$this->requestFactory = new RequestFactory;
 		$this->streamFactory  = new StreamFactory;
 		$this->uriFactory     = new UriFactory;

src/Storage/OAuthStorageAbstract.php

@@ -47,7 +47,7 @@ public function toStorage(AccessToken $token):string {
 	/**
 	 * @param string $data
 	 *
-	 * @return \chillerlan\OAuth\Core\AccessToken
+	 * @return \chillerlan\OAuth\Core\AccessToken|\chillerlan\Settings\SettingsContainerInterface
 	 */
 	public function fromStorage(string $data):AccessToken{
 		return (new AccessToken)->fromJSON($data);

src/Storage/OAuthStorageInterface.php

@@ -16,8 +16,6 @@
 
 interface OAuthStorageInterface{
 
-	const TOKEN_NONCE = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
-
 	/**
 	 * @param string                             $service
 	 * @param \chillerlan\OAuth\Core\AccessToken $token

src/Storage/SessionStorage.php

@@ -41,7 +41,7 @@ public function __construct(SettingsContainerInterface $options = null){
 		parent::__construct($options);
 
 		$this->sessionVar = $this->options->sessionTokenVar;
-		$this->stateVar = $this->options->sessionStateVar;
+		$this->stateVar   = $this->options->sessionStateVar;
 
 		// Determine if the session has started.
 		// @link http://stackoverflow.com/a/18542272/1470961
@@ -92,7 +92,7 @@ public function storeAccessToken(string $service, AccessToken $token):OAuthStora
 	/**
 	 * @param string $service
 	 *
-	 * @return \chillerlan\OAuth\Core\AccessToken
+	 * @return \chillerlan\OAuth\Core\AccessToken|\chillerlan\Settings\SettingsContainerInterface
 	 * @throws \chillerlan\OAuth\Storage\OAuthStorageException
 	 */
 	public function getAccessToken(string $service):AccessToken{

tests/API/APITestAbstract.php

@@ -93,8 +93,7 @@ protected function setUp(){
 		$this->logger   = $this->initLog($options);
 		$http           = $this->initHttp($options, $this->logger);
 		$this->storage  = new MemoryStorage;
-		$this->provider = new $this->FQN($http, $this->storage, $options);
-		$this->provider->setLogger($this->logger);
+		$this->provider = new $this->FQN($http, $this->storage, $options, $this->logger);
 
 		$tokenfile = $this->CFG.'/'.$this->provider->serviceName.'.token.json';
 		$token = is_file($tokenfile)