Typed Optional::orElseGet now correctly supports null

src/Optional.php

@@ -8,7 +8,7 @@
 use Throwable;
 
 /**
  * @template T of mixed type of non-null value
  *
  * @implements JavaSe8\Optional<T>
  */
@@ -22,7 +22,7 @@
     final protected function __construct(
         protected readonly mixed $value,
     ) {
         if ($this->value !== null && !@static::isSupported($this->value)) {
             throw new InvalidArgumentException('Value is not supported.');
         }
     }
@@ -58,12 +58,12 @@
         if (static::class === Optional::class) {
             if ($value !== null) {
                 try {
                     /** @var static */
                     return TypedOptional::of($value, Optional::class);
                 } catch (Exception\CouldNotFindTypedOptionalForValue) {
                 }
             }
             /** @var static */
             return new class ($value) extends Optional {
                 protected static function isInstanceOfStatic(object $obj): bool
                 {
@@ -115,7 +115,7 @@
             $obj->ifPresent(function (mixed $objValue) use (&$equals, $strict): void {
                 $equals = match (!is_object($this->value) || $strict) {
                     true => $this->value === $objValue,
                     false => $this->value == $objValue,
                 };
             });
             return $equals ?? $this->value === null;
@@ -148,13 +148,13 @@
     public function flatMap(callable $mapper): self
     {
         if ($this->value === null) {
             /** @var self<U> */
             return Optional::empty();
         }
 
         /** @var mixed $mapped */
         $mapped = $mapper($this->value);
         /** @var self<U> */
         return match (true) {
             $mapped instanceof self => $mapped,
             $mapped instanceof JavaSe8\Optional => $mapped->isPresent() ? Optional::of($mapped->get()) : Optional::empty(),
@@ -213,7 +213,9 @@
             return $this->value;
         }
         $other = $otherSupplier();
-        return static::isSupported($other) ? $other : throw new InvalidArgumentException('Other supplier must return supported other.');
+        return $other === null || static::isSupported($other)
+            ? $other
+            : throw new InvalidArgumentException('Other supplier must return supported other.');
     }
 
     /**
@@ -237,7 +239,7 @@
         }
 
         if (is_string($exceptionSupplier)) {
             /** @var class-string<E> $exceptionSupplier */
             if (!class_exists($exceptionSupplier, autoload: true)) {
                 throw new InvalidArgumentException('Exception supplier must be existing class name.');
             }
@@ -260,7 +262,7 @@
     /**
      * @deprecated use {@see self::orElse()}
      *
      * @todo BC remove it
      *
      * Inverse of {@see self::ofNullable()}
      *

tests/OptionalTest.php

@@ -308,31 +308,35 @@ public static function dataMethodMapWorks(): array
     }
 
     #[DataProvider('dataMethodOrElseWorks')]
-    public function testMethodOrElseWorks(Optional $optional, string $expectedValue): void
+    public function testMethodOrElseWorks(Optional $optional, string|null $orValue, string|null $expectedValue): void
     {
-        self::assertSame($expectedValue, $optional->orElse(self::OTHER));
+        self::assertSame($expectedValue, $optional->orElse($orValue));
     }
 
     public static function dataMethodOrElseWorks(): array
     {
         return self::makeDataSet([
-            [self::VALUE],
-            [self::OTHER],
-        ]);
+            [self::OTHER, self::VALUE],
+            [self::OTHER, self::OTHER],
+        ]) + [
+            'typed null' => [OptionalString::empty(), null, null],
+        ];
     }
 
     #[DataProvider('dataMethodOrElseGetWorks')]
-    public function testMethodOrElseGetWorks(Optional $optional, string $expectedValue): void
+    public function testMethodOrElseGetWorks(Optional $optional, string|null $orValue, string|null $expectedValue): void
     {
-        self::assertSame($expectedValue, $optional->orElseGet(static fn(): string => self::OTHER));
+        self::assertSame($expectedValue, $optional->orElseGet(static fn(): string|null => $orValue));
     }
 
     public static function dataMethodOrElseGetWorks(): array
     {
         return self::makeDataSet([
-            [self::VALUE],
-            [self::OTHER],
-        ]);
+            [self::OTHER, self::VALUE],
+            [self::OTHER, self::OTHER],
+        ]) + [
+            'typed null' => [OptionalString::empty(), null, null],
+        ];
     }
 
     #[DataProvider('dataMethodOrElseThrowWorks')]