Merge pull request #16 from php-http/housekeeping

cleanup branch alias and explicitly require legacy message-factory

Author: dbu

.github/workflows/ci.yml

@@ -1,5 +1,11 @@
 name: Tests
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - '[0-9]+.x'
+      - '[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.x'
+  pull_request:
 
 jobs:
   build:
@@ -8,18 +14,18 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        php: [ '7.3', '7.4', '8.0', '8.1', '8.2']
+        php: [ '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
 
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.5.0
+        uses: shivammathur/setup-php@2.30.0
         with:
           php-version: ${{ matrix.php }}
           coverage: none
           tools: flex
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download dependencies
         run: composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
@@ -35,14 +41,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.5.0
+        uses: shivammathur/setup-php@2.30.0
         with:
           php-version: 7.3
           coverage: none
           tools: flex
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download dependencies
         run: composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable --prefer-lowest

.github/workflows/static.yml

@@ -1,13 +1,19 @@
-on: [push, pull_request]
 name: Static analysis
+on:
+  push:
+    branches:
+      - '[0-9]+.x'
+      - '[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.x'
+  pull_request:
 
 jobs:
   phpstan:
     name: PHPStan
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: PHPStan
         uses: docker://oskarstark/phpstan-ga
@@ -20,7 +26,7 @@ jobs:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: PHP-CS-Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
@@ -31,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Psalm
         uses: docker://vimeo/psalm-github-actions

.gitignore

@@ -1,4 +1,4 @@
-/.php_cs.cache
+/.php-cs-fixer.cache
 /composer.lock
 /phpunit.xml
 /vendor/

composer.json

@@ -19,7 +19,8 @@
     "require-dev": {
         "phpunit/phpunit": "^8.0|^9.3",
         "php-http/client-integration-tests": "^3.0",
-        "phpspec/prophecy-phpunit": "^2.0"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "php-http/message-factory": "^1.1"
     },
     "provide": {
         "php-http/client-implementation": "1.0",
@@ -36,11 +37,6 @@
             "Http\\Adapter\\Guzzle7\\Tests\\": "tests/"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
-    },
     "scripts": {
         "test": "@php vendor/bin/phpunit"
     }

psalm.baseline.xml

@@ -5,4 +5,9 @@
       <code>$exception-&gt;getResponse()</code>
     </PossiblyNullArgument>
   </file>
+  <file src="src/Client.php">
+    <PossiblyUnusedMethod occurrences="1">
+      <code>createWithConfig</code>
+    </PossiblyUnusedMethod>
+  </file>
 </files>

src/Client.php

@@ -43,17 +43,11 @@ public static function createWithConfig(array $config): Client
         return new self(self::buildClient($config));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendRequest(RequestInterface $request): ResponseInterface
     {
         return $this->sendAsyncRequest($request)->wait();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendAsyncRequest(RequestInterface $request)
     {
         $promise = $this->guzzle->sendAsync($request);

src/Promise.php

@@ -53,13 +53,13 @@ public function __construct(PromiseInterface $promise, RequestInterface $request
             $this->state = self::FULFILLED;
 
             return $response;
-        }, function ($reason) use ($request) {
+        }, function ($reason) {
             $this->state = self::REJECTED;
 
             if ($reason instanceof HttplugException) {
                 $this->exception = $reason;
             } elseif ($reason instanceof GuzzleExceptions\GuzzleException) {
-                $this->exception = $this->handleException($reason, $request);
+                $this->exception = $this->handleException($reason);
             } elseif ($reason instanceof \Throwable) {
                 $this->exception = new HttplugException\TransferException('Invalid exception returned from Guzzle7', 0, $reason);
             } else {
@@ -70,31 +70,22 @@ public function __construct(PromiseInterface $promise, RequestInterface $request
         });
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function then(callable $onFulfilled = null, callable $onRejected = null)
+    public function then(?callable $onFulfilled = null, ?callable $onRejected = null)
     {
         return new static($this->promise->then($onFulfilled, $onRejected), $this->request);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getState()
     {
         return $this->state;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function wait($unwrap = true)
     {
         $this->promise->wait(false);
 
         if ($unwrap) {
-            if (self::REJECTED == $this->getState()) {
+            if (self::REJECTED === $this->getState()) {
                 throw $this->exception;
             }
 
@@ -107,7 +98,7 @@ public function wait($unwrap = true)
      *
      * @return HttplugException
      */
-    private function handleException(GuzzleExceptions\GuzzleException $exception, RequestInterface $request)
+    private function handleException(GuzzleExceptions\GuzzleException $exception)
     {
         if ($exception instanceof GuzzleExceptions\ConnectException) {
             return new HttplugException\NetworkException($exception->getMessage(), $exception->getRequest(), $exception);

tests/CurlHttpAdapterTest.php

@@ -11,9 +11,6 @@
  */
 class CurlHttpAdapterTest extends HttpAdapterTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHandler()
     {
         return new CurlHandler();

tests/CurlHttpAsyncAdapterTest.php

@@ -11,9 +11,6 @@
  */
 class CurlHttpAsyncAdapterTest extends HttpAsyncAdapterTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHandler()
     {
         return new CurlHandler();

tests/DefaultHttpAdapterTest.php

@@ -13,9 +13,6 @@
  */
 class DefaultHttpAdapterTest extends HttpClientTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHttpAdapter(): ClientInterface
     {
         return new Client();

tests/DefaultHttpAdapterWithConfigTest.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+use Http\Adapter\Guzzle7\Client;
+use Http\Client\Tests\HttpClientTest;
+use Psr\Http\Client\ClientInterface;
+
+/**
+ * @author David Buchmann <[email protected]>
+ */
+class DefaultHttpAdapterWithConfigTest extends HttpClientTest
+{
+    protected function createHttpAdapter(): ClientInterface
+    {
+        $this->defaultHeaders['X-Test'] = 'configuration-value';
+
+        return Client::createWithConfig([
+            'headers' => [
+                'X-Test' => 'configuration-value',
+            ],
+        ]);
+    }
+}

tests/HttpAdapterTest.php

@@ -14,9 +14,6 @@
  */
 abstract class HttpAdapterTest extends HttpClientTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHttpAdapter(): ClientInterface
     {
         return new Client(new GuzzleClient(['handler' => $this->createHandler()]));

tests/HttpAsyncAdapterTest.php

@@ -14,9 +14,6 @@
  */
 abstract class HttpAsyncAdapterTest extends HttpAsyncClientTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHttpAsyncClient(): HttpAsyncClient
     {
         return new Client(new GuzzleClient(['handler' => $this->createHandler()]));

tests/MultiCurlHttpAdapterTest.php

@@ -11,9 +11,6 @@
  */
 class MultiCurlHttpAdapterTest extends HttpAdapterTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHandler()
     {
         return new CurlMultiHandler();

tests/MultiCurlHttpAsyncAdapterTest.php

@@ -11,9 +11,6 @@
  */
 class MultiCurlHttpAsyncAdapterTest extends HttpAsyncAdapterTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHandler()
     {
         return new CurlMultiHandler();

tests/StreamHttpAdapterTest.php

@@ -11,9 +11,6 @@
  */
 class StreamHttpAdapterTest extends HttpAdapterTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHandler()
     {
         return new StreamHandler();

tests/StreamHttpAsyncAdapterTest.php

@@ -11,9 +11,6 @@
  */
 class StreamHttpAsyncAdapterTest extends HttpAsyncAdapterTest
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createHandler()
     {
         return new StreamHandler();