Merge pull request #31 from petrknap/if-present-else

Added `else` argument to `ifPresent`
petrknap · Jan 22, 2025 · 8c5c811 · 8c5c811
2 parents 30d768f + a15fc34
commit 8c5c811
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ if ($optionalString->isPresent()) {
 OptionalResource::ofFalsable(tmpfile())->ifPresent(function ($tmpFile): void {
     fwrite($tmpFile, 'data');
     fclose($tmpFile);
-});
+}, else: fn () => print('tmpfile() failed'));
 ```
 
 ### Create and use your own typed optional

diff --git a/src/Optional.php b/src/Optional.php
@@ -153,10 +153,12 @@ public function get(): mixed
         return $this->orElseThrow();
     }
 
-    public function ifPresent(callable $consumer): void
+    public function ifPresent(callable $consumer, callable|null $else = null): void
     {
         if ($this->value !== null) {
             $consumer($this->value);
+        } elseif ($else !== null) {
+            $else();
         }
     }
 

diff --git a/tests/OptionalTest.php b/tests/OptionalTest.php
@@ -225,22 +225,28 @@ public static function dataMethodGetWorks(): array
     }
 
     #[DataProvider('dataMethodIfPresentWorks')]
-    public function testMethodIfPresentWorks(Optional $optional, bool $expectedInvoke): void
+    public function testMethodIfPresentWorks(Optional $optional, string $expectedInvoked): void
     {
-        $invoked = false;
-        $optional->ifPresent(static function (string $value) use (&$invoked) {
-            self::assertSame(self::VALUE, $value);
-            $invoked = true;
-        });
+        $invoked = null;
+        $optional->ifPresent(
+            consumer: static function (string $value) use (&$invoked) {
+                self::assertSame(self::VALUE, $value);
+                $invoked = 'consumer';
+            },
+            else: static function (mixed ...$args) use (&$invoked) {
+                self::assertSame([], $args);
+                $invoked = 'else';
+            },
+        );
 
-        self::assertSame($expectedInvoke, $invoked);
+        self::assertSame($expectedInvoked, $invoked);
     }
 
     public static function dataMethodIfPresentWorks(): array
     {
         return self::makeDataSet([
-            [true],
-            [false],
+            ['consumer'],
+            ['else'],
         ]);
     }