Symfony 8 support follow-up, PHPUnit 11

.github/workflows/ci.yml

@@ -37,8 +37,10 @@ jobs:
 
             - name: Install dependencies
               uses: ramsey/composer-install@v3
+              with:
+                  dependency-versions: highest
               env:
-                  SYMFONY_REQUIRE: ^7
+                  SYMFONY_REQUIRE: ^8
 
             - name: Install PHPUnit dependencies
               run: vendor/bin/simple-phpunit --version
@@ -195,3 +197,34 @@ jobs:
 
         - name: Run tests
           run: vendor/bin/phpunit --configuration phpunit.xml.dist.10
+
+    phpunit-11:
+      runs-on: ubuntu-latest
+      strategy:
+        matrix:
+          php-versions: ['8.2', '8.3', '8.4', '8.5']
+        fail-fast: false
+      name: PHP ${{ matrix.php-versions }} (PHPUnit 11) Test on ubuntu-latest
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v5
+
+        - name: Setup PHP
+          uses: shivammathur/setup-php@v2
+          with:
+            php-version: ${{ matrix.php-versions }}
+            extensions: zip
+
+        - name: Install dependencies
+          uses: ramsey/composer-install@v3
+          with:
+            composer-options: "--prefer-dist"
+
+        - name: Remove phpunit-bridge dependency (not yet PHPUnit 11+ compliant)
+          run: composer remove --dev symfony/phpunit-bridge
+
+        - name: Install latest PHPUnit 11
+          run: composer require --dev --prefer-dist 'phpunit/phpunit:11.5.*'
+
+        - name: Run tests
+          run: vendor/bin/phpunit --configuration phpunit.xml.dist.11

composer.json

@@ -32,7 +32,7 @@
         "symfony/dependency-injection": "^6.4 || ^7.3 || ^8.0",
         "symfony/deprecation-contracts": "^2.4 || ^3",
         "symfony/dom-crawler": "^6.4 || ^7.3 || ^8.0",
-        "symfony/http-client": "^6.4 || ^7.0",
+        "symfony/http-client": "^6.4 || ^7.0 || ^8.0",
         "symfony/http-kernel": "^6.4 || ^7.3 || ^8.0",
         "symfony/process": "^6.4 || ^7.3 || ^8.0"
     },

phpunit.xml.dist.10

@@ -21,8 +21,6 @@
 
   <php>
     <env name="KERNEL_CLASS" value="Symfony\Component\Panther\Tests\DummyKernel"/>
-    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0"/>
-    <server name="SYMFONY_PHPUNIT_VERSION" value=">=10"/>
   </php>
 
   <testsuites>

phpunit.xml.dist.11

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         cacheDirectory=".phpunit.cache"
+>
+    <php>
+        <ini name="display_errors" value="1" />
+        <ini name="error_reporting" value="-1" />
+        <env name="KERNEL_CLASS" value="Symfony\Component\Panther\Tests\DummyKernel"/>
+        <server name="SHELL_VERBOSITY" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Project Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <source ignoreSuppressionOfDeprecations="true"
+            ignoreIndirectDeprecations="true"
+            restrictNotices="true"
+            restrictWarnings="true"
+    >
+        <include>
+            <directory>src</directory>
+        </include>
+
+        <deprecationTrigger>
+            <function>trigger_deprecation</function>
+        </deprecationTrigger>
+    </source>
+
+</phpunit>

src/Client.php

@@ -291,7 +291,7 @@ protected function createCrawler(): PantherCrawler
         return new PantherCrawler($elements, $this->webDriver, $this->webDriver->getCurrentURL());
     }
 
-    protected function doRequest($request)
+    protected function doRequest(object $request): object
     {
         throw new LogicException('Not useful in WebDriver mode.');
     }

src/DomCrawler/Crawler.php

@@ -142,7 +142,7 @@ public function matches(string $selector): bool
         return $this->filterXPath($xpath)->count() > 0;
     }
 
-    public function closest(string $selector): ?self
+    public function closest(string $selector): ?static
     {
         $converter = $this->createCssSelectorConverter();
         $xpath = WebDriverBy::xpath($converter->toXPath($selector, 'self::'));

tests/AssertionsTest.php

@@ -13,6 +13,7 @@
 
 namespace Symfony\Component\Panther\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 
@@ -29,6 +30,7 @@ protected function setUp(): void
         }
     }
 
+    #[DataProvider('clientFactoryProvider')]
     /**
      * @dataProvider clientFactoryProvider
      */

tests/ClientTest.php

@@ -20,6 +20,7 @@
 use Facebook\WebDriver\JavaScriptExecutor;
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverExpectedCondition;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\BrowserKit\CookieJar as BrowserKitCookieJar;
@@ -56,6 +57,7 @@ public function testWaitForEmptyLocator(): void
         $client->waitFor('');
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -83,6 +85,7 @@ public static function waitForDataProvider(): iterable
         yield 'xpath expression' => ['locator' => '//*[@id="hello"]'];
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -95,6 +98,7 @@ public function testWaitForVisibility(string $locator): void
         $this->assertSame('Hello', $crawler->filter('#hello')->text(null, true));
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -107,6 +111,7 @@ public function testWaitForInvisibility(string $locator): void
         $this->assertSame('', $crawler->filter('#hello')->text(null, true));
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -119,6 +124,7 @@ public function testWaitForElementToContain(string $locator): void
         $this->assertSame('Hello new content', $crawler->filter('#hello')->text(null, true));
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -131,6 +137,7 @@ public function testWaitForElementToNotContain(string $locator): void
         $this->assertSame('Hello', $crawler->filter('#hello')->text(null, true));
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -143,6 +150,7 @@ public function testWaitForEnabled(string $locator): void
         $this->assertTrue($crawler->filter('#hello')->isEnabled());
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -155,6 +163,7 @@ public function testWaitForDisabled(string $locator): void
         $this->assertFalse($crawler->filter('#hello')->isEnabled());
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -167,6 +176,7 @@ public function testWaitForAttributeToContain(string $locator): void
         $this->assertSame('42', $crawler->filter('#hello')->getAttribute('data-old-price'));
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -179,6 +189,7 @@ public function testWaitForAttributeToNotContain(string $locator): void
         $this->assertSame('36', $crawler->filter('#hello')->getAttribute('data-old-price'));
     }
 
+    #[DataProvider('waitForDataProvider')]
     /**
      * @dataProvider waitForDataProvider
      */
@@ -244,6 +255,7 @@ public static function waitForExceptionsProvider(): iterable
         ];
     }
 
+    #[DataProvider('waitForExceptionsProvider')]
     /**
      * @dataProvider waitForExceptionsProvider
      */
@@ -287,6 +299,7 @@ public function testExecuteAsyncScript(): void
         $this->assertSame('P1', $innerText);
     }
 
+    #[DataProvider('clientFactoryProvider')]
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -318,6 +331,7 @@ public function testRefreshCrawler(): void
         $this->assertSame('Hello', $refreshedCrawler->filter('h1')->text(null, true));
     }
 
+    #[DataProvider('clientFactoryProvider')]
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -336,6 +350,7 @@ public function testFollowLink(callable $clientFactory, string $type): void
         $this->assertSame(self::$baseUri.'/basic.html#e12', $crawler->getUri());
     }
 
+    #[DataProvider('clientFactoryProvider')]
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -391,6 +406,7 @@ public function testSubmitForm(callable $clientFactory): void
         $this->assertSame('I1: n/a', $crawler->filter('#result')->text(null, true));
     }
 
+    #[DataProvider('clientFactoryProvider')]
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -417,6 +433,7 @@ public function testSubmitFormWithValues(callable $clientFactory): void
         $this->assertSame('I1: Reclus', $crawler->filter('#result')->text(null, true));
     }
 
+    #[DataProvider('clientFactoryProvider')]
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -444,6 +461,7 @@ public function testHistory(callable $clientFactory): void
         $this->assertSame(self::$baseUri.'/link.html', $crawler->getUri());
     }
 
+    #[DataProvider('clientFactoryProvider')]
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -496,6 +514,7 @@ public function testCookie(callable $clientFactory, string $type): void
         $this->assertNull($cookieJar->get('foo'));
     }
 
+    #[DataProvider('clientFactoryProvider')]
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -506,6 +525,7 @@ public function testServerPort(callable $clientFactory): void
         $this->assertEquals($expectedPort, mb_substr(self::$baseUri, -4));
     }
 
+    #[DataProvider('clientFactoryProvider')]
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -593,6 +613,7 @@ public function testCreateHttpBrowserClientWithInvalidHttpClientOptions(): void
         ]);
     }
 
+    #[DataProvider('providePrefersReducedMotion')]
     /**
      * @dataProvider providePrefersReducedMotion
      */
@@ -605,6 +626,7 @@ public function testPrefersReducedMotion(string $browser): void
         $this->assertStringEndsWith('#clicked', $client->getCurrentURL());
     }
 
+    #[DataProvider('providePrefersReducedMotion')]
     /**
      * @dataProvider providePrefersReducedMotion
      */