Author: codemasher

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "chillerlan/php-httpinterface",
-	"description": "A http PSR-7/17 client/interface for PHP7.2+",
+	"description": "A http PSR-7/17/18 client/interface for PHP7.2+",
 	"license": "MIT",
 	"type": "library",
 	"keywords": [
@@ -20,15 +20,16 @@
 	},
 	"provide": {
 		"chillerlan/php-httpinterface": "2.0",
-		"psr/http-message-implementation": "1.0",
-		"psr/http-factory-implementation": "1.0"
+		"psr/http-client-implementation": "1.0",
+		"psr/http-factory-implementation": "1.0",
+		"psr/http-message-implementation": "1.0"
 	},
 	"require": {
 		"php": "^7.2",
 		"ext-curl":"*",
 		"chillerlan/php-settings-container":"^1.0",
 		"fig/http-message-util":"^1.1",
-		"php-http/httplug":"^1.1",
+		"psr/http-client":"dev-master",
 		"psr/http-message": "^1.0",
 		"psr/http-factory":"^1.0",
 		"psr/log": "^1.0"

src/ClientException.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Class ClientException
+ *
+ * @filesource   ClientException.php
+ * @created      10.09.2018
+ * @package      chillerlan\HTTP
+ * @author       smiley <smiley@chillerlan.net>
+ * @copyright    2018 smiley
+ * @license      MIT
+ */
+
+namespace chillerlan\HTTP;
+
+use Psr\Http\Client\ClientExceptionInterface;
+use Exception;
+
+class ClientException extends Exception implements ClientExceptionInterface{
+
+}

src/CurlClient.php

@@ -15,7 +15,6 @@
 use chillerlan\HTTP\Psr17\{RequestFactory, ResponseFactory, StreamFactory};
 use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Http\Message\{RequestFactoryInterface, RequestInterface, ResponseFactoryInterface, ResponseInterface, StreamFactoryInterface};
-use Http\Client\Exception\{NetworkException, RequestException};
 
 class CurlClient implements HTTPClientInterface{
 
@@ -66,8 +65,8 @@ public function __construct(
 	 *
 	 * @return \Psr\Http\Message\ResponseInterface
 	 *
-	 * @throws \Http\Client\Exception If an error happens during processing the request.
-	 * @throws \Exception             If processing the request is impossible (eg. bad configuration).
+	 * @throws \Psr\Http\Client\ClientExceptionInterface If an error happens during processing the request.
+	 * @throws \Exception                                If processing the request is impossible (eg. bad configuration).
 	 */
 	public function sendRequest(RequestInterface $request):ResponseInterface{
 		$handle = new CurlHandle($request, $this->responseFactory->createResponse(), $this->options);

src/HTTPClientInterface.php

@@ -13,15 +13,10 @@
 namespace chillerlan\HTTP;
 
 use Fig\Http\Message\RequestMethodInterface;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\ResponseInterface;
 
-/**
- * ...waiting for PSR-18, going with HTTPlug for now
- *
- * @link https://github.com/php-fig/fig-standards/tree/master/proposed/http-client/
- */
-interface HTTPClientInterface extends HttpClient, RequestMethodInterface{
+interface HTTPClientInterface extends ClientInterface, RequestMethodInterface{
 
 	/**
 	 * @param string      $uri
@@ -32,8 +27,8 @@ interface HTTPClientInterface extends HttpClient, RequestMethodInterface{
 	 *
 	 * @return \Psr\Http\Message\ResponseInterface
 	 *
-	 * @throws \Http\Client\Exception If an error happens during processing the request.
-	 * @throws \Exception             If processing the request is impossible (eg. bad configuration).
+	 * @throws \Psr\Http\Client\ClientExceptionInterface If an error happens during processing the request.
+	 * @throws \Exception                                If processing the request is impossible (eg. bad configuration).
 	 */
 	public function request(string $uri, string $method = null, array $query = null, $body = null, array $headers = null):ResponseInterface;
 

src/NetworkException.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Class NetworkException
+ *
+ * @filesource   NetworkException.php
+ * @created      10.09.2018
+ * @package      chillerlan\HTTP
+ * @author       smiley <smiley@chillerlan.net>
+ * @copyright    2018 smiley
+ * @license      MIT
+ */
+
+namespace chillerlan\HTTP;
+
+use Exception;
+use Psr\Http\Client\NetworkExceptionInterface;
+use Psr\Http\Message\RequestInterface;
+
+class NetworkException extends ClientException implements NetworkExceptionInterface{
+
+	/**
+	 * @var \Psr\Http\Message\RequestInterface
+	 */
+	private $request;
+
+	/**
+	 * @param string                             $message
+	 * @param \Psr\Http\Message\RequestInterface $request
+	 * @param \Exception|null                    $previous
+	 */
+	public function __construct(string $message, RequestInterface $request, Exception $previous = null){
+		$this->request = $request;
+
+		parent::__construct($message, 0, $previous);
+	}
+
+	/**
+	 * Returns the request.
+	 *
+	 * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
+	 *
+	 * @return \Psr\Http\Message\RequestInterface
+	 */
+	public function getRequest():RequestInterface{
+		return $this->request;
+	}
+
+}

src/RequestException.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Class RequestException
+ *
+ * @filesource   RequestException.php
+ * @created      10.09.2018
+ * @package      chillerlan\HTTP
+ * @author       smiley <smiley@chillerlan.net>
+ * @copyright    2018 smiley
+ * @license      MIT
+ */
+
+namespace chillerlan\HTTP;
+
+use Exception;
+use Psr\Http\Client\RequestExceptionInterface;
+use Psr\Http\Message\RequestInterface;
+
+class RequestException extends ClientException implements RequestExceptionInterface{
+
+	/**
+	 * @var \Psr\Http\Message\RequestInterface
+	 */
+	private $request;
+
+	/**
+	 * @param string                             $message
+	 * @param \Psr\Http\Message\RequestInterface $request
+	 * @param \Exception|null                    $previous
+	 */
+	public function __construct(string $message, RequestInterface $request, Exception $previous = null){
+		$this->request = $request;
+
+		parent::__construct($message, 0, $previous);
+	}
+
+	/**
+	 * Returns the request.
+	 *
+	 * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
+	 *
+	 * @return \Psr\Http\Message\RequestInterface
+	 */
+	public function getRequest():RequestInterface{
+		return $this->request;
+	}
+
+}