diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-04-13 09:43:14 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-04-13 09:43:14 +0200 |
commit | f2e5fdc3666a2a6525b4202ab48df05efeebaf5c (patch) | |
tree | f559474e248a33c472fe0b260641866be5c0def3 /src/Wallabag/AnnotationBundle/Controller | |
parent | a417b869237763ee115982d6367a82aa6174d74e (diff) | |
parent | 86732aa01cf0ad0fb5279f38ce75a9bedbbb66e1 (diff) | |
download | wallabag-f2e5fdc3666a2a6525b4202ab48df05efeebaf5c.tar.gz wallabag-f2e5fdc3666a2a6525b4202ab48df05efeebaf5c.tar.zst wallabag-f2e5fdc3666a2a6525b4202ab48df05efeebaf5c.zip |
Merge pull request #1916 from wallabag/cleanup
Convert array + phpDoc
Diffstat (limited to 'src/Wallabag/AnnotationBundle/Controller')
-rw-r--r-- | src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php index 5f981eb5..ad083e31 100644 --- a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php +++ b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php | |||
@@ -30,7 +30,7 @@ class WallabagAnnotationController extends FOSRestController | |||
30 | ->getRepository('WallabagAnnotationBundle:Annotation') | 30 | ->getRepository('WallabagAnnotationBundle:Annotation') |
31 | ->findAnnotationsByPageId($entry->getId(), $this->getUser()->getId()); | 31 | ->findAnnotationsByPageId($entry->getId(), $this->getUser()->getId()); |
32 | $total = count($annotationRows); | 32 | $total = count($annotationRows); |
33 | $annotations = array('total' => $total, 'rows' => $annotationRows); | 33 | $annotations = ['total' => $total, 'rows' => $annotationRows]; |
34 | 34 | ||
35 | $json = $this->get('serializer')->serialize($annotations, 'json'); | 35 | $json = $this->get('serializer')->serialize($annotations, 'json'); |
36 | 36 | ||
@@ -141,6 +141,6 @@ class WallabagAnnotationController extends FOSRestController | |||
141 | */ | 141 | */ |
142 | private function renderJsonResponse($json, $code = 200) | 142 | private function renderJsonResponse($json, $code = 200) |
143 | { | 143 | { |
144 | return new Response($json, $code, array('application/json')); | 144 | return new Response($json, $code, ['application/json']); |
145 | } | 145 | } |
146 | } | 146 | } |