diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-02-06 18:15:19 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-02-09 12:58:44 +0100 |
commit | 653e8be4c1ae589fff52af0229338ced7b2ada2c (patch) | |
tree | e07ec28b834a9303b63910e6f6bfb8c4ff5d840a /src | |
parent | 8af35ad932177e0363412a868afc128b406e3322 (diff) | |
download | wallabag-653e8be4c1ae589fff52af0229338ced7b2ada2c.tar.gz wallabag-653e8be4c1ae589fff52af0229338ced7b2ada2c.tar.zst wallabag-653e8be4c1ae589fff52af0229338ced7b2ada2c.zip |
rename Tags entity
why did I delete this file?
rename Tags entity
rename Tags entity
Diffstat (limited to 'src')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/WallabagRestController.php | 8 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Tag.php (renamed from src/Wallabag/CoreBundle/Entity/Tags.php) | 28 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/TagsEntries.php | 93 |
3 files changed, 18 insertions, 111 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php index 1df18247..c298d849 100644 --- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php | |||
@@ -7,7 +7,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; | |||
7 | use Symfony\Component\HttpFoundation\Request; | 7 | use Symfony\Component\HttpFoundation\Request; |
8 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; | 8 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
9 | use Wallabag\CoreBundle\Entity\Entry; | 9 | use Wallabag\CoreBundle\Entity\Entry; |
10 | use Wallabag\CoreBundle\Entity\Tags; | 10 | use Wallabag\CoreBundle\Entity\Tag; |
11 | use Wallabag\CoreBundle\Service\Extractor; | 11 | use Wallabag\CoreBundle\Service\Extractor; |
12 | 12 | ||
13 | class WallabagRestController extends Controller | 13 | class WallabagRestController extends Controller |
@@ -206,7 +206,7 @@ class WallabagRestController extends Controller | |||
206 | * } | 206 | * } |
207 | * ) | 207 | * ) |
208 | */ | 208 | */ |
209 | public function deleteEntriesTagsAction(Entry $entry, Tags $tag) | 209 | public function deleteEntriesTagsAction(Entry $entry, Tag $tag) |
210 | { | 210 | { |
211 | } | 211 | } |
212 | 212 | ||
@@ -229,7 +229,7 @@ class WallabagRestController extends Controller | |||
229 | * } | 229 | * } |
230 | * ) | 230 | * ) |
231 | */ | 231 | */ |
232 | public function getTagAction(Tags $tag) | 232 | public function getTagAction(Tag $tag) |
233 | { | 233 | { |
234 | } | 234 | } |
235 | 235 | ||
@@ -242,7 +242,7 @@ class WallabagRestController extends Controller | |||
242 | * } | 242 | * } |
243 | * ) | 243 | * ) |
244 | */ | 244 | */ |
245 | public function deleteTagAction(Tags $tag) | 245 | public function deleteTagAction(Tag $tag) |
246 | { | 246 | { |
247 | } | 247 | } |
248 | } | 248 | } |
diff --git a/src/Wallabag/CoreBundle/Entity/Tags.php b/src/Wallabag/CoreBundle/Entity/Tag.php index eab91ba0..31017563 100644 --- a/src/Wallabag/CoreBundle/Entity/Tags.php +++ b/src/Wallabag/CoreBundle/Entity/Tag.php | |||
@@ -5,28 +5,28 @@ namespace Wallabag\CoreBundle\Entity; | |||
5 | use Doctrine\ORM\Mapping as ORM; | 5 | use Doctrine\ORM\Mapping as ORM; |
6 | 6 | ||
7 | /** | 7 | /** |
8 | * Tags | 8 | * Tag |
9 | * | 9 | * |
10 | * @ORM\Table(name="tags") | 10 | * @ORM\Table(name="tag") |
11 | * @ORM\Entity | 11 | * @ORM\Entity |
12 | */ | 12 | */ |
13 | class Tags | 13 | class Tag |
14 | { | 14 | { |
15 | /** | 15 | /** |
16 | * @var integer | 16 | * @var integer |
17 | * | 17 | * |
18 | * @ORM\Column(name="id", type="integer", nullable=false) | 18 | * @ORM\Column(name="id", type="integer") |
19 | * @ORM\Id | 19 | * @ORM\Id |
20 | * @ORM\GeneratedValue(strategy="IDENTITY") | 20 | * @ORM\GeneratedValue(strategy="AUTO") |
21 | */ | 21 | */ |
22 | private $id; | 22 | private $id; |
23 | 23 | ||
24 | /** | 24 | /** |
25 | * @var string | 25 | * @var string |
26 | * | 26 | * |
27 | * @ORM\Column(name="value", type="text", nullable=true) | 27 | * @ORM\Column(name="label", type="text") |
28 | */ | 28 | */ |
29 | private $value; | 29 | private $label; |
30 | 30 | ||
31 | /** | 31 | /** |
32 | * Get id | 32 | * Get id |
@@ -39,24 +39,24 @@ class Tags | |||
39 | } | 39 | } |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * Set value | 42 | * Set label |
43 | * | 43 | * |
44 | * @param string $value | 44 | * @param string $label |
45 | * @return Tags | 45 | * @return Tag |
46 | */ | 46 | */ |
47 | public function setValue($value) | 47 | public function setLabel($label) |
48 | { | 48 | { |
49 | $this->value = $value; | 49 | $this->label = $label; |
50 | 50 | ||
51 | return $this; | 51 | return $this; |
52 | } | 52 | } |
53 | 53 | ||
54 | /** | 54 | /** |
55 | * Get value | 55 | * Get label |
56 | * | 56 | * |
57 | * @return string | 57 | * @return string |
58 | */ | 58 | */ |
59 | public function getValue() | 59 | public function getLabel() |
60 | { | 60 | { |
61 | return $this->value; | 61 | return $this->value; |
62 | } | 62 | } |
diff --git a/src/Wallabag/CoreBundle/Entity/TagsEntries.php b/src/Wallabag/CoreBundle/Entity/TagsEntries.php deleted file mode 100644 index 6b0cea0d..00000000 --- a/src/Wallabag/CoreBundle/Entity/TagsEntries.php +++ /dev/null | |||
@@ -1,93 +0,0 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\Entity; | ||
4 | |||
5 | use Doctrine\ORM\Mapping as ORM; | ||
6 | |||
7 | /** | ||
8 | * TagsEntries | ||
9 | * | ||
10 | * @ORM\Table(name="tags_entries") | ||
11 | * @ORM\Entity | ||
12 | */ | ||
13 | class TagsEntries | ||
14 | { | ||
15 | /** | ||
16 | * @var integer | ||
17 | * | ||
18 | * @ORM\Column(name="id", type="integer", nullable=false) | ||
19 | * @ORM\Id | ||
20 | * @ORM\GeneratedValue(strategy="IDENTITY") | ||
21 | */ | ||
22 | private $id; | ||
23 | |||
24 | /** | ||
25 | * @var integer | ||
26 | * | ||
27 | * @ORM\Column(name="entry_id", type="integer", nullable=true) | ||
28 | */ | ||
29 | private $entryId; | ||
30 | |||
31 | /** | ||
32 | * @var integer | ||
33 | * | ||
34 | * @ORM\Column(name="tag_id", type="integer", nullable=true) | ||
35 | */ | ||
36 | private $tagId; | ||
37 | |||
38 | /** | ||
39 | * Get id | ||
40 | * | ||
41 | * @return integer | ||
42 | */ | ||
43 | public function getId() | ||
44 | { | ||
45 | return $this->id; | ||
46 | } | ||
47 | |||
48 | /** | ||
49 | * Set entryId | ||
50 | * | ||
51 | * @param integer $entryId | ||
52 | * @return TagsEntries | ||
53 | */ | ||
54 | public function setEntryId($entryId) | ||
55 | { | ||
56 | $this->entryId = $entryId; | ||
57 | |||
58 | return $this; | ||
59 | } | ||
60 | |||
61 | /** | ||
62 | * Get entryId | ||
63 | * | ||
64 | * @return integer | ||
65 | */ | ||
66 | public function getEntryId() | ||
67 | { | ||
68 | return $this->entryId; | ||
69 | } | ||
70 | |||
71 | /** | ||
72 | * Set tagId | ||
73 | * | ||
74 | * @param integer $tagId | ||
75 | * @return TagsEntries | ||
76 | */ | ||
77 | public function setTagId($tagId) | ||
78 | { | ||
79 | $this->tagId = $tagId; | ||
80 | |||
81 | return $this; | ||
82 | } | ||
83 | |||
84 | /** | ||
85 | * Get tagId | ||
86 | * | ||
87 | * @return integer | ||
88 | */ | ||
89 | public function getTagId() | ||
90 | { | ||
91 | return $this->tagId; | ||
92 | } | ||
93 | } | ||