Add support for PHP 8

Author: danielcivit

.github/workflows/build.yml

@@ -15,10 +15,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.1'
           - '7.2'
           - '7.3'
           - '7.4'
+          - '8.0'
     steps:
       - name: Install php
         uses: shivammathur/setup-php@v2

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Add support for PHP 8.0
+
+### Removed
+- Removed support for PHP 7.1
 
 ## [4.1.0] - 2021-02-03
 ### Added

README.md

@@ -23,7 +23,7 @@ All clients can be replaced without any side effects.
 
 If you don't have any client implementation installed, use the following:
 ```bash
-composer require php-http/guzzle6-adapter guzzlehttp/psr7
+composer require guzzlehttp/guzzle
 ```
 
 If you don't have any factory implementation installed, use the following:

composer.json

@@ -5,21 +5,20 @@
   "license": "MIT",
   "version": "4.1.0",
   "require": {
-    "php": "^7.1",
+    "php": "^7.2|^8.0",
     "ext-json": "*",
     "psr/http-client-implementation": "^1.0",
     "psr/http-message-implementation": "^1.0",
     "psr/http-factory-implementation": "^1.0",
     "php-http/discovery": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.5 || ^6.5",
-    "php-http/guzzle6-adapter": "^2.0",
-    "guzzlehttp/psr7": "^1.6",
+    "phpunit/phpunit": "^9.0 || ^7.5",
+    "guzzlehttp/guzzle": "^7.0",
     "object-calisthenics/phpcs-calisthenics-rules": "^3.5 || ^2.0",
     "http-interop/http-factory-guzzle": "^1.0",
     "php-http/mock-client": "^1.3",
-    "fzaninotto/faker": "^1.9",
+    "fakerphp/faker": "^1.13",
     "phpstan/phpstan": "^0.12.23"
   },
   "suggest": {

phpunit.xml.dist

@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.1/phpunit.xsd"
-         bootstrap="./tests/bootstrap.php"
-         cacheResult="false">
-    <testsuites>
-        <testsuite name="All">
-            <directory suffix="Test.php">tests</directory>
-        </testsuite>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">tests/Unit</directory>
-        </testsuite>
-        <testsuite name="Integration">
-            <directory suffix="Test.php">tests/Integration</directory>
-        </testsuite>
-        <testsuite name="Functional">
-            <directory suffix="Test.php">tests/Functional</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <directory>./tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="./tests/bootstrap.php" cacheResult="false">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory>./tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="All">
+      <directory suffix="Test.php">tests</directory>
+    </testsuite>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Integration">
+      <directory suffix="Test.php">tests/Integration</directory>
+    </testsuite>
+    <testsuite name="Functional">
+      <directory suffix="Test.php">tests/Functional</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

tests/Functional/AbstractTestCase.php

@@ -16,7 +16,7 @@ abstract class AbstractTestCase extends TestCase
     /**
      * Setup resources for all tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Version::getInstance()->addPluginVersion('functional-test');

tests/Unit/Util/VersionTest.php

@@ -23,8 +23,8 @@ public function testGetInstance()
     public function testGetVersion()
     {
         $instance = Version::getInstance();
-        $this->assertContains('Plugin ', $instance->getVersion());
-        $this->assertContains('PHP-SDK ', $instance->getVersion());
+        $this->assertStringContainsString('Plugin ', $instance->getVersion());
+        $this->assertStringContainsString('PHP-SDK ', $instance->getVersion());
     }
 
     /**
@@ -43,6 +43,6 @@ public function testGetPluginVersion()
     {
         $instance = Version::getInstance();
         $instance->addPluginVersion('foobar');
-        $this->assertContains('foobar', $instance->getPluginVersion());
+        $this->assertStringContainsString('foobar', $instance->getPluginVersion());
     }
 }