feat(HTTPError): \Stringable implementation

.gitattributes

@@ -1,12 +1,10 @@
 *.php diff=php
 
-/build            export-ignore
-/Tests            export-ignore
-/vendor           export-ignore
-/diagrams         export-ignore
-/.gitattributes   export-ignore
-/.gitignore       export-ignore
-/.env             export-ignore
-/phpunit.xml.dist export-ignore
-/composer.lock    export-ignore
-/*.yml            export-ignore
+build/    export-ignore
+tests/    export-ignore
+vendor/   export-ignore
+diagrams/ export-ignore
+.git*     export-ignore
+.env      export-ignore
+*dist     export-ignore
+*.yml     export-ignore

.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+env:
+  timezone: UTC
+  REQUIRED_PHP_EXTENSIONS: 'curl fileinfo libxml mbstring zip'
+
+concurrency:
+  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP ${{ matrix.php-version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer:v2
+          ini_values: opcache.enable=0
+          coverage: pcov
+
+      - name: Install composer and update
+        uses: ramsey/composer-install@v2
+        with:
+          composer-options: '--prefer-dist --no-progress --no-interaction'
+          dependency-versions: highest
+
+      - name: Run unit test suite
+        run: vendor/bin/phpunit --exclude integration --verbose --coverage-text
+
+      - name: Run integration tests
+        if: success() || failure()
+        run: vendor/bin/phpunit --group integration --verbose

.gitignore

@@ -1,7 +1,9 @@
-build
-vendor
+build/
+vendor/
+.idea/
+.vscode/
+.fleet/
 .DS_Store
-.idea
 .tmp
 composer.lock
 *.cache

.scrutinizer.yml

@@ -7,14 +7,14 @@ build:
           - php-scrutinizer-run
       environment:
         php:
-          version: '8.0.1'
+          version: '8.1.2'
 
 before_commands:
   - 'composer update -o --prefer-source --no-interaction'
 
 filter:
   excluded_paths:
-    - 'Tests/*'
+    - 'tests/*'
     - 'vendor/*'
     - 'diagrams/*'
     - 'build/*'

AcceptHeaderNegotiator.php

@@ -30,7 +30,7 @@
 use Koded\Http\Interfaces\HttpStatus;
 use function array_shift;
 use function explode;
-use function join;
+use function implode;
 use function parse_str;
 use function preg_match;
 use function preg_replace;
@@ -91,7 +91,7 @@ private function parse(string $header): Generator
 
 abstract class AcceptHeader
 {
-    private string $header    = '';
+    protected string $header  = '';
     private string $separator = '/';
     private string $type      = '';
     private string $subtype   = '*';
@@ -131,7 +131,7 @@ public function __construct(string $header)
          */
         $this->subtype  = trim(explode('+', $subtype)[1] ?? $subtype);
         $this->catchAll = ('*' === $this->type) && ('*' === $this->subtype);
-        parse_str(join('&', $bits), $this->params);
+        parse_str(implode('&', $bits), $this->params);
         $this->quality = (float)($this->params['q'] ?? 1);
         unset($this->params['q']);
     }
@@ -180,13 +180,13 @@ public function is(string $type): bool
      *
      * @internal
      */
-    public function matches(AcceptHeader $accept, array &$matches = null): void
+    public function matches(AcceptHeader $accept, ?array &$matches = null): void
     {
         $matches   = (array)$matches;
         $accept    = clone $accept;
         $typeMatch = ($this->type === $accept->type);
         if (1.0 === $accept->quality) {
-            $accept->quality = (float)$this->quality;
+            $accept->quality = $this->quality;
         }
         if ($accept->catchAll) {
             $accept->type    = $this->type;

Client/ClientFactory.php

@@ -11,61 +11,76 @@
 
 namespace Koded\Http\Client;
 
-use Koded\Http\Interfaces\{HttpRequestClient, Request};
+use Koded\Http\Interfaces\{ClientType, HttpMethod, HttpRequestClient};
+use InvalidArgumentException;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 
 class ClientFactory
 {
-    const CURL = 0;
-    const PHP  = 1;
+    private ClientType $clientType;
 
-    private int $clientType = self::CURL;
-
-    public function __construct(int $clientType = ClientFactory::CURL)
+    public function __construct(ClientType $type = ClientType::CURL)
     {
-        $this->clientType = $clientType;
+        $this->clientType = $type;
     }
 
     public function get($uri, array $headers = []): HttpRequestClient
     {
-        return $this->new(Request::GET, $uri, null, $headers);
+        return $this->new(HttpMethod::GET, $uri, null, $headers);
     }
 
     public function post($uri, $body, array $headers = []): HttpRequestClient
     {
-        return $this->new(Request::POST, $uri, $body, $headers);
+        return $this->new(HttpMethod::POST, $uri, $body, $headers);
     }
 
     public function put($uri, $body, array $headers = []): HttpRequestClient
     {
-        return $this->new(Request::PUT, $uri, $body, $headers);
+        return $this->new(HttpMethod::PUT, $uri, $body, $headers);
     }
 
     public function patch($uri, $body, array $headers = []): HttpRequestClient
     {
-        return $this->new(Request::PATCH, $uri, $body, $headers);
+        return $this->new(HttpMethod::PATCH, $uri, $body, $headers);
     }
 
     public function delete($uri, array $headers = []): HttpRequestClient
     {
-        return $this->new(Request::DELETE, $uri, null, $headers);
+        return $this->new(HttpMethod::DELETE, $uri, null, $headers);
     }
 
     public function head($uri, array $headers = []): HttpRequestClient
     {
-        return $this->new(Request::HEAD, $uri, null, $headers)->maxRedirects(0);
+        return $this->new(HttpMethod::HEAD, $uri, null, $headers)->maxRedirects(0);
     }
 
     public function client(): HttpRequestClient
     {
-        return $this->new('HEAD', '');
+        return $this->new(HttpMethod::HEAD, '');
     }
 
-    protected function new(string $method, $uri, $body = null, array $headers = []): HttpRequestClient
+    // FIXME: implement this?
+//    public function sendRequest(RequestInterface $request): ResponseInterface
+//    {
+//        return $this->new(
+//            HttpMethod::tryFrom($request->getMethod()),
+//            $request->getUri(),
+//            $request->getBody()->getContents(),
+//            $request->getHeaders()
+//        )->read();
+//    }
+
+    protected function new(
+        HttpMethod $method,
+        $uri,
+        $body = null,
+        array $headers = []): HttpRequestClient
     {
         return match ($this->clientType) {
-            self::CURL => new CurlClient($method, $uri, $body, $headers),
-            self::PHP => new PhpClient($method, $uri, $body, $headers),
-            default => throw new \InvalidArgumentException("{$this->clientType} is not a valid HTTP client"),
+            ClientType::CURL => new CurlClient($method, $uri, $body, $headers),
+            ClientType::PHP => new PhpClient($method, $uri, $body, $headers),
+            default => throw new InvalidArgumentException("{$this->clientType} is not a valid HTTP client"),
         };
     }
 }