updates

Author: kierwils

.github/workflows/php.yml

@@ -0,0 +1,25 @@
+name: Composer
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.4'
+        extensions: xdebug, mbstring
+
+    - name: composer install
+      run: composer install --no-progress
+
+    - name: composer tests
+      run: composer test

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "codin/http-client",
     "description": "Tiny PSR-18 Http Client",
-    "license": "Apache-2.0",
+    "license": "MIT",
     "type": "library",
     "minimum-stability": "dev",
     "prefer-stable": true,

license.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Codin’ Co.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

readme.md

@@ -1,5 +1,9 @@
 # Simple http client
 
+![version](https://img.shields.io/github/v/tag/codin/http-client)
+![workflow](https://img.shields.io/github/workflow/status/codin/http-client/Composer)
+![license](https://img.shields.io/github/license/codin/http-client)
+
 Example
 
 ```php

spec/RequestBuilderSpec.php

@@ -2,14 +2,14 @@
 
 namespace spec\Codin\HttpClient;
 
+use function json_encode;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument\Token\TypeToken;
 use Psr\Http\Message\ServerRequestFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use Psr\Http\Message\UriInterface;
 use Psr\Http\Message\StreamInterface;
-use function json_encode;
+use Psr\Http\Message\UriInterface;
 
 class RequestBuilderSpec extends ObjectBehavior
 {

src/Exceptions/ClientError.php

@@ -4,10 +4,12 @@
 
 namespace Codin\HttpClient\Exceptions;
 
+use ErrorException;
+use Psr\Http\Client\RequestExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-class ClientError extends TransportError
+class ClientError extends ErrorException implements RequestExceptionInterface
 {
     protected RequestInterface $request;
 

src/Exceptions/TransportError.php

@@ -5,7 +5,21 @@
 namespace Codin\HttpClient\Exceptions;
 
 use ErrorException;
+use Psr\Http\Client\NetworkExceptionInterface;
+use Psr\Http\Message\RequestInterface;
 
-class TransportError extends ErrorException
+class TransportError extends ErrorException implements NetworkExceptionInterface
 {
+    protected RequestInterface $request;
+
+    public function __construct(string $message, int $code, RequestInterface $request)
+    {
+        $this->request = $request;
+        parent::__construct($message, $code);
+    }
+
+    public function getRequest(): RequestInterface
+    {
+        return $this->request;
+    }
 }

src/HttpClient.php

@@ -112,7 +112,7 @@ protected function buildOptions(RequestInterface $request): array
             };
         }
 
-        return $this->options + $options;
+        return array_merge($options, $this->options);
     }
 
     protected function parseHeaders(ResponseInterface $response, StreamInterface $headers): ResponseInterface
@@ -172,11 +172,7 @@ static function ($session, string $data) use ($body): int {
         curl_reset($this->session);
 
         if (false === $result) {
-            throw new Exceptions\TransportError(sprintf(
-                'cURL error (%s): %s',
-                curl_errno($this->session),
-                curl_error($this->session)
-            ));
+            throw new Exceptions\TransportError(curl_error($this->session), curl_errno($this->session), $request);
         }
 
         $response = $this->buildResponse($headers, $body);