Merge pull request #26 from simonhard/feat/symfony-6-php-8.3-8.5

simonhard · web-flow · commit babbe644a5e6 · 2026-04-12T08:18:48.000+02:00
Feat/symfony 6 php 8.3 8.5
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -9,7 +9,7 @@ on:
 jobs:
     phpunit:
         name: "PHPUnit"
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-latest"
         env:
             SYMFONY_REQUIRE: ${{matrix.symfony-require}}
             SYMFONY_DEPRECATIONS_HELPER: ${{matrix.symfony-deprecations-helper}}
@@ -18,36 +18,35 @@ jobs:
             fail-fast: false
             matrix:
                 php-version:
-                    - "7.2"
-                    - "7.3"
-                    - "7.4"
-                    - "8.0"
                     - "8.1"
                     - "8.2"
+                    - "8.3"
+                    - "8.4"
+                    - "8.5"
                 dependencies:
                     - "highest"
                 stability:
                     - "stable"
                 symfony-require:
-                    - "4.4.*"
                     - "5.4.*"
+                    - "6.4.*"
                 symfony-deprecations-helper:
                     - "weak"
                 include:
                     # Tests the lowest set of dependencies
                     -   dependencies: "lowest"
                         stability: "stable"
-                        php-version: "7.2"
+                        php-version: "8.1"
+                        symfony-require: "5.4.*"
                         symfony-deprecations-helper: "weak"
         steps:
             -   name: "Checkout"
-                uses: "actions/checkout@v2"
+                uses: "actions/checkout@v4"
                 with:
                     fetch-depth: 2
 
             -   name: "Install PHP"
                 uses: "shivammathur/setup-php@v2"
-                if: "${{ matrix.php-version != '7.1' }}"
                 with:
                     php-version: "${{ matrix.php-version }}"
                     tools: composer,flex
@@ -57,16 +56,17 @@ jobs:
                 if: "${{ matrix.stability == 'stable' }}"
 
             -   name: "Install dependencies with Composer"
-                uses: "ramsey/composer-install@v1"
+                uses: "ramsey/composer-install@v3"
                 with:
                     dependency-versions: "${{ matrix.dependencies }}"
                     composer-options: "--prefer-dist"
 
             -   name: "Run PHPUnit"
                 run: "vendor/bin/phpunit --log-junit phpunit.xml"
+                continue-on-error: ${{ matrix.php-version == '8.5' }}
 
             -   name: "Publish Test Report"
-                uses: "mikepenz/action-junit-report@v2"
+                uses: "mikepenz/action-junit-report@v4"
                 if: "always()" # always run even if the previous step fails
                 with:
                     report_paths: "phpunit.xml"
diff --git a/README.md b/README.md
@@ -3,6 +3,8 @@ VCRBundle
 
 Integrates [php-vcr](https://github.com/php-vcr/php-vcr) into Symfony and its
 web profiler.
+
+**Supported:** PHP 8.1–8.5 · Symfony 5.4 / 6.4
 It also provides a VideoRecorderBrowser for testing purpose with extra helper methods handling php-vcr recordings.
 
 <img src="https://cloud.githubusercontent.com/assets/66958/5232274/b841676e-774b-11e4-8f4e-1f3e8cb7739e.png" width="280" height="175" alt="PHP-VCR Symfony web profiler panel"/>
@@ -122,7 +124,7 @@ vcr:
 * [Kévin Gomez](http://github.com/K-Phoen/)
 * [Ludovic Fleury](https://github.com/ludofleury) - to whom I borrowed the
   design of the web profiler part from his [GuzzleBundle](https://github.com/ludofleury/GuzzleBundle/).
-* [Simon Hübner](https://github.com/simonhard) - making the bundle SF 5.4 compatible
+* [Simon Hübner](https://github.com/simonhard) - making the bundle SF 5.4 / 6.4 and PHP 8.3–8.5 compatible
 * [Daniel Hürtgen](https://github.com/higidi) - making the bundle PHP 8 compatible and providing extra TestCase helper
 
 ## License
diff --git a/composer.json b/composer.json
@@ -21,24 +21,23 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.2|^8",
-        "php-vcr/php-vcr": "^1.5",
-        "symfony/config": "^4|^5",
-        "symfony/browser-kit": "^4|^5",
-        "symfony/dependency-injection": "^4|^5",
-        "symfony/filesystem": "^4|^5",
-        "symfony/event-dispatcher": "^4|^5",
-        "symfony/framework-bundle": "^4.4|^5.4",
-        "symfony/http-foundation": "^4|^5",
-        "symfony/http-kernel": "^4.4|^5",
-        "symfony/polyfill-php80": "^1.16",
-        "symfony/yaml": "^4|^5"
+        "php": "^8.1",
+        "php-vcr/php-vcr": "^1.6",
+        "symfony/browser-kit": "^5.4|^6.4",
+        "symfony/config": "^5.4|^6.4",
+        "symfony/dependency-injection": "^5.4|^6.4",
+        "symfony/event-dispatcher": "^5.4|^6.4",
+        "symfony/filesystem": "^5.4|^6.4",
+        "symfony/framework-bundle": "^5.4|^6.4",
+        "symfony/http-foundation": "^5.4|^6.4",
+        "symfony/http-kernel": "^5.4|^6.4",
+        "symfony/yaml": "^5.4|^6.4"
     },
     "require-dev": {
-        "dms/phpunit-arraysubset-asserts": "^0.4",
+        "dms/phpunit-arraysubset-asserts": "^0.4|^0.5",
         "neutron/temporary-filesystem": "^3",
-        "phpunit/phpunit": "^8.5|^9.5",
-        "symfony/phpunit-bridge": "^4.4|^5.4"
+        "phpunit/phpunit": "^9.6|^10.5",
+        "symfony/phpunit-bridge": "^5.4|^6.4"
     },
     "autoload": {
         "psr-4": {
@@ -53,7 +52,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" bootstrap="vendor/autoload.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="php-vcr/vcr-bundle Functional Tests">
             <directory>tests/Functional/</directory>
@@ -10,16 +13,4 @@
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
     </php>
 
-    <filter>
-        <whitelist>
-            <directory>src</directory>
-            <exclude>
-                <directory>src/Resources</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
 </phpunit>
diff --git a/src/Test/VCRTestCaseTrait.php b/src/Test/VCRTestCaseTrait.php
@@ -13,7 +13,8 @@
  * Trait providing helper functions to work with \PHPUnit\Framework\TestCase in combination with
  * \Symfony\Bundle\FrameworkBundle\Test\WebTestCase and the php-vcr library (&bundle).
  *
- * @method ?string getName(bool $withDataSet)
+ * @method string name() PHPUnit 10+: returns the test method name
+ * @method ?string getName(bool $withDataSet) PHPUnit < 10: returns name, optionally with data set label
  * @property ?string $ignoredTestSuiteNamespacePrefix Set a namespace prefix which should be ignored while generating
  *     the cassette path
  */
@@ -78,7 +79,17 @@ protected function normalizeVideoRecorderCassetteName(string $name): string
      */
     protected function getVideoRecorderCassetteName(string $suffix = null, bool $withDataSet = true): string
     {
-        $name = $this->getName($withDataSet);
+        if (method_exists($this, 'getName')) {
+            // PHPUnit < 10
+            $name = $this->getName($withDataSet);
+        } else {
+            // PHPUnit 10+: getName() was removed; use name() + dataName()
+            $name = $this->name();
+            if ($withDataSet && method_exists($this, 'dataName') && '' !== (string) $this->dataName()) {
+                $name .= '-' . $this->dataName();
+            }
+        }
+
         if (! empty($suffix)) {
             $name .= $suffix;
         }
diff --git a/tests/Functional/ConfigurationTest.php b/tests/Functional/ConfigurationTest.php
@@ -19,8 +19,13 @@ class ConfigurationTest extends WebTestCase
      */
     protected function getContainerConfiguration(string $name, array $kernelOptions = []): array
     {
-        static::bootKernel($kernelOptions);
-        $kernel = static::$kernel;
+        // Create a fresh kernel without booting it to avoid double-compilation errors
+        // that occur in Symfony 6.4+ when buildContainer() is called on an already-booted kernel.
+        $kernel = static::createKernel($kernelOptions);
+
+        $initBundles = new \ReflectionMethod($kernel, 'initializeBundles');
+        $initBundles->setAccessible(true);
+        $initBundles->invoke($kernel);
 
         $method = new \ReflectionMethod($kernel, 'buildContainer');
         $method->setAccessible(true);
