support for PHPUnit 10

peoplepath · Mar 23, 2023 · 32c684d · 32c684d
1 parent 44d08ed
commit 32c684d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -10,9 +10,9 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
-        "phpunit/phpunit": "^7.0||^8.0||^9.0",
-        "symfony/yaml": "^4.0||^5.0||^6.0"
+        "php": ">=8.1",
+        "phpunit/phpunit": "^10.0",
+        "symfony/yaml": "^6.0"
     },
     "suggest": {
         "elasticsearch/elasticsearch" : "Needed to support Elasticsearch",

diff --git a/src/DbFixturesTrait.php b/src/DbFixturesTrait.php
@@ -8,7 +8,7 @@
 use PDO;
 use stdClass;
 use Symfony\Component\Yaml\Yaml;
-use PHPUnit\Util\Test;
+use PHPUnit\Metadata\Annotation\Parser\Registry;
 
 const AVAILABLE_MODES = ['read-only', 'write'];
 
@@ -37,13 +37,13 @@ abstract protected function getConnection(string $connectionName) : mixed;
      * @before
      */
     public function loadFixturesByAnnotations(): void {
-        $annotations = Test::parseTestMethodAnnotations(
+        $annotations = Registry::getInstance()->forMethod(
             static::class,
-            $this->getName(false)
-        );
+            $this->name()
+        )->symbolAnnotations();
 
         $fixtures = [];
-        foreach ($annotations['method']['fixtures'] ?? [] as $fixture) {
+        foreach ($annotations['fixtures'] ?? [] as $fixture) {
             [$connectionName, $mode, $args] = \explode(' ', $fixture, 3) + [null, null, null];
 
             if (!in_array($mode, AVAILABLE_MODES)) {

diff --git a/tests/UsageOfDbFixturesTraitTest.php b/tests/UsageOfDbFixturesTraitTest.php
@@ -49,10 +49,12 @@ public function provideConnections(): \Generator {
      * @fixtures sqlite read-only bds.yml
      * @fixtures mysql read-only bds.yml
      *
-     * @dataProvider provideConnections
-     * @requires @requires PHP >= 8.1
+     * @testWith ["mysql"]
+     *           ["sqlite"]
      */
-    public function testBds(\PDO $connection): void {
+    public function testBds(string $connectionName): void {
+        $connection = $this->getConnection($connectionName);
+
         $stmt = $connection->query('SELECT * FROM demo');
         $demo = $stmt->fetchAll(\PDO::FETCH_ASSOC);
 
@@ -123,9 +125,12 @@ public function testBdsMongo(): void {
      * @fixtures sqlite read-only bds.yml fixtures.yml fixtures.yaml
      * @fixtures mysql read-only bds.yml fixtures.yml fixtures.yaml
      *
-     * @dataProvider provideConnections
+     * @testWith ["mysql"]
+     *           ["sqlite"]
      */
-    public function testLoadingFixtures(\PDO $connection): void {
+    public function testLoadingFixtures(string $connectionName): void {
+        $connection = $this->getConnection($connectionName);
+
         $stmt = $connection->query('SELECT username FROM demo');
         $demo = $stmt->fetchAll(\PDO::FETCH_ASSOC);
 
@@ -222,9 +227,12 @@ public function testErrorInFixturesWithMongo() {
     }
 
     /**
-     * @dataProvider provideConnections
+     * @testWith ["mysql"]
+     *           ["sqlite"]
      */
-    function testBinaryFixturesSqlite(\PDO $pdo) {
+    function testBinaryFixturesSqlite(string $connectionName) {
+        $pdo = $this->getConnection($connectionName);
+
         $connectionName = $pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
 
         $this->loadFixtures(