aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/AnnotationBundle
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-10-06 11:40:14 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-22 09:06:07 +0200
commitb1e92f8c14d3d506f2bfab628ba8ed95de0e8b51 (patch)
tree753f752dae1d8c421a04e218d65d6df183a6b89f /src/Wallabag/AnnotationBundle
parent1eea248bb0ebf49772878557211817905a4d6952 (diff)
downloadwallabag-b1e92f8c14d3d506f2bfab628ba8ed95de0e8b51.tar.gz
wallabag-b1e92f8c14d3d506f2bfab628ba8ed95de0e8b51.tar.zst
wallabag-b1e92f8c14d3d506f2bfab628ba8ed95de0e8b51.zip
cs
Diffstat (limited to 'src/Wallabag/AnnotationBundle')
-rw-r--r--src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
index b04c0bc2..519fd2f5 100644
--- a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
+++ b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
@@ -5,7 +5,6 @@ namespace Wallabag\AnnotationBundle\Controller;
5use FOS\RestBundle\Controller\FOSRestController; 5use FOS\RestBundle\Controller\FOSRestController;
6use Symfony\Component\HttpFoundation\JsonResponse; 6use Symfony\Component\HttpFoundation\JsonResponse;
7use Symfony\Component\HttpFoundation\Request; 7use Symfony\Component\HttpFoundation\Request;
8use Symfony\Component\HttpFoundation\Response;
9use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; 8use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
10use Wallabag\AnnotationBundle\Entity\Annotation; 9use Wallabag\AnnotationBundle\Entity\Annotation;
11use Wallabag\CoreBundle\Entity\Entry; 10use Wallabag\CoreBundle\Entity\Entry;
@@ -39,10 +38,11 @@ class WallabagAnnotationController extends FOSRestController
39 * Creates a new annotation. 38 * Creates a new annotation.
40 * 39 *
41 * @param Request $request 40 * @param Request $request
42 * @param Entry $entry 41 * @param Entry $entry
42 *
43 * @return JsonResponse 43 * @return JsonResponse
44 * @see Wallabag\ApiBundle\Controller\WallabagRestController
45 * 44 *
45 * @see Wallabag\ApiBundle\Controller\WallabagRestController
46 */ 46 */
47 public function postAnnotationAction(Request $request, Entry $entry) 47 public function postAnnotationAction(Request $request, Entry $entry)
48 { 48 {
@@ -78,7 +78,8 @@ class WallabagAnnotationController extends FOSRestController
78 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation") 78 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
79 * 79 *
80 * @param Annotation $annotation 80 * @param Annotation $annotation
81 * @param Request $request 81 * @param Request $request
82 *
82 * @return JsonResponse 83 * @return JsonResponse
83 */ 84 */
84 public function putAnnotationAction(Annotation $annotation, Request $request) 85 public function putAnnotationAction(Annotation $annotation, Request $request)
@@ -105,6 +106,7 @@ class WallabagAnnotationController extends FOSRestController
105 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation") 106 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
106 * 107 *
107 * @param Annotation $annotation 108 * @param Annotation $annotation
109 *
108 * @return JsonResponse 110 * @return JsonResponse
109 */ 111 */
110 public function deleteAnnotationAction(Annotation $annotation) 112 public function deleteAnnotationAction(Annotation $annotation)