From 35bb27790f99df21deb811054f3d448bd4b6287e Mon Sep 17 00:00:00 2001 From: Tobias Minich Date: Tue, 12 Aug 2025 14:31:50 +0200 Subject: [PATCH] Fix and improve type annotations. --- src/Option.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Option.php b/src/Option.php index 1d484d6..0db66f1 100644 --- a/src/Option.php +++ b/src/Option.php @@ -58,16 +58,20 @@ abstract public function unwrap(); /** * Unwraps a result, yielding the content of a Some. Else, it returns optb. * - * @param T $optb - * @return T + * @template U + * + * @param U $optb + * @return T|U */ abstract public function unwrapOr($optb); /** * Returns the contained value or computes it from a callable. * - * @param callable(): T $op - * @return T + * @template U + * + * @param callable(): U $op + * @return T|U */ abstract public function unwrapOrElse(callable $op); @@ -84,7 +88,7 @@ abstract public function inspect(callable $f): self; * * @template U * - * @param callable(T=):U $mapper + * @param callable(T):U $mapper * @return Option */ abstract public function map(callable $mapper): self; @@ -95,7 +99,7 @@ abstract public function map(callable $mapper): self; * @template U * * @param U $default - * @param callable(T=):U $mapper + * @param callable(T):U $mapper * @return U */ abstract public function mapOr($default, callable $mapper); @@ -106,7 +110,7 @@ abstract public function mapOr($default, callable $mapper); * @template U * * @param callable():U $default - * @param callable(T=):U $mapper + * @param callable(T):U $mapper * @return U */ abstract public function mapOrElse(callable $default, callable $mapper);