diff options
author | lizyn <zhiylin@outlook.com> | 2020-02-24 10:04:13 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-24 10:04:13 +0800 |
commit | b19df31d78d881a43bcf6b3215e5fc3781e8e8aa (patch) | |
tree | d0d9861694a4b5e5fbfdbeb53c255ecd15fe9328 /src/Wallabag/CoreBundle/Entity/Config.php | |
parent | 4d0c632c70ea50d459c3c55ddda2e0f394dd51cb (diff) | |
parent | 04d918cae0227c06a41d27fb6533dddbf30dfe71 (diff) | |
download | wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.gz wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.zst wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.zip |
Merge pull request #1 from wallabag/master
Keep up with the master again
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity/Config.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Config.php | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index b902ae2c..fe7942ee 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php | |||
@@ -11,8 +11,12 @@ use Wallabag\UserBundle\Entity\User; | |||
11 | * Config. | 11 | * Config. |
12 | * | 12 | * |
13 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ConfigRepository") | 13 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ConfigRepository") |
14 | * @ORM\Table(name="`config`") | 14 | * @ORM\Table( |
15 | * @ORM\Entity | 15 | * name="`config`", |
16 | * indexes={ | ||
17 | * @ORM\Index(name="config_feed_token", columns={"feed_token"}, options={"lengths"={255}}), | ||
18 | * } | ||
19 | * ) | ||
16 | */ | 20 | */ |
17 | class Config | 21 | class Config |
18 | { | 22 | { |
@@ -60,21 +64,21 @@ class Config | |||
60 | /** | 64 | /** |
61 | * @var string | 65 | * @var string |
62 | * | 66 | * |
63 | * @ORM\Column(name="rss_token", type="string", nullable=true) | 67 | * @ORM\Column(name="feed_token", type="string", nullable=true) |
64 | */ | 68 | */ |
65 | private $rssToken; | 69 | private $feedToken; |
66 | 70 | ||
67 | /** | 71 | /** |
68 | * @var int | 72 | * @var int |
69 | * | 73 | * |
70 | * @ORM\Column(name="rss_limit", type="integer", nullable=true) | 74 | * @ORM\Column(name="feed_limit", type="integer", nullable=true) |
71 | * @Assert\Range( | 75 | * @Assert\Range( |
72 | * min = 1, | 76 | * min = 1, |
73 | * max = 100000, | 77 | * max = 100000, |
74 | * maxMessage = "validator.rss_limit_too_high" | 78 | * maxMessage = "validator.feed_limit_too_high" |
75 | * ) | 79 | * ) |
76 | */ | 80 | */ |
77 | private $rssLimit; | 81 | private $feedLimit; |
78 | 82 | ||
79 | /** | 83 | /** |
80 | * @var float | 84 | * @var float |
@@ -231,51 +235,51 @@ class Config | |||
231 | } | 235 | } |
232 | 236 | ||
233 | /** | 237 | /** |
234 | * Set rssToken. | 238 | * Set feed Token. |
235 | * | 239 | * |
236 | * @param string $rssToken | 240 | * @param string $feedToken |
237 | * | 241 | * |
238 | * @return Config | 242 | * @return Config |
239 | */ | 243 | */ |
240 | public function setRssToken($rssToken) | 244 | public function setFeedToken($feedToken) |
241 | { | 245 | { |
242 | $this->rssToken = $rssToken; | 246 | $this->feedToken = $feedToken; |
243 | 247 | ||
244 | return $this; | 248 | return $this; |
245 | } | 249 | } |
246 | 250 | ||
247 | /** | 251 | /** |
248 | * Get rssToken. | 252 | * Get feedToken. |
249 | * | 253 | * |
250 | * @return string | 254 | * @return string |
251 | */ | 255 | */ |
252 | public function getRssToken() | 256 | public function getFeedToken() |
253 | { | 257 | { |
254 | return $this->rssToken; | 258 | return $this->feedToken; |
255 | } | 259 | } |
256 | 260 | ||
257 | /** | 261 | /** |
258 | * Set rssLimit. | 262 | * Set Feed Limit. |
259 | * | 263 | * |
260 | * @param int $rssLimit | 264 | * @param int $feedLimit |
261 | * | 265 | * |
262 | * @return Config | 266 | * @return Config |
263 | */ | 267 | */ |
264 | public function setRssLimit($rssLimit) | 268 | public function setFeedLimit($feedLimit) |
265 | { | 269 | { |
266 | $this->rssLimit = $rssLimit; | 270 | $this->feedLimit = $feedLimit; |
267 | 271 | ||
268 | return $this; | 272 | return $this; |
269 | } | 273 | } |
270 | 274 | ||
271 | /** | 275 | /** |
272 | * Get rssLimit. | 276 | * Get Feed Limit. |
273 | * | 277 | * |
274 | * @return int | 278 | * @return int |
275 | */ | 279 | */ |
276 | public function getRssLimit() | 280 | public function getFeedLimit() |
277 | { | 281 | { |
278 | return $this->rssLimit; | 282 | return $this->feedLimit; |
279 | } | 283 | } |
280 | 284 | ||
281 | /** | 285 | /** |
@@ -367,8 +371,6 @@ class Config | |||
367 | } | 371 | } |
368 | 372 | ||
369 | /** | 373 | /** |
370 | * @param TaggingRule $rule | ||
371 | * | ||
372 | * @return Config | 374 | * @return Config |
373 | */ | 375 | */ |
374 | public function addTaggingRule(TaggingRule $rule) | 376 | public function addTaggingRule(TaggingRule $rule) |