Author: codemasher

composer.json

@@ -22,12 +22,13 @@
 	"require": {
 		"php": "^7.2",
 		"ext-json":"*",
-		"chillerlan/php-traits": "^2.0",
+		"chillerlan/php-dotenv": "^1.0",
+		"chillerlan/php-settings-container": "^1.0",
 		"chillerlan/php-httpinterface": "dev-master",
 		"psr/log": "^1.0"
 	},
 	"require-dev": {
-		"chillerlan/php-log": "^2.0",
+		"chillerlan/php-log": "^3.0",
 		"phpunit/phpunit": "^7.3"
 	},
 	"autoload": {

examples/oauth-example-common.php

@@ -7,10 +7,10 @@
  * @license      MIT
  */
 
-use chillerlan\HTTP\{CurlClient, HTTPClientAbstract, HTTPResponseInterface};
+use chillerlan\HTTP\CurlClient;
 use chillerlan\Logger\{Log, LogOptionsTrait, Output\ConsoleLog};
 use chillerlan\OAuth\{OAuthOptions, Storage\SessionStorage};
-use chillerlan\Traits\{DotEnv, ImmutableSettingsInterface};
+use chillerlan\DotEnv\DotEnv;
 
 ini_set('date.timezone', 'Europe/Amsterdam');
 
@@ -32,54 +32,21 @@
 
 	// log
 	'minLogLevel'      => 'debug',
-
-	// test http client
-	'sleep'            => 0.25,
 ];
 
-/** @var \chillerlan\Traits\ImmutableSettingsInterface $options */
+/** @var \chillerlan\Settings\SettingsContainerInterface $options */
 $options = new class($options_arr) extends OAuthOptions{
 	use LogOptionsTrait;
 
 	protected $sleep;
 };
 
 $logger = new Log;
-$logger->addInstance(new ConsoleLog($options), 'console');
+$logger->addInstance(new ConsoleLog, 'console');
 
 /** @var \chillerlan\HTTP\HTTPClientInterface $http */
-$http = new class($options) extends HTTPClientAbstract{
-
-	protected $client;
-
-	public function __construct(ImmutableSettingsInterface $options){
-		parent::__construct($options);
-		$this->client = new CurlClient($this->options);
-	}
-
-	protected function getResponse():HTTPResponseInterface{
-
-		$this->logger->debug('$args', [
-			'$url' => $this->requestURL,
-			'$params' => $this->requestParams,
-			'$method' => $this->requestMethod,
-			'$body' => $this->requestBody,
-			'$headers' => $this->requestHeaders,
-		]);
-
-		$response = $this->client->request($this->requestURL, $this->requestParams, $this->requestMethod, $this->requestBody, $this->requestHeaders);
-
-		$this->logger->debug($response->body, (array)$response->headers);
-
-		usleep($this->options->sleep * 1000000);
-
-		return $response;
-	}
-
-};
-
-#$http->setLogger($logger);
+$http = new CurlClient($options);
 
 /** @var \chillerlan\OAuth\Storage\OAuthStorageInterface $storage */
-$storage = new SessionStorage($options);
+$storage = new SessionStorage;
 #$storage->setLogger($logger);

src/Core/OAuthProvider.php

@@ -273,7 +273,7 @@ public function request(string $path, array $params = null, string $method = nul
 		$request = $this->getRequestAuthorization($request, $token);
 
 		if(is_array($body) && $request->hasHeader('content-type')){
-			$contentType = strtolower($request->getHeader('content-type'));
+			$contentType = strtolower($request->getHeaderLine('content-type'));
 
 			if($contentType === 'application/x-www-form-urlencoded'){
 				$body = $this->streamFactory->createStream(http_build_query($body, '', '&', PHP_QUERY_RFC1738));

src/Storage/OAuthStorageAbstract.php

@@ -13,7 +13,7 @@
 namespace chillerlan\OAuth\Storage;
 
 use chillerlan\OAuth\{Core\AccessToken, OAuthOptions};
-use chillerlan\Traits\ImmutableSettingsInterface;
+use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger};
 
 abstract class OAuthStorageAbstract implements OAuthStorageInterface, LoggerAwareInterface{
@@ -27,10 +27,10 @@ abstract class OAuthStorageAbstract implements OAuthStorageInterface, LoggerAwar
 	/**
 	 * OAuthStorageAbstract constructor.
 	 *
-	 * @param \chillerlan\Traits\ImmutableSettingsInterface|null $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
 	 * @param \Psr\Log\LoggerInterface|null              $logger
 	 */
-	public function __construct(ImmutableSettingsInterface $options = null, LoggerInterface $logger = null){
+	public function __construct(SettingsContainerInterface $options = null, LoggerInterface $logger = null){
 		$this->options = $options ?? new OAuthOptions;
 		$this->logger  = $logger ?? new NullLogger;
 	}

src/Storage/SessionStorage.php

@@ -13,7 +13,7 @@
 namespace chillerlan\OAuth\Storage;
 
 use chillerlan\OAuth\Core\AccessToken;
-use chillerlan\Traits\ImmutableSettingsInterface;
+use chillerlan\Settings\SettingsContainerInterface;
 
 class SessionStorage extends OAuthStorageAbstract{
 
@@ -35,9 +35,9 @@ class SessionStorage extends OAuthStorageAbstract{
 	/**
 	 * Session constructor.
 	 *
-	 * @param \chillerlan\Traits\ImmutableSettingsInterface|null $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
 	 */
-	public function __construct(ImmutableSettingsInterface $options = null){
+	public function __construct(SettingsContainerInterface $options = null){
 		parent::__construct($options);
 
 		$this->sessionVar = $this->options->sessionTokenVar;

tests/OAuthTestAbstract.php

@@ -15,7 +15,7 @@
 use chillerlan\Logger\Log;
 use chillerlan\Logger\LogOptions;
 use chillerlan\Logger\Output\LogOutputAbstract;
-use chillerlan\Traits\DotEnv;
+use chillerlan\DotEnv\DotEnv;
 use PHPUnit\Framework\TestCase;
 
 abstract class OAuthTestAbstract extends TestCase{
@@ -43,7 +43,7 @@ abstract class OAuthTestAbstract extends TestCase{
 	protected $options;
 
 	/**
-	 * @var \chillerlan\Traits\DotEnv
+	 * @var \chillerlan\DotEnv\DotEnv
 	 */
 	protected $env;
 

tests/Storage/StorageTest.php

@@ -13,12 +13,10 @@
 namespace chillerlan\OAuthTest\Storage;
 
 use chillerlan\OAuth\Core\AccessToken;
-use chillerlan\OAuth\Storage\{MemoryStorage, OAuthStorageInterface, SessionStorage};
+use chillerlan\OAuth\Storage\{MemoryStorage, SessionStorage};
 use chillerlan\OAuthTest\OAuthTestAbstract;
-use chillerlan\Traits\ClassLoader;
 
 class StorageTest extends OAuthTestAbstract{
-	use ClassLoader;
 
 	protected const STORAGE_INTERFACES = [
 		'MemoryStorage'  => [MemoryStorage::class],
@@ -42,7 +40,7 @@ protected function setUp(){
 	}
 
 	protected function initStorage($storageInterface):void{
-		$this->storage = $this->loadClass($storageInterface, OAuthStorageInterface::class);
+		$this->storage = new $storageInterface;
 	}
 
 	/**