texthtml · mathroc · Jul 7, 2025
diff --git a/tests/Unit/Option/BooleanTest.php b/tests/Unit/Option/BooleanTest.php
@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 use TH\Maybe\Tests\Provider;
 
@@ -12,24 +13,24 @@ final class BooleanTest extends TestCase
     use Provider\Options;
 
     /**
-     * @dataProvider andMatrix
      * @template T
      * @param Option<T> $left
      * @param Option<T> $right
      * @param Option<T> $expected
      */
+     #[DataProvider('andMatrix')]
     public function testAnd(Option $left, Option $right, Option $expected): void
     {
         Assert::assertSame($expected, $left->and($right));
     }
 
     /**
-     * @dataProvider andMatrix
      * @template T
      * @param Option<T> $left
      * @param Option<T> $right
      * @param Option<T> $expected
      */
+     #[DataProvider('andMatrix')]
     public function testAndThen(Option $left, Option $right, Option $expected): void
     {
         $calls = [];
@@ -47,12 +48,12 @@ public function testAndThen(Option $left, Option $right, Option $expected): void
     }
 
     /**
-     * @dataProvider orMatrix
      * @template T
      * @param Option<T> $left
      * @param Option<T> $right
      * @param Option<T> $expected
      */
+     #[DataProvider('orMatrix')]
     public function testOrElse(Option $left, Option $right, Option $expected): void
     {
         $calls = 0;
@@ -70,24 +71,24 @@ public function testOrElse(Option $left, Option $right, Option $expected): void
     }
 
     /**
-     * @dataProvider orMatrix
      * @template T
      * @param Option<T> $left
      * @param Option<T> $right
      * @param Option<T> $expected
      */
+     #[DataProvider('orMatrix')]
     public function testOr(Option $left, Option $right, Option $expected): void
     {
         Assert::assertSame($expected, $left->or($right));
     }
 
     /**
-     * @dataProvider xorMatrix
      * @template T
      * @param Option<T> $left
      * @param Option<T> $right
      * @param Option<T> $expected
      */
+     #[DataProvider('xorMatrix')]
     public function testXor(Option $left, Option $right, Option $expected): void
     {
         Assert::assertEquals($expected, $left->xor($right));

diff --git a/tests/Unit/Option/ContainsTest.php b/tests/Unit/Option/ContainsTest.php
@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 use TH\Maybe\Tests\Provider;
 
@@ -12,9 +13,9 @@ final class ContainsTest extends TestCase
     use Provider\Values;
 
     /**
-     * @dataProvider containsMatrix
      * @param Option<mixed> $option
      */
+     #[DataProvider('containsMatrix')]
     public function testContains(Option $option, mixed $value, bool $expect, bool $strict = true): void
     {
         Assert::assertSame($expect, $option->contains($value, strict: $strict));

diff --git a/tests/Unit/Option/ConvertToResultTest.php b/tests/Unit/Option/ConvertToResultTest.php
@@ -3,6 +3,7 @@
 namespace TH\Maybe\Tests\Unit\Option;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 use TH\Maybe\Result;
 use TH\Maybe\Tests\Assert;
@@ -13,10 +14,10 @@ final class ConvertToResultTest extends TestCase
     use Provider\Transpose;
 
     /**
-     * @dataProvider okOrMatrix
      * @param Option<mixed> $option
      * @param Result<mixed, mixed> $expected
      */
+    #[DataProvider('okOrMatrix')]
     public function testOkOr(Option $option, mixed $err, Result $expected): void
     {
         Assert::assertEquals($expected, $result = $option->okOr($err));
@@ -26,10 +27,10 @@ public function testOkOr(Option $option, mixed $err, Result $expected): void
     }
 
     /**
-     * @dataProvider okOrMatrix
      * @param Option<mixed> $option
      * @param Result<mixed, mixed> $expected
      */
+    #[DataProvider('okOrElseMatrix')]
     public function testOkOrElse(Option $option, mixed $err, Result $expected, int $expectedCalls): void
     {
         $calls = 0;
@@ -47,30 +48,43 @@ public function testOkOrElse(Option $option, mixed $err, Result $expected, int $
     }
 
     /**
-     * @return iterable<array{Option<mixed>, mixed, Result<mixed, mixed>, int}>
+     * @return iterable<array{Option<mixed>, mixed, Result<mixed, mixed>}>
      */
     public static function okOrMatrix(): iterable
     {
         yield "none" => [
             Option\none(),
             "Don't panic !",
             Result\err("Don't panic !"),
-            1,
         ];
 
         yield "some" => [
             Option\some(42),
             "Don't panic !",
             Result\ok(42),
-            0,
         ];
     }
 
     /**
-     * @dataProvider transposeMatrix
+     * @return iterable<array{Option<mixed>, mixed, Result<mixed, mixed>, int}>
+     */
+    public static function okOrElseMatrix(): iterable
+    {
+        foreach (self::okOrMatrix() as $key => [$option, $err, $result]) {
+            yield $key => [
+                $option,
+                $err,
+                $result,
+                $option instanceof Option\None ? 1 : 0,
+            ];
+        }
+    }
+
+    /**
      * @param Option<Result<mixed, mixed>> $option
      * @param Result<mixed, mixed> $expected
      */
+     #[DataProvider('transposeMatrix')]
     public function testTranspose(Option $option, Result $expected): void
     {
         Assert::assertEquals($expected, $result = Option\transpose($option));

diff --git a/tests/Unit/Option/FilterTest.php b/tests/Unit/Option/FilterTest.php
@@ -4,16 +4,17 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 
 final class FilterTest extends TestCase
 {
     /**
-     * @dataProvider filterMatrix
      * @template T
      * @param Option<T> $option
      * @param array<T> $expectedCalls
      */
+     #[DataProvider('filterMatrix')]
     public function testFilter(Option $option, bool $filterResult, bool $expectNone, array $expectedCalls): void
     {
         $calls = [];

diff --git a/tests/Unit/Option/FlattenTest.php b/tests/Unit/Option/FlattenTest.php
@@ -4,15 +4,16 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 
 final class FlattenTest extends TestCase
 {
     /**
-     * @dataProvider flattenMatrix
      * @param Option<mixed> $expected
      * @param Option<Option<mixed>> $option
      */
+     #[DataProvider('flattenMatrix')]
     public function testFlatten(Option $expected, Option $option): void
     {
         Assert::assertEquals($expected, Option\flatten($option));

diff --git a/tests/Unit/Option/FromValueTest.php b/tests/Unit/Option/FromValueTest.php
@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 use TH\Maybe\Tests\Provider;
 
@@ -12,9 +13,9 @@ final class FromValueTest extends TestCase
     use Provider\Options;
 
     /**
-     * @dataProvider fromValueMatrix
      * @param Option<mixed> $expected
      */
+     #[DataProvider('fromValueMatrix')]
     public function testFromValue(Option $expected, mixed $value, mixed $noneValue, bool $strict = true): void
     {
         Assert::assertEquals($expected, Option\fromValue($value, $noneValue, strict: $strict));

diff --git a/tests/Unit/Option/InspectTest.php b/tests/Unit/Option/InspectTest.php
@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 use TH\Maybe\Tests\Provider;
 
@@ -12,8 +13,8 @@ final class InspectTest extends TestCase
     use Provider\Values;
 
     /**
-     * @dataProvider values
      */
+     #[DataProvider('values')]
     public function testInspectSome(mixed $value): void
     {
         $option = Option\some($value);

diff --git a/tests/Unit/Option/IsTest.php b/tests/Unit/Option/IsTest.php
@@ -3,6 +3,7 @@
 namespace TH\Maybe\Tests\Unit\Option;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 use TH\Maybe\Tests\Assert;
 use TH\Maybe\Tests\Provider;
@@ -12,8 +13,8 @@ final class IsTest extends TestCase
     use Provider\Values;
 
     /**
-     * @dataProvider values
      */
+     #[DataProvider('values')]
     public function testIsSome(mixed $value): void
     {
         $option = Option\some($value);
@@ -26,8 +27,8 @@ public function testIsSome(mixed $value): void
     }
 
     /**
-     * @dataProvider values
      */
+     #[DataProvider('values')]
     public function testIsNone(mixed $value): void
     {
         $option = Option\some($value);
@@ -40,8 +41,8 @@ public function testIsNone(mixed $value): void
     }
 
     /**
-     * @dataProvider values
      */
+     #[DataProvider('values')]
     public function testIsSomeAnd(mixed $value): void
     {
         $option = Option\some($value);

diff --git a/tests/Unit/Option/MapTest.php b/tests/Unit/Option/MapTest.php
@@ -4,19 +4,20 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 
 final class MapTest extends TestCase
 {
     /**
-     * @dataProvider mapMatrix
      * @template T
      * @template U
      * @param Option<T> $option
      * @param U $mapResult
      * @param Option<U> $expected
      * @param array<T> $expectedCalls
      */
+     #[DataProvider('mapMatrix')]
     public function testMap(Option $option, mixed $mapResult, Option $expected, array $expectedCalls): void
     {
         $calls = [];
@@ -59,7 +60,6 @@ public static function mapMatrix(): iterable
     }
 
     /**
-     * @dataProvider mapOrMatrix
      * @template T
      * @template U
      * @param Option<T> $option
@@ -68,6 +68,7 @@ public static function mapMatrix(): iterable
      * @param U $expected
      * @param array<T> $expectedCalls
      */
+     #[DataProvider('mapOrMatrix')]
     public function testMapOr(
         Option $option,
         mixed $mapResult,

diff --git a/tests/Unit/Option/OfTest.php b/tests/Unit/Option/OfTest.php
@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 use TH\Maybe\Tests\Provider;
 
@@ -12,18 +13,18 @@ final class OfTest extends TestCase
     use Provider\Options;
 
     /**
-     * @dataProvider fromValueMatrix
      * @param Option<mixed> $expected
      */
+     #[DataProvider('fromValueMatrix')]
     public function testOf(Option $expected, mixed $value, mixed $noneValue, bool $strict = true): void
     {
         Assert::assertEquals($expected, Option\of(static fn () => $value, $noneValue, strict: $strict));
     }
 
     /**
-     * @dataProvider fromValueMatrix
      * @param Option<mixed> $expected
      */
+     #[DataProvider('fromValueMatrix')]
     public function testTryOf(Option $expected, mixed $value, mixed $noneValue, bool $strict = true): void
     {
         Assert::assertEquals($expected, Option\tryOf(static fn () => $value, $noneValue, strict: $strict));

diff --git a/tests/Unit/Option/SerializationTest.php b/tests/Unit/Option/SerializationTest.php
@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TH\Maybe\Option;
 use TH\Maybe\Tests\Provider;
 
@@ -20,8 +21,8 @@ public function testWithNone(): void
     }
 
     /**
-     * @dataProvider serializableValues
      */
+     #[DataProvider('serializableValues')]
     public function testWithSomeValidValues(mixed $value): void
     {
         $this->testSerializableOption(Option\some($value));