Merge pull request #55 from wiz-develop:issue54

PHP 8.5 バージョンアップ対応

Author: endoumame

mise.toml

@@ -0,0 +1,2 @@
+[tools]
+php = "8.5"

src/Option/None.php

@@ -6,6 +6,7 @@
 
 use Closure;
 use EmptyIterator;
+use NoDiscard;
 use Override;
 use RuntimeException;
 use Throwable;
@@ -78,12 +79,14 @@ public function unwrap(): never
         $this->expect('Unwrapping a `None` value');
     }
 
+    #[NoDiscard]
     #[Override]
     public function unwrapOr(mixed $default): mixed
     {
         return $default;
     }
 
+    #[NoDiscard]
     #[Override]
     public function unwrapOrElse(Closure $default): mixed
     {

src/Option/Some.php

@@ -5,6 +5,7 @@
 namespace WizDevelop\PhpMonad\Option;
 
 use Closure;
+use NoDiscard;
 use Override;
 use Throwable;
 use Traversable;
@@ -80,6 +81,7 @@ public function expect(string $message): mixed
     /**
      * @throws void
      */
+    #[NoDiscard]
     #[Override]
     public function unwrap(): mixed
     {
@@ -89,6 +91,7 @@ public function unwrap(): mixed
     /**
      * @return T
      */
+    #[NoDiscard]
     #[Override]
     public function unwrapOr(mixed $default): mixed
     {
@@ -98,6 +101,7 @@ public function unwrapOr(mixed $default): mixed
     /**
      * @return T
      */
+    #[NoDiscard]
     #[Override]
     public function unwrapOrElse(Closure $default): mixed
     {
@@ -110,6 +114,7 @@ public function unwrapOrElse(Closure $default): mixed
      * @return T
      * @throws never
      */
+    #[NoDiscard]
     #[Override]
     public function unwrapOrThrow(Throwable $exception): mixed
     {

src/Result/Err.php

@@ -6,6 +6,7 @@
 
 use Closure;
 use EmptyIterator;
+use NoDiscard;
 use Override;
 use RuntimeException;
 use Throwable;
@@ -103,6 +104,7 @@ public function unwrap(): never
     /**
      * @return E
      */
+    #[NoDiscard]
     #[Override]
     public function unwrapErr(): mixed
     {
@@ -114,6 +116,7 @@ public function unwrapErr(): mixed
      * @param  U $default
      * @return U
      */
+    #[NoDiscard]
     #[Override]
     public function unwrapOr(mixed $default): mixed
     {
@@ -125,6 +128,7 @@ public function unwrapOr(mixed $default): mixed
      * @param  Closure(E): U $default
      * @return U
      */
+    #[NoDiscard]
     #[Override]
     public function unwrapOrElse(Closure $default): mixed
     {

src/Result/Ok.php

@@ -5,6 +5,7 @@
 namespace WizDevelop\PhpMonad\Result;
 
 use Closure;
+use NoDiscard;
 use Override;
 use RuntimeException;
 use Throwable;
@@ -92,6 +93,7 @@ public function expect(string $message): mixed
     /**
      * @return T
      */
+    #[NoDiscard]
     #[Override]
     public function unwrap(): mixed
     {
@@ -107,12 +109,14 @@ public function unwrapErr(): never
         throw new RuntimeException(sprintf('Unwrapping err on `Ok`: %s', serialize($this->value)));
     }
 
+    #[NoDiscard]
     #[Override]
     public function unwrapOr(mixed $default): mixed
     {
         return $this->value;
     }
 
+    #[NoDiscard]
     #[Override]
     public function unwrapOrElse(Closure $default): mixed
     {
@@ -125,6 +129,7 @@ public function unwrapOrElse(Closure $default): mixed
      * @return T
      * @throws never
      */
+    #[NoDiscard]
     #[Override]
     public function unwrapOrThrow(Throwable $exception): mixed
     {

tests/Unit/Option/OrThrowTest.php

@@ -15,8 +15,6 @@
 
 #[TestDox('Option - OrThrow メソッドのテスト')]
 #[CoversClass(Option::class)]
-#[CoversClass(Option\Some::class)]
-#[CoversClass(Option\None::class)]
 final class OrThrowTest extends TestCase
 {
     #[Test]

tests/Unit/Result/OrThrowTest.php

@@ -15,8 +15,6 @@
 
 #[TestDox('Result - OrThrow メソッドのテスト')]
 #[CoversClass(Result::class)]
-#[CoversClass(Result\Ok::class)]
-#[CoversClass(Result\Err::class)]
 final class OrThrowTest extends TestCase
 {
     #[Test]