🛀 logger fix

Author: codemasher

src/Providers/OAuth2Provider.php

@@ -19,6 +19,7 @@
 	Token, Storage\TokenStorageInterface
 };
 use chillerlan\Traits\ContainerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * from CSRFTokenTrait:
@@ -35,7 +36,7 @@ abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface{
 	/**
 	 * @var array
 	 */
-	protected $scopes;
+	protected $scopes = [];
 
 	/**
 	 * @var string
@@ -58,12 +59,16 @@ abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface{
 	 * @param \chillerlan\HTTP\HTTPClientInterface            $http
 	 * @param \chillerlan\OAuth\Storage\TokenStorageInterface $storage
 	 * @param \chillerlan\Traits\ContainerInterface           $options
+	 * @param \Psr\Log\LoggerInterface|null                   $logger
 	 * @param array                                           $scopes
 	 */
-	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, array $scopes = null){
-		parent::__construct($http, $storage, $options);
+	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, LoggerInterface $logger = null, array $scopes = null){
+		parent::__construct($http, $storage, $options, $logger);
+
+		if($scopes !== null){
+			$this->scopes = $scopes;
+		}
 
-		$this->scopes = $scopes ?? [];
 	}
 
 	/**

src/Providers/OAuthProvider.php

@@ -15,21 +15,22 @@
 use chillerlan\HTTP\{
 	HTTPClientInterface, HTTPClientTrait
 };
-use chillerlan\Logger\LogTrait;
 use chillerlan\MagicAPI\ApiClientInterface;
 use chillerlan\OAuth\Storage\TokenStorageInterface;
 use chillerlan\Traits\{
 	ClassLoader, ContainerInterface, Magic
 };
-use Psr\Log\LoggerAwareInterface;
+use Psr\Log\{
+	LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger
+};
 use ReflectionClass;
 
 /**
  * @property string $serviceName
  * @property string $userRevokeURL
  */
 abstract class OAuthProvider implements OAuthInterface, LoggerAwareInterface{
-	use ClassLoader, Magic, HTTPClientTrait, LogTrait;
+	use ClassLoader, Magic, HTTPClientTrait, LoggerAwareTrait;
 
 	/**
 	 * @var \chillerlan\OAuth\Storage\TokenStorageInterface
@@ -87,12 +88,15 @@ abstract class OAuthProvider implements OAuthInterface, LoggerAwareInterface{
 	 * @param \chillerlan\HTTP\HTTPClientInterface            $http
 	 * @param \chillerlan\OAuth\Storage\TokenStorageInterface $storage
 	 * @param \chillerlan\Traits\ContainerInterface           $options
+	 * @param \Psr\Log\LoggerInterface|null                   $logger
 	 */
-	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options){
+	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, LoggerInterface $logger = null){
 		$this->setHTTPClient($http);
 
 		$this->storage     = $storage;
 		$this->options     = $options;
+		$this->logger      = $logger ?? new NullLogger;
+
 		$this->serviceName = (new ReflectionClass($this))->getShortName();
 
 		if($this instanceof ApiClientInterface){

src/Storage/TokenStorageAbstract.php

@@ -12,13 +12,14 @@
 
 namespace chillerlan\OAuth\Storage;
 
-use chillerlan\Logger\LogTrait;
 use chillerlan\OAuth\{OAuthOptions, Token};
 use chillerlan\Traits\ContainerInterface;
-use Psr\Log\LoggerAwareInterface;
+use Psr\Log\{
+	LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger
+};
 
 abstract class TokenStorageAbstract implements TokenStorageInterface, LoggerAwareInterface{
-	use LogTrait;
+	use LoggerAwareTrait;
 
 	protected 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";
 
@@ -31,9 +32,11 @@ abstract class TokenStorageAbstract implements TokenStorageInterface, LoggerAwar
 	 * TokenStorageAbstract constructor.
 	 *
 	 * @param \chillerlan\Traits\ContainerInterface|null $options
+	 * @param \Psr\Log\LoggerInterface|null              $logger
 	 */
-	public function __construct(ContainerInterface $options = null){
+	public function __construct(ContainerInterface $options = null, LoggerInterface $logger = null){
 		$this->options = $options ?? new OAuthOptions;
+		$this->logger  = $logger ?? new NullLogger;
 	}
 
 	/**

tests/API/APITestAbstract.php

@@ -16,7 +16,7 @@
 	HTTPClientAbstract, HTTPClientInterface, HTTPOptionsTrait, HTTPResponseInterface, TinyCurlClient
 };
 use chillerlan\Logger\{
-	Log, LogOptions, LogOptionsTrait, Output\LogOutputAbstract
+	Log, LogOptionsTrait, Output\LogOutputAbstract
 };
 use chillerlan\OAuth\{
 	OAuthOptions, Providers\OAuthInterface, Storage\MemoryTokenStorage, Storage\TokenStorageInterface, Token
@@ -102,10 +102,7 @@ protected function setUp(){
 		$this->storage  = new MemoryTokenStorage;
 		$this->logger   = $this->initLogger($this->options);
 		$this->http     = $this->initHttp($this->options);
-		$this->provider = $this->initProvider($this->http, $this->storage, $this->options);
-
-		/** @noinspection PhpUndefinedMethodInspection */
-		$this->provider->setLogger($this->logger);
+		$this->provider = $this->initProvider($this->http, $this->storage, $this->options, $this->logger);
 
 		$tokenfile = $this->CFGDIR.'/'.$this->provider->serviceName.'.'.$this->TOKEN_EXT;
 
@@ -160,11 +157,12 @@ protected function __log(string $level, string $message, array $context = null):
 	 * @param \chillerlan\HTTP\HTTPClientInterface            $http
 	 * @param \chillerlan\OAuth\Storage\TokenStorageInterface $storage
 	 * @param \chillerlan\Traits\ContainerInterface           $options
+	 * @param \Psr\Log\LoggerInterface                        $logger
 	 *
 	 * @return \chillerlan\OAuth\Providers\OAuthInterface
 	 */
-	protected function initProvider(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options){
-		return new $this->FQCN($http, $storage, $options);
+	protected function initProvider(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, LoggerInterface $logger){
+		return new $this->FQCN($http, $storage, $options, $logger);
 	}
 
 	/**

tests/API/OAuth2APITestAbstract.php

@@ -17,6 +17,7 @@
 	Providers\ClientCredentials, Providers\OAuth2Interface, Storage\TokenStorageInterface, Token
 };
 use chillerlan\Traits\ContainerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  */
@@ -30,8 +31,8 @@ abstract class OAuth2APITestAbstract extends APITestAbstract{
 	/**
 	 * @inheritdoc
 	 */
-	protected function initProvider(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options){
-		return new $this->FQCN($http, $storage, $options, $this->scopes);
+	protected function initProvider(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, LoggerInterface $logger){
+		return new $this->FQCN($http, $storage, $options, $logger, $this->scopes);
 	}
 
 	public function testOAuth2Instance(){

tests/StorageTest.php

@@ -90,7 +90,7 @@ protected function initStorage($storageInterface):void{
 		$db = null;
 
 		if($storageInterface === DBTokenStorage::class){
-			$db = new Database($this->options, null, new NullLogger);
+			$db = new Database($this->options);
 
 			$db->connect();
 			$db->drop->table($this::TABLE_TOKEN)->query();