Allow installation with PHP 8 (#86)

Author: alexander-schranz

.github/workflows/test-application.yaml

@@ -0,0 +1,64 @@
+name: Test application
+
+on:
+    pull_request:
+    push:
+        branches:
+            - 'master'
+            - '[0-9]+.x'
+            - '[0-9]+.[0-9]+'
+            - '[0-9]+.[0-9]+.x'
+
+jobs:
+    test:
+        name: 'PHP ${{ matrix.php-version }}, Symfony ${{ matrix.symfony-version }}'
+        runs-on: ubuntu-20.04
+        env:
+            COVERAGE: ${{ matrix.coverage }}
+
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - php-version: '7.1'
+                      dependencies: 'lowest'
+                      coverage: 'true'
+                      test-command: 'test-ci'
+                    - php-version: '7.1'
+                      test-command: 'test'
+                    - php-version: '7.2'
+                      test-command: 'test'
+                    - php-version: '7.3'
+                      test-command: 'test'
+                    - php-version: '7.4'
+                      test-command: 'test'
+                    - php-version: '8.0'
+                      test-command: 'test'
+
+        steps:
+            - name: Checkout project
+              uses: actions/checkout@v2
+
+            - name: Install and configure PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php-version }}
+                  tools: 'composer:v2'
+
+            - name: Install dependencies with Composer
+              uses: ramsey/composer-install@v1
+              with:
+                  dependency-versions: ${{ matrix.dependencies }}
+                  composer-options: --prefer-dist --no-suggest
+
+            - name: Start HTTP Test Server
+              run: vendor/bin/http_test_server > /dev/null 2>&1 &
+
+            - name: Execute test
+              run: composer ${{ matrix.test-command }}
+
+            - name: Coverage
+              if: ${{ matrix.coverage }}
+              run: |
+                  wget https://scrutinizer-ci.com/ocular.phar
+                  php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml

.travis.yml

@@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.0.x] - 2020-02-xx
+
+### Added
+
+- Add Support for PHP 8
 
 ## [2.0.1] - 2018-12-16
 

CHANGELOG.md

@@ -15,15 +15,15 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 || ^8.0",
         "php-http/httplug": "^2.0",
         "psr/http-client": "^1.0",
         "guzzlehttp/guzzle": "^6.0"
     },
     "require-dev": {
         "ext-curl": "*",
-        "phpunit/phpunit": "^7.4",
-        "php-http/client-integration-tests": "^2.0"
+        "phpunit/phpunit": "^7.4 || ^8.4",
+        "php-http/client-integration-tests": "^2.0 || ^3.0"
     },
     "provide": {
         "php-http/client-implementation": "1.0",

composer.json

@@ -6,6 +6,7 @@
 
 use Http\Adapter\Guzzle6\Client;
 use Http\Client\Tests\HttpClientTest;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * @author David Buchmann <[email protected]>
@@ -15,7 +16,7 @@ class DefaultHttpAdapterTest extends HttpClientTest
     /**
      * {@inheritdoc}
      */
-    protected function createHttpAdapter()
+    protected function createHttpAdapter(): ClientInterface
     {
         return new Client();
     }

tests/DefaultHttpAdapterTest.php

@@ -7,6 +7,7 @@
 use GuzzleHttp\Client as GuzzleClient;
 use Http\Adapter\Guzzle6\Client;
 use Http\Client\Tests\HttpClientTest;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * @author GeLo <[email protected]>
@@ -16,7 +17,7 @@ abstract class HttpAdapterTest extends HttpClientTest
     /**
      * {@inheritdoc}
      */
-    protected function createHttpAdapter()
+    protected function createHttpAdapter(): ClientInterface
     {
         return new Client(new GuzzleClient(['handler' => $this->createHandler()]));
     }

tests/HttpAdapterTest.php

@@ -6,6 +6,7 @@
 
 use GuzzleHttp\Client as GuzzleClient;
 use Http\Adapter\Guzzle6\Client;
+use Http\Client\HttpAsyncClient;
 use Http\Client\Tests\HttpAsyncClientTest;
 
 /**
@@ -16,7 +17,7 @@ abstract class HttpAsyncAdapterTest extends HttpAsyncClientTest
     /**
      * {@inheritdoc}
      */
-    protected function createHttpAsyncClient()
+    protected function createHttpAsyncClient(): HttpAsyncClient
     {
         return new Client(new GuzzleClient(['handler' => $this->createHandler()]));
     }

tests/HttpAsyncAdapterTest.php

@@ -13,11 +13,10 @@
  */
 class PromiseTest extends TestCase
 {
-    /**
-     * @expectedException \Exception
-     */
     public function testNonDomainExceptionIsHandled()
     {
+        $this->expectException(\Exception::class);
+
         $request = $this->prophesize('Psr\Http\Message\RequestInterface');
         $promise = new RejectedPromise(new \Exception());