Fix configs

Author: tatevikg1

config/parameters.yml.dist

@@ -21,6 +21,8 @@ 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)%%'

config/services/providers.yml

@@ -13,12 +13,17 @@ services:
     arguments:
       $confPath: '%app.phplist_isp_conf_path%'
 
-  PhpList\Core\Domain\Subscription\Service\Provider\CheckboxGroupValueProvider: ~
-  PhpList\Core\Domain\Subscription\Service\Provider\SelectOrRadioValueProvider: ~
-  PhpList\Core\Domain\Subscription\Service\Provider\ScalarValueProvider: ~
+  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:
-    calls:
-      - [ setTranslator, [ '@translator' ] ]
+    autowire: true
 
   PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider:
+    autowire: true
+    arguments:
+      $cache: '@Psr\SimpleCache\CacheInterface'

config/services/repositories.yml

@@ -68,8 +68,9 @@ services:
     arguments:
       - PhpList\Core\Domain\Subscription\Model\Subscription
   PhpList\Core\Domain\Subscription\Repository\DynamicListAttrRepository:
+    autowire: true
     arguments:
-      $prefix: '%env(default:phplist_ DATABASE_PREFIX)%'
+      $prefix: '%database_prefix%'
   PhpList\Core\Domain\Subscription\Repository\SubscriberHistoryRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:

config/services/services.yml

@@ -132,3 +132,9 @@ services:
   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'

src/Domain/Configuration/Repository/ConfigRepository.php

@@ -10,6 +10,6 @@ class ConfigRepository extends AbstractRepository
 {
     public function findValueByItem(string $name): ?string
     {
-        return $this->findOneBy(['item' => $name])?->getValue();
+        return $this->findOneBy(['key' => $name])?->getValue();
     }
 }

src/Domain/Configuration/Service/Provider/ConfigProvider.php

@@ -18,7 +18,8 @@ class ConfigProvider
     public function __construct(
         private readonly ConfigRepository $configRepository,
         private readonly CacheInterface $cache,
-        private readonly int $ttlSeconds = 300
+        private readonly DefaultConfigProvider $defaultConfigs,
+        private readonly ?int $ttlSeconds = 300
     ) {
     }
 
@@ -37,7 +38,7 @@ public function isEnabled(ConfigOption $key): bool
             $config->getValue() === '1';
         }
 
-        return DefaultConfigProvider::has($key->value) && DefaultConfigProvider::get($key->value) === '1';
+        return $this->defaultConfigs->has($key->value) && $this->defaultConfigs->get($key->value)['value'] === '1';
     }
 
     /**
@@ -61,7 +62,7 @@ public function getValue(ConfigOption $key): ?string
             return $value;
         }
 
-        return DefaultConfigProvider::has($key->value) ? DefaultConfigProvider::get($key->value) : null;
+        return $this->defaultConfigs->has($key->value) ? $this->defaultConfigs->get($key->value)['value'] : null;
     }
 
     /** @SuppressWarnings(PHPMD.StaticAccess) */

src/Domain/Configuration/Service/Provider/DefaultConfigProvider.php

@@ -6,9 +6,7 @@
 
 use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Exception;
 use InvalidArgumentException;
-use PhpList\Core\Domain\Common\Model\Interfaces\DomainModel;
 
 class DynamicListAttrRepository
 {

src/Domain/Subscription/Repository/DynamicListAttrRepository.php

@@ -42,8 +42,8 @@ public function testImportFromCsvCreatesNewSubscribers(): void
         $this->entityManager->flush();
 
         $csvContent = "email,confirmed,html_email,blacklisted,disabled,extra_data,first_name\n";
-        $csvContent .= "test@example.com,1,1,0,0,\"Some extra data\",John\n";
-        $csvContent .= "another@example.com,0,0,1,1,\"More data\",Jane\n";
+        $csvContent .= "test1@example.com,1,1,0,0,\"Some extra data\",John\n";
+        $csvContent .= "another1@example.com,0,0,1,1,\"More data\",Jane\n";
 
         $tempFile = tempnam(sys_get_temp_dir(), 'csv_test');
         file_put_contents($tempFile, $csvContent);
@@ -58,7 +58,7 @@ public function testImportFromCsvCreatesNewSubscribers(): void
 
         $subscriberCountBefore = count($this->subscriberRepository->findAll());
 
-        $options = new SubscriberImportOptions();
+        $options = new SubscriberImportOptions(true);
         $result = $this->subscriberCsvImportManager->importFromCsv($uploadedFile, $options);
 
         $subscriberCountAfter = count($this->subscriberRepository->findAll());