4 files changed, 22 insertions, 27 deletions

diff --git a/app/config/routing.yml b/app/config/routing.yml
index 426dcdcf..20f6979a 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -18,11 +18,6 @@ login_check:
 logout:
     path:   /logout
 
-#wallabag_api:
-#    resource: "@WallabagApiBundle/Controller/"
-#    type:     annotation
-#    prefix:   /api
-
 rest :
   type : rest
   resource : "routing_rest.yml"
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;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tags;
+use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Service\Extractor;
 
 class WallabagRestController extends Controller
@@ -206,7 +206,7 @@ class WallabagRestController extends Controller
      *      }
      * )
      */
-    public function deleteEntriesTagsAction(Entry $entry, Tags $tag)
+    public function deleteEntriesTagsAction(Entry $entry, Tag $tag)
     {
     }
 
@@ -229,7 +229,7 @@ class WallabagRestController extends Controller
      *       }
      * )
      */
-    public function getTagAction(Tags $tag)
+    public function getTagAction(Tag $tag)
     {
     }
 
@@ -242,7 +242,7 @@ class WallabagRestController extends Controller
      *      }
      * )
      */
-    public function deleteTagAction(Tags $tag)
+    public function deleteTagAction(Tag $tag)
     {
     }
 }
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;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Tags
+ * Tag
  *
- * @ORM\Table(name="tags")
+ * @ORM\Table(name="tag")
  * @ORM\Entity
  */
-class Tags
+class Tag
 {
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var string
      *
-     * @ORM\Column(name="value", type="text", nullable=true)
+     * @ORM\Column(name="label", type="text")
      */
-    private $value;
+    private $label;
 
     /**
      * Get id
@@ -39,24 +39,24 @@ class Tags
     }
 
     /**
-     * Set value
+     * Set label
      *
-     * @param  string $value
-     * @return Tags
+     * @param  string $label
+     * @return Tag
      */
-    public function setValue($value)
+    public function setLabel($label)
     {
-        $this->value = $value;
+        $this->label = $label;
 
         return $this;
     }
 
     /**
-     * Get value
+     * Get label
      *
      * @return string
      */
-    public function getValue()
+    public function getLabel()
     {
         return $this->value;
     }
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
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="entry_id", type="integer", nullable=true)
+     * @ORM\Column(name="entry_id", type="integer")
      */
     private $entryId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="tag_id", type="integer", nullable=true)
+     * @ORM\Column(name="tag_id", type="integer")
      */
     private $tagId;