Merge remote-tracking branch 'origin/master' into 2.4

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Entity / Config.php

diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 0b75270d451400bb5235333e01a4422598ffe600..c6e65d66e050cb4c977b059da3c727ad5ead5b81 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -60,21 +60,21 @@ class Config
     /**
      * @var string
      *
-     * @ORM\Column(name="rss_token", type="string", nullable=true)
+     * @ORM\Column(name="feed_token", type="string", nullable=true)
      */
-    private $rssToken;
+    private $feedToken;
 
     /**
      * @var int
      *
-     * @ORM\Column(name="rss_limit", type="integer", nullable=true)
+     * @ORM\Column(name="feed_limit", type="integer", nullable=true)
      * @Assert\Range(
      *      min = 1,
      *      max = 100000,
-     *      maxMessage = "validator.rss_limit_too_high"
+     *      maxMessage = "validator.feed_limit_too_high"
      * )
      */
-    private $rssLimit;
+    private $feedLimit;
 
     /**
      * @var float
@@ -93,7 +93,7 @@ class Config
     /**
      * @var int
      *
-     * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true)
+     * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true, options={"default" = 0})
      */
     private $actionMarkAsRead;
 
@@ -231,51 +231,51 @@ class Config
     }
 
     /**
-     * Set rssToken.
+     * Set feed Token.
      *
-     * @param string $rssToken
+     * @param string $feedToken
      *
      * @return Config
      */
-    public function setRssToken($rssToken)
+    public function setFeedToken($feedToken)
     {
-        $this->rssToken = $rssToken;
+        $this->feedToken = $feedToken;
 
         return $this;
     }
 
     /**
-     * Get rssToken.
+     * Get feedToken.
      *
      * @return string
      */
-    public function getRssToken()
+    public function getFeedToken()
     {
-        return $this->rssToken;
+        return $this->feedToken;
     }
 
     /**
-     * Set rssLimit.
+     * Set Feed Limit.
      *
-     * @param int $rssLimit
+     * @param int $feedLimit
      *
      * @return Config
      */
-    public function setRssLimit($rssLimit)
+    public function setFeedLimit($feedLimit)
     {
-        $this->rssLimit = $rssLimit;
+        $this->feedLimit = $feedLimit;
 
         return $this;
     }
 
     /**
-     * Get rssLimit.
+     * Get Feed Limit.
      *
      * @return int
      */
-    public function getRssLimit()
+    public function getFeedLimit()
     {
-        return $this->rssLimit;
+        return $this->feedLimit;
     }
 
     /**