2 files changed, 77 insertions, 9 deletions

diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 91f9bfe8..9f079656 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -32,12 +32,17 @@ class Config
     private $theme;
 
     /**
-     * @var string
+     * @var integer
      *
      * @Assert\NotBlank()
+     * @Assert\Range(
+     *      min = 1,
+     *      max = 100000,
+     *      maxMessage = "This will certainly kill the app"
+     * )
      * @ORM\Column(name="items_per_page", type="integer", nullable=false)
      */
-    private $items_per_page;
+    private $itemsPerPage;
 
     /**
      * @var string
@@ -48,6 +53,25 @@ class Config
     private $language;
 
     /**
+     * @var string
+     *
+     * @ORM\Column(name="rss_token", type="string", nullable=true)
+     */
+    private $rssToken;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="rss_limit", type="integer", nullable=true)
+     * @Assert\Range(
+     *      min = 1,
+     *      max = 100000,
+     *      maxMessage = "This will certainly kill the app"
+     * )
+     */
+    private $rssLimit;
+
+    /**
      * @ORM\OneToOne(targetEntity="User", inversedBy="config")
      */
     private $user;
@@ -58,8 +82,6 @@ class Config
     public function __construct(User $user)
     {
         $this->user = $user;
-        $this->items_per_page = 12;
-        $this->language = 'en_US';
     }
 
     /**
@@ -96,26 +118,26 @@ class Config
     }
 
     /**
-     * Set items_per_page
+     * Set itemsPerPage
      *
      * @param  integer $itemsPerPage
      * @return Config
      */
     public function setItemsPerPage($itemsPerPage)
     {
-        $this->items_per_page = $itemsPerPage;
+        $this->itemsPerPage = $itemsPerPage;
 
         return $this;
     }
 
     /**
-     * Get items_per_page
+     * Get itemsPerPage
      *
      * @return integer
      */
     public function getItemsPerPage()
     {
-        return $this->items_per_page;
+        return $this->itemsPerPage;
     }
 
     /**
@@ -163,4 +185,50 @@ class Config
     {
         return $this->user;
     }
+
+    /**
+     * Set rssToken
+     *
+     * @param  string $rssToken
+     * @return Config
+     */
+    public function setRssToken($rssToken)
+    {
+        $this->rssToken = $rssToken;
+
+        return $this;
+    }
+
+    /**
+     * Get rssToken
+     *
+     * @return string
+     */
+    public function getRssToken()
+    {
+        return $this->rssToken;
+    }
+
+    /**
+     * Set rssLimit
+     *
+     * @param  string $rssLimit
+     * @return Config
+     */
+    public function setRssLimit($rssLimit)
+    {
+        $this->rssLimit = $rssLimit;
+
+        return $this;
+    }
+
+    /**
+     * Get rssLimit
+     *
+     * @return string
+     */
+    public function getRssLimit()
+    {
+        return $this->rssLimit;
+    }
 }
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php
index 6a7619ac..e75e3a83 100644
--- a/src/Wallabag/CoreBundle/Entity/User.php
+++ b/src/Wallabag/CoreBundle/Entity/User.php
@@ -14,7 +14,7 @@ use JMS\Serializer\Annotation\Expose;
  * User
  *
  * @ORM\Table(name="user")
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\UserRepository")
  * @ORM\HasLifecycleCallbacks()
  * @ExclusionPolicy("all")
  */