Merge pull request #33 from wiz-develop/endou-mame/issue32

Author: endou-mame

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
+        }
     }
-}
+}

composer.lock

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

phpstan.neon.dist

@@ -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.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/None.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/Option/Some.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.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/Err.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/Ok.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();
 }