Update composer and tests to support php 8 (#417)

* Update composer and tests to support php8

* fix: deactivate multi curl server push for php 8
feat: add the php 8 build to the ci config

* chore: fix build

* chore: fix build

* chore: fix build

* chore: fix build

* chore: ci changes

* Remove conflict section from composer.json

Testing if ci work without it

* Use php7.4 image for testing of http2 push

Co-authored-by: Chris Doehring 

Author: sunkan

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        php: ['7.2', '7.3', '7.4']
+        php: ['7.2', '7.3', '7.4', '8.0']
         sf_version: ['3.4.*', '4.4.*', '5.0.*']
 
     steps:
@@ -103,7 +103,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@2.1.0
         with:
-          php-version: 7.3
+          php-version: 7.4
           tools: flex
 
       - name: Checkout code
@@ -122,7 +122,7 @@ jobs:
 
       - name: Run tests
         run: |
-          docker run --rm --net buzz-bridge -v "$PWD":/usr/src/myapp -w /usr/src/myapp -e BUZZ_TEST_SERVER=http://test-server/index.php tommymuehle/docker-alpine-php-nightly php vendor/bin/phpunit
+          docker run --rm --net buzz-bridge -v "$PWD":/usr/src/myapp -w /usr/src/myapp -e BUZZ_TEST_SERVER=http://test-server/index.php php:7.4-cli php vendor/bin/phpunit
 
   lowest:
     name: Lowest deps

.github/workflows/static.yml

@@ -42,6 +42,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Psalm
-        uses: docker://muglug/psalm-github-actions
+        uses: docker://vimeo/psalm-github-actions
         with:
           args: --no-progress --show-info=false --stats

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.3-fpm-stretch
+FROM php:7.4-fpm-buster
 
 # Install Nginx
 RUN apt-get update -qq && apt-get install -y --no-install-recommends -qq nginx

composer.json

@@ -18,18 +18,18 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 || ^8.0",
         "psr/http-message": "^1.0",
         "psr/http-client": "^1.0",
         "php-http/httplug": "^1.1 || ^2.0",
         "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0",
         "psr/http-factory": "^1.0"
     },
     "require-dev": {
-        "php-http/client-integration-tests": "^2.0.1",
+        "php-http/client-integration-tests": "^3.0",
         "nyholm/psr7": "^1.0",
         "psr/log": "^1.0",
-        "phpunit/phpunit": "7.5.20"
+        "phpunit/phpunit": "^7.5 || ^9.4"
     },
     "provide": {
         "php-http/client-implementation": "1.0",

lib/Client/AbstractClient.php

@@ -13,7 +13,7 @@
 abstract class AbstractClient
 {
     /**
-     * @var OptionsResolver
+     * @var OptionsResolver|null
      */
     private $optionsResolver;
 

lib/Client/MultiCurl.php

@@ -56,7 +56,13 @@ public function __construct($responseFactory, array $options = [])
     {
         parent::__construct($responseFactory, $options);
 
-        if (\PHP_VERSION_ID < 70215 || \PHP_VERSION_ID === 70300 || \PHP_VERSION_ID === 70301 || !(CURL_VERSION_HTTP2 & curl_version()['features'])) {
+        if (
+            \PHP_VERSION_ID < 70215 ||
+            \PHP_VERSION_ID === 70300 ||
+            \PHP_VERSION_ID === 70301 ||
+            \PHP_VERSION_ID >= 80000 ||
+            !(CURL_VERSION_HTTP2 & curl_version()['features'])
+        ) {
             // Dont use HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/76675
             $this->serverPushSupported = false;
         }

tests/Integration/BaseIntegrationTest.php

@@ -8,7 +8,7 @@
 
 abstract class BaseIntegrationTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (getenv('BUZZ_TEST_SERVER')) {

tests/Integration/BuzzIntegrationTest.php

@@ -21,7 +21,7 @@
 
 class BuzzIntegrationTest extends BaseIntegrationTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (empty($_SERVER['BUZZ_TEST_SERVER'])) {
@@ -125,7 +125,7 @@ public function testFormPostWithRequestBuilder($client, $async)
         $this->assertNotEmpty($response->getBody()->__toString(), 'Response from server should not be empty');
 
         $data = json_decode($response->getBody()->__toString(), true);
-        $this->assertInternalType('array', $data, $response->getBody()->__toString());
+        $this->assertIsArray($data, $response->getBody()->__toString());
         $this->assertArrayHasKey('SERVER', $data);
 
         $this->assertStringStartsWith('multipart/form-data', $data['SERVER']['CONTENT_TYPE']);
@@ -156,7 +156,7 @@ public function testFormPostWithLargeRequestBody($client, $async)
         $this->assertNotEmpty($response->getBody()->__toString(), 'Response from server should not be empty');
 
         $data = json_decode($response->getBody()->__toString(), true);
-        $this->assertInternalType('array', $data, $response->getBody()->__toString());
+        $this->assertIsArray($data, $response->getBody()->__toString());
         $this->assertArrayHasKey('SERVER', $data);
 
         $this->assertStringStartsWith('multipart/form-data', $data['SERVER']['CONTENT_TYPE']);

tests/Integration/Httplug/BaseIntegrationTest.php

@@ -9,7 +9,7 @@
 
 abstract class BaseIntegrationTest extends HttpClientTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (false === PHPUnitUtility::getUri()) {

tests/Integration/Httplug/BrowserIntegrationTest.php

@@ -7,10 +7,11 @@
 use Buzz\Browser;
 use Buzz\Client\FileGetContents;
 use Nyholm\Psr7\Factory\Psr17Factory;
+use Psr\Http\Client\ClientInterface;
 
 class BrowserIntegrationTest extends BaseIntegrationTest
 {
-    protected function createHttpAdapter()
+    protected function createHttpAdapter(): ClientInterface
     {
         $client = new FileGetContents(new Psr17Factory(), []);
         $browser = new Browser($client, new Psr17Factory());