Use Doctrine in SettingsController

[MAILPOET-2436]

lib/Settings/SettingsController.php

@@ -4,8 +4,7 @@ namespace MailPoet\Settings;
 
 use MailPoet\Cron\CronTrigger;
 use MailPoet\DI\ContainerWrapper;
-use MailPoet\Models\Setting;
+use MailPoet\Entities\SettingEntity;
-use MailPoet\Util\Helpers;
 use MailPoet\WP\Functions as WPFunctions;
 
 class SettingsController {
@@ -22,6 +21,13 @@ class SettingsController {
 
   private $defaults = null;
 
+  /** @var SettingsRepository */
+  private $settings_repository;
+
+  function __construct(SettingsRepository $settings_repository) {
+    $this->settings_repository = $settings_repository;
+  }
+
   function get($key, $default = null) {
     $this->ensureLoaded();
     $key_parts = explode('.', $key);
@@ -107,7 +113,11 @@ class SettingsController {
   }
 
   function delete($key) {
-    Setting::deleteValue($key);
+    $setting = $this->settings_repository->findOneByName($key);
+    if ($setting) {
+      $this->settings_repository->remove($setting);
+      $this->settings_repository->flush();
+    }
     unset($this->settings[$key]);
   }
 
@@ -115,7 +125,11 @@ class SettingsController {
     if ($this->loaded) {
       return;
     }
-    $this->settings = Setting::getAll() ?: [];
+
+    $this->settings = [];
+    foreach ($this->settings_repository->findAll() as $setting) {
+      $this->settings[$setting->getName()] = $setting->getValue();
+    }
     $this->loaded = true;
   }
 
@@ -132,28 +146,19 @@ class SettingsController {
   }
 
   private function fetchValue($key) {
-    $setting = Setting::where('name', $key)->findOne();
+    $setting = $this->settings_repository->findOneByName($key);
-    if (!$setting instanceof Setting) {
+    return $setting ? $setting->getValue() : null;
-      return null;
-    }
-    if (is_serialized($setting->value)) {
-      return unserialize($setting->value);
-    } else {
-      return $setting->value;
-    }
   }
 
   private function saveValue($key, $value) {
-    $value = Helpers::recursiveTrim($value);
+    $setting = $this->settings_repository->findOneByName($key);
-    if (is_array($value)) {
+    if (!$setting) {
-      $value = serialize($value);
+      $setting = new SettingEntity();
+      $setting->setName($key);
+      $this->settings_repository->persist($setting);
     }
-
+    $setting->setValue($value);
-    $setting = Setting::createOrUpdate([
+    $this->settings_repository->flush();
-      'name' => $key,
-      'value' => $value,
-    ]);
-    return ($setting->id() > 0 && $setting->getErrors() === false);
   }
 
   function resetCache() {

lib/Settings/SettingsRepository.php

@@ -14,6 +14,10 @@ use MailPoet\Entities\SettingEntity;
  * @method void remove(SettingEntity $entity)
  */
 class SettingsRepository extends Repository {
+  function findOneByName($name) {
+    return $this->doctrine_repository->findOneBy(['name' => $name]);
+  }
+
   protected function getEntityClassName() {
     return SettingEntity::class;
   }