X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FWallabagRestController.php;h=b895b67cd913b881bbd765f06918d54972576c64;hb=0a018fe03980b35c9f7aca838e67a8efa43b7f2d;hp=276cfe1c78b18412aaa0577c753c3b3418280c08;hpb=1d14779154481b320e1c44fccf2558d8c9fa43a1;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
index 276cfe1c..b895b67c 100644
--- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
@@ -6,7 +6,6 @@ use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Service\Extractor;
@@ -197,6 +196,9 @@ class WallabagRestController extends Controller
      */
     public function getEntriesTagsAction(Entry $entry)
     {
+        $json = $this->get('serializer')->serialize($entry, 'json');
+
+        return new Response($json, 200, array('application/json'));
     }
 
     /**
@@ -233,22 +235,10 @@ class WallabagRestController extends Controller
      * Retrieve all tags
      *
      * @ApiDoc(
+     *          {"name"="user", "dataType"="integer", "requirement"="\w+", "description"="The user ID"}
      * )
      */
-    public function getTagsAction()
-    {
-    }
-
-    /**
-     * Retrieve a single tag
-     *
-     * @ApiDoc(
-     *       requirements={
-     *          {"name"="tag", "dataType"="string", "requirement"="\w+", "description"="The tag"}
-     *       }
-     * )
-     */
-    public function getTagAction(Tag $tag)
+    public function getTagsUserAction()
     {
     }