🚿

Author: codemasher

composer.json

@@ -29,7 +29,7 @@
 		"ext-json":"*",
 		"ext-simplexml":"*",
 		"ext-zlib": "*",
-		"chillerlan/php-http-message-utils": "^1.0",
+		"chillerlan/php-httpinterface": "dev-main#e1a872e63fc8ee066163f8259a19defff2eb0683",
 		"chillerlan/php-settings-container": "^2.1",
 		"psr/http-client":"^1.0",
 		"psr/http-message": "^1.0",
@@ -38,7 +38,6 @@
 	"require-dev": {
 		"chillerlan/php-dotenv": "^2.1",
 		"guzzlehttp/guzzle": "^7.3",
-		"guzzlehttp/psr7": "^2.0.0-beta1",
 		"phan/phan": "^4.0",
 		"phpunit/phpunit": "^9.5"
 	},

phpunit.xml.dist

@@ -25,10 +25,10 @@
 	</logging>
 	<php>
 		<const name="TEST_IS_CI" value="true"/>
-		<const name="TEST_CLIENT_FACTORY" value="chillerlan\OAuthTest\GuzzleClientFactory"/>
-		<const name="REQUEST_FACTORY" value="GuzzleHttp\Psr7\HttpFactory"/>
-		<const name="RESPONSE_FACTORY" value="GuzzleHttp\Psr7\HttpFactory"/>
-		<const name="STREAM_FACTORY" value="GuzzleHttp\Psr7\HttpFactory"/>
-		<const name="URI_FACTORY" value="GuzzleHttp\Psr7\HttpFactory"/>
+		<const name="TEST_CLIENT_FACTORY" value="chillerlan\OAuthTest\ChillerlanHttpClientFactory"/>
+		<const name="REQUEST_FACTORY" value="chillerlan\HTTP\Psr17\RequestFactory"/>
+		<const name="RESPONSE_FACTORY" value="chillerlan\HTTP\Psr17\ResponseFactory"/>
+		<const name="STREAM_FACTORY" value="chillerlan\HTTP\Psr17\StreamFactory"/>
+		<const name="URI_FACTORY" value="chillerlan\HTTP\Psr17\UriFactory"/>
 	</php>
 </phpunit>

src/Core/OAuthProvider.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\OAuth\Core;
 
-use GuzzleHttp\Psr7\HttpFactory;
+use chillerlan\HTTP\Psr17\{RequestFactory, StreamFactory, UriFactory};
 use chillerlan\HTTP\Utils\Query;
 use chillerlan\OAuth\MagicAPI\{ApiClientException, EndpointMap, EndpointMapInterface};
 use chillerlan\OAuth\Storage\OAuthStorageInterface;
@@ -164,10 +164,9 @@ public function __construct(
 
 		// i hate this, but i also hate adding 3 more params to the constructor
 		// no i won't use a DI container for this. don't @ me
-		$factory              = new HttpFactory;
-		$this->requestFactory = $factory;
-		$this->streamFactory  = $factory;
-		$this->uriFactory     = $factory;
+		$this->requestFactory = new RequestFactory;
+		$this->streamFactory  = new StreamFactory;
+		$this->uriFactory     = new UriFactory;
 
 		$this->serviceName = (new ReflectionClass($this))->getShortName();
 

tests/ChillerlanHttpClientFactory.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Class ChillerlanHttpClientFactory
+ *
+ * @created      01.04.2021
+ * @author       smiley <smiley@chillerlan.net>
+ * @copyright    2021 smiley
+ * @license      MIT
+ */
+
+namespace chillerlan\OAuthTest;
+
+use chillerlan\HTTP\HTTPOptions;
+use chillerlan\HTTP\Psr18\CurlClient;
+use Psr\Http\Client\ClientInterface;
+
+class ChillerlanHttpClientFactory implements OAuthTestHttpClientFactoryInterface{
+
+	/**
+	 * @inheritDoc
+	 */
+	public static function getClient(string $cfgdir):ClientInterface{
+		$options             = new HTTPOptions;
+		$options->ca_info    = $cfgdir.'/cacert.pem';
+		$options->user_agent = 'chillerlanPhpOAuth/4.0.0 +https://github.com/chillerlan/php-oauth-core';
+
+		return new CurlClient($options);
+	}
+
+}