Skip to content

Commit 780fd1b

Browse files
committed
introduce Option::fromNullable() and ->toNullable()
1 parent bcc17aa commit 780fd1b

File tree

2 files changed

+51
-1
lines changed

2 files changed

+51
-1
lines changed

src/Option.php

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,26 @@ public static function some($value): Some
2323
return new Some($value);
2424
}
2525

26-
/**y
26+
/**
2727
* @return None
2828
*/
2929
public static function none(): None
3030
{
3131
return self::$none ??= new None();
3232
}
3333

34+
/**
35+
* @template TNew
36+
* @param TNew|null $value
37+
* @return Option<TNew>
38+
*/
39+
public static function fromNullable($value): Option
40+
{
41+
return $value === null
42+
? self::none()
43+
: self::some($value);
44+
}
45+
3446
/**
3547
* @template T
3648
* @param list<Option<T>> $options
@@ -124,4 +136,12 @@ public function toResultLazy(callable $else): ResultInterface
124136
->map(fn($t) => new Success($t))
125137
->getOr(fn() => new Error($else()));
126138
}
139+
140+
/**
141+
* @return TValue|null
142+
*/
143+
public function toNullable()
144+
{
145+
return $this->getOrElse(null);
146+
}
127147
}

test/OptionTest.php

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,34 @@ public function testGetOrThrowNone(): void
9494
/** @psalm-suppress UnusedMethodCall */
9595
$option->getOrThrow(new \RuntimeException('expected'));
9696
}
97+
98+
public function testFromNullableGivenValue(): void
99+
{
100+
$option = Option::fromNullable(123);
101+
$mapped = $option->map(fn(int $val) => $val + 1);
102+
self::assertEquals(124, $mapped->getOrElse(-1));
103+
}
104+
105+
public function testFromNullableGivenNull(): void
106+
{
107+
/** @var Option<int> $option */
108+
$option = Option::fromNullable(null);
109+
$mapped = $option->map(fn(int $val) => $val + 1);
110+
self::assertEquals(-1, $mapped->getOrElse(-1));
111+
}
112+
113+
public function testToNullableSome(): void
114+
{
115+
$option = Option::some(123);
116+
$nullable = $option->toNullable();
117+
self::assertEquals(123, $nullable);
118+
}
119+
120+
public function testToNullableNone(): void
121+
{
122+
/** @var Option<int> $option */
123+
$option = Option::none();
124+
$nullable = $option->toNullable();
125+
self::assertNull($nullable);
126+
}
97127
}

0 commit comments

Comments
 (0)