New upstream version 2.2.0

CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.0] - 2020-07-13
+
+### Changed
+
+- Support PHP 7.1-8.0
+
 ## [2.1.0] - 2019-12-27
 
 ### Changed

README.md

@@ -58,16 +58,6 @@ $ composer test
 ```
 
 
-## Contributing
-
-Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html).
-
-
-## Security
-
-If you discover any security related issues, please contact us at [security@php-http.org](mailto:security@php-http.org).
-
-
 ## License
 
 The MIT License (MIT). Please see [License File](LICENSE) for more information.

composer.json

 {
     "name": "php-http/httplug",
     "description": "HTTPlug, the HTTP client abstraction for PHP",
-    "license": "MIT",
-    "keywords": ["http", "client"],
+    "keywords": [
+        "http",
+        "client"
+    ],
     "homepage": "http://httplug.io",
+    "license": "MIT",
     "authors": [
         {
             "name": "Eric GELOEN",
@@ -11,18 +14,24 @@
         },
         {
             "name": "Márk Sági-Kazár",
-            "email": "mark.sagikazar@gmail.com"
+            "email": "mark.sagikazar@gmail.com",
+            "homepage": "https://sagikazarmark.hu"
         }
     ],
     "require": {
-        "php": "^7.0",
-        "psr/http-message": "^1.0",
+        "php": "^7.1 || ^8.0",
+        "php-http/promise": "^1.1",
         "psr/http-client": "^1.0",
-        "php-http/promise": "^1.0"
+        "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "phpspec/phpspec": "^4.3.4|^5.0|^6.0",
-        "friends-of-phpspec/phpspec-code-coverage" : "^4.1"
+        "friends-of-phpspec/phpspec-code-coverage": "^4.1",
+        "phpspec/phpspec": "^5.1 || ^6.0"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.x-dev"
+        }
     },
     "autoload": {
         "psr-4": {
@@ -32,10 +41,5 @@
     "scripts": {
         "test": "vendor/bin/phpspec run",
         "test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        }
     }
 }

src/Exception/HttpException.php

@@ -21,9 +21,6 @@ class HttpException extends RequestException
 
     /**
      * @param string $message
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param \Exception|null   $previous
      */
     public function __construct(
         $message,

src/Exception/NetworkException.php

@@ -2,8 +2,8 @@
 
 namespace Http\Client\Exception;
 
-use Psr\Http\Message\RequestInterface;
 use Psr\Http\Client\NetworkExceptionInterface as PsrNetworkException;
+use Psr\Http\Message\RequestInterface;
 
 /**
  * Thrown when the request cannot be completed because of network issues.
@@ -18,8 +18,6 @@ class NetworkException extends TransferException implements PsrNetworkException
 
     /**
      * @param string $message
-     * @param RequestInterface $request
-     * @param \Exception|null  $previous
      */
     public function __construct($message, RequestInterface $request, \Exception $previous = null)
     {

src/Exception/RequestException.php

@@ -2,8 +2,8 @@
 
 namespace Http\Client\Exception;
 
-use Psr\Http\Message\RequestInterface;
 use Psr\Http\Client\RequestExceptionInterface as PsrRequestException;
+use Psr\Http\Message\RequestInterface;
 
 /**
  * Exception for when a request failed, providing access to the failed request.
@@ -19,8 +19,6 @@ class RequestException extends TransferException implements PsrRequestException
 
     /**
      * @param string $message
-     * @param RequestInterface $request
-     * @param \Exception|null  $previous
      */
     public function __construct($message, RequestInterface $request, \Exception $previous = null)
     {

src/HttpAsyncClient.php

@@ -17,7 +17,7 @@ interface HttpAsyncClient
      *
      * Exceptions related to processing the request are available from the returned Promise.
      *
-     * @return Promise Resolves a PSR-7 Response or fails with an Http\Client\Exception.
+     * @return Promise resolves a PSR-7 Response or fails with an Http\Client\Exception
      *
      * @throws \Exception If processing the request is impossible (eg. bad configuration).
      */

src/Promise/HttpFulfilledPromise.php

@@ -13,9 +13,6 @@ final class HttpFulfilledPromise implements Promise
      */
     private $response;
 
-    /**
-     * @param ResponseInterface $response
-     */
     public function __construct(ResponseInterface $response)
     {
         $this->response = $response;

src/Promise/HttpRejectedPromise.php

@@ -12,9 +12,6 @@ final class HttpRejectedPromise implements Promise
      */
     private $exception;
 
-    /**
-     * @param Exception $exception
-     */
     public function __construct(Exception $exception)
     {
         $this->exception = $exception;