add support for attributes

README.md

@@ -4,6 +4,7 @@ Simple DB fixtures loading, replacement for phpunit/dbunit
 ## Usage
 ```php
 use IW\PHPUnit\DbFixtures\DbFixturesTrait;
+use IW\PHPUnit\DbFixtures\Fixtures;
 
 final class MyTest extends TestCase
 {
@@ -17,10 +18,8 @@ final class MyTest extends TestCase
       'elastic' => new Elasticsearch\Client(...),
     };
   }
-
-  /**
-   * @fixtures mysql read-only fixtures.yml
-   */
+
+  #[Fixtures('mysql', 'read-only', 'fixtures.yml')]
   public function testWithFixtures() {
     // before test data from fixtures.yml will be loaded into mysql
   }

composer.json

@@ -10,8 +10,8 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
-        "phpunit/phpunit": "^9.5||^10.0||^11.0"
+        "php": ">=8.3",
+        "phpunit/phpunit": "^11.0"
     },
     "suggest": {
         "opensearch-project/opensearch-php" : "Needed for OpenSearch support",

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '2'
 services:
   mysql:
     image: mysql:8.0

src/DbFixturesTrait.php

@@ -7,12 +7,12 @@
 use OpenSearch;
 use PDO;
 use stdClass;
+use ReflectionMethod;
 use Symfony\Component\Yaml\Yaml;
 use PHPUnit\Framework\Attributes\Before;
 use PHPUnit\Metadata\Annotation\Parser\Registry;
 use PHPUnit\Util\Test;
-
-const AVAILABLE_MODES = ['read-only', 'write'];
+use PHPUnit\Event\Facade as EventFacade;
 
 trait DbFixturesTrait
 {
@@ -40,44 +40,45 @@ abstract protected function getConnection(string $connectionName) : mixed;
      */
     #[Before]
     public function loadFixturesByAnnotations(): void {
-        if (method_exists(Test::class, 'parseTestMethodAnnotations')) {
-            $annotations = $annotations = Test::parseTestMethodAnnotations(
-                static::class,
-                $this->getName(false)
-            )['method'] ?? [];
-        } else {
-            $annotations = Registry::getInstance()->forMethod(
-                static::class,
-                $this->name()
-            )->symbolAnnotations();
-        }
+        $annotations = Registry::getInstance()->forMethod(
+            static::class,
+            $this->name()
+        )->symbolAnnotations();
 
         $fixtures = [];
         foreach ($annotations['fixtures'] ?? [] as $fixture) {
-            [$connectionName, $mode, $args] = \explode(' ', $fixture, 3) + [null, null, null];
+            [$connectionName, $mode, $files] = \explode(' ', $fixture, 3) + [null, null, null];
 
-            if (!in_array($mode, AVAILABLE_MODES)) {
-                throw new \UnexpectedValueException(
-                    sprintf('Wrong or missing mode of the fixture. Available modes [%s].', implode(', ', AVAILABLE_MODES))
-                );
+            $fixture = new Fixtures($connectionName, $mode, ...explode(' ', $files));
+
+            if (isset($fixtures[$connectionName])) {
+                $fixture = $fixture->mergeWith($fixtures[$connectionName]);
             }
 
-            if (array_key_exists($connectionName, $fixtures)) {
-                [$newMode, $newArgs] = $fixtures[$connectionName];
-                $params = [$newMode, $newArgs.' '.$args];
-            } else {
-                $params = [$mode, $args];
+            $fixtures[$connectionName] = $fixture;
+
+            EventFacade::emitter()->testTriggeredPhpunitDeprecation(
+                $this->valueObjectForEvents(),
+                'Annotation @fixtures is deprecated, use attribute Fixtures instead',
+            );
+        }
+
+        foreach ((new ReflectionMethod($this, $this->name()))->getAttributes(Fixtures::class) as $attribute) {
+            $fixture = $attribute->newInstance();
+
+            if (isset($fixtures[$fixture->label])) {
+                $fixture = $fixture->mergeWith($fixtures[$fixture->label]);
             }
 
-            $fixtures[$connectionName]  = $params;
+            $fixtures[$fixture->label] = $fixture;
         }
 
-        foreach ($fixtures as $connectionName => [$mode, $args]) {
+        foreach ($fixtures as $connectionName => $fixture) {
+            $mode = $fixture->mode;
+
             $filenames = [];
-            if ($args) {
-                foreach (\explode(' ', $args) as $filename) {
-                    $filenames[] = $this->resolveFilePath($connectionName, $filename);
-                }
+            foreach ($fixture->files as $filename) {
+                $filenames[] = $this->resolveFilePath($connectionName, $filename);
             }
 
             $cache        = $this->getCache();

src/Fixtures.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+namespace IW\PHPUnit\DbFixtures;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
+final readonly class Fixtures
+{
+    public array $files;
+
+    public function __construct(public string $label, public string $mode, string ...$files) {
+        assert(!empty($label), 'No label given');
+        assert(in_array($mode, ['read-only', 'write']), 'Mode must be either "read-only" or "write"');
+        assert(!empty($files), 'No fixture files given');
+
+        foreach ($files as $file) {
+            assert(!empty($file), 'Empty fixture file given');
+        }
+
+        $this->files = $files;
+    }
+
+    public function mergeWith(Fixtures $fixtures) : Fixtures {
+        assert($fixtures->label === $this->label, 'Cannot merge fixtures with different labels');
+
+        return new Fixtures(
+            $this->label,
+            in_array('write', [$fixtures->mode, $this->mode]) ? 'write' : 'read-only',
+            array_values(array_unique(array_merge($fixtures->files, $this->files))),
+        );
+    }
+}

tests/FixturesTest.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace IW\PHPUnit\DbFixtures;
+
+use PHPUnit\Framework\TestCase;
+
+final class FixturesTest extends TestCase
+{
+    public function testCreate() : void {
+        $fixtures = new Fixtures('mysql', 'write', 'foo.yaml', 'bar.json');
+
+        $this->assertSame('mysql', $fixtures->label);
+        $this->assertSame('write', $fixtures->mode);
+        $this->assertSame(['foo.yaml', 'bar.json'], $fixtures->files);
+    }
+}

tests/UsageOfDbFixturesTraitTest.php

@@ -3,9 +3,11 @@
 namespace IW\PHPUnit\DbFixtures;
 
 use Elasticsearch;
+use IW\PHPUnit\DbFixtures\Fixtures;
 use MongoDB;
-use PDO;
 use MongoDB\Client;
+use PDO;
+use PHPUnit\Framework\Attributes\TestWith;
 
 final class UsageOfDbFixturesTraitTest extends \PHPUnit\Framework\TestCase
 {
@@ -52,6 +54,14 @@ public function provideConnections(): \Generator {
      * @testWith ["mysql"]
      *           ["sqlite"]
      */
+    public function testBdsWithAnnotations(string $label): void {
+        $this->testBds($label);
+    }
+
+    #[Fixtures('mysql', 'read-only', 'bds.yml')]
+    #[Fixtures('sqlite', 'read-only', 'bds.yml')]
+    #[TestWith(['mysql'])]
+    #[TestWith(['sqlite'])]
     public function testBds(string $connectionName): void {
         $connection = $this->getConnection($connectionName);
 
@@ -76,10 +86,7 @@ public function testBds(string $connectionName): void {
         $this->assertSame($expected, $demo);
     }
 
-    /**
-     * @fixtures mongo read-only bds.json
-     *
-     */
+    #[Fixtures('mongo', 'read-only', 'bds.json')]
     public function testBdsMongo(): void {
         $database        = $this->getConnection('mongo');
         $fieldCollection = $database->selectCollection('user');
@@ -121,13 +128,10 @@ public function testBdsMongo(): void {
         $this->assertSame($expected, $foundDocuments);
     }
 
-    /**
-     * @fixtures sqlite read-only bds.yml fixtures.yml fixtures.yaml
-     * @fixtures mysql read-only bds.yml fixtures.yml fixtures.yaml
-     *
-     * @testWith ["mysql"]
-     *           ["sqlite"]
-     */
+    #[Fixtures('mysql', 'read-only', 'bds.yml', 'fixtures.yml', 'fixtures.yaml')]
+    #[Fixtures('sqlite', 'read-only', 'bds.yml', 'fixtures.yml', 'fixtures.yaml')]
+    #[TestWith(['mysql'])]
+    #[TestWith(['sqlite'])]
     public function testLoadingFixtures(string $connectionName): void {
         $connection = $this->getConnection($connectionName);
 
@@ -152,10 +156,7 @@ public function testLoadingFixtures(string $connectionName): void {
         $this->assertSame($expected, $demo);
     }
 
-    /**
-     * @fixtures mongo read-only fixtures.json
-     *
-     */
+    #[Fixtures('mongo', 'read-only', 'fixtures.json')]
     public function testLoadingFixturesMongo(): void {
         $database        = $this->getConnection('mongo');
         $fieldCollection = $database->selectCollection('field');