Merge pull request #483 from php-http/sf8

dbu · web-flow · commit a2cceefb5ba6 · 2026-01-05T11:15:57.000+01:00
test with symfony 8
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -72,6 +72,10 @@ jobs:
             symfony-require: "7.4.*"
             php-version: "8.5"
             symfony-deprecations-helper: "weak"
+          - dependencies: "php-http/guzzle7-adapter symfony/http-client:^8"
+            symfony-require: "8.0.*"
+            php-version: "8.5"
+            symfony-deprecations-helper: "weak"
 
     steps:
       - name: "Checkout"
@@ -88,14 +92,21 @@ jobs:
           tools: "flex"
 
       - name: "Enforce using stable dependencies"
-        run: "composer config minimum-stability stable"
-        if: "${{ matrix.stability == 'stable' }}"
+        run: "composer config minimum-stability ${{ matrix.stability }}"
+        if: "${{ matrix.stability }}"
 
       - name: "Add dependencies and enable flex"
         run: |
           composer config allow-plugins.symfony/flex true
           composer require --no-update ${{ matrix.dependencies }}
 
+      - name: "Work around https://github.com/symfony/symfony/pull/62692"
+        run: "composer require --no-update symfony/console:*"
+
+      - name: "Get correct version for workaround"
+        run: "composer require --no-update symfony/console:${{ matrix.symfony-require }}"
+        if: "${{ matrix.symfony-require }}"
+
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v3"
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 # Version 2
 
+# 2.3.0 - unreleased
+
+- Compatible with Symfony 8.
+
 # 2.2.0 - 2025-12-11
 
 - Replaced XML configuration with PHP configuration.
diff --git a/composer.json b/composer.json
@@ -35,11 +35,11 @@
         "php-http/stopwatch-plugin": "^1.2",
         "psr/http-factory-implementation": "^1.0",
         "psr/http-message": "^1.0 || ^2.0",
-        "symfony/config": "^6.4 || ^7.1",
-        "symfony/dependency-injection": "^6.4 || ^7.1",
-        "symfony/event-dispatcher": "^6.4 || ^7.1",
-        "symfony/http-kernel": "^6.4 || ^7.1",
-        "symfony/options-resolver": "^6.4 || ^7.1"
+        "symfony/config": "^6.4 || ^7.1 || ^8.0",
+        "symfony/dependency-injection": "^6.4 || ^7.1 || ^8.0",
+        "symfony/event-dispatcher": "^6.4 || ^7.1 || ^8.0",
+        "symfony/http-kernel": "^6.4 || ^7.1 || ^8.0",
+        "symfony/options-resolver": "^6.4 || ^7.1 || ^8.0"
     },
     "conflict": {
         "kriswallsmith/buzz": "<0.17",
@@ -52,23 +52,23 @@
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.7 || ^2.0",
-        "matthiasnoback/symfony-config-test": "^5.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0",
+        "matthiasnoback/symfony-config-test": "^5.2 || ^v6.1.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0 || ^6.2.0",
         "nyholm/nsa": "^1.1",
         "nyholm/psr7": "^1.2.1",
-        "php-http/cache-plugin": "^1.7",
+        "php-http/cache-plugin": "^1.7 || ^2.0",
         "php-http/mock-client": "^1.2",
         "php-http/promise": "^1.0",
         "php-http/throttle-plugin": "^1.1",
-        "phpunit/phpunit": "^9",
-        "symfony/browser-kit": "^6.4 || ^7.1",
-        "symfony/cache": "^6.4 || ^7.1",
-        "symfony/dom-crawler": "^6.4 || ^7.1",
-        "symfony/framework-bundle": "^6.4 || ^7.1",
-        "symfony/http-foundation": "^6.4 || ^7.1",
-        "symfony/stopwatch": "^6.4 || ^7.1",
-        "symfony/twig-bundle": "^6.4 || ^7.1",
-        "symfony/web-profiler-bundle": "^6.4 || ^7.1",
+        "phpunit/phpunit": "^9 || ^10.0 || ^11.0 || ^12.0",
+        "symfony/browser-kit": "^6.4 || ^7.1 || ^8.0",
+        "symfony/cache": "^6.4 || ^7.1 || ^8.0",
+        "symfony/dom-crawler": "^6.4 || ^7.1 || ^8.0",
+        "symfony/framework-bundle": "^6.4 || ^7.1 || ^8.0",
+        "symfony/http-foundation": "^6.4 || ^7.1 || ^8.0",
+        "symfony/stopwatch": "^6.4 || ^7.1 || ^8.0",
+        "symfony/twig-bundle": "^6.4 || ^7.1 || ^8.0",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.1 || ^8.0",
         "twig/twig": "^1.41 || ^2.10 || ^3.0"
     },
     "suggest": {
@@ -96,7 +96,6 @@
             "tests/Resources/app/AppKernel.php"
         ]
     },
-    "prefer-stable": false,
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
diff --git a/src/Collector/Collector.php b/src/Collector/Collector.php
@@ -22,9 +22,11 @@
 final class Collector extends DataCollector
 {
     private ?Stack $activeStack = null;
+    private ?int $capturedBodyLength = null;
 
-    public function __construct(private ?int $capturedBodyLength = null)
+    public function __construct(?int $capturedBodyLength = null)
     {
+        $this->capturedBodyLength = $capturedBodyLength;
         $this->reset();
     }
 
diff --git a/tests/Functional/DiscoveredClientsTest.php b/tests/Functional/DiscoveredClientsTest.php
@@ -15,6 +15,7 @@
 use Nyholm\NSA;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 final class DiscoveredClientsTest extends WebTestCase
 {
@@ -119,7 +120,7 @@ public function testForcedDiscovery(): void
         $this->assertEquals($container->get('httplug.client.acme'), HttpAsyncClientDiscovery::find());
     }
 
-    private function getCustomContainer($debug, $environment = 'test')
+    private function getCustomContainer($debug, $environment = 'test'): ContainerInterface
     {
         static::bootKernel(['debug' => $debug, 'environment' => $environment]);
 
diff --git a/tests/Functional/Issue206.php b/tests/Functional/Issue206.php
@@ -5,7 +5,6 @@
 namespace Http\HttplugBundle\Tests\Functional;
 
 use Http\Client\Common\HttpMethodsClient;
-use Http\Client\Common\PluginClient;
 use Http\Client\Common\PluginClientFactory;
 use Http\Discovery\Psr18ClientDiscovery;
 use Nyholm\Psr7\Factory\Psr17Factory;
@@ -24,6 +23,6 @@ public function testCustomClientDoesNotCauseException(): void
         $pluginClient = (new PluginClientFactory())->createClient($myCustomClient, []);
 
         // If we get to this line, no exceptions has been thrown.
-        $this->assertInstanceOf(PluginClient::class, $pluginClient);
+        $this->addToAssertionCount(1);
     }
 }
diff --git a/tests/Functional/ProfilerTest.php b/tests/Functional/ProfilerTest.php
@@ -5,6 +5,7 @@
 namespace Http\HttplugBundle\Tests\Functional;
 
 use GuzzleHttp\Psr7\Request;
+use PHPUnit\Framework\Attributes\Group;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
@@ -13,6 +14,7 @@ final class ProfilerTest extends WebTestCase
     /**
      * @group legacy
      */
+    #[Group('legacy')]
     public function testShowProfiler(): void
     {
         $client = static::createClient();
diff --git a/tests/Functional/ProfilingTest.php b/tests/Functional/ProfilingTest.php
@@ -7,8 +7,7 @@
 use GuzzleHttp\Psr7\Request;
 use Http\Client\Common\Plugin;
 use Http\Client\Common\PluginClient;
-use Http\Discovery\StreamFactoryDiscovery;
-use Http\Discovery\UriFactoryDiscovery;
+use Http\Discovery\Psr17FactoryDiscovery;
 use Http\HttplugBundle\Collector\Collector;
 use Http\HttplugBundle\Collector\Formatter;
 use Http\HttplugBundle\Collector\ProfileClient;
@@ -40,7 +39,7 @@ public function setUp(): void
     public function testProfilingWithCachePlugin(): void
     {
         $client = $this->createClient([
-            new Plugin\CachePlugin(new ArrayAdapter(), StreamFactoryDiscovery::find(), [
+            new Plugin\CachePlugin(new ArrayAdapter(), Psr17FactoryDiscovery::findStreamFactory(), [
                 'respect_response_cache_directives' => [],
                 'default_ttl' => 86400,
             ]),
@@ -79,7 +78,7 @@ public function testProfilingWhenPluginThrowException(): void
     public function testProfiling(): void
     {
         $client = $this->createClient([
-            new Plugin\AddHostPlugin(UriFactoryDiscovery::find()->createUri('https://example.com')),
+            new Plugin\AddHostPlugin(Psr17FactoryDiscovery::findUriFactory()->createUri('https://example.com')),
             new Plugin\RedirectPlugin(),
             new Plugin\RetryPlugin(),
         ]);
@@ -95,7 +94,7 @@ public function testProfiling(): void
         $this->assertEquals('example.com', $stack->getRequestHost());
     }
 
-    private function createClient(array $plugins, $clientName = 'Acme', array $clientOptions = [])
+    private function createClient(array $plugins, string $clientName = 'Acme', array $clientOptions = [])
     {
         $plugins = array_map(fn (Plugin $plugin) => new ProfilePlugin($plugin, $this->collector, $this->formatter, $plugin::class), $plugins);
 
diff --git a/tests/Functional/ServiceInstantiationTest.php b/tests/Functional/ServiceInstantiationTest.php
@@ -13,6 +13,7 @@
 use Http\HttplugBundle\Collector\ProfilePlugin;
 use Http\HttplugBundle\Collector\StackPlugin;
 use Nyholm\NSA;
+use PHPUnit\Framework\Attributes\Group;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
@@ -55,6 +56,7 @@ public function testHttpClientNoDebug(): void
     /**
      * @group legacy
      */
+    #[Group('legacy')]
     public function testDebugToolbar(): void
     {
         static::bootKernel(['debug' => true]);
diff --git a/tests/Unit/Collector/FormatterTest.php b/tests/Unit/Collector/FormatterTest.php
@@ -12,6 +12,7 @@
 use Http\Message\Formatter as MessageFormatter;
 use Http\Message\Formatter\CurlCommandFormatter;
 use Http\Message\Formatter\SimpleFormatter;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -66,6 +67,7 @@ public function testFormatResponseForRequest(): void
     /**
      * @group legacy
      */
+    #[Group('legacy')]
     public function testFormatResponse(): void
     {
         $response = new Response();
diff --git a/tests/Unit/DependencyInjection/ConfigurationTest.php b/tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -13,6 +13,7 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
 /**
  * @author David Buchmann <mail@davidbu.ch>
@@ -115,7 +116,7 @@ protected function getConfiguration(): ConfigurationInterface
 
     public function testSupportsAllConfigFormats(): void
     {
-        if (!class_exists(Client::class)) {
+        if (!\class_exists(Client::class)) {
             $this->markTestSkipped('Guzzle 7 adapter is not installed');
         }
 
@@ -322,11 +323,17 @@ public function testSupportsAllConfigFormats(): void
             ],
         ];
 
-        $formats = array_map(fn ($path) => __DIR__.'/../../Resources/Fixtures/'.$path, [
+        $formats = [
             'config/full.yml',
-            'config/full.xml',
             'config/full.php',
-        ]);
+        ];
+
+        // XML configuration is not supported in Symfony 8+
+        if (\class_exists(XmlFileLoader::class)) {
+            $formats[] = 'config/full.xml';
+        }
+
+        $formats = array_map(fn ($path) => __DIR__.'/../../Resources/Fixtures/'.$path, $formats);
 
         foreach ($formats as $format) {
             $this->assertProcessedConfigurationEquals($expectedConfiguration, [$format]);
diff --git a/tests/Unit/DependencyInjection/HttplugExtensionTest.php b/tests/Unit/DependencyInjection/HttplugExtensionTest.php
@@ -9,6 +9,8 @@
 use Http\HttplugBundle\DependencyInjection\HttplugExtension;
 use Http\HttplugBundle\Tests\Resources\CustomPluginConfigurator;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -505,6 +507,8 @@ public function testClientIsTaggedWithHttplugClientTag(): void
      *
      * @group vcr-plugin
      */
+    #[DataProvider('provideVcrPluginConfig')]
+    #[Group('vcr-plugin')]
     public function testVcrPluginConfiguration(array $config, array $services, array $arguments = []): void
     {
         if (!class_exists(InMemoryRecorder::class)) {
@@ -529,6 +533,7 @@ public function testVcrPluginConfiguration(array $config, array $services, array
     /**
      * @group vcr-plugin
      */
+    #[Group('vcr-plugin')]
     public function testIsNotLoadedUnlessNeeded(): void
     {
         if (!class_exists(InMemoryRecorder::class)) {
@@ -539,7 +544,7 @@ public function testIsNotLoadedUnlessNeeded(): void
         $this->assertContainerBuilderNotHasService('httplug.plugin.vcr.recorder.in_memory');
     }
 
-    public function provideVcrPluginConfig()
+    public static function provideVcrPluginConfig(): \Generator
     {
         $config = [
             'mode' => 'record',

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,11 @@`
`22`	`22`	`final class Collector extends DataCollector`
`23`	`23`	`{`
`24`	`24`	`private ?Stack $activeStack = null;`
	`25`	`+ private ?int $capturedBodyLength = null;`
`25`	`26`
`26`		`- public function __construct(private ?int $capturedBodyLength = null)`
	`27`	`+ public function __construct(?int $capturedBodyLength = null)`
`27`	`28`	`{`
	`29`	`+ $this->capturedBodyLength = $capturedBodyLength;`
`28`	`30`	`$this->reset();`
`29`	`31`	`}`
`30`	`32`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use Nyholm\NSA;`
`16`	`16`	`use Psr\Http\Client\ClientInterface;`
`17`	`17`	`use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;`
	`18`	`+use Symfony\Component\DependencyInjection\ContainerInterface;`
`18`	`19`
`19`	`20`	`final class DiscoveredClientsTest extends WebTestCase`
`20`	`21`	`{`
`@@ -119,7 +120,7 @@ public function testForcedDiscovery(): void`
`119`	`120`	`$this->assertEquals($container->get('httplug.client.acme'), HttpAsyncClientDiscovery::find());`
`120`	`121`	`}`
`121`	`122`
`122`		`- private function getCustomContainer($debug, $environment = 'test')`
	`123`	`+ private function getCustomContainer($debug, $environment = 'test'): ContainerInterface`
`123`	`124`	`{`
`124`	`125`	`static::bootKernel(['debug' => $debug, 'environment' => $environment]);`
`125`	`126`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`namespace Http\HttplugBundle\Tests\Functional;`
`6`	`6`
`7`	`7`	`use Http\Client\Common\HttpMethodsClient;`
`8`		`-use Http\Client\Common\PluginClient;`
`9`	`8`	`use Http\Client\Common\PluginClientFactory;`
`10`	`9`	`use Http\Discovery\Psr18ClientDiscovery;`
`11`	`10`	`use Nyholm\Psr7\Factory\Psr17Factory;`
`@@ -24,6 +23,6 @@ public function testCustomClientDoesNotCauseException(): void`
`24`	`23`	`$pluginClient = (new PluginClientFactory())->createClient($myCustomClient, []);`
`25`	`24`
`26`	`25`	`// If we get to this line, no exceptions has been thrown.`
`27`		`- $this->assertInstanceOf(PluginClient::class, $pluginClient);`
	`26`	`+ $this->addToAssertionCount(1);`
`28`	`27`	`}`
`29`	`28`	`}`