🔥 get rid of this mess NAO

Author: codemasher

composer.json

@@ -19,7 +19,6 @@
 		"source": "https://github.com/chillerlan/php-httpinterface"
 	},
 	"provide": {
-		"chillerlan/php-httpinterface": "2.0",
 		"psr/http-client-implementation": "1.0",
 		"psr/http-factory-implementation": "1.0",
 		"psr/http-message-implementation": "1.0",

src/Psr18/HTTPClientAbstract.php

@@ -13,30 +13,21 @@
 namespace chillerlan\HTTP\Psr18;
 
 use chillerlan\HTTP\HTTPOptions;
-use chillerlan\HTTP\Psr17\{RequestFactory, ResponseFactory};
+use chillerlan\HTTP\Psr17\{ResponseFactory};
 use chillerlan\Settings\SettingsContainerInterface;
-use Psr\Http\Message\{RequestFactoryInterface, ResponseFactoryInterface, ResponseInterface};
+use Fig\Http\Message\RequestMethodInterface;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger};
 
-use function chillerlan\HTTP\Psr7\{merge_query, normalize_request_headers};
-use function chillerlan\HTTP\Psr17\create_stream;
-use function http_build_query, in_array, is_array, is_object, json_encode, strtoupper;
-
-use const PHP_QUERY_RFC1738;
-
-abstract class HTTPClientAbstract implements HTTPClientInterface, LoggerAwareInterface{
+abstract class HTTPClientAbstract implements ClientInterface, LoggerAwareInterface, RequestMethodInterface{
 	use LoggerAwareTrait;
 
 	/**
 	 * @var \chillerlan\HTTP\HTTPOptions
 	 */
 	protected $options;
 
-	/**
-	 * @var \Psr\Http\Message\RequestFactoryInterface
-	 */
-	protected $requestFactory;
-
 	/**
 	 * @var \Psr\Http\Message\ResponseFactoryInterface
 	 */
@@ -46,66 +37,17 @@ abstract class HTTPClientAbstract implements HTTPClientInterface, LoggerAwareInt
 	 * HTTPClientAbstract constructor.
 	 *
 	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
-	 * @param \Psr\Http\Message\RequestFactoryInterface|null       $requestFactory
 	 * @param \Psr\Http\Message\ResponseFactoryInterface|null      $responseFactory
 	 * @param \Psr\Log\LoggerInterface|null                        $logger
 	 */
 	public function __construct(
 		SettingsContainerInterface $options = null,
-		RequestFactoryInterface $requestFactory = null,
 		ResponseFactoryInterface $responseFactory = null,
 		LoggerInterface $logger = null
 	){
 		$this->options         = $options ?? new HTTPOptions;
-		$this->requestFactory  = $requestFactory ?? new RequestFactory;
 		$this->responseFactory = $responseFactory ?? new ResponseFactory;
 		$this->logger          = $logger ?? new NullLogger;
 	}
 
-	/**
-	 * @deprecated: messy, under-used, missing flexibility
-	 *
-	 * @param string      $uri
-	 * @param string|null $method
-	 * @param array|null  $query
-	 * @param mixed|null  $body
-	 * @param array|null  $headers
-	 *
-	 * @return \Psr\Http\Message\ResponseInterface
-	 */
-	public function request(string $uri, string $method = null, array $query = null, $body = null, array $headers = null):ResponseInterface{
-		$method  = strtoupper($method ?? 'GET');
-		$headers = normalize_request_headers($headers);
-		$request = $this->requestFactory->createRequest($method, merge_query($uri, $query ?? []));
-
-		if(in_array($method, ['DELETE', 'PATCH', 'POST', 'PUT'], true) && $body !== null){
-
-			if(is_array($body) || is_object($body)){
-
-				if(!isset($headers['Content-type'])){
-					$headers['Content-type'] = 'application/x-www-form-urlencoded';
-				}
-
-				if($headers['Content-type'] === 'application/x-www-form-urlencoded'){
-					$body = http_build_query($body, '', '&', PHP_QUERY_RFC1738);
-				}
-				elseif($headers['Content-type'] === 'application/json'){
-					$body = json_encode($body);
-				}
-				else{
-					$body = null; // @todo
-				}
-
-			}
-
-			$request = $request->withBody(create_stream((string)$body));
-		}
-
-		foreach($headers as $header => $value){
-			$request = $request->withAddedHeader($header, $value);
-		}
-
-		return $this->sendRequest($request);
-	}
-
 }

src/Psr18/HTTPClientInterface.php

@@ -25,7 +25,7 @@ abstract class HTTPClientTestAbstract extends TestCase{
 	protected const USER_AGENT = 'chillerlanHttpTest/2.0';
 
 	/**
-	 * @var \chillerlan\HTTP\Psr18\HTTPClientInterface
+	 * @var \Psr\Http\Client\ClientInterface
 	 */
 	protected $http;
 
@@ -47,65 +47,6 @@ public function testSendRequest(){
 
 	}
 
-	public function requestDataProvider():array {
-		return [
-			'get'        => ['get',    []],
-			'post'       => ['post',   []],
-			'post-json'  => ['post',   ['Content-type' => 'application/json']],
-			'post-form'  => ['post',   ['Content-type' => 'application/x-www-form-urlencoded']],
-			'put-json'   => ['put',    ['Content-type' => 'application/json']],
-			'put-form'   => ['put',    ['Content-type' => 'application/x-www-form-urlencoded']],
-			'patch-json' => ['patch',  ['Content-type' => 'application/json']],
-			'patch-form' => ['patch',  ['Content-type' => 'application/x-www-form-urlencoded']],
-			'delete'     => ['delete', []],
-		];
-	}
-
-	/**
-	 * @dataProvider requestDataProvider
-	 *
-	 * @param $method
-	 * @param $extra_headers
-	 */
-	public function testRequest(string $method, array $extra_headers){
-
-		try{
-			$response = $this->http->request(
-				'https://httpbin.org/'.$method,
-				$method,
-				['foo' => 'bar'],
-				['huh' => 'wtf'],
-				['what' => 'nope'] + $extra_headers
-			);
-		}
-		catch(Exception $e){
-			$this->markTestSkipped('error: '.$e->getMessage());
-
-			return;
-		}
-
-		$json = get_json($response);
-
-		if(!$json){
-			$this->markTestSkipped('empty response');
-		}
-		else{
-			$this->assertSame('https://httpbin.org/'.$method.'?foo=bar', $json->url);
-			$this->assertSame('bar', $json->args->foo);
-			$this->assertSame('nope', $json->headers->What);
-			$this->assertSame($this::USER_AGENT, $json->headers->{'User-Agent'});
-
-			if(in_array($method, ['patch', 'post', 'put'])){
-
-				isset($extra_headers['content-type']) && $extra_headers['content-type'] === 'application/json'
-					? $this->assertSame('wtf', $json->json->huh)
-					: $this->assertSame('wtf', $json->form->huh);
-
-			}
-		}
-
-	}
-
 	public function testNetworkError(){
 		$this->expectException(ClientExceptionInterface::class);
 

tests/Psr18/HTTPClientTestAbstract.php

@@ -31,14 +31,4 @@ public function log($level, $message, array $context = []){
 		$this->http = new LoggingClient($this->http, $logger);
 	}
 
-	/**
-	 * @dataProvider requestDataProvider
-	 *
-	 * @param $method
-	 * @param $extra_headers
-	 */
-	public function testRequest(string $method, array $extra_headers){
-		$this->markTestSkipped('N/A');
-	}
-
 }