fix a few more errors

Author: chx

src/Validator/RequiredMachineName.php

@@ -10,7 +10,7 @@
 final class RequiredMachineName {
 
   /**
-   * @throws \UnexpectedValueException
+   * Magic method.
    */
   public function __invoke(mixed $value): ?string {
     return (new Chained(new Required(), new MachineName()))($value);

src/Validator/ServiceName.php

@@ -10,7 +10,7 @@
 final class ServiceName {
 
   /**
-   * @throws \UnexpectedValueException
+   * Magic method.
    */
   public function __invoke(mixed $value): ?string {
     if (!\is_string($value) || !\preg_match('/^[a-z][a-z0-9_\.]*[a-z0-9]$/', $value)) {

tests/unit/Validator/ChoiceTest.php

@@ -17,25 +17,22 @@ final class ChoiceTest extends TestCase {
    * Test callback.
    */
   #[DataProvider('dataProvider')]
-  public function test(mixed $value, array $choices, ?string $message, ?\UnexpectedValueException $exception): void {
+  public function test(mixed $value, array $choices, ?string $message, ?string $expected): void {
     $validator = $message ? new Choice($choices, $message) : new Choice($choices);
-    if ($exception) {
-      $this->expectExceptionObject($exception);
-    }
-    self::assertSame($value, $validator($value));
+    self::assertSame($expected, $validator($value));
   }
 
   public static function dataProvider(): array {
-    $default_exception = new \UnexpectedValueException('The value you selected is not a valid choice.');
+    $default_error = 'The value you selected is not a valid choice.';
     return [
-      ['wrong', ['aaa', 'bbb'], NULL, $default_exception],
+      ['wrong', ['aaa', 'bbb'], NULL, $default_error],
       ['aaa', ['aaa', 'bbb'], NULL, NULL],
-      ['wrong', ['aaa', 'bbb'], 'Custom message.', new \UnexpectedValueException('Custom message.')],
-      [111, ['111', '222'], NULL, $default_exception],
-      ['111', [111, 222], NULL, $default_exception],
+      ['wrong', ['aaa', 'bbb'], 'Custom message.', 'Custom message.'],
+      [111, ['111', '222'], NULL, $default_error],
+      ['111', [111, 222], NULL, $default_error],
       [111, [111, 222], NULL, NULL],
-      [FALSE, ['aaa', 'bbb'], NULL, $default_exception],
-      [[], ['aaa', 'bbb'], NULL, $default_exception],
+      [FALSE, ['aaa', 'bbb'], NULL, $default_error],
+      [[], ['aaa', 'bbb'], NULL, $default_error],
     ];
   }
 

tests/unit/Validator/RequiredMachineNameTest.php

@@ -17,26 +17,23 @@ final class RequiredMachineNameTest 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 RequiredMachineName())($machine_name));
+  public function test(mixed $machine_name, $expected): void {
+    self::assertSame($expected, (new RequiredMachineName())($machine_name));
   }
 
   public static function dataProvider(): array {
-    $mn_exception = new \UnexpectedValueException('The value is not correct machine name.');
-    $rq_exception = new \UnexpectedValueException('The value is required.');
+    $mn_error = 'The value is not correct machine name.';
+    $rq_error = 'The value is required.';
     return [
       ['snake_case_here', NULL],
       ['ends_with_number123', NULL],
-      ['UPPER_CASE', $mn_exception],
-      ['123begins_with_number', $mn_exception],
-      ['0', $mn_exception],
-      ['', $rq_exception],
-      [NULL, $rq_exception],
-      [FALSE, $mn_exception],
-      [TRUE, $mn_exception],
+      ['UPPER_CASE', $mn_error],
+      ['123begins_with_number', $mn_error],
+      ['0', $mn_error],
+      ['', $rq_error],
+      [NULL, $rq_error],
+      [FALSE, $mn_error],
+      [TRUE, $mn_error],
     ];
   }
 

tests/unit/Validator/RequiredTest.php

@@ -17,23 +17,20 @@ final class RequiredTest 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 Required())($machine_name));
+  public function test(mixed $machine_name, ?string $expected): void {
+    self::assertSame($expected, (new Required())($machine_name));
   }
 
   public static function dataProvider(): array {
-    $exception = new \UnexpectedValueException('The value is required.');
+    $error = 'The value is required.';
     return [
       ['yes', NULL],
       ['0', NULL],
-      ['', $exception],
-      [NULL, $exception],
+      ['', $error],
+      [NULL, $error],
       [FALSE, NULL],
       [TRUE, NULL],
-      [[], $exception],
+      [[], $error],
       [['foo'], NULL],
     ];
   }

tests/unit/Validator/ServiceNameTest.php

@@ -17,27 +17,24 @@ final class ServiceNameTest 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 ServiceName())($machine_name));
+  public function test(mixed $machine_name, ?string $expected): void {
+    self::assertSame($expected, (new ServiceName())($machine_name));
   }
 
   public static function dataProvider(): array {
-    $exception = new \UnexpectedValueException('The value is not correct service name.');
+    $error = 'The value is not correct service name.';
     return [
       ['snake_case_here', NULL],
       ['dot.inside', NULL],
-      ['CamelCaseHere', $exception],
-      [' not_trimmed ', $exception],
-      ['.leading.dot', $exception],
-      ['ending.dot.', $exception],
-      ['special&character', $exception],
-      [TRUE, $exception],
-      [NULL, $exception],
-      [[], $exception],
-      [new \stdClass(), $exception],
+      ['CamelCaseHere', $error],
+      [' not_trimmed ', $error],
+      ['.leading.dot', $error],
+      ['ending.dot.', $error],
+      ['special&character', $error],
+      [TRUE, $error],
+      [NULL, $error],
+      [[], $error],
+      [new \stdClass(), $error],
     ];
   }