phpstan/phpstan-strict-rules 導入

composer.json

@@ -30,6 +30,13 @@
         "wiz-develop/php-cs-fixer-config": "^8.3",
         "phpstan/phpstan": "^1.12",
         "phpunit/php-code-coverage": "^11.0",
-        "phpunit/phpunit": "^11.3"
+        "phpunit/phpunit": "^11.3",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan-strict-rules": "^1.6"
+    },
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     }
-}
+}

phpstan.neon.dist

@@ -4,5 +4,6 @@ parameters:
     level: max
     paths:
         - src
+        - tests
     typeAliases:
         BasicTypes: 'int|string|bool|null|float|array|iterable|callable|resource|object'

src/Option.php

@@ -103,7 +103,7 @@ public function and(self $right): self;
      * @param  Closure(T): Option<U> $right
      * @return Option<U>
      */
-    public function andThen(Closure $right): self;
+    public function andThen(Closure $right): self; /** @phpstan-ignore method.childParameterType */
 
     /**
      * @see https://doc.rust-lang.org/std/option/enum.Option.html#method.or

src/Option/None.php

@@ -33,6 +33,9 @@ public static function unit(mixed $value): self
     /**
      * @return $this
      */
+    /**
+     * @phpstan-ignore method.childParameterType
+     */
     #[Override]
     public function andThen(Closure $right): self
     {

src/Option/Some.php

@@ -41,6 +41,9 @@ public static function unit(mixed $value): self
      * @param  Closure(T): Option<U> $right
      * @return Option<U>
      */
+    /**
+     * @phpstan-ignore method.childParameterType
+     */
     #[Override]
     public function andThen(Closure $right): Option
     {

src/Result.php

@@ -117,7 +117,7 @@ public function and(self $right): self;
      * @param  Closure(T): Result<U, F>                          $right
      * @return (F is BasicTypes ? Result<U, E|F> : Result<U, E>)
      */
-    public function andThen(Closure $right): self;
+    public function andThen(Closure $right): self; /** @phpstan-ignore method.childParameterType */
 
     /**
      * @see https://doc.rust-lang.org/std/result/enum.Result.html#method.or

src/Result/Err.php

@@ -42,7 +42,7 @@ public static function unit(mixed $value): self
     }
 
     /**
-     * @return $this
+     * @phpstan-ignore method.childParameterType, missingType.generics
      */
     #[Override]
     public function andThen(Closure $right): self

src/Result/Ok.php

@@ -46,9 +46,13 @@ public static function unit(mixed $value): self
      * @param  Closure(T) :Result<U, F> $right
      * @return Result<U, F>
      */
+    /**
+     * @phpstan-ignore method.childParameterType
+     */
     #[Override]
     public function andThen(Closure $right): Result
     {
+        // @phpstan-ignore return.type
         return $right($this->value);
     }
 

src/Result/functions.php

@@ -92,15 +92,18 @@ function transpose(Result $result): Option
 }
 
 /**
- * @return Result<bool, non-empty-list<mixed>>
+ * @template T
+ * @template E
+ * @param  (Result<T, E>|Result)           ...$results
+ * @return Result<bool, non-empty-list<E>>
  */
-/** @phpstan-ignore-next-line */
-function combine(Result ...$results): Result
+function combine(Result ...$results): Result // @phpstan-ignore-line
 {
     $errs = array_filter($results, static fn (Result $result) => $result->isErr());
     if (count($errs) > 0) {
+        // @phpstan-ignore return.type
         return Result\err(array_values(array_map(static fn (Result $result) => $result->unwrapErr(), $errs)));
     }
 
-    return Result\ok(true);
+    return Result\ok();
 }

tests/Provider/OptionProvider.php

@@ -11,6 +11,9 @@ trait OptionProvider
     /**
      * @return iterable<array{Option<mixed>, mixed, mixed}>
      */
+    /**
+     * @phpstan-ignore missingType.iterableValue
+     */
     public static function fromValueMatrix(): iterable
     {
         $o = (object)[];

tests/Unit/MonadTest.php → tests/Unit/MonadTestAbstract.php

@@ -23,7 +23,7 @@
 /**
  * @template TMonad of Monad
  */
-abstract class MonadTest extends TestCase
+abstract class MonadTestAbstract extends TestCase
 {
     /**
      * @return iterable<array{TMonad<string>}>
@@ -100,8 +100,7 @@ private function get_caller_type(array $backtrace): ?ReflectionNamedType
             $ref_class = new ReflectionClass($backtrace['class']);
             $ref_method = $ref_class->getMethod($backtrace['function']);
             $ref_type = $ref_method->getReturnType();
-
-        } elseif ($function = ($backtrace['function'] ?? null)) {
+        } elseif ($function = ($backtrace['function'] ?? null)) {/** @phpstan-ignore elseif.condNotBoolean */
             $ref_function = new ReflectionFunction($function);
             $ref_type = $ref_function->getReturnType();
         }

tests/Unit/Option/InterfaceTest.php

@@ -28,15 +28,13 @@ public function instanceOfOption(): void
     public function instanceOfNone(): void
     {
         Assert::assertInstanceOf(Option\None::class, Option\none());
-        // @phpstan-ignore-next-line
         Assert::assertNotInstanceOf(Option\None::class, Option\some(null));
     }
 
     #[Test]
     #[TestDox('instanceOfSome test')]
     public function instanceOfSome(): void
     {
-        // @phpstan-ignore-next-line
         Assert::assertNotInstanceOf(Option\Some::class, Option\none());
         Assert::assertInstanceOf(Option\Some::class, Option\some(null));
     }

tests/Unit/Option/OrThrowTest.php

@@ -10,6 +10,7 @@
 use PHPUnit\Framework\Attributes\TestDox;
 use RuntimeException;
 use WizDevelop\PhpMonad\Option;
+use WizDevelop\PhpMonad\Tests\Assert;
 use WizDevelop\PhpMonad\Tests\TestCase;
 
 #[TestDox('Option - OrThrow メソッドのテスト')]
@@ -27,9 +28,9 @@ public function someReturnsItself(): void
 
         $result = $some->orThrow($exception);
 
-        $this->assertSame($some, $result);
-        $this->assertTrue($result->isSome());
-        $this->assertSame(42, $result->unwrap());
+        Assert::assertSame($some, $result);
+        Assert::assertTrue($result->isSome());
+        Assert::assertSame(42, $result->unwrap());
     }
 
     #[Test]

tests/Unit/Option/TransposeTest.php

@@ -9,6 +9,7 @@
 use PHPUnit\Framework\Attributes\TestDox;
 use WizDevelop\PhpMonad\Option;
 use WizDevelop\PhpMonad\Result;
+use WizDevelop\PhpMonad\Tests\Assert;
 use WizDevelop\PhpMonad\Tests\TestCase;
 
 #[TestDox('Option - transpose関数のテスト')]
@@ -24,9 +25,9 @@ public function transposeSomeOk(): void
         /** @phpstan-ignore-next-line */
         $result = Option\transpose($option);
 
-        $this->assertTrue($result->isOk());
-        $this->assertTrue($result->unwrap()->isSome());
-        $this->assertSame(42, $result->unwrap()->unwrap());
+        Assert::assertTrue($result->isOk());
+        Assert::assertTrue($result->unwrap()->isSome());
+        Assert::assertSame(42, $result->unwrap()->unwrap());
     }
 
     #[Test]
@@ -38,8 +39,8 @@ public function transposeSomeErr(): void
         /** @phpstan-ignore-next-line */
         $result = Option\transpose($option);
 
-        $this->assertTrue($result->isErr());
-        $this->assertSame('error', $result->unwrapErr());
+        Assert::assertTrue($result->isErr());
+        Assert::assertSame('error', $result->unwrapErr());
     }
 
     #[Test]
@@ -51,7 +52,7 @@ public function transposeNone(): void
         /** @phpstan-ignore-next-line */
         $result = Option\transpose($option);
 
-        $this->assertTrue($result->isOk());
-        $this->assertTrue($result->unwrap()->isNone());
+        Assert::assertTrue($result->isOk());
+        Assert::assertTrue($result->unwrap()->isNone());
     }
 }

tests/Unit/Option/UnwrapOrThrowTest.php

@@ -11,6 +11,7 @@
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use WizDevelop\PhpMonad\Option;
+use WizDevelop\PhpMonad\Tests\Assert;
 
 use function WizDevelop\PhpMonad\Option\none;
 use function WizDevelop\PhpMonad\Option\some;
@@ -27,7 +28,7 @@ public function some値の場合は値を返す(): void
         $option = some($value);
         $exception = new Exception('This exception should not be thrown');
 
-        $this->assertSame($value, $option->unwrapOrThrow($exception));
+        Assert::assertSame($value, $option->unwrapOrThrow($exception));
     }
 
     #[Test]