diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Config.php | 31 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Entry.php | 23 |
2 files changed, 50 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index a25656d3..d0f0e3f3 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php | |||
@@ -81,6 +81,13 @@ class Config | |||
81 | private $readingSpeed; | 81 | private $readingSpeed; |
82 | 82 | ||
83 | /** | 83 | /** |
84 | * @var string | ||
85 | * | ||
86 | * @ORM\Column(name="pocket_consumer_key", type="string", nullable=true) | ||
87 | */ | ||
88 | private $pocketConsumerKey; | ||
89 | |||
90 | /** | ||
84 | * @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config") | 91 | * @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config") |
85 | */ | 92 | */ |
86 | private $user; | 93 | private $user; |
@@ -279,6 +286,30 @@ class Config | |||
279 | } | 286 | } |
280 | 287 | ||
281 | /** | 288 | /** |
289 | * Set pocketConsumerKey. | ||
290 | * | ||
291 | * @param string $pocketConsumerKey | ||
292 | * | ||
293 | * @return Config | ||
294 | */ | ||
295 | public function setPocketConsumerKey($pocketConsumerKey) | ||
296 | { | ||
297 | $this->pocketConsumerKey = $pocketConsumerKey; | ||
298 | |||
299 | return $this; | ||
300 | } | ||
301 | |||
302 | /** | ||
303 | * Get pocketConsumerKey. | ||
304 | * | ||
305 | * @return string | ||
306 | */ | ||
307 | public function getPocketConsumerKey() | ||
308 | { | ||
309 | return $this->pocketConsumerKey; | ||
310 | } | ||
311 | |||
312 | /** | ||
282 | * @param TaggingRule $rule | 313 | * @param TaggingRule $rule |
283 | * | 314 | * |
284 | * @return Config | 315 | * @return Config |
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index c3e6b4d5..a4b0d7a8 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php | |||
@@ -97,7 +97,7 @@ class Entry | |||
97 | private $content; | 97 | private $content; |
98 | 98 | ||
99 | /** | 99 | /** |
100 | * @var date | 100 | * @var \DateTime |
101 | * | 101 | * |
102 | * @ORM\Column(name="created_at", type="datetime") | 102 | * @ORM\Column(name="created_at", type="datetime") |
103 | * | 103 | * |
@@ -106,7 +106,7 @@ class Entry | |||
106 | private $createdAt; | 106 | private $createdAt; |
107 | 107 | ||
108 | /** | 108 | /** |
109 | * @var date | 109 | * @var \DateTime |
110 | * | 110 | * |
111 | * @ORM\Column(name="updated_at", type="datetime") | 111 | * @ORM\Column(name="updated_at", type="datetime") |
112 | * | 112 | * |
@@ -410,7 +410,22 @@ class Entry | |||
410 | } | 410 | } |
411 | 411 | ||
412 | /** | 412 | /** |
413 | * @return string | 413 | * Set created_at. |
414 | * Only used when importing data from an other service. | ||
415 | * | ||
416 | * @param \DateTime $createdAt | ||
417 | * | ||
418 | * @return Entry | ||
419 | */ | ||
420 | public function setCreatedAt(\DateTime $createdAt) | ||
421 | { | ||
422 | $this->createdAt = $createdAt; | ||
423 | |||
424 | return $this; | ||
425 | } | ||
426 | |||
427 | /** | ||
428 | * @return \DateTime | ||
414 | */ | 429 | */ |
415 | public function getCreatedAt() | 430 | public function getCreatedAt() |
416 | { | 431 | { |
@@ -418,7 +433,7 @@ class Entry | |||
418 | } | 433 | } |
419 | 434 | ||
420 | /** | 435 | /** |
421 | * @return string | 436 | * @return \DateTime |
422 | */ | 437 | */ |
423 | public function getUpdatedAt() | 438 | public function getUpdatedAt() |
424 | { | 439 | { |