aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/AnnotationBundle/Controller
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-10-11 09:55:03 +0200
committerGitHub <noreply@github.com>2017-10-11 09:55:03 +0200
commitd8dc7372ab3d8ac4c5d5546e5c5e00bf4bf2d862 (patch)
tree3f7ea5ce149b98d01a32f45c2d5be43fbf8ea21c /src/Wallabag/AnnotationBundle/Controller
parent21bdbb2d5e8ef1a93a51bc6d55e041f95820b4ba (diff)
parentf645d371ce55e9c2a45712df34244318742b0d74 (diff)
downloadwallabag-d8dc7372ab3d8ac4c5d5546e5c5e00bf4bf2d862.tar.gz
wallabag-d8dc7372ab3d8ac4c5d5546e5c5e00bf4bf2d862.tar.zst
wallabag-d8dc7372ab3d8ac4c5d5546e5c5e00bf4bf2d862.zip
Merge pull request #3376 from wallabag/symfony-3.3
Symfony 3.3
Diffstat (limited to 'src/Wallabag/AnnotationBundle/Controller')
-rw-r--r--src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
index 8d7b6ee9..f3090e65 100644
--- a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
+++ b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
@@ -31,7 +31,7 @@ class WallabagAnnotationController extends FOSRestController
31 $total = count($annotationRows); 31 $total = count($annotationRows);
32 $annotations = ['total' => $total, 'rows' => $annotationRows]; 32 $annotations = ['total' => $total, 'rows' => $annotationRows];
33 33
34 $json = $this->get('serializer')->serialize($annotations, 'json'); 34 $json = $this->get('jms_serializer')->serialize($annotations, 'json');
35 35
36 return (new JsonResponse())->setJson($json); 36 return (new JsonResponse())->setJson($json);
37 } 37 }
@@ -64,7 +64,7 @@ class WallabagAnnotationController extends FOSRestController
64 $em->persist($annotation); 64 $em->persist($annotation);
65 $em->flush(); 65 $em->flush();
66 66
67 $json = $this->get('serializer')->serialize($annotation, 'json'); 67 $json = $this->get('jms_serializer')->serialize($annotation, 'json');
68 68
69 return JsonResponse::fromJsonString($json); 69 return JsonResponse::fromJsonString($json);
70 } 70 }
@@ -99,7 +99,7 @@ class WallabagAnnotationController extends FOSRestController
99 $em->persist($annotation); 99 $em->persist($annotation);
100 $em->flush(); 100 $em->flush();
101 101
102 $json = $this->get('serializer')->serialize($annotation, 'json'); 102 $json = $this->get('jms_serializer')->serialize($annotation, 'json');
103 103
104 return JsonResponse::fromJsonString($json); 104 return JsonResponse::fromJsonString($json);
105 } 105 }
@@ -124,7 +124,7 @@ class WallabagAnnotationController extends FOSRestController
124 $em->remove($annotation); 124 $em->remove($annotation);
125 $em->flush(); 125 $em->flush();
126 126
127 $json = $this->get('serializer')->serialize($annotation, 'json'); 127 $json = $this->get('jms_serializer')->serialize($annotation, 'json');
128 128
129 return (new JsonResponse())->setJson($json); 129 return (new JsonResponse())->setJson($json);
130 } 130 }