diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-05-09 15:21:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-09 15:21:21 +0300 |
commit | 6e67f41152ad025e74696e7140de0f9fb0d601de (patch) | |
tree | 5d87be5998bedfc2e25099be17fdc1f3e5cc45ed /src/Wallabag/CoreBundle/Entity/Config.php | |
parent | 522e37ad274361dde697da13a92ff3f846599822 (diff) | |
parent | 68a90821a305867e9b655da2dbfe558d37253990 (diff) | |
download | wallabag-6e67f41152ad025e74696e7140de0f9fb0d601de.tar.gz wallabag-6e67f41152ad025e74696e7140de0f9fb0d601de.tar.zst wallabag-6e67f41152ad025e74696e7140de0f9fb0d601de.zip |
Merge pull request #3223 from wallabag/rss2atom
Changed RSS to Atom feed and improve paging
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity/Config.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Config.php | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index b902ae2c..c6e65d66 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php | |||
@@ -60,21 +60,21 @@ class Config | |||
60 | /** | 60 | /** |
61 | * @var string | 61 | * @var string |
62 | * | 62 | * |
63 | * @ORM\Column(name="rss_token", type="string", nullable=true) | 63 | * @ORM\Column(name="feed_token", type="string", nullable=true) |
64 | */ | 64 | */ |
65 | private $rssToken; | 65 | private $feedToken; |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * @var int | 68 | * @var int |
69 | * | 69 | * |
70 | * @ORM\Column(name="rss_limit", type="integer", nullable=true) | 70 | * @ORM\Column(name="feed_limit", type="integer", nullable=true) |
71 | * @Assert\Range( | 71 | * @Assert\Range( |
72 | * min = 1, | 72 | * min = 1, |
73 | * max = 100000, | 73 | * max = 100000, |
74 | * maxMessage = "validator.rss_limit_too_high" | 74 | * maxMessage = "validator.feed_limit_too_high" |
75 | * ) | 75 | * ) |
76 | */ | 76 | */ |
77 | private $rssLimit; | 77 | private $feedLimit; |
78 | 78 | ||
79 | /** | 79 | /** |
80 | * @var float | 80 | * @var float |
@@ -231,51 +231,51 @@ class Config | |||
231 | } | 231 | } |
232 | 232 | ||
233 | /** | 233 | /** |
234 | * Set rssToken. | 234 | * Set feed Token. |
235 | * | 235 | * |
236 | * @param string $rssToken | 236 | * @param string $feedToken |
237 | * | 237 | * |
238 | * @return Config | 238 | * @return Config |
239 | */ | 239 | */ |
240 | public function setRssToken($rssToken) | 240 | public function setFeedToken($feedToken) |
241 | { | 241 | { |
242 | $this->rssToken = $rssToken; | 242 | $this->feedToken = $feedToken; |
243 | 243 | ||
244 | return $this; | 244 | return $this; |
245 | } | 245 | } |
246 | 246 | ||
247 | /** | 247 | /** |
248 | * Get rssToken. | 248 | * Get feedToken. |
249 | * | 249 | * |
250 | * @return string | 250 | * @return string |
251 | */ | 251 | */ |
252 | public function getRssToken() | 252 | public function getFeedToken() |
253 | { | 253 | { |
254 | return $this->rssToken; | 254 | return $this->feedToken; |
255 | } | 255 | } |
256 | 256 | ||
257 | /** | 257 | /** |
258 | * Set rssLimit. | 258 | * Set Feed Limit. |
259 | * | 259 | * |
260 | * @param int $rssLimit | 260 | * @param int $feedLimit |
261 | * | 261 | * |
262 | * @return Config | 262 | * @return Config |
263 | */ | 263 | */ |
264 | public function setRssLimit($rssLimit) | 264 | public function setFeedLimit($feedLimit) |
265 | { | 265 | { |
266 | $this->rssLimit = $rssLimit; | 266 | $this->feedLimit = $feedLimit; |
267 | 267 | ||
268 | return $this; | 268 | return $this; |
269 | } | 269 | } |
270 | 270 | ||
271 | /** | 271 | /** |
272 | * Get rssLimit. | 272 | * Get Feed Limit. |
273 | * | 273 | * |
274 | * @return int | 274 | * @return int |
275 | */ | 275 | */ |
276 | public function getRssLimit() | 276 | public function getFeedLimit() |
277 | { | 277 | { |
278 | return $this->rssLimit; | 278 | return $this->feedLimit; |
279 | } | 279 | } |
280 | 280 | ||
281 | /** | 281 | /** |