AttributeTypeValidator

Author: tatevikg1

resources/translations/messages.en.xlf

@@ -436,7 +436,14 @@
                 <source>General import error: %error%</source>
                 <target>General import error: %error%</target>
             </trans-unit>
-
+            <trans-unit id="subscription.value_must_be_string">
+                <source>Value must be a string.</source>
+                <target>Value must be a string.</target>
+            </trans-unit>
+            <trans-unit id="subscription.invalid_attribute_type">
+                <source>Invalid attribute type: "%type%". Valid types are: %valid_types%</source>
+                <target>Invalid attribute type: "%type%". Valid types are: %valid_types%</target>
+            </trans-unit>
 
         </body>
     </file>

src/Domain/Messaging/Exception/ImapConnectionException.php

@@ -12,6 +12,5 @@ class ImapConnectionException extends RuntimeException
     public function __construct(?Throwable $previous = null)
     {
         parent::__construct('Cannot connect to IMAP server', 0, $previous);
-
     }
 }

src/Domain/Messaging/Exception/OpenMboxFileException.php

@@ -12,6 +12,5 @@ class OpenMboxFileException extends RuntimeException
     public function __construct(?Throwable $previous = null)
     {
         parent::__construct('Cannot open mbox file', 0, $previous);
-
     }
 }

src/Domain/Subscription/Service/SubscriberCsvImporter.php

@@ -87,7 +87,8 @@ public function importFromCsv(UploadedFile $file, SubscriberImportOptions $optio
                         $this->entityManager->flush();
                     }
                 } catch (Throwable $e) {
-                    $stats['errors'][] = $this->translator->trans('Error processing %email%: %error%',
+                    $stats['errors'][] = $this->translator->trans(
+                        'Error processing %email%: %error%',
                         ['%email%' => $dto->email, '%error%' => $e->getMessage()]
                     );
                     $stats['skipped']++;

src/Domain/Subscription/Validator/AttributeTypeValidator.php

@@ -8,9 +8,14 @@
 use PhpList\Core\Domain\Common\Model\ValidationContext;
 use PhpList\Core\Domain\Common\Validator\ValidatorInterface;
 use Symfony\Component\Validator\Exception\ValidatorException;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AttributeTypeValidator implements ValidatorInterface
 {
+    public function __construct(private readonly TranslatorInterface $translator)
+    {
+    }
+
     private const VALID_TYPES = [
         'textline',
         'checkbox',
@@ -25,15 +30,17 @@ class AttributeTypeValidator implements ValidatorInterface
     public function validate(mixed $value, ValidationContext $context = null): void
     {
         if (!is_string($value)) {
-            throw new InvalidArgumentException('Value must be a string.');
+            throw new InvalidArgumentException($this->translator->trans('Value must be a string.'));
         }
 
         $errors = [];
         if (!in_array($value, self::VALID_TYPES, true)) {
-            $errors[] = sprintf(
-                'Invalid attribute type: "%s". Valid types are: %s',
-                $value,
-                implode(', ', self::VALID_TYPES)
+            $errors[] = $this->translator->trans(
+                'Invalid attribute type: "%type%". Valid types are: %valid_types%',
+                [
+                    '%type%' => $value,
+                    '%valid_types%' => implode(', ', self::VALID_TYPES),
+                ]
             );
         }
 

tests/Unit/Domain/Subscription/Validator/AttributeTypeValidatorTest.php

@@ -7,6 +7,7 @@
 use InvalidArgumentException;
 use PhpList\Core\Domain\Subscription\Validator\AttributeTypeValidator;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\Translator;
 use Symfony\Component\Validator\Exception\ValidatorException;
 
 class AttributeTypeValidatorTest extends TestCase
@@ -15,7 +16,7 @@ class AttributeTypeValidatorTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->validator = new AttributeTypeValidator();
+        $this->validator = new AttributeTypeValidator(new Translator('en'));
     }
 
     public function testValidatesValidType(): void