Update import logic, add dynamic attribute repository (#362)

* Skip password and modified fields while import, do not subscribe blacklisted users

* DefaultConfigProvider

* Use ConfigProvider in ProcessQueueCommand

* Use ConfigProvider in SubscriberCsvImporter + send email

* Rename paramProvider

* Test fix

* AttributeValueProvider for dynamic tables

* Update: config provider

* Translations in default configs

* Email with messageHandler

* Style fix

* PhpCs fix

* Fix configs

* replace list names

* Add tests + fix

* Add more tests + fix handler

---------

Co-authored-by: Tatevik <[email protected]>

Author: TatevikGr

README.md

@@ -214,3 +214,11 @@ For detailed configuration instructions, see the [Mailer Transports documentatio
 ## Copyright
 
 phpList is copyright (C) 2000-2025 [phpList Ltd](https://www.phplist.com/).
+
+
+### Translations
+command to extract translation strings
+
+```bash
+php bin/console translation:extract --force en --format=xlf
+```

config/parameters.yml.dist

@@ -21,14 +21,18 @@ parameters:
     env(PHPLIST_DATABASE_USER): 'phplist'
     database_password: '%%env(PHPLIST_DATABASE_PASSWORD)%%'
     env(PHPLIST_DATABASE_PASSWORD): 'phplist'
+    database_prefix: '%%env(DATABASE_PREFIX)%%'
+    env(DATABASE_PREFIX): 'phplist_'
 
     # Email configuration
     app.mailer_from: '%%env(MAILER_FROM)%%'
     env(MAILER_FROM): '[email protected]'
     app.mailer_dsn: '%%env(MAILER_DSN)%%'
     env(MAILER_DSN): 'null://null'
     app.confirmation_url: '%%env(CONFIRMATION_URL)%%'
-    env(CONFIRMATION_URL): 'https://example.com/confirm/'
+    env(CONFIRMATION_URL): 'https://example.com/subscriber/confirm/'
+    app.subscription_confirmation_url: '%%env(SUBSCRIPTION_CONFIRMATION_URL)%%'
+    env(SUBSCRIPTION_CONFIRMATION_URL): 'https://example.com/subscription/confirm/'
     app.password_reset_url: '%%env(PASSWORD_RESET_URL)%%'
     env(PASSWORD_RESET_URL): 'https://example.com/reset/'
 

config/services/messenger.yml

@@ -22,3 +22,9 @@ services:
         tags: [ 'messenger.message_handler' ]
         arguments:
             $passwordResetUrl: '%app.password_reset_url%'
+
+    PhpList\Core\Domain\Messaging\MessageHandler\SubscriptionConfirmationMessageHandler:
+      autowire: true
+      autoconfigure: true
+      tags: [ 'messenger.message_handler' ]
+

config/services/providers.yml

@@ -3,7 +3,7 @@ services:
     autowire: true
     autoconfigure: true
 
-  PhpList\Core\Core\ConfigProvider:
+  PhpList\Core\Core\ParameterProvider:
     arguments:
       $config: '%app.config%'
 
@@ -12,3 +12,18 @@ services:
     autoconfigure: true
     arguments:
       $confPath: '%app.phplist_isp_conf_path%'
+
+  PhpList\Core\Domain\Subscription\Service\Provider\CheckboxGroupValueProvider:
+    autowire: true
+  PhpList\Core\Domain\Subscription\Service\Provider\SelectOrRadioValueProvider:
+    autowire: true
+  PhpList\Core\Domain\Subscription\Service\Provider\ScalarValueProvider:
+    autowire: true
+
+  PhpList\Core\Domain\Configuration\Service\Provider\DefaultConfigProvider:
+    autowire: true
+
+  PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider:
+    autowire: true
+    arguments:
+      $cache: '@Psr\SimpleCache\CacheInterface'

config/services/repositories.yml

@@ -1,156 +1,138 @@
 services:
+  PhpList\Core\Domain\Analytics\Repository\LinkTrackRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Analytics\Model\LinkTrack
+  PhpList\Core\Domain\Analytics\Repository\UserMessageViewRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Analytics\Model\UserMessageView
+  PhpList\Core\Domain\Analytics\Repository\LinkTrackUmlClickRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Analytics\Model\LinkTrackUmlClick
+
+
   PhpList\Core\Domain\Configuration\Repository\ConfigRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Configuration\Model\Config
-
   PhpList\Core\Domain\Configuration\Repository\EventLogRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Configuration\Model\EventLog
 
+
   PhpList\Core\Domain\Identity\Repository\AdministratorRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Identity\Model\Administrator
       - Doctrine\ORM\Mapping\ClassMetadata\ClassMetadata
       - PhpList\Core\Security\HashGenerator
-
   PhpList\Core\Domain\Identity\Repository\AdminAttributeValueRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Identity\Model\AdminAttributeValue
-
   PhpList\Core\Domain\Identity\Repository\AdminAttributeDefinitionRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Identity\Model\AdminAttributeDefinition
-
   PhpList\Core\Domain\Identity\Repository\AdministratorTokenRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Identity\Model\AdministratorToken
-
   PhpList\Core\Domain\Identity\Repository\AdminPasswordRequestRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Identity\Model\AdminPasswordRequest
 
+
   PhpList\Core\Domain\Subscription\Repository\SubscriberListRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Subscription\Model\SubscriberList
-
   PhpList\Core\Domain\Subscription\Repository\SubscriberRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Subscription\Model\Subscriber
-
   PhpList\Core\Domain\Subscription\Repository\SubscriberAttributeValueRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Subscription\Model\SubscriberAttributeValue
-
   PhpList\Core\Domain\Subscription\Repository\SubscriberAttributeDefinitionRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Subscription\Model\SubscriberAttributeDefinition
-
   PhpList\Core\Domain\Subscription\Repository\SubscriptionRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Subscription\Model\Subscription
+  PhpList\Core\Domain\Subscription\Repository\DynamicListAttrRepository:
+    autowire: true
+    arguments:
+      $prefix: '%database_prefix%'
+  PhpList\Core\Domain\Subscription\Repository\SubscriberHistoryRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Subscription\Model\SubscriberHistory
+  PhpList\Core\Domain\Subscription\Repository\UserBlacklistRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Subscription\Model\UserBlacklist
+  PhpList\Core\Domain\Subscription\Repository\UserBlacklistDataRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Subscription\Model\UserBlacklistData
+  PhpList\Core\Domain\Subscription\Repository\SubscriberPageRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Subscription\Model\SubscribePage
+  PhpList\Core\Domain\Subscription\Repository\SubscriberPageDataRepository:
+    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
+    arguments:
+      - PhpList\Core\Domain\Subscription\Model\SubscribePageData
+
 
   PhpList\Core\Domain\Messaging\Repository\MessageRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\Message
-
   PhpList\Core\Domain\Messaging\Repository\TemplateRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\Template
-
   PhpList\Core\Domain\Messaging\Repository\TemplateImageRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\TemplateImage
-
   PhpList\Core\Domain\Messaging\Repository\UserMessageBounceRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\UserMessageBounce
-
   PhpList\Core\Domain\Messaging\Repository\UserMessageForwardRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\UserMessageForward
-
-  PhpList\Core\Domain\Analytics\Repository\LinkTrackRepository:
-    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
-    arguments:
-      - PhpList\Core\Domain\Analytics\Model\LinkTrack
-
-  PhpList\Core\Domain\Analytics\Repository\UserMessageViewRepository:
-    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
-    arguments:
-      - PhpList\Core\Domain\Analytics\Model\UserMessageView
-
-  PhpList\Core\Domain\Analytics\Repository\LinkTrackUmlClickRepository:
-    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
-    arguments:
-      - PhpList\Core\Domain\Analytics\Model\LinkTrackUmlClick
-
   PhpList\Core\Domain\Messaging\Repository\UserMessageRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\UserMessage
-
-  PhpList\Core\Domain\Subscription\Repository\SubscriberHistoryRepository:
-    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
-    arguments:
-      - PhpList\Core\Domain\Subscription\Model\SubscriberHistory
-
   PhpList\Core\Domain\Messaging\Repository\ListMessageRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\ListMessage
-
-  PhpList\Core\Domain\Subscription\Repository\UserBlacklistRepository:
-    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
-    arguments:
-      - PhpList\Core\Domain\Subscription\Model\UserBlacklist
-
-  PhpList\Core\Domain\Subscription\Repository\UserBlacklistDataRepository:
-    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
-    arguments:
-      - PhpList\Core\Domain\Subscription\Model\UserBlacklistData
-
-  PhpList\Core\Domain\Subscription\Repository\SubscriberPageRepository:
-    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
-    arguments:
-      - PhpList\Core\Domain\Subscription\Model\SubscribePage
-
-  PhpList\Core\Domain\Subscription\Repository\SubscriberPageDataRepository:
-    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
-    arguments:
-      - PhpList\Core\Domain\Subscription\Model\SubscribePageData
-
   PhpList\Core\Domain\Messaging\Repository\BounceRegexRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\BounceRegex
-
   PhpList\Core\Domain\Messaging\Repository\BounceRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\Bounce
-
   PhpList\Core\Domain\Messaging\Repository\BounceRegexBounceRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
       - PhpList\Core\Domain\Messaging\Model\BounceRegex
-
   PhpList\Core\Domain\Messaging\Repository\SendProcessRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:

config/services/resolvers.yml

@@ -0,0 +1,15 @@
+services:
+  PhpList\Core\Domain\Subscription\Service\Resolver\AttributeValueResolver:
+    arguments:
+      $providers:
+        - '@PhpList\Core\Domain\Subscription\Service\Provider\CheckboxGroupValueProvider'
+        - '@PhpList\Core\Domain\Subscription\Service\Provider\SelectOrRadioValueProvider'
+        - '@PhpList\Core\Domain\Subscription\Service\Provider\ScalarValueProvider'
+
+  PhpList\Core\Domain\Common\ClientIpResolver:
+    autowire: true
+    autoconfigure: true
+
+  PhpList\Core\Domain\Messaging\Service\BounceActionResolver:
+    arguments:
+      - !tagged_iterator { tag: 'phplist.bounce_action_handler' }

config/services/services.yml

@@ -44,10 +44,6 @@ services:
       $mailqueueBatchPeriod: '%messaging.mail_queue_period%'
       $mailqueueThrottle: '%messaging.mail_queue_throttle%'
 
-  PhpList\Core\Domain\Common\ClientIpResolver:
-    autowire: true
-    autoconfigure: true
-
   PhpList\Core\Domain\Common\SystemInfoCollector:
     autowire: true
     autoconfigure: true
@@ -118,18 +114,27 @@ services:
     autoconfigure: true
     resource: '../../src/Domain/Messaging/Service/Handler/*Handler.php'
 
-  PhpList\Core\Domain\Messaging\Service\BounceActionResolver:
-    arguments:
-      - !tagged_iterator { tag: 'phplist.bounce_action_handler' }
-
   PhpList\Core\Domain\Messaging\Service\MaxProcessTimeLimiter:
     autowire: true
     autoconfigure: true
     arguments:
       $maxSeconds: '%messaging.max_process_time%'
 
-
   PhpList\Core\Domain\Identity\Service\PermissionChecker:
     autowire: true
     autoconfigure: true
     public: true
+
+  PhpList\Core\Domain\Configuration\Service\UserPersonalizer:
+    autowire: true
+    autoconfigure: true
+
+  PhpList\Core\Domain\Configuration\Service\LegacyUrlBuilder:
+    autowire: true
+    autoconfigure: true
+
+  cache.app.simple:
+    class: Symfony\Component\Cache\Psr16Cache
+    arguments: [ '@cache.app' ]
+
+  Psr\SimpleCache\CacheInterface: '@cache.app.simple'