Refactor attribute type system to use enums and manage dynamic list attributes table names

config/services/mappers.yml

@@ -4,10 +4,10 @@ services:
     autoconfigure: true
     public: false
 
-  PhpList\Core\Domain\Subscription\Service\CsvRowToDtoMapper:
+  PhpList\Core\Domain\Subscription\Service\ArrayToDtoMapper:
     autowire: true
     autoconfigure: true
 
-  PhpList\Core\Domain\Subscription\Service\CsvImporter:
+  PhpList\Core\Domain\Subscription\Service\CsvToDtoImporter:
     autowire: true
     autoconfigure: true

src/Domain/Subscription/Service/CsvRowToDtoMapper.php → src/Domain/Subscription/Service/ArrayToDtoMapper.php

@@ -6,7 +6,7 @@
 
 use PhpList\Core\Domain\Subscription\Model\Dto\ImportSubscriberDto;
 
-class CsvRowToDtoMapper
+class ArrayToDtoMapper
 {
     private const FK_HEADER = 'foreignkey';
     private const KNOWN_HEADERS = [

src/Domain/Subscription/Service/CsvImporter.php → src/Domain/Subscription/Service/CsvToDtoImporter.php

@@ -11,10 +11,10 @@
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Throwable;
 
-class CsvImporter
+class CsvToDtoImporter
 {
     public function __construct(
-        private readonly CsvRowToDtoMapper $rowMapper,
+        private readonly ArrayToDtoMapper $rowMapper,
         private readonly ValidatorInterface $validator,
         private readonly TranslatorInterface $translator,
     ) {
@@ -25,7 +25,7 @@ public function __construct(
      * @return array{valid: ImportSubscriberDto[], errors: array<int, array<string>>}
      * @throws CsvException
      */
-    public function import(string $csvFilePath): array
+    public function parseAndValidate(string $csvFilePath): array
     {
         $reader = Reader::createFromPath($csvFilePath, 'r');
         $reader->setHeaderOffset(0);

src/Domain/Subscription/Service/SubscriberCsvImporter.php

@@ -23,9 +23,12 @@
 use Throwable;
 
 /**
- * phpcs:ignore Generic.Commenting.Todo
- * @todo: check if dryRun will work (some function flush)
- * Service for importing subscribers from a CSV file.
+ * Handles full subscriber import workflow, including DB transactions and message dispatching.
+ *
+ * Note: Although this lives in the Service namespace, it acts as an *application service* —
+ * it orchestrates multiple domain services and manages transactions/flushes directly.
+ * This is an intentional exception for this complex import use case.
+ *
  * @SuppressWarnings("CouplingBetweenObjects")
  * @SuppressWarnings("ExcessiveParameterList")
  */
@@ -35,7 +38,7 @@ class SubscriberCsvImporter
     private SubscriberAttributeManager $attributeManager;
     private SubscriptionManager $subscriptionManager;
     private SubscriberRepository $subscriberRepository;
-    private CsvImporter $csvImporter;
+    private CsvToDtoImporter $csvToDtoImporter;
     private EntityManagerInterface $entityManager;
     private TranslatorInterface $translator;
     private MessageBusInterface $messageBus;
@@ -46,7 +49,7 @@ public function __construct(
         SubscriberAttributeManager $attributeManager,
         SubscriptionManager $subscriptionManager,
         SubscriberRepository $subscriberRepository,
-        CsvImporter $csvImporter,
+        CsvToDtoImporter $csvToDtoImporter,
         EntityManagerInterface $entityManager,
         TranslatorInterface $translator,
         MessageBusInterface $messageBus,
@@ -56,7 +59,7 @@ public function __construct(
         $this->attributeManager = $attributeManager;
         $this->subscriptionManager = $subscriptionManager;
         $this->subscriberRepository = $subscriberRepository;
-        $this->csvImporter = $csvImporter;
+        $this->csvToDtoImporter = $csvToDtoImporter;
         $this->entityManager = $entityManager;
         $this->translator = $translator;
         $this->messageBus = $messageBus;
@@ -78,6 +81,7 @@ public function importFromCsv(
             'updated' => 0,
             'skipped' => 0,
             'blacklisted' => 0,
+            'invalid_email' => 0,
             'errors' => [],
         ];
 
@@ -89,7 +93,7 @@ public function importFromCsv(
                 );
             }
 
-            $result = $this->csvImporter->import($path);
+            $result = $this->csvToDtoImporter->parseAndValidate($path);
 
             foreach ($result['valid'] as $dto) {
                 try {
@@ -244,11 +248,12 @@ private function handleInvalidEmail(
         if (!filter_var($dto->email, FILTER_VALIDATE_EMAIL)) {
             if ($options->skipInvalidEmail) {
                 $stats['skipped']++;
+                $stats['invalid_email']++;
+                $stats['errors'][] = $this->translator->trans('Invalid email: %email%', ['%email%' => $dto->email]);
 
                 return true;
             }
-            // phpcs:ignore Generic.Commenting.Todo
-            // @todo: check
+
             $dto->email = 'invalid_' . $dto->email;
             $dto->sendConfirmation = false;
         }

tests/Unit/Domain/Subscription/Service/SubscriberCsvImporterTest.php

@@ -12,7 +12,7 @@
 use PhpList\Core\Domain\Subscription\Model\SubscriberAttributeDefinition;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberAttributeDefinitionRepository;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
-use PhpList\Core\Domain\Subscription\Service\CsvImporter;
+use PhpList\Core\Domain\Subscription\Service\CsvToDtoImporter;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberAttributeManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
@@ -29,7 +29,7 @@ class SubscriberCsvImporterTest extends TestCase
     private SubscriberManager&MockObject $subscriberManagerMock;
     private SubscriberAttributeManager&MockObject $attributeManagerMock;
     private SubscriberRepository&MockObject $subscriberRepositoryMock;
-    private CsvImporter&MockObject $csvImporterMock;
+    private CsvToDtoImporter&MockObject $csvImporterMock;
     private SubscriberAttributeDefinitionRepository&MockObject $attributeDefinitionRepositoryMock;
     private SubscriberCsvImporter $subject;
 
@@ -39,7 +39,7 @@ protected function setUp(): void
         $this->attributeManagerMock = $this->createMock(SubscriberAttributeManager::class);
         $subscriptionManagerMock = $this->createMock(SubscriptionManager::class);
         $this->subscriberRepositoryMock = $this->createMock(SubscriberRepository::class);
-        $this->csvImporterMock = $this->createMock(CsvImporter::class);
+        $this->csvImporterMock = $this->createMock(CsvToDtoImporter::class);
         $this->attributeDefinitionRepositoryMock = $this->createMock(SubscriberAttributeDefinitionRepository::class);
         $entityManager = $this->createMock(EntityManagerInterface::class);
 
@@ -48,7 +48,7 @@ protected function setUp(): void
             attributeManager: $this->attributeManagerMock,
             subscriptionManager: $subscriptionManagerMock,
             subscriberRepository: $this->subscriberRepositoryMock,
-            csvImporter: $this->csvImporterMock,
+            csvToDtoImporter: $this->csvImporterMock,
             entityManager: $entityManager,
             translator: new Translator('en'),
             messageBus: $this->createMock(MessageBusInterface::class),
@@ -108,7 +108,7 @@ public function testImportFromCsvCreatesNewSubscribers(): void
         $importDto2->extraAttributes = ['first_name' => 'Jane'];
 
         $this->csvImporterMock
-            ->method('import')
+            ->method('parseAndValidate')
             ->with($tempFile)
             ->willReturn([
                 'valid' => [$importDto1, $importDto2],
@@ -173,7 +173,7 @@ public function testImportFromCsvUpdatesExistingSubscribers(): void
         $importDto->extraAttributes = [];
 
         $this->csvImporterMock
-            ->method('import')
+            ->method('parseAndValidate')
             ->with($tempFile)
             ->willReturn([
                 'valid' => [$importDto],
@@ -244,7 +244,7 @@ public function testImportResolvesByForeignKeyWhenProvidedAndMatches(): void
         );
 
         $this->csvImporterMock
-            ->method('import')
+            ->method('parseAndValidate')
             ->with($tempFile)
             ->willReturn([
                 'valid' => [$dto],
@@ -309,7 +309,7 @@ public function testImportConflictWhenEmailAndForeignKeyReferToDifferentSubscrib
         );
 
         $this->csvImporterMock
-            ->method('import')
+            ->method('parseAndValidate')
             ->with($tempFile)
             ->willReturn([
                 'valid' => [$dto],
@@ -369,7 +369,7 @@ public function testImportResolvesByEmailWhenForeignKeyNotFound(): void
         );
 
         $this->csvImporterMock
-            ->method('import')
+            ->method('parseAndValidate')
             ->with($tempFile)
             ->willReturn([
                 'valid' => [$dto],
@@ -429,7 +429,7 @@ public function testImportCreatesNewWhenNeitherEmailNorForeignKeyFound(): void
         );
 
         $this->csvImporterMock
-            ->method('import')
+            ->method('parseAndValidate')
             ->with($tempFile)
             ->willReturn([
                 'valid' => [$dto],