🚿

Author: codemasher

composer.json

@@ -21,16 +21,16 @@
 	},
 	"require": {
 		"php": "^7.2",
-		"chillerlan/php-traits": "^1.1",
-		"chillerlan/php-httpinterface": "^1.0",
+		"chillerlan/php-traits": "^1.1.10",
+		"chillerlan/php-httpinterface": "dev-master",
 		"chillerlan/php-magic-apiclient": "dev-master",
 		"psr/log": "^1.0",
 		"psr/simple-cache": "^1.0"
 	},
 	"require-dev": {
 		"chillerlan/php-curl": "^1.0",
-		"chillerlan/php-database": "^2.0",
-		"chillerlan/php-log": "^1.0",
+		"chillerlan/php-database": "^2.0.2",
+		"chillerlan/php-log": "^1.0.5",
 		"phpunit/phpunit": "^7.1"
 	},
 	"autoload": {

examples/oauth-example-common.php

@@ -14,7 +14,7 @@
 	HTTPClientAbstract, HTTPResponseInterface, TinyCurlClient
 };
 use chillerlan\Logger\{
-	Log, LogOptions, LogOptionsTrait, LogTrait, Output\LogOutputAbstract, Output\NullLogger
+	Log, LogOptionsTrait, Output\LogOutputAbstract
 };
 use chillerlan\OAuth\{
 	OAuthOptions, Storage\SessionTokenStorage
@@ -63,11 +63,9 @@
 	use DatabaseOptionsTrait, LogOptionsTrait;
 };
 
-/** @var \Psr\Log\LoggerInterface $logger */
-$nullLogger = (new Log)->addInstance(new NullLogger($options), 'nullLog');
+$logger = new Log;
 
-/** @var \Psr\Log\LoggerInterface $logger */
-$logger = (new Log)->addInstance(
+$logger->addInstance(
 	new class ($options) extends LogOutputAbstract{
 
 		protected function __log(string $level, string $message, array $context = null):void{
@@ -84,7 +82,6 @@ protected function __log(string $level, string $message, array $context = null):
 
 /** @var \chillerlan\HTTP\HTTPClientInterface $http */
 $http = new class($options) extends HTTPClientAbstract{
-	use LogTrait;
 
 	protected $client;
 
@@ -95,23 +92,23 @@ public function __construct(ContainerInterface $options){
 
 	public function request(string $url, array $params = null, string $method = null, $body = null, array $headers = null):HTTPResponseInterface{
 		$args = func_get_args();
-		$this->debug('$args', $args);
+		$this->logger->debug('$args', $args);
 
 		$response = $this->client->request(...$args);
-		$this->debug(print_r($response, true));
+		$this->logger->debug(print_r($response, true));
 
 		usleep(100000); // flood protection
 		return $response;
 	}
 
 };
 
-$http->setLogger($nullLogger);
+#$http->setLogger($logger);
 
 /** @var \chillerlan\Database\Database $db */
 $db = new Database($options);
-$db->setLogger($nullLogger);
+#$db->setLogger($logger);
 
 /** @var \chillerlan\OAuth\Storage\TokenStorageInterface $storage */
 $storage = new SessionTokenStorage($options); //new DBTokenStorage($options, $db);
-$storage->setLogger($nullLogger);
+#$storage->setLogger($logger);

src/Providers/OAuthInterface.php

@@ -18,6 +18,13 @@
 /**
  * @property string $serviceName
  * @property string $userRevokeURL
+ *
+ * from \Psr\Log\LoggerAwareTrait
+ * @property \Psr\Log\LoggerInterface $logger
+ * @method setLogger(\Psr\Log\LoggerInterface $logger)
+ *
+ * from \chillerlan\Traits\Classloader
+ * @method mixed loadClass(string $class, string $type = null, ...$params)
  */
 interface OAuthInterface{
 

src/Storage/TokenStorageInterface.php

@@ -14,6 +14,11 @@
 
 use chillerlan\OAuth\Token;
 
+/**
+ * from \Psr\Log\LoggerAwareTrait
+ * @property \Psr\Log\LoggerInterface $logger
+ * @method setLogger(\Psr\Log\LoggerInterface $logger)
+ */
 interface TokenStorageInterface{
 
 	/**