PSR-18

Author: codemasher

composer.json

@@ -4,7 +4,8 @@
 	"homepage": "https://github.com/chillerlan/php-oauth-core",
 	"license": "MIT",
 	"type": "library",
-	"minimum-stability": "stable",
+	"minimum-stability": "dev",
+	"prefer-stable": true,
 	"keywords": [
 		"oauth", "oauth1", "oauth2", "client", "core"
 	],

src/Core/OAuthProvider.php

@@ -16,7 +16,7 @@
 use chillerlan\HTTP\MagicAPI\{ApiClientException, ApiClientInterface, EndpointMapInterface};
 use chillerlan\OAuth\Storage\OAuthStorageInterface;
 use chillerlan\Settings\SettingsContainerInterface;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\{RequestFactoryInterface, StreamFactoryInterface, StreamInterface, UriFactoryInterface};
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, NullLogger};
@@ -33,7 +33,7 @@ abstract class OAuthProvider implements OAuthInterface, ApiClientInterface, Logg
 	use LoggerAwareTrait;
 
 	/**
-	 * @var \Http\Client\HttpClient
+	 * @var \Psr\Http\Client\ClientInterface
 	 */
 	protected $http;
 
@@ -115,13 +115,13 @@ abstract class OAuthProvider implements OAuthInterface, ApiClientInterface, Logg
 	/**
 	 * OAuthProvider constructor.
 	 *
-	 * @param \Http\Client\HttpClient                         $http
+	 * @param \Psr\Http\Client\ClientInterface                $http
 	 * @param \chillerlan\OAuth\Storage\OAuthStorageInterface $storage
 	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 *
 	 * @throws \chillerlan\HTTP\MagicAPI\ApiClientException
 	 */
-	public function __construct(HttpClient $http, OAuthStorageInterface $storage, SettingsContainerInterface $options){
+	public function __construct(ClientInterface $http, OAuthStorageInterface $storage, SettingsContainerInterface $options){
 		$this->http    = $http;
 		$this->storage = $storage;
 		$this->options = $options;

tests/API/APITestAbstract.php

@@ -17,7 +17,7 @@
 use chillerlan\Logger\{Log, LogOptionsTrait, Output\LogOutputAbstract};
 use chillerlan\OAuth\{OAuthOptions, Core\AccessToken, Core\OAuthInterface, Storage\MemoryStorage};
 use chillerlan\Settings\SettingsContainerInterface;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
 use Psr\Log\LoggerInterface;
@@ -125,11 +125,11 @@ protected function __log(string $level, string $message, array $context = null):
 	/**
 	 * @param $options
 	 *
-	 * @return \Http\Client\HttpClient
+	 * @return \Psr\Http\Client\ClientInterface
 	 */
-	protected function initHttp($options, $logger):HttpClient{
-		return new class($options, $logger) implements HttpClient{
-			/** @var \Http\Client\HttpClient */
+	protected function initHttp($options, $logger):ClientInterface{
+		return new class($options, $logger) implements ClientInterface{
+			/** @var \Psr\Http\Client\ClientInterface */
 			protected $client;
 			/** @var \chillerlan\Settings\SettingsContainerInterface  */
 			protected $options;

tests/Providers/ProviderTestAbstract.php

@@ -15,7 +15,7 @@
 use chillerlan\HTTP\{Psr17, Psr7\Response};
 use chillerlan\OAuth\Core\{AccessToken, OAuth1Interface, OAuth2Interface, OAuthInterface};
 use chillerlan\OAuth\{OAuthOptions, Storage\MemoryStorage};
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
 use ReflectionClass, ReflectionMethod, ReflectionProperty;
@@ -70,8 +70,8 @@ protected function setUp(){
 		$this->storage->storeAccessToken($this->provider->serviceName, new AccessToken(['accessToken' => 'foo']));
 	}
 
-	protected function initHttp():HttpClient{
-		return new class($this->reflection, $this->responses) implements HttpClient{
+	protected function initHttp():ClientInterface{
+		return new class($this->reflection, $this->responses) implements ClientInterface{
 
 			/** @var \ReflectionClass */
 			protected $reflection;