🛀

Author: codemasher

composer.json

@@ -21,16 +21,16 @@
 	},
 	"require": {
 		"php": "^7.2",
-		"chillerlan/php-traits": "^1.1.10",
+		"chillerlan/php-traits": "^1.1",
 		"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.2",
-		"chillerlan/php-log": "^1.0.5",
+		"chillerlan/php-database": "^2.0",
+		"chillerlan/php-log": "^1.0",
 		"phpunit/phpunit": "^7.1"
 	},
 	"autoload": {

examples/oauth-example-common.php

@@ -14,7 +14,7 @@
 	HTTPClientAbstract, HTTPResponseInterface, TinyCurlClient
 };
 use chillerlan\Logger\{
-	Log, LogOptionsTrait, Output\LogOutputAbstract
+	Log, LogOptionsTrait, Output\ConsoleLog, Output\LogOutputAbstract
 };
 use chillerlan\OAuth\{
 	OAuthOptions, Storage\SessionTokenStorage
@@ -64,21 +64,7 @@
 };
 
 $logger = new Log;
-
-$logger->addInstance(
-	new class ($options) extends LogOutputAbstract{
-
-		protected function __log(string $level, string $message, array $context = null):void{
-			echo $message.PHP_EOL;
-
-			if(!empty($context)){
-				echo print_r($context, true).PHP_EOL;
-			}
-		}
-
-	},
-	'console'
-);
+$logger->addInstance(new ConsoleLog($options), 'console');
 
 /** @var \chillerlan\HTTP\HTTPClientInterface $http */
 $http = new class($options) extends HTTPClientAbstract{

tests/API/APITestAbstract.php

@@ -16,7 +16,7 @@
 	HTTPClientAbstract, HTTPClientInterface, HTTPOptionsTrait, HTTPResponseInterface, TinyCurlClient
 };
 use chillerlan\Logger\{
-	Log, LogOptionsTrait, Output\LogOutputAbstract
+	Log, LogOptionsTrait, Output\ConsoleLog, Output\LogOutputAbstract
 };
 use chillerlan\OAuth\{
 	OAuthOptions, Providers\OAuthInterface, Storage\MemoryTokenStorage, Storage\TokenStorageInterface, Token
@@ -99,8 +99,10 @@ protected function setUp(){
 			protected $sleep;
 		};
 
+		$this->logger = new Log;
+		$this->logger->addInstance(new ConsoleLog($options), 'console');
+
 		$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, $this->logger);
 
@@ -135,24 +137,6 @@ protected  function getOptions(string $cfgdir):array {
 		];
 	}
 
-	/**
-	 * @param \chillerlan\Traits\ContainerInterface $options
-	 *
-	 * @return \Psr\Log\LoggerInterface
-	 */
-	protected function initLogger(ContainerInterface $options):LoggerInterface{
-		return (new Log)->addInstance(
-			new class ($options) extends LogOutputAbstract{
-
-				protected function __log(string $level, string $message, array $context = null):void{
-					echo $message.PHP_EOL.print_r($context, true).PHP_EOL;
-				}
-
-			},
-			'console'
-		);
-	}
-
 	/**
 	 * @param \chillerlan\HTTP\HTTPClientInterface            $http
 	 * @param \chillerlan\OAuth\Storage\TokenStorageInterface $storage

tests/StorageTest.php

@@ -25,7 +25,6 @@
 	ClassLoader, DotEnv
 };
 use PHPUnit\Framework\TestCase;
-use Psr\Log\NullLogger;
 
 class StorageTest extends TestCase{
 	use ClassLoader;