Add subject to be more specific about what cannot be empty

Author: thofman

src/Command/AddArticle.php

@@ -26,10 +26,10 @@ public function execute(InputInterface $input, OutputInterface $output): int
         $authorQuestion = new Question('Please enter the name of the author: ', '');
         $authorQuestion->setValidator(
             static function (string $value): string {
-                $nonEmptyStringValidator = new NonEmptyStringValidator();
+                $nonEmptyStringValidator = new NonEmptyStringValidator('Author');
                 $validationResult = $nonEmptyStringValidator->validate($value);
                 if (!$validationResult->isValid) {
-                    throw new RuntimeException('Author cannot be empty');
+                    throw new RuntimeException($validationResult->validationErrorMessage);
                 }
 
                 return new StringSanitizer()->sanitize($validationResult->value);
@@ -40,10 +40,10 @@ static function (string $value): string {
         $titleQuestion = new Question('Please enter the title of the article: ', '');
         $titleQuestion->setValidator(
             static function (string $value): string {
-                $nonEmptyStringValidator = new NonEmptyStringValidator();
+                $nonEmptyStringValidator = new NonEmptyStringValidator('Title');
                 $validationResult = $nonEmptyStringValidator->validate($value);
                 if (!$validationResult->isValid) {
-                    throw new RuntimeException('Title cannot be empty');
+                    throw new RuntimeException($validationResult->validationErrorMessage);
                 }
 
                 return new StringSanitizer()->sanitize($validationResult->value);
@@ -54,10 +54,10 @@ static function (string $value): string {
         $urlQuestion = new Question('Please enter the URL of the article: ', '');
         $urlQuestion->setValidator(
             static function (string $value): string {
-                $nonEmptyStringValidator = new NonEmptyStringValidator();
+                $nonEmptyStringValidator = new NonEmptyStringValidator('URL');
                 $validationResult = $nonEmptyStringValidator->validate($value);
                 if (!$validationResult->isValid) {
-                    throw new RuntimeException('URL cannot be empty');
+                    throw new RuntimeException($validationResult->validationErrorMessage);
                 }
 
                 if (!filter_var($validationResult->value, FILTER_VALIDATE_URL)) {

src/Domain/Question/Validation/NonEmptyStringValidator.php

@@ -5,11 +5,16 @@
 
 final readonly class NonEmptyStringValidator implements Validator
 {
+    public function __construct(
+        private string $subject,
+    ) {
+    }
+
     public function validate(string $value): ValidationResult
     {
         $trimmedValue = trim($value);
         if ($trimmedValue === '') {
-            return ValidationResult::invalid('The value cannot be empty');
+            return ValidationResult::invalid(sprintf('%s cannot be empty', $this->subject));
         }
 
         return ValidationResult::valid($trimmedValue);

tests/unit/Domain/Question/Validation/NonEmptyStringValidatorTest.php

@@ -14,17 +14,17 @@ final class NonEmptyStringValidatorTest extends TestCase
 {
     #[Test]
     #[DataProvider('provideDataToTestTheNonEmptyStringValidator')]
-    public function theNonEmptyStringValidator(string $value, ValidationResult $expectedResult): void
+    public function theNonEmptyStringValidator(string $subject, string $value, ValidationResult $expectedResult): void
     {
-        $validator = new NonEmptyStringValidator();
+        $validator = new NonEmptyStringValidator($subject);
         self::assertEquals($expectedResult, $validator->validate($value));
     }
 
     public static function provideDataToTestTheNonEmptyStringValidator(): Generator
     {
-        yield ['test', ValidationResult::valid('test')];
-        yield [' test ', ValidationResult::valid('test')];
-        yield ['', ValidationResult::invalid('The value cannot be empty')];
-        yield [' ', ValidationResult::invalid('The value cannot be empty')];
+        yield ['Title', 'test', ValidationResult::valid('test')];
+        yield ['Title', ' test ', ValidationResult::valid('test')];
+        yield ['Title', '', ValidationResult::invalid('Title cannot be empty')];
+        yield ['Title', ' ', ValidationResult::invalid('Title cannot be empty')];
     }
 }