fix a few more errors

Author: chx

src/Validator/Choice.php

@@ -17,11 +17,11 @@ public function __construct(
   /**
    * @throws \UnexpectedValueException
    */
-  public function __invoke(mixed $value): string|int|float {
+  public function __invoke(mixed $value): ?string {
     return match(FALSE) {
       \is_string($value) || \is_int($value) || \is_float($value),
-      \in_array($value, $this->choices, TRUE) => throw new \UnexpectedValueException($this->message),
-      default => $value,
+      \in_array($value, $this->choices, TRUE) => $this->message,
+      default => NULL,
     };
   }
 

tests/unit/Validator/MachineNameTest.php

@@ -17,30 +17,27 @@ final class MachineNameTest extends TestCase {
    * Test callback.
    */
   #[DataProvider('dataProvider')]
-  public function test(mixed $machine_name, ?\UnexpectedValueException $exception): void {
-    if ($exception) {
-      $this->expectExceptionObject($exception);
-    }
-    self::assertSame($machine_name, (new MachineName())($machine_name));
+  public function test(mixed $machine_name, ?string $expected): void {
+    self::assertSame($expected, (new MachineName())($machine_name));
   }
 
   public static function dataProvider(): array {
-    $exception = new \UnexpectedValueException('The value is not correct machine name.');
+    $error = 'The value is not correct machine name.';
     return [
       ['snake_case_here', NULL],
       ['ends_with_number123', NULL],
-      ['UPPER_CASE', $exception],
-      ['123begins_with_number', $exception],
-      ['with.dot', $exception],
-      [' not_trimmed ', $exception],
-      ['Hello world ', $exception],
-      ['ends_with_underscore_', $exception],
-      ['', $exception],
-      ['foo*&)(*&@#()*&@#bar', $exception],
-      [TRUE, $exception],
-      [NULL, $exception],
-      [[], $exception],
-      [new \stdClass(), $exception],
+      ['UPPER_CASE', $error],
+      ['123begins_with_number', $error],
+      ['with.dot', $error],
+      [' not_trimmed ', $error],
+      ['Hello world ', $error],
+      ['ends_with_underscore_', $error],
+      ['', $error],
+      ['foo*&)(*&@#()*&@#bar', $error],
+      [TRUE, $error],
+      [NULL, $error],
+      [[], $error],
+      [new \stdClass(), $error],
     ];
   }
 

tests/unit/Validator/OptionalTest.php

@@ -18,23 +18,20 @@ final class OptionalTest extends TestCase {
    * Test callback.
    */
   #[DataProvider('dataProvider')]
-  public function test(mixed $machine_name, ?\UnexpectedValueException $exception): void {
-    if ($exception) {
-      $this->expectExceptionObject($exception);
-    }
+  public function test(mixed $machine_name, ?string $expected): void {
     $validator = new Optional(new MachineName());
-    self::assertSame($machine_name, $validator($machine_name));
+    self::assertSame($expected, $validator($machine_name));
   }
 
   public static function dataProvider(): array {
-    $exception = new \UnexpectedValueException('The value is not correct machine name.');
+    $error = 'The value is not correct machine name.';
     return [
-      ['foo*&)(*&@#()*&@#bar', $exception],
-      [TRUE, $exception],
+      ['foo*&)(*&@#()*&@#bar', $error],
+      [TRUE, $error],
       [NULL, NULL],
       ['', NULL],
-      [' ', $exception],
-      [new \stdClass(), $exception],
+      [' ', $error],
+      [new \stdClass(), $error],
     ];
   }