]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
cs
authorThomas Citharel <tcit@tcit.fr>
Thu, 6 Oct 2016 09:40:14 +0000 (11:40 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Sat, 22 Oct 2016 07:06:07 +0000 (09:06 +0200)
src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
src/Wallabag/ApiBundle/Controller/WallabagRestController.php

index b04c0bc24d630d37c6176c30a0c7f27c5cf90db4..519fd2f58a5e34add926376253a07fb648f27a3a 100644 (file)
@@ -5,7 +5,6 @@ namespace Wallabag\AnnotationBundle\Controller;
 use FOS\RestBundle\Controller\FOSRestController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Wallabag\AnnotationBundle\Entity\Annotation;
 use Wallabag\CoreBundle\Entity\Entry;
@@ -39,10 +38,11 @@ class WallabagAnnotationController extends FOSRestController
      * Creates a new annotation.
      *
      * @param Request $request
-     * @param Entry $entry
+     * @param Entry   $entry
+     *
      * @return JsonResponse
-     * @see Wallabag\ApiBundle\Controller\WallabagRestController
      *
+     * @see Wallabag\ApiBundle\Controller\WallabagRestController
      */
     public function postAnnotationAction(Request $request, Entry $entry)
     {
@@ -78,7 +78,8 @@ class WallabagAnnotationController extends FOSRestController
      * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
      *
      * @param Annotation $annotation
-     * @param Request $request
+     * @param Request    $request
+     *
      * @return JsonResponse
      */
     public function putAnnotationAction(Annotation $annotation, Request $request)
@@ -105,6 +106,7 @@ class WallabagAnnotationController extends FOSRestController
      * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
      *
      * @param Annotation $annotation
+     *
      * @return JsonResponse
      */
     public function deleteAnnotationAction(Annotation $annotation)
index e2e4924b6ef50d8d391f7e83d0c098b07a795123..b30ab267564740f2d6fe59cffdc27f458abb5b83 100644 (file)
@@ -529,6 +529,7 @@ class WallabagRestController extends FOSRestController
      * )
      *
      * @param Entry $entry
+     *
      * @return JsonResponse
      */
     public function getAnnotationsAction(Entry $entry)
@@ -537,8 +538,9 @@ class WallabagRestController extends FOSRestController
 
         $response = $this->forward('WallabagApiBundle:WallabagRest:getAnnotations',
             [
-                'entry' => $entry
+                'entry' => $entry,
             ]);
+
         return $response;
     }
 
@@ -546,7 +548,8 @@ class WallabagRestController extends FOSRestController
      * Creates a new annotation.
      *
      * @param Request $request
-     * @param Entry $entry
+     * @param Entry   $entry
+     *
      * @return JsonResponse
      * @ApiDoc(
      *      requirements={
@@ -555,7 +558,6 @@ class WallabagRestController extends FOSRestController
      *          {"name"="text", "dataType"="string", "required"=true, "description"=""},
      *      }
      * )
-     *
      */
     public function postAnnotationAction(Request $request, Entry $entry)
     {
@@ -564,8 +566,9 @@ class WallabagRestController extends FOSRestController
         $response = $this->forward('WallabagApiBundle:WallabagRest:postAnnotation',
             [
                 'request' => $request,
-                'entry' => $entry
+                'entry' => $entry,
             ]);
+
         return $response;
     }
 
@@ -581,7 +584,8 @@ class WallabagRestController extends FOSRestController
      * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
      *
      * @param Annotation $annotation
-     * @param Request $request
+     * @param Request    $request
+     *
      * @return JsonResponse
      */
     public function putAnnotationAction(Annotation $annotation, Request $request)
@@ -591,8 +595,9 @@ class WallabagRestController extends FOSRestController
         $response = $this->forward('WallabagApiBundle:WallabagRest:putAnnotation',
             [
                 'annotation' => $annotation,
-                'request' => $request
+                'request' => $request,
             ]);
+
         return $response;
     }
 
@@ -608,6 +613,7 @@ class WallabagRestController extends FOSRestController
      * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
      *
      * @param Annotation $annotation
+     *
      * @return JsonResponse
      */
     public function deleteAnnotationAction(Annotation $annotation)
@@ -618,6 +624,7 @@ class WallabagRestController extends FOSRestController
             [
                 'annotation' => $annotation,
             ]);
+
         return $response;
     }