🛀 cleanup

Author: codemasher

src/CurlUtils/CurlHandleInterface.php

@@ -18,6 +18,13 @@
 use const CURLE_COULDNT_CONNECT, CURLE_COULDNT_RESOLVE_HOST, CURLE_COULDNT_RESOLVE_PROXY,
 	CURLE_GOT_NOTHING, CURLE_OPERATION_TIMEOUTED, CURLE_SSL_CONNECT_ERROR;
 
+/**
+ * @property resource                            $curl
+ * @property int                                 $id
+ * @property int                                 $retries
+ * @property \Psr\Http\Message\RequestInterface  $request
+ * @property \Psr\Http\Message\ResponseInterface $response
+ */
 interface CurlHandleInterface{
 
 	const CURL_NETWORK_ERRORS = [

src/CurlUtils/CurlMultiClient.php

@@ -78,10 +78,12 @@ public function __construct(
 		$this->logger          = $logger ?? new NullLogger;
 		$this->curl_multi      = curl_multi_init();
 
-		curl_multi_setopt($this->curl_multi, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
-		curl_multi_setopt($this->curl_multi, CURLMOPT_MAXCONNECTS, $this->options->windowSize);
+		$curl_multi_options = [
+			CURLMOPT_PIPELINING  => CURLPIPE_MULTIPLEX,
+			CURLMOPT_MAXCONNECTS => $this->options->windowSize,
+		] + $this->options->curl_multi_options;
 
-		foreach($this->options->curl_multi_options as $k => $v){
+		foreach($curl_multi_options as $k => $v){
 			curl_multi_setopt($this->curl_multi, $k, $v);
 		}
 

src/Psr18/CurlClient.php

@@ -24,7 +24,7 @@ class CurlClient extends HTTPClientAbstract{
 	 * @inheritDoc
 	 */
 	public function sendRequest(RequestInterface $request):ResponseInterface{
-		/** @var \chillerlan\HTTP\CurlUtils\CurlHandle $handle */
+		/** @var \chillerlan\HTTP\CurlUtils\CurlHandleInterface $handle */
 		$handle = new $this->options->curlHandle($request, $this->responseFactory->createResponse(), $this->options);
 		$handle->init();
 

src/Psr7/Stream.php

@@ -259,7 +259,7 @@ public function read($length):string{
 		$string = fread($this->stream, $length);
 
 		if($string === false){
-			throw new RuntimeException('Unable to read from stream');
+			throw new RuntimeException('Unable to read from stream'); // @codeCoverageIgnore
 		}
 
 		return $string;

src/Psr7/UploadedFile.php

@@ -17,7 +17,7 @@
 use InvalidArgumentException, RuntimeException;
 
 use function chillerlan\HTTP\Psr17\create_stream_from_input;
-use function in_array, is_string, is_writable, move_uploaded_file, php_sapi_name,rename;
+use function in_array, is_file, is_string, is_writable, move_uploaded_file, php_sapi_name,rename;
 
 use const UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_INI_SIZE,
 	UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_OK, UPLOAD_ERR_PARTIAL;
@@ -87,7 +87,7 @@ final class UploadedFile implements UploadedFileInterface{
 	 *
 	 * @throws \InvalidArgumentException
 	 */
-	public function __construct($file, int $size, int $error, string $filename = null, string $mediaType = null){
+	public function __construct($file, int $size, int $error = UPLOAD_ERR_OK, string $filename = null, string $mediaType = null){
 
 		if(!in_array($error, $this::UPLOAD_ERRORS, true)){
 			throw new InvalidArgumentException('Invalid error status for UploadedFile');
@@ -101,12 +101,9 @@ public function __construct($file, int $size, int $error, string $filename = nul
 
 		if($this->error === UPLOAD_ERR_OK){
 
-			if(is_string($file)){
-				$this->file = $file;
-			}
-			else{
-				$this->stream = create_stream_from_input($file);
-			}
+			is_string($file)
+				? $this->file = $file
+				: $this->stream = create_stream_from_input($file);
 
 		}
 
@@ -123,7 +120,11 @@ public function getStream():StreamInterface{
 			return $this->stream;
 		}
 
-		return $this->streamFactory->createStreamFromFile($this->file, 'r+');
+		if(is_file($this->file)){
+			return $this->streamFactory->createStreamFromFile($this->file, 'r+');
+		}
+
+		return $this->streamFactory->createStream($this->file);
 	}
 
 	/**
@@ -152,7 +153,7 @@ public function moveTo($targetPath):void{
 		}
 
 		if($this->moved === false){
-			throw new RuntimeException('Uploaded file could not be moved to '.$targetPath);
+			throw new RuntimeException('Uploaded file could not be moved to '.$targetPath); // @codeCoverageIgnore
 		}
 
 	}

tests/CurlUtils/CurlMultiClientTest.php

@@ -18,7 +18,9 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
+
 use function chillerlan\HTTP\Psr7\build_http_query;
+use function array_column, implode, in_array, ksort;
 
 class CurlMultiClientTest extends TestCase{
 
@@ -40,15 +42,18 @@ protected function setUp():void{
 	protected function getRequests():array{
 
 		$ids = [
-			[1,2,6,11,15,23,24,56,57,58,59,60,61,62,63,64,68,69,70,71,72,73,74,75,76],
-			[77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101],
+			[1, 2, 6, 11, 15, 23, 24, 56, 57, 58, 59, 60, 61, 62, 63, 64, 68, 69, 70, 71, 72, 73, 74, 75, 76],
+			[77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101],
 		];
 
 		$requests = [];
 
 		foreach($ids as $chunk){
 			foreach(['de', 'en', 'es', 'fr', 'zh'] as $lang){
-				$requests[] = new Request(Request::METHOD_GET, 'https://api.guildwars2.com/v2/items?'.build_http_query(['lang' => $lang, 'ids' => implode(',', $chunk)]));
+				$requests[] = new Request(
+					Request::METHOD_GET,
+					'https://api.guildwars2.com/v2/items?'.build_http_query(['lang' => $lang, 'ids' => implode(',', $chunk)])
+				);
 			}
 		}
 
@@ -63,7 +68,7 @@ protected function getTestResponseHandler():MultiResponseHandlerInterface{
 
 			public function handleResponse(ResponseInterface $response, RequestInterface $request, int $id, array $curl_info):?RequestInterface{
 
-				if(\in_array($response->getStatusCode(), [200, 206], true)){
+				if(in_array($response->getStatusCode(), [200, 206], true)){
 					$this->responses[$id]['lang'] = $response->getHeaderLine('content-language');
 					// ok, so the headers are empty on travis???
 #					\var_dump($response->getHeaders());
@@ -76,7 +81,7 @@ public function handleResponse(ResponseInterface $response, RequestInterface $re
 			}
 
 			public function getResponses():array{
-				\ksort($this->responses);
+				ksort($this->responses);
 
 				return $this->responses;
 			}
@@ -105,7 +110,7 @@ public function testMultiRequest(){
 
 		// the responses are ordered
 		// i'll probably never know why this fails on travis
-#		$this->assertSame(['de','en','es','fr','zh','de','en','es','fr','zh'], \array_column($responses, 'lang'));
+#		$this->assertSame(['de', 'en', 'es', 'fr', 'zh', 'de', 'en', 'es', 'fr', 'zh'], array_column($responses, 'lang'));
 
 		// cover the destructor
 		unset($this->http);
@@ -119,7 +124,6 @@ public function testEmptyStackException(){
 		$this->http->process();
 	}
 
-
 	public function testNoResponseHandlerException(){
 		$this->expectException(ClientExceptionInterface::class);
 		$this->expectExceptionMessage('no response handler set');

tests/HTTPOptionsTest.php

@@ -16,6 +16,10 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientExceptionInterface;
 
+use function file_exists, ini_get, is_array;
+
+use const CURLOPT_CAINFO, CURLOPT_CAPATH, CURLOPT_SSL_VERIFYHOST, CURLOPT_SSL_VERIFYPEER;
+
 class HTTPOptionsTest extends TestCase{
 
 	public function testConvertInvalidCurlOptionsValueToArray(){
@@ -46,7 +50,7 @@ public function testCaDisable(){
 
 	public function testCaInfoFile(){
 		$file = __DIR__.'/cacert.pem';
-		$o = new HTTPOptions(['ca_info' => $file]);
+		$o    = new HTTPOptions(['ca_info' => $file]);
 
 		$this->assertSame($file, $o->curl_options[CURLOPT_CAINFO]);
 		$this->assertSame(2, $o->curl_options[CURLOPT_SSL_VERIFYHOST]);
@@ -56,7 +60,7 @@ public function testCaInfoFile(){
 
 	public function testCaInfoDir(){
 		$dir = __DIR__;
-		$o = new HTTPOptions(['ca_info' => $dir]);
+		$o   = new HTTPOptions(['ca_info' => $dir]);
 
 		$this->assertSame($dir, $o->curl_options[CURLOPT_CAPATH]);
 		$this->assertSame(2, $o->curl_options[CURLOPT_SSL_VERIFYHOST]);
@@ -73,7 +77,7 @@ public function testCaInfoInvalidException(){
 
 	public function testCurloptCaInfoFile(){
 		$file = __DIR__.'/cacert.pem';
-		$o = new HTTPOptions(['curl_options' => [CURLOPT_CAINFO => $file]]);
+		$o    = new HTTPOptions(['curl_options' => [CURLOPT_CAINFO => $file]]);
 
 		$this->assertSame($file, $o->curl_options[CURLOPT_CAINFO]);
 		$this->assertSame(2, $o->curl_options[CURLOPT_SSL_VERIFYHOST]);
@@ -83,7 +87,7 @@ public function testCurloptCaInfoFile(){
 
 	public function testCurloptCaInfoDir(){
 		$dir = __DIR__;
-		$o = new HTTPOptions(['curl_options' => [CURLOPT_CAPATH => $dir]]);
+		$o   = new HTTPOptions(['curl_options' => [CURLOPT_CAPATH => $dir]]);
 
 		$this->assertSame($dir, $o->curl_options[CURLOPT_CAPATH]);
 		$this->assertSame(2, $o->curl_options[CURLOPT_SSL_VERIFYHOST]);

tests/Psr15/PriorityQueueRequestHandlerTest.php

@@ -12,13 +12,15 @@
 
 namespace chillerlan\HTTPTest\Psr15;
 
-use chillerlan\HTTP\Psr17;
 use chillerlan\HTTP\Psr15\Middleware\{MiddlewareException, PriorityMiddleware};
 use chillerlan\HTTP\Psr15\PriorityQueueRequestHandler;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\{ResponseInterface, ServerRequestInterface};
 use Psr\Http\Server\{MiddlewareInterface, RequestHandlerInterface};
 
+use function array_keys;
+use function chillerlan\HTTP\Psr17\create_server_request_from_globals;
+
 class PriorityQueueRequestHandlerTest extends TestCase{
 
 	public function testHandler(){
@@ -46,7 +48,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 		});
 
 		// execute it:
-		$response = $handler->handle(Psr17\create_server_request_from_globals());
+		$response = $handler->handle(create_server_request_from_globals());
 
 		// highest priority shall be processed first and go out last
 		$this->assertSame(
@@ -72,7 +74,7 @@ public function testNestedHandler(){
 		];
 
 		$handler  = new PriorityQueueRequestHandler($middlewareStack);
-		$response = $handler->handle(Psr17\create_server_request_from_globals());
+		$response = $handler->handle(create_server_request_from_globals());
 
 		$this->assertSame(
 			['X-Priority-1', 'X-Priority-11', 'X-Priority-22', 'X-Priority-33', 'X-Priority-3', 'X-Priority-4'],

tests/Psr15/QueueRequestHandlerTest.php

@@ -14,12 +14,14 @@
 
 use chillerlan\HTTP\Psr15\{EmptyResponseHandler, QueueRequestHandler};
 use chillerlan\HTTP\Psr15\Middleware\MiddlewareException;
-use chillerlan\HTTP\Psr17;
 use chillerlan\HTTP\Psr17\ResponseFactory;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\{ResponseInterface, ServerRequestInterface};
 use Psr\Http\Server\{MiddlewareInterface, RequestHandlerInterface};
 
+use function array_keys;
+use function chillerlan\HTTP\Psr17\create_server_request_from_globals;
+
 class QueueRequestHandlerTest extends TestCase{
 
 	public function testHandler(){
@@ -61,7 +63,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 		});
 
 		// execute it:
-		$response = $handler->handle(Psr17\create_server_request_from_globals());
+		$response = $handler->handle(create_server_request_from_globals());
 
 		$this->assertSame(
 			['X-Out-First', 'X-Out-Second', 'X-Out-Third'],

tests/Psr17/FactoryHelpersTest.php

@@ -20,6 +20,9 @@
 use function chillerlan\HTTP\Psr17\{
 	create_uri_from_globals, create_server_request_from_globals, create_stream, create_stream_from_input
 };
+use function fopen, fseek, fwrite, simplexml_load_string, time;
+
+use const UPLOAD_ERR_OK;
 
 class FactoryHelpersTest extends TestCase{
 
@@ -161,13 +164,7 @@ public function testCreateServerRequestFromGlobals(){
 		);
 
 		$expectedFiles = [
-			'file' => new UploadedFile(
-				'/tmp/php/php1h4j1o',
-				123,
-				UPLOAD_ERR_OK,
-				'MyFile.txt',
-				'text/plain'
-			),
+			'file' => new UploadedFile('/tmp/php/php1h4j1o', 123, UPLOAD_ERR_OK, 'MyFile.txt', 'text/plain'),
 		];
 
 		$this->assertEquals($expectedFiles, $server->getUploadedFiles());