Remove internal Choice class

phpstan-baseline.php

@@ -8,10 +8,10 @@
 	'path' => __DIR__ . '/src/Nexus/Collection/Collection.php',
 ];
 $ignoreErrors[] = [
-	'message' => '#^Method Nexus\\\\Option\\\\Choice\\:\\:from\\(\\) never returns Nexus\\\\Option\\\\Some\\<T of mixed\\> so it can be removed from the return type\\.$#',
+	'message' => '#^Function Nexus\\\\Option\\\\option\\(\\) never returns Nexus\\\\Option\\\\Some\\<T of mixed\\> so it can be removed from the return type\\.$#',
 	'identifier' => 'return.unusedType',
 	'count' => 1,
-	'path' => __DIR__ . '/src/Nexus/Option/Choice.php',
+	'path' => __DIR__ . '/src/Nexus/Option/functions.php',
 ];
 $ignoreErrors[] = [
 	'message' => '#^Method Nexus\\\\Tests\\\\AutoReview\\\\ComposerJsonTest\\:\\:getComposer\\(\\) should return array\\<string, mixed\\> but returns mixed\\.$#',

src/Nexus/Option/functions.php

@@ -24,5 +24,9 @@
  */
 function option(mixed $value, mixed $none = null): Option
 {
-    return Choice::from($value, $none);
+    if ($value === $none) {
+        return new None();
+    }
+
+    return new Some($value);
 }

tests/Option/ChoiceTest.php → tests/Option/FunctionsTest.php

@@ -13,10 +13,8 @@
 
 namespace Nexus\Tests\Option;
 
-use Nexus\Option\Choice;
 use Nexus\Option\None;
 use Nexus\Option\Some;
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\CoversFunction;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
@@ -26,18 +24,10 @@
 /**
  * @internal
  */
-#[CoversClass(Choice::class)]
 #[CoversFunction('Nexus\Option\option')]
 #[Group('unit-test')]
-final class ChoiceTest extends TestCase
+final class FunctionsTest extends TestCase
 {
-    public function testChoiceFrom(): void
-    {
-        self::assertInstanceOf(Some::class, Choice::from(2));
-        self::assertInstanceOf(None::class, Choice::from(null));
-        self::assertInstanceOf(Some::class, Choice::from(null, false));
-    }
-
     public function testOptionFunction(): void
     {
         self::assertInstanceOf(Some::class, option(2));

tests/Option/data/option.php

@@ -13,16 +13,16 @@
 
 namespace Nexus\Tests\Option;
 
-use Nexus\Option\Choice;
 use Nexus\Option\None;
 use Nexus\Option\Option;
 use Nexus\Option\Some;
 
+use function Nexus\Option\option;
 use function PHPStan\Testing\assertType;
 
-assertType(None::class, Choice::from(null));
+assertType(None::class, option(null));
 assertType(None::class, new None());
-assertType('Nexus\Option\Some<null>', Choice::from(null, false));
+assertType('Nexus\Option\Some<null>', option(null, false));
 assertType('Nexus\Option\Some<int>', new Some(2));
 
 function testOption(Option $option): void