aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Controller/WallabagRestController.php8
-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.php8
3 files changed, 22 insertions, 22 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
index ddb1f8a5..f77a3749 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;
7use Symfony\Component\HttpFoundation\Request; 7use Symfony\Component\HttpFoundation\Request;
8use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; 8use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
9use Wallabag\CoreBundle\Entity\Entry; 9use Wallabag\CoreBundle\Entity\Entry;
10use Wallabag\CoreBundle\Entity\Tags; 10use Wallabag\CoreBundle\Entity\Tag;
11use Wallabag\CoreBundle\Service\Extractor; 11use Wallabag\CoreBundle\Service\Extractor;
12 12
13class WallabagRestController extends Controller 13class WallabagRestController extends Controller
@@ -228,7 +228,7 @@ class WallabagRestController extends Controller
228 * } 228 * }
229 * ) 229 * )
230 */ 230 */
231 public function deleteEntriesTagsAction(Entry $entry, Tags $tag) 231 public function deleteEntriesTagsAction(Entry $entry, Tag $tag)
232 { 232 {
233 } 233 }
234 234
@@ -251,7 +251,7 @@ class WallabagRestController extends Controller
251 * } 251 * }
252 * ) 252 * )
253 */ 253 */
254 public function getTagAction(Tags $tag) 254 public function getTagAction(Tag $tag)
255 { 255 {
256 } 256 }
257 257
@@ -264,7 +264,7 @@ class WallabagRestController extends Controller
264 * } 264 * }
265 * ) 265 * )
266 */ 266 */
267 public function deleteTagAction(Tags $tag) 267 public function deleteTagAction(Tag $tag)
268 { 268 {
269 } 269 }
270} 270}
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;
5use Doctrine\ORM\Mapping as ORM; 5use 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 */
13class Tags 13class 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
index 6b0cea0d..22826387 100644
--- a/src/Wallabag/CoreBundle/Entity/TagsEntries.php
+++ b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
@@ -15,23 +15,23 @@ class TagsEntries
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 integer 25 * @var integer
26 * 26 *
27 * @ORM\Column(name="entry_id", type="integer", nullable=true) 27 * @ORM\Column(name="entry_id", type="integer")
28 */ 28 */
29 private $entryId; 29 private $entryId;
30 30
31 /** 31 /**
32 * @var integer 32 * @var integer
33 * 33 *
34 * @ORM\Column(name="tag_id", type="integer", nullable=true) 34 * @ORM\Column(name="tag_id", type="integer")
35 */ 35 */
36 private $tagId; 36 private $tagId;
37 37