Merge pull request #4084 from wallabag/feature/internal-setting

Rename internal settings table

4 files changed, 42 insertions, 7 deletions

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 50e19f0c..f73e0696 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -2,7 +2,6 @@
 
 namespace Wallabag\CoreBundle\Command;
 
-use Craue\ConfigBundle\Entity\Setting;
 use FOS\UserBundle\Event\UserEvent;
 use FOS\UserBundle\FOSUserEvents;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
@@ -13,6 +12,7 @@ use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Wallabag\CoreBundle\Entity\InternalSetting;
 
 class InstallCommand extends ContainerAwareCommand
 {
@@ -276,10 +276,10 @@ class InstallCommand extends ContainerAwareCommand
         $em = $this->getContainer()->get('doctrine.orm.entity_manager');
 
         // cleanup before insert new stuff
-        $em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
+        $em->createQuery('DELETE FROM WallabagCoreBundle:InternalSetting')->execute();
 
         foreach ($this->getContainer()->getParameter('wallabag_core.default_internal_settings') as $setting) {
-            $newSetting = new Setting();
+            $newSetting = new InternalSetting();
             $newSetting->setName($setting['name']);
             $newSetting->setValue($setting['value']);
             $newSetting->setSection($setting['section']);
diff --git a/src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php
index cc7d1f59..b052d1d5 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php
@@ -2,13 +2,13 @@
 
 namespace Wallabag\CoreBundle\DataFixtures;
 
-use Craue\ConfigBundle\Entity\Setting;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Wallabag\CoreBundle\Entity\InternalSetting;
 
-class SettingFixtures extends Fixture implements ContainerAwareInterface
+class InternalSettingFixtures extends Fixture implements ContainerAwareInterface
 {
     /**
      * @var ContainerInterface
@@ -26,7 +26,7 @@ class SettingFixtures extends Fixture implements ContainerAwareInterface
     public function load(ObjectManager $manager)
     {
         foreach ($this->container->getParameter('wallabag_core.default_internal_settings') as $setting) {
-            $newSetting = new Setting();
+            $newSetting = new InternalSetting();
             $newSetting->setName($setting['name']);
             $newSetting->setValue($setting['value']);
             $newSetting->setSection($setting['section']);
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 5181d91d..35be9655 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -17,7 +17,6 @@ use Wallabag\UserBundle\Entity\User;
  *         @ORM\Index(name="config_feed_token", columns={"feed_token"}, options={"lengths"={255}}),
  *     }
  * )
- * @ORM\Entity
  */
 class Config
 {
diff --git a/src/Wallabag/CoreBundle/Entity/InternalSetting.php b/src/Wallabag/CoreBundle/Entity/InternalSetting.php
new file mode 100644
index 00000000..df8bd3be
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Entity/InternalSetting.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Wallabag\CoreBundle\Entity;
+
+use Craue\ConfigBundle\Entity\BaseSetting;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * InternalSetting.
+ *
+ * Re-define setting so we can override length attribute to fix utf8mb4 issue.
+ *
+ * @ORM\Entity(repositoryClass="Craue\ConfigBundle\Repository\SettingRepository")
+ * @ORM\Table(name="`internal_setting`")
+ * @ORM\AttributeOverrides({
+ *      @ORM\AttributeOverride(name="name",
+ *          column=@ORM\Column(
+ *              length = 191
+ *          )
+ *      ),
+ *      @ORM\AttributeOverride(name="section",
+ *          column=@ORM\Column(
+ *              length = 191
+ *          )
+ *      )
+ * })
+ */
+class InternalSetting extends BaseSetting
+{
+    /**
+     * @var string|null
+     *
+     * @ORM\Column(name="value", type="string", nullable=true, length=191)
+     */
+    protected $value;
+}