Update UserConfig schema

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index feaaebf6903ac5e92758dd8ba3b04f7155bf83ba..bf2f747d81a70b762b3567a28dcf14733b2ccc8c 100644 (file)
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -136,18 +136,18 @@ class InstallCommand extends ContainerAwareCommand
         $em->persist($user);
 
         $pagerConfig = new UsersConfig();
-        $pagerConfig->setUserId($user->getId());
+        $pagerConfig->setUser($user);
         $pagerConfig->setName('pager');
         $pagerConfig->setValue(10);
 
         $em->persist($pagerConfig);
 
-        // $languageConfig = new LanguageConfig();
-        // $languageConfig->setUserId($user->getId());
-        // $languageConfig->setName('language');
-        // $languageConfig->setValue('en_EN.UTF8');
+        $languageConfig = new LanguageConfig();
+        $languageConfig->setUser($user);
+        $languageConfig->setName('language');
+        $languageConfig->setValue('en_EN');
 
-        // $em->persist($languageConfig);
+        $em->persist($languageConfig);
 
         $em->flush();
     }

diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 045ca308ee99991303ae0ecb95c3a0bc7f565cdf..14977d320e80bc4d1031c648b71b761ccf48e378 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -3,6 +3,7 @@
 namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Config
@@ -15,16 +16,17 @@ class Config
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var string
      *
-     * @ORM\Column(name="name", type="string", nullable=true)
+     * @Assert\NotBlank()
+     * @ORM\Column(name="name", type="string", nullable=false)
      */
     private $name;
 

diff --git a/src/Wallabag/CoreBundle/Entity/UsersConfig.php b/src/Wallabag/CoreBundle/Entity/UsersConfig.php
index 0742edbcb986857db569a3f4030f512baa2841b0..52127631a7d1806233fe3bab0a9fd3f259899ebc 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/UsersConfig.php
+++ b/src/Wallabag/CoreBundle/Entity/UsersConfig.php
@@ -22,11 +22,9 @@ class UsersConfig
     private $id;
 
     /**
-     * @var string
-     *
-     * @ORM\Column(name="user_id", type="decimal", precision=10, scale=0, nullable=true)
+     * @ORM\ManyToOne(targetEntity="User", inversedBy="config")
      */
-    private $userId;
+    private $user;
 
     /**
      * @var string
@@ -53,71 +51,71 @@ class UsersConfig
     }
 
     /**
-     * Set userId
+     * Set name
      *
-     * @param  string      $userId
+     * @param  string      $name
      * @return UsersConfig
      */
-    public function setUserId($userId)
+    public function setName($name)
     {
-        $this->userId = $userId;
+        $this->name = $name;
 
         return $this;
     }
 
     /**
-     * Get userId
+     * Get name
      *
      * @return string
      */
-    public function getUserId()
+    public function getName()
     {
-        return $this->userId;
+        return $this->name;
     }
 
     /**
-     * Set name
+     * Set value
      *
-     * @param  string      $name
+     * @param  string      $value
      * @return UsersConfig
      */
-    public function setName($name)
+    public function setValue($value)
     {
-        $this->name = $name;
+        $this->value = $value;
 
         return $this;
     }
 
     /**
-     * Get name
+     * Get value
      *
      * @return string
      */
-    public function getName()
+    public function getValue()
     {
-        return $this->name;
+        return $this->value;
     }
 
     /**
-     * Set value
+     * Set user
      *
-     * @param  string      $value
+     * @param  \Wallabag\CoreBundle\Entity\User $user
      * @return UsersConfig
      */
-    public function setValue($value)
+    public function setUser(\Wallabag\CoreBundle\Entity\User $user = null)
     {
-        $this->value = $value;
+        $this->user = $user;
 
         return $this;
     }
 
     /**
-     * Get value
+     * Get user
      *
-     * @return string
+     * @return \Wallabag\CoreBundle\Entity\User
      */
-    public function getValue()
+    public function getUser()
     {
-        return $this->value;
+        return $this->user;
     }
 }