Allow PHP 8 (#389)

Author: ddeboer

.travis.yml

@@ -13,6 +13,7 @@ env:
         - SYMFONY_PHPUNIT_VERSION="8"
         - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
         - SYMFONY_DEPRECATIONS_HELPER="max[self]=0"
+        - DEPENDENCIES="php-http/guzzle7-adapter"
 
 branches:
     except:
@@ -22,14 +23,14 @@ matrix:
     fast_finish: true
     include:
           # Minimum supported Symfony version and lowest PHP version
-        - php: 7.2
-          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+        - php: 7.3
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" DEPENDENCIES="php-http/guzzle6-adapter"
 
           # Test the latest stable release
-        - php: 7.2
         - php: 7.3
-          env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="php-http/vcr-plugin:^1.0@dev"
+          env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="php-http/guzzle7-adapter php-http/vcr-plugin:^1.0@dev"
         - php: 7.4
+        - php: 8.0
 
           # Test LTS versions
         - php: 7.3
@@ -39,21 +40,23 @@ matrix:
         - php: 7.3
           env: SYMFONY_REQUIRE=4.3.*
         - php: 7.3
-          env: SYMFONY_REQUIRE=4.4.* DEPENDENCIES="symfony/http-client:^4.4"
+          env: SYMFONY_REQUIRE=4.4.* DEPENDENCIES="php-http/guzzle7-adapter symfony/http-client:^4.4"
         - php: 7.3
-          env: SYMFONY_REQUIRE=5.0.* DEPENDENCIES="symfony/http-client:^5.0"
+          env: SYMFONY_REQUIRE=5.0.* DEPENDENCIES="php-http/guzzle7-adapter symfony/http-client:^5.0"
 
           # Test with httplug 1.x clients
-        - php: 7.2
+        - php: 7.3
           env: DEPENDENCIES="php-http/buzz-adapter:^1.0 php-http/guzzle6-adapter:^1.1.1 php-http/react-adapter:^0.2.1 php-http/socket-client:^1.0"
 
           # Test with httplug 2.x clients
-        - php: 7.2
-          env: DEPENDENCIES="php-http/guzzle6-adapter:^2.0.1 php-http/curl-client:^2.0.0 php-http/vcr-plugin:^1.0@dev"
+        - php: 7.3
+          env: DEPENDENCIES="php-http/guzzle7-adapter php-http/curl-client:^2.0.0 php-http/vcr-plugin:^1.0@dev"
 
           # Latest commit to master
         - php: 7.4
-          env: STABILITY="dev" DEPENDENCIES="php-http/vcr-plugin:^1.0@dev"
+          env: STABILITY="dev" DEPENDENCIES="php-http/guzzle7-adapter php-http/vcr-plugin:^1.0@dev"
+        - php: 8.0
+          env: STABILITY="dev"
 
     allow_failures:
           # dev stability is allowed to fail.
@@ -67,7 +70,6 @@ before_install:
 
 install:
     # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
-    - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
     - COMPOSER_MEMORY_LIMIT=-1 composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
     - vendor/bin/simple-phpunit install
 

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
+# 1.20.0 - to be released
+
+- Support PHP 8.
+
 ## 1.19.0 - 2020-10-21
 
 ### Changed

README.md

@@ -28,6 +28,7 @@ Please see the [official documentation](http://docs.php-http.org/en/latest/integ
 ## Testing
 
 ``` bash
+$ composer require --dev php-http/guzzle7-adapter
 $ composer test
 ```
 

composer.json

@@ -25,7 +25,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.3 || ^8.0",
         "php-http/client-common": "^1.9 || ^2.0",
         "php-http/client-implementation": "^1.0",
         "php-http/discovery": "^1.0",
@@ -46,11 +46,11 @@
         "php-http/curl-client": "<2.0"
     },
     "require-dev": {
+        "guzzlehttp/psr7": "^1.7",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "nyholm/nsa": "^1.1",
         "nyholm/psr7": "^1.2.1",
         "php-http/cache-plugin": "^1.7",
-        "php-http/guzzle6-adapter": "^1.1.1 || ^2.0.1",
         "php-http/mock-client": "^1.2",
         "php-http/promise": "^1.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",

src/ClientFactory/Guzzle7Factory.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Http\HttplugBundle\ClientFactory;
+
+use Http\Adapter\Guzzle7\Client;
+
+/**
+ * @author Tobias Nyholm <[email protected]>
+ */
+class Guzzle7Factory implements ClientFactory
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createClient(array $config = [])
+    {
+        if (!class_exists('Http\Adapter\Guzzle7\Client')) {
+            throw new \LogicException('To use the Guzzle7 adapter you need to install the "php-http/guzzle7-adapter" package.');
+        }
+
+        return Client::createWithConfig($config);
+    }
+}

src/Resources/config/data-collector.xml

@@ -72,6 +72,12 @@
             <argument type="service" id="httplug.collector.formatter"/>
             <argument type="service" id="debug.stopwatch"/>
         </service>
+        <service id="httplug.collector.factory.guzzle7" class="Http\HttplugBundle\Collector\ProfileClientFactory" decorates="httplug.factory.guzzle7" public="false">
+            <argument type="service" id="httplug.collector.factory.guzzle7.inner"/>
+            <argument type="service" id="httplug.collector.collector"/>
+            <argument type="service" id="httplug.collector.formatter"/>
+            <argument type="service" id="debug.stopwatch"/>
+        </service>
         <service id="httplug.collector.factory.react" class="Http\HttplugBundle\Collector\ProfileClientFactory" decorates="httplug.factory.react" public="false">
             <argument type="service" id="httplug.collector.factory.react.inner"/>
             <argument type="service" id="httplug.collector.collector"/>

src/Resources/config/services.xml

@@ -90,6 +90,7 @@
             <argument type="service" id="httplug.message_factory"/>
         </service>
         <service id="httplug.factory.guzzle6" class="Http\HttplugBundle\ClientFactory\Guzzle6Factory" public="false" />
+        <service id="httplug.factory.guzzle7" class="Http\HttplugBundle\ClientFactory\Guzzle7Factory" public="false" />
         <service id="httplug.factory.react" class="Http\HttplugBundle\ClientFactory\ReactFactory" public="false">
             <argument type="service" id="httplug.message_factory"/>
         </service>

tests/Functional/DiscoveredClientsTest.php

@@ -4,6 +4,7 @@
 
 namespace Http\HttplugBundle\Tests\Functional;
 
+use Http\Adapter\Guzzle7\Client;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use Http\Discovery\HttpAsyncClientDiscovery;
@@ -101,6 +102,10 @@ public function testDisabledDiscovery(): void
      */
     public function testForcedDiscovery(): void
     {
+        if (!class_exists(Client::class)) {
+            $this->markTestSkipped('Guzzle7 adapter is not installed');
+        }
+
         $container = $this->getContainer(true, 'discovery_forced');
 
         $this->assertFalse($container->has('httplug.auto_discovery.auto_discovered_client'));

tests/Functional/DiscoveryTest.php

@@ -4,7 +4,7 @@
 
 namespace Http\HttplugBundle\Tests\Unit\DependencyInjection\Compiler;
 
-use Http\Adapter\Guzzle6\Client;
+use Http\Adapter\Guzzle7\Client;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;

tests/Functional/ServiceInstantiationTest.php

@@ -5,6 +5,7 @@
 namespace Http\HttplugBundle\Tests\Functional;
 
 use GuzzleHttp\Psr7\Request as GuzzleRequest;
+use Http\Adapter\Guzzle7\Client;
 use Http\Client\Common\Plugin\RedirectPlugin;
 use Http\Client\Common\PluginClient;
 use Http\Client\HttpClient;
@@ -29,6 +30,10 @@ class ServiceInstantiationTest extends WebTestCase
 {
     public function testHttpClient(): void
     {
+        if (!class_exists(Client::class)) {
+            $this->markTestSkipped('Guzzle7 adapter is not installed');
+        }
+
         static::bootKernel();
         $container = static::$kernel->getContainer();
         $this->assertTrue($container->has('httplug.client'));
@@ -38,6 +43,10 @@ public function testHttpClient(): void
 
     public function testHttpClientNoDebug(): void
     {
+        if (!class_exists(Client::class)) {
+            $this->markTestSkipped('Guzzle7 adapter is not installed');
+        }
+
         static::bootKernel(['debug' => false]);
         $container = static::$kernel->getContainer();
         $this->assertTrue($container->has('httplug.client'));
@@ -70,6 +79,10 @@ public function testProfilingShouldNotChangeServiceReference(): void
 
     public function testProfilingDecoration(): void
     {
+        if (!class_exists(Client::class)) {
+            $this->markTestSkipped('Guzzle7 adapter is not installed');
+        }
+
         static::bootKernel(['debug' => true]);
         $container = static::$kernel->getContainer();