🛀 moved http client

codemasher · codemasher · commit 4bbfbe07a8fc · 2024-03-10T09:03:25.000+01:00
diff --git a/examples/curl_multi.php b/examples/curl_multi.php
@@ -10,27 +10,26 @@
  * @license      MIT
  */
 
+use chillerlan\HTTP\{CurlClient , CurlMultiClient, HTTPOptions, MultiResponseHandlerInterface};
+use chillerlan\HTTP\Psr7\HTTPFactory;
 use chillerlan\HTTP\Utils\{MessageUtil, QueryUtil};
-use chillerlan\HTTP\Common\{CurlMultiClient, MultiResponseHandlerInterface};
-use chillerlan\HTTP\HTTPOptions;
-use chillerlan\HTTP\Psr18\CurlClient;
-use chillerlan\HTTP\Psr7\Request;
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
 
 require_once __DIR__.'/../vendor/autoload.php';
 
 // options for both clients
 $options = new HTTPOptions;
 $options->ca_info    = __DIR__.'/cacert.pem';
-$options->sleep      = (60 / 300 * 1000000); // GW2 API limit: 300 requests/minute
+$options->sleep      = 1; // GW2 API limit: 300 requests/minute
 #$options->user_agent = 'my fancy http client';
 
-$client = new CurlClient($options);
+$factory = new HTTPFactory;
+$client  = new CurlClient($factory, $options);
 
 $endpoint     = 'https://api.guildwars2.com/v2/items';
 $languages    = ['de', 'en', 'es'];//, 'fr', 'zh'
 // request the list of item ids
-$itemResponse = $client->sendRequest(new Request('GET', $endpoint));
+$itemResponse = $client->sendRequest($factory->createRequest('GET', $endpoint));
 
 if($itemResponse->getStatusCode() !== 200){
 	exit('/v2/items fetch error');
@@ -63,7 +62,7 @@ public function handleResponse(ResponseInterface $response, RequestInterface $re
 			try{
 				$json = MessageUtil::decodeJSON($response);
 			}
-			catch(Throwable $e){
+			catch(Throwable){
 				// maybe we didn't properly receive the data? let's try again
 				return $request;
 			}
@@ -73,7 +72,7 @@ public function handleResponse(ResponseInterface $response, RequestInterface $re
 				$file = $lang.'/'.$item->id;
 				file_put_contents(__DIR__.'/'.$file.'.json', json_encode($item, (JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)));
 
-#				echo $file.PHP_EOL;
+				echo $file.PHP_EOL;
 			}
 
 			// response ok, nothing to return
@@ -86,12 +85,12 @@ public function handleResponse(ResponseInterface $response, RequestInterface $re
 
 };
 
-$multiClient = new CurlMultiClient($handler, $options);
+$multiClient = new CurlMultiClient($handler, $factory, $options);
 
 // chunk the item response into arrays of 200 ids each (API limit) and create Request objects for each desired language
 foreach(array_chunk(MessageUtil::decodeJSON($itemResponse), 200) as $chunk){
 	foreach($languages as $lang){
-		$multiClient->addRequest(new Request('GET', $endpoint.'?'.QueryUtil::build(['lang' => $lang, 'ids' => implode(',', $chunk)])));
+		$multiClient->addRequest($factory->createRequest('GET', $endpoint.'?'.QueryUtil::build(['lang' => $lang, 'ids' => implode(',', $chunk)])));
 	}
 }
 
diff --git a/examples/spotify.php b/examples/spotify.php
@@ -8,10 +8,9 @@
  * @license      MIT
  */
 
-use chillerlan\HTTP\HTTPOptions;
-use chillerlan\HTTP\Psr18\CurlClient;
+use chillerlan\HTTP\{CurlClient, HTTPOptions};
+use chillerlan\HTTP\Psr7\HTTPFactory;
 use chillerlan\HTTP\Utils\MessageUtil;
-use chillerlan\HTTP\Psr7\{Request, Uri};
 
 require_once __DIR__.'/../vendor/autoload.php';
 
@@ -24,17 +23,18 @@
 $options->ca_info    = __DIR__.'/cacert.pem';
 $options->user_agent = 'Mozilla/5.0 (Windows NT 6.6.6; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0';
 
-$http = new CurlClient($options);
+$factory = new HTTPFactory;
+$http    = new CurlClient($factory, $options);
 
-$tokenRequest  = new Request('GET', new Uri('https://open.spotify.com/get_access_token'));
+$tokenRequest  = $factory->createRequest('GET', $factory->createUri('https://open.spotify.com/get_access_token'));
 $tokenResponse = $http->sendRequest($tokenRequest);
 
 if($tokenResponse->getStatusCode() !== 200){
 	throw new RuntimeException('could not obtain token');
 }
 
 $token    = MessageUtil::decodeJSON($tokenResponse);
-$queryUri = new Uri('https://api-partner.spotify.com/pathfinder/v1/query');
+$queryUri = $factory->createUri('https://api-partner.spotify.com/pathfinder/v1/query');
 $params   = [
 	'operationName' => 'queryArtistOverview',
 	'extensions'    => json_encode(['persistedQuery' => ['version' => 1, 'sha256Hash' => $sha256Hash]]),
@@ -43,7 +43,7 @@
 foreach($artists as $artistID){
 	$params['variables'] = json_encode(['uri' => sprintf('spotify:artist:%s', $artistID)]);
 
-	$request  = new Request('GET', $queryUri->withQuery(http_build_query($params)));
+	$request  = $factory->createRequest('GET', $queryUri->withQuery(http_build_query($params)));
 	$request  = $request->withHeader('Authorization', sprintf('Bearer %s', $token->accessToken));
 	/** @phan-suppress-next-line PhanTypeMismatchArgumentSuperType */
 	$response = $http->sendRequest($request);
diff --git a/src/ClientException.php b/src/ClientException.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Psr18;
+namespace chillerlan\HTTP;
 
 use Exception;
 use Psr\Http\Client\ClientExceptionInterface;
diff --git a/src/CurlClient.php b/src/CurlClient.php
@@ -10,9 +10,8 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Psr18;
+namespace chillerlan\HTTP;
 
-use chillerlan\HTTP\Common\CurlHandle;
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
 use function in_array, sprintf;
 use const CURLE_OK;
diff --git a/src/CurlHandle.php b/src/CurlHandle.php
@@ -10,10 +10,8 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Common;
+namespace chillerlan\HTTP;
 
-use chillerlan\HTTP\HTTPOptions;
-use chillerlan\HTTP\Psr18\ClientException;
 use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Http\Message\{RequestInterface, ResponseInterface, StreamInterface};
 use CurlHandle as CH;
@@ -278,7 +276,7 @@ protected function setHeaderOptions():void{
 	}
 
 	/**
-	 * @throws \chillerlan\HTTP\Psr18\ClientException
+	 * @throws \chillerlan\HTTP\ClientException
 	 */
 	public function setRequestOptions():void{
 		$method   = $this->request->getMethod();
diff --git a/src/CurlMultiClient.php b/src/CurlMultiClient.php
@@ -10,10 +10,8 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Common;
+namespace chillerlan\HTTP;
 
-use chillerlan\HTTP\Psr18\ClientException;
-use chillerlan\HTTP\HTTPOptions;
 use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Http\Message\{RequestInterface, ResponseFactoryInterface};
 use Psr\Log\{LoggerAwareInterface, LoggerInterface, NullLogger};
@@ -38,7 +36,7 @@ class CurlMultiClient implements LoggerAwareInterface{
 	/**
 	 * the stack of running handles
 	 *
-	 * @var \chillerlan\HTTP\Common\CurlMultiHandle[]
+	 * @var \chillerlan\HTTP\CurlMultiHandle[]
 	 */
 	protected array $handles = [];
 
@@ -47,8 +45,8 @@ class CurlMultiClient implements LoggerAwareInterface{
 	 */
 	public function __construct(
 		protected MultiResponseHandlerInterface          $multiResponseHandler,
+		protected ResponseFactoryInterface               $responseFactory,
 		protected HTTPOptions|SettingsContainerInterface $options = new HTTPOptions,
-		protected ResponseFactoryInterface               $responseFactory = new HTTPFactory,
 		protected LoggerInterface                        $logger = new NullLogger,
 	){
 		$this->curl_multi = curl_multi_init();
diff --git a/src/CurlMultiHandle.php b/src/CurlMultiHandle.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Common;
+namespace chillerlan\HTTP;
 
 use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
diff --git a/src/HTTPClientAbstract.php b/src/HTTPClientAbstract.php
@@ -10,10 +10,8 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Psr18;
+namespace chillerlan\HTTP;
 
-use chillerlan\HTTP\Common\HTTPFactory;
-use chillerlan\HTTP\HTTPOptions;
 use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
@@ -30,8 +28,8 @@ abstract class HTTPClientAbstract implements HTTPClientInterface{
 	 * HTTPClientAbstract constructor.
 	 */
 	public function __construct(
+		protected ResponseFactoryInterface               $responseFactory,
 		protected HTTPOptions|SettingsContainerInterface $options = new HTTPOptions,
-		protected ResponseFactoryInterface               $responseFactory = new HTTPFactory,
 		protected LoggerInterface                        $logger = new NullLogger,
 	){
 
diff --git a/src/HTTPClientInterface.php b/src/HTTPClientInterface.php
@@ -10,17 +10,16 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Psr18;
+namespace chillerlan\HTTP;
 
-use Fig\Http\Message\RequestMethodInterface;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\{ResponseFactoryInterface, StreamFactoryInterface};
 use Psr\Log\LoggerInterface;
 
 /**
  *
  */
-interface HTTPClientInterface extends ClientInterface, RequestMethodInterface{
+interface HTTPClientInterface extends ClientInterface{
 
 	/**
 	 * Sets a PSR-3 Logger
diff --git a/src/HTTPOptionsTrait.php b/src/HTTPOptionsTrait.php
@@ -14,7 +14,6 @@
 
 namespace chillerlan\HTTP;
 
-use chillerlan\HTTP\Psr18\ClientException;
 use function file_exists, ini_get, is_dir, is_file, is_link, readlink, trim;
 use const CURLOPT_CAINFO, CURLOPT_CAPATH;
 
diff --git a/src/LoggingClient.php b/src/LoggingClient.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Psr18;
+namespace chillerlan\HTTP;
 
 use chillerlan\HTTP\Utils\MessageUtil;
 use Psr\Http\Client\{ClientExceptionInterface, ClientInterface};
@@ -33,6 +33,7 @@ public function __construct(
 		protected ClientInterface $http,
 		protected LoggerInterface $logger = new NullLogger,
 	){
+
 	}
 
 	/**
@@ -60,7 +61,9 @@ public function sendRequest(RequestInterface $request):ResponseInterface{
 			$this->logger->error($e->getTraceAsString());
 
 			if(!$e instanceof ClientExceptionInterface){
-				throw new ClientException(sprintf('unexpected exception, does not implement "ClientExceptionInterface": %s', get_class($e)));
+				throw new ClientException(
+					sprintf('unexpected exception, does not implement "ClientExceptionInterface": %s', get_class($e)),
+				);
 			}
 
 			throw $e;
diff --git a/src/MultiResponseHandlerInterface.php b/src/MultiResponseHandlerInterface.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Common;
+namespace chillerlan\HTTP;
 
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
 
diff --git a/src/NetworkException.php b/src/NetworkException.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Psr18;
+namespace chillerlan\HTTP;
 
 use Psr\Http\Client\NetworkExceptionInterface;
 use Psr\Http\Message\RequestInterface;
diff --git a/src/RequestException.php b/src/RequestException.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Psr18;
+namespace chillerlan\HTTP;
 
 use Psr\Http\Client\RequestExceptionInterface;
 use Psr\Http\Message\RequestInterface;
diff --git a/src/StreamClient.php b/src/StreamClient.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Psr18;
+namespace chillerlan\HTTP;
 
 use chillerlan\HTTP\Utils\HeaderUtil;
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
diff --git a/src/URLExtractor.php b/src/URLExtractor.php
@@ -10,9 +10,8 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTP\Psr18;
+namespace chillerlan\HTTP;
 
-use chillerlan\HTTP\Common\HTTPFactory;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\{RequestFactoryInterface, RequestInterface, ResponseInterface, UriInterface};
 use function array_reverse, in_array;
@@ -35,7 +34,7 @@ class URLExtractor implements ClientInterface{
 	 */
 	public function __construct(
 		protected ClientInterface         $http,
-		protected RequestFactoryInterface $requestFactory = new HTTPFactory,
+		protected RequestFactoryInterface $requestFactory,
 	){
 
 	}
diff --git a/tests/CurlClientNoCATest.php b/tests/CurlClientNoCATest.php
@@ -10,9 +10,9 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTPTest\Psr18;
+namespace chillerlan\HTTPTest;
 
-use chillerlan\HTTP\Psr18\CurlClient;
+use chillerlan\HTTP\CurlClient;
 use PHPUnit\Framework\Attributes\Group;
 use Psr\Http\Client\ClientInterface;
 
@@ -26,7 +26,7 @@ protected function initClient():ClientInterface{
 		$this->options->ca_info        = null;
 		$this->options->ssl_verifypeer = false;
 
-		return new CurlClient($this->options);
+		return new CurlClient($this->responseFactory, $this->options);
 	}
 
 }
diff --git a/tests/CurlClientTest.php b/tests/CurlClientTest.php
@@ -10,11 +10,9 @@
 
 declare(strict_types=1);
 
-namespace chillerlan\HTTPTest\Psr18;
+namespace chillerlan\HTTPTest;
 
-use chillerlan\HTTP\Psr18\{CurlClient, RequestException};
-use chillerlan\HTTP\Psr7\Request;
-use Fig\Http\Message\RequestMethodInterface;
+use chillerlan\HTTP\CurlClient;
 use PHPUnit\Framework\Attributes\Group;
 use Psr\Http\Client\ClientInterface;
 
@@ -25,13 +23,13 @@
 class CurlClientTest extends HTTPClientTestAbstract{
 
 	protected function initClient():ClientInterface{
-		return new CurlClient($this->options);
+		return new CurlClient($this->responseFactory, $this->options);
 	}
 
 	public function testRequestError():void{
-		$this->expectException(RequestException::class);
+		$this->expectException(\chillerlan\HTTP\RequestException::class);
 
-		$this->http->sendRequest(new Request(RequestMethodInterface::METHOD_GET, ''));
+		$this->http->sendRequest($this->requestFactory->createRequest('GET', ''));
 	}
 
 }
diff --git a/tests/CurlHandleTest.php b/tests/CurlHandleTest.php
diff --git a/tests/CurlMultiClientTest.php b/tests/CurlMultiClientTest.php
diff --git a/tests/FactoryTrait.php b/tests/FactoryTrait.php
diff --git a/tests/HTTPClientTestAbstract.php b/tests/HTTPClientTestAbstract.php
diff --git a/tests/HTTPOptionsTest.php b/tests/HTTPOptionsTest.php
diff --git a/tests/LoggingClientTest.php b/tests/LoggingClientTest.php
diff --git a/tests/StreamClientNoCATest.php b/tests/StreamClientNoCATest.php
diff --git a/tests/StreamClientTest.php b/tests/StreamClientTest.php
diff --git a/tests/URLExtractorTest.php b/tests/URLExtractorTest.php
