diff options
author | Jeremy <j0k3r@users.noreply.github.com> | 2015-02-06 09:55:16 +0100 |
---|---|---|
committer | Jeremy <j0k3r@users.noreply.github.com> | 2015-02-06 09:55:16 +0100 |
commit | 29c4517f7a8ed08239e5bee3d6c3fa823a83d102 (patch) | |
tree | 5d5bd15db7ae19994da55574ade821acdc115c36 /src/Wallabag/CoreBundle/Entity | |
parent | c8dee953961964aa842e516995f0c6fafd007f9b (diff) | |
parent | be463487cc195026b11e92f1d6d6276f5851b97e (diff) | |
download | wallabag-29c4517f7a8ed08239e5bee3d6c3fa823a83d102.tar.gz wallabag-29c4517f7a8ed08239e5bee3d6c3fa823a83d102.tar.zst wallabag-29c4517f7a8ed08239e5bee3d6c3fa823a83d102.zip |
Merge pull request #1059 from wallabag/rename-entry
Rename entry
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Entry.php (renamed from src/Wallabag/CoreBundle/Entity/Entries.php) | 95 |
1 files changed, 45 insertions, 50 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Entries.php b/src/Wallabag/CoreBundle/Entity/Entry.php index ab5b859b..70c1dc08 100644 --- a/src/Wallabag/CoreBundle/Entity/Entries.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php | |||
@@ -6,23 +6,23 @@ use Doctrine\ORM\Mapping as ORM; | |||
6 | use Symfony\Component\Validator\Constraints as Assert; | 6 | use Symfony\Component\Validator\Constraints as Assert; |
7 | 7 | ||
8 | /** | 8 | /** |
9 | * Entries | 9 | * Entry |
10 | * | 10 | * |
11 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntriesRepository") | 11 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository") |
12 | * @ORM\Table(name="entries") | 12 | * @ORM\Table(name="entry") |
13 | * @ORM\HasLifecycleCallbacks() | 13 | * @ORM\HasLifecycleCallbacks() |
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | class Entries | 16 | class Entry |
17 | { | 17 | { |
18 | /** | 18 | /** |
19 | * @var integer | 19 | * @var integer |
20 | * | 20 | * |
21 | * @ORM\Column(name="id", type="integer", nullable=true) | 21 | * @ORM\Column(name="id", type="integer") |
22 | * @ORM\Id | 22 | * @ORM\Id |
23 | * @ORM\GeneratedValue(strategy="AUTO") | 23 | * @ORM\GeneratedValue(strategy="AUTO") |
24 | */ | 24 | */ |
25 | private $id = null; | 25 | private $id; |
26 | 26 | ||
27 | /** | 27 | /** |
28 | * @var string | 28 | * @var string |
@@ -42,21 +42,21 @@ class Entries | |||
42 | /** | 42 | /** |
43 | * @var boolean | 43 | * @var boolean |
44 | * | 44 | * |
45 | * @ORM\Column(name="is_read", type="boolean", nullable=true, options={"default" = false}) | 45 | * @ORM\Column(name="is_archived", type="boolean") |
46 | */ | 46 | */ |
47 | private $isRead = false; | 47 | private $isArchived = false; |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * @var boolean | 50 | * @var boolean |
51 | * | 51 | * |
52 | * @ORM\Column(name="is_fav", type="boolean", nullable=true, options={"default" = false}) | 52 | * @ORM\Column(name="is_starred", type="boolean") |
53 | */ | 53 | */ |
54 | private $isFav = false; | 54 | private $isStarred = false; |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * @var boolean | 57 | * @var boolean |
58 | * | 58 | * |
59 | * @ORM\Column(name="is_deleted", type="boolean", nullable=true, options={"default" = false}) | 59 | * @ORM\Column(name="is_deleted", type="boolean") |
60 | */ | 60 | */ |
61 | private $isDeleted = false; | 61 | private $isDeleted = false; |
62 | 62 | ||
@@ -70,14 +70,14 @@ class Entries | |||
70 | /** | 70 | /** |
71 | * @var date | 71 | * @var date |
72 | * | 72 | * |
73 | * @ORM\Column(name="created_at", type="datetime", nullable=true) | 73 | * @ORM\Column(name="created_at", type="datetime") |
74 | */ | 74 | */ |
75 | private $createdAt; | 75 | private $createdAt; |
76 | 76 | ||
77 | /** | 77 | /** |
78 | * @var date | 78 | * @var date |
79 | * | 79 | * |
80 | * @ORM\Column(name="updated_at", type="datetime", nullable=true) | 80 | * @ORM\Column(name="updated_at", type="datetime") |
81 | */ | 81 | */ |
82 | private $updatedAt; | 82 | private $updatedAt; |
83 | 83 | ||
@@ -136,8 +136,8 @@ class Entries | |||
136 | /** | 136 | /** |
137 | * Set title | 137 | * Set title |
138 | * | 138 | * |
139 | * @param string $title | 139 | * @param string $title |
140 | * @return Entries | 140 | * @return Entry |
141 | */ | 141 | */ |
142 | public function setTitle($title) | 142 | public function setTitle($title) |
143 | { | 143 | { |
@@ -159,8 +159,8 @@ class Entries | |||
159 | /** | 159 | /** |
160 | * Set url | 160 | * Set url |
161 | * | 161 | * |
162 | * @param string $url | 162 | * @param string $url |
163 | * @return Entries | 163 | * @return Entry |
164 | */ | 164 | */ |
165 | public function setUrl($url) | 165 | public function setUrl($url) |
166 | { | 166 | { |
@@ -180,61 +180,61 @@ class Entries | |||
180 | } | 180 | } |
181 | 181 | ||
182 | /** | 182 | /** |
183 | * Set isRead | 183 | * Set isArchived |
184 | * | 184 | * |
185 | * @param string $isRead | 185 | * @param string $isArchived |
186 | * @return Entries | 186 | * @return Entry |
187 | */ | 187 | */ |
188 | public function setRead($isRead) | 188 | public function setArchived($isArchived) |
189 | { | 189 | { |
190 | $this->isRead = $isRead; | 190 | $this->isArchived = $isArchived; |
191 | 191 | ||
192 | return $this; | 192 | return $this; |
193 | } | 193 | } |
194 | 194 | ||
195 | /** | 195 | /** |
196 | * Get isRead | 196 | * Get isArchived |
197 | * | 197 | * |
198 | * @return string | 198 | * @return string |
199 | */ | 199 | */ |
200 | public function isRead() | 200 | public function isArchived() |
201 | { | 201 | { |
202 | return $this->isRead; | 202 | return $this->isArchived; |
203 | } | 203 | } |
204 | 204 | ||
205 | public function toggleArchive() | 205 | public function toggleArchive() |
206 | { | 206 | { |
207 | $this->isRead = $this->getIsRead() ^ 1; | 207 | $this->isArchived = $this->isArchived() ^ 1; |
208 | 208 | ||
209 | return $this; | 209 | return $this; |
210 | } | 210 | } |
211 | 211 | ||
212 | /** | 212 | /** |
213 | * Set isFav | 213 | * Set isStarred |
214 | * | 214 | * |
215 | * @param string $isFav | 215 | * @param string $isStarred |
216 | * @return Entries | 216 | * @return Entry |
217 | */ | 217 | */ |
218 | public function setFav($isFav) | 218 | public function setStarred($isStarred) |
219 | { | 219 | { |
220 | $this->isFav = $isFav; | 220 | $this->isStarred = $isStarred; |
221 | 221 | ||
222 | return $this; | 222 | return $this; |
223 | } | 223 | } |
224 | 224 | ||
225 | /** | 225 | /** |
226 | * Get isFav | 226 | * Get isStarred |
227 | * | 227 | * |
228 | * @return string | 228 | * @return string |
229 | */ | 229 | */ |
230 | public function isFav() | 230 | public function isStarred() |
231 | { | 231 | { |
232 | return $this->isFav; | 232 | return $this->isStarred; |
233 | } | 233 | } |
234 | 234 | ||
235 | public function toggleStar() | 235 | public function toggleStar() |
236 | { | 236 | { |
237 | $this->isFav = $this->getIsFav() ^ 1; | 237 | $this->isStarred = $this->isStarred() ^ 1; |
238 | 238 | ||
239 | return $this; | 239 | return $this; |
240 | } | 240 | } |
@@ -242,8 +242,8 @@ class Entries | |||
242 | /** | 242 | /** |
243 | * Set content | 243 | * Set content |
244 | * | 244 | * |
245 | * @param string $content | 245 | * @param string $content |
246 | * @return Entries | 246 | * @return Entry |
247 | */ | 247 | */ |
248 | public function setContent($content) | 248 | public function setContent($content) |
249 | { | 249 | { |
@@ -265,8 +265,8 @@ class Entries | |||
265 | /** | 265 | /** |
266 | * Set userId | 266 | * Set userId |
267 | * | 267 | * |
268 | * @param string $userId | 268 | * @param string $userId |
269 | * @return Entries | 269 | * @return Entry |
270 | */ | 270 | */ |
271 | public function setUserId($userId) | 271 | public function setUserId($userId) |
272 | { | 272 | { |
@@ -310,15 +310,6 @@ class Entries | |||
310 | } | 310 | } |
311 | 311 | ||
312 | /** | 312 | /** |
313 | * @param mixed $createdAt | ||
314 | * @ORM\PrePersist | ||
315 | */ | ||
316 | public function setCreatedAt() | ||
317 | { | ||
318 | $this->createdAt = new \DateTime(); | ||
319 | } | ||
320 | |||
321 | /** | ||
322 | * @return string | 313 | * @return string |
323 | */ | 314 | */ |
324 | public function getUpdatedAt() | 315 | public function getUpdatedAt() |
@@ -327,11 +318,15 @@ class Entries | |||
327 | } | 318 | } |
328 | 319 | ||
329 | /** | 320 | /** |
330 | * @param string $updatedAt | 321 | * @ORM\PrePersist |
331 | * @ORM\PreUpdate | 322 | * @ORM\PreUpdate |
332 | */ | 323 | */ |
333 | public function setUpdatedAt() | 324 | public function timestamps() |
334 | { | 325 | { |
326 | if (is_null($this->createdAt)) { | ||
327 | $this->createdAt = new \DateTime(); | ||
328 | } | ||
329 | |||
335 | $this->updatedAt = new \DateTime(); | 330 | $this->updatedAt = new \DateTime(); |
336 | } | 331 | } |
337 | 332 | ||