Support PHP 7.4 and 8.0 (#52)

Author: GrahamCampbell

.gitattributes

@@ -5,11 +5,6 @@
 /.php_cs          export-ignore
 /.scrutinizer.yml export-ignore
 /.styleci.yml     export-ignore
-/.travis.yml      export-ignore
-/behat.yml.dist   export-ignore
-/features/        export-ignore
 /phpspec.ci.yml   export-ignore
 /phpspec.yml.dist export-ignore
-/phpunit.xml.dist export-ignore
 /spec/            export-ignore
-/tests/           export-ignore

.github/workflows/tests.yml

@@ -0,0 +1,91 @@
+name: tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  latest:
+    name: PHP ${{ matrix.php }} Latest
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+          coverage: none
+
+      - name: Install PHP 7 dependencies
+        run: composer update --prefer-dist --no-interaction --no-progress
+        if: "matrix.php != '8.0'"
+
+      - name: Install PHP 8 dependencies
+        run: |
+          composer require "phpdocumentor/reflection-docblock:^5.2@dev" --no-interaction --no-update
+          composer update --prefer-dist --prefer-stable --no-interaction --no-progress --ignore-platform-req=php
+        if: "matrix.php == '8.0'"
+
+      - name: Execute tests
+        run: composer test
+
+  lowest:
+    name: PHP ${{ matrix.php }} Lowest
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: ['7.1', '7.2', '7.3', '7.4']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "sebastian/comparator:^3.0.2" --no-interaction --no-update
+          composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress
+
+      - name: Execute tests
+        run: composer test
+
+  coverage:
+    name: Code Coverage
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          tools: composer:v2
+          coverage: xdebug
+
+      - name: Install dependencies
+        run: |
+          composer require "friends-of-phpspec/phpspec-code-coverage:^4.3.2" --no-interaction --no-update
+          composer update --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: composer test-ci
+
+      - name: Upload coverage
+        run: |
+          wget https://scrutinizer-ci.com/ocular.phar
+          php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml

.gitignore

@@ -1,6 +1,4 @@
-/behat.yml
 /build/
 /composer.lock
 /phpspec.yml
-/phpunit.xml
 /vendor/

.travis.yml

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 || ^8.0",
         "php-http/client-common": "^1.9 || ^2.0",
         "php-http/discovery": "^1.0",
         "php-http/httplug": "^1.0 || ^2.0",
@@ -31,8 +31,7 @@
         "php-http/client-implementation": "1.0"
     },
     "require-dev": {
-        "henrikbjorn/phpspec-code-coverage": "^1.0",
-        "phpspec/phpspec": "^2.4"
+        "phpspec/phpspec": "^5.1 || ^6.0"
     },
     "config": {
         "sort-packages": true
@@ -47,8 +46,6 @@
             "Http\\Mock\\": "src/"
         }
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "scripts": {
         "test": "vendor/bin/phpspec run",
         "test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml"

composer.json

@@ -4,7 +4,7 @@ suites:
         psr4_prefix: Http\Mock
 formatter.name: pretty
 extensions:
-    - PhpSpec\Extension\CodeCoverageExtension
+    FriendsOfPhpSpec\PhpSpec\CodeCoverage\CodeCoverageExtension: ~
 code_coverage:
     format: clover
     output: build/coverage.xml

phpspec.ci.yml

@@ -7,7 +7,7 @@
 use Http\Message\RequestMatcher;
 use Http\Message\ResponseFactory;
 use Http\Mock\Client;
-use Psr\Http\Client\ClientExceptionInterface;
+use Http\Client\Exception as ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use PhpSpec\ObjectBehavior;