Merge pull request #16 from petrknap/improved-or-else-throw

feat: `orElseThrow` now does not require supplier

README.md

@@ -21,7 +21,7 @@ $optionalString = Optional::of('value');
 echo $optionalString->isPresent() ? $optionalString->get() : 'empty';
 echo $optionalString->orElse('empty');
 echo $optionalString->orElseGet(fn () => 'empty');
-echo $optionalString->orElseThrow(fn () => new \Exception());
+echo $optionalString->orElseThrow();
 
 $optionalString->ifPresent(function (string $value): void { echo $value; });
 

src/Optional.php

@@ -100,7 +100,7 @@ public function get(): mixed
         if ($this->wasPresent === null) {
             self::logNotice('Call `isPresent()` before accessing the value.');
         }
-        return $this->orElseThrow(static fn (): Exception\CouldNotGetValueOfEmptyOptional => new Exception\CouldNotGetValueOfEmptyOptional()); // @todo use default supplier
+        return $this->orElseThrow();
     }
 
     public function ifPresent(callable $consumer): void
@@ -140,14 +140,11 @@ public function orElseGet(callable $otherSupplier): mixed
         return static::isSupported($other) ? $other : throw new InvalidArgumentException('Other supplier must return supported other.');
     }
 
-    /**
-     * @todo make supplier nullable
-     */
-    public function orElseThrow(callable $exceptionSupplier): mixed
+    public function orElseThrow(?callable $exceptionSupplier = null): mixed
     {
         return $this->orElseGet(static function () use ($exceptionSupplier): never {
             /** @var Throwable|mixed $exception */
-            $exception = $exceptionSupplier();
+            $exception = $exceptionSupplier === null ? new Exception\CouldNotGetValueOfEmptyOptional() : $exceptionSupplier();
             if ($exception instanceof Throwable) {
                 throw $exception;
             }