diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 17:29:16 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 17:29:16 +0100 |
commit | 864c1dd23a4aa9e5f412302694d9303070dca6dc (patch) | |
tree | 9d84fbb6898d86e0e3bf7aaf193db89c45e88097 /src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |
parent | 5a619812ca3eb05a82a023ccdaee13501eb8d45f (diff) | |
download | wallabag-864c1dd23a4aa9e5f412302694d9303070dca6dc.tar.gz wallabag-864c1dd23a4aa9e5f412302694d9303070dca6dc.tar.zst wallabag-864c1dd23a4aa9e5f412302694d9303070dca6dc.zip |
Fix rest controller merge
Diffstat (limited to 'src/Wallabag/ApiBundle/Controller/WallabagRestController.php')
-rw-r--r-- | src/Wallabag/ApiBundle/Controller/WallabagRestController.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 544c1ea9..1ff593f5 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |||
@@ -5,6 +5,8 @@ namespace Wallabag\ApiBundle\Controller; | |||
5 | use FOS\RestBundle\Controller\FOSRestController; | 5 | use FOS\RestBundle\Controller\FOSRestController; |
6 | use Symfony\Component\Security\Core\Exception\AccessDeniedException; | 6 | use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
7 | use Wallabag\CoreBundle\Entity\Entry; | 7 | use Wallabag\CoreBundle\Entity\Entry; |
8 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; | ||
9 | use Symfony\Component\HttpFoundation\JsonResponse; | ||
8 | 10 | ||
9 | class WallabagRestController extends FOSRestController | 11 | class WallabagRestController extends FOSRestController |
10 | { | 12 | { |
@@ -19,6 +21,7 @@ class WallabagRestController extends FOSRestController | |||
19 | { | 21 | { |
20 | $version = $this->container->getParameter('wallabag_core.version'); | 22 | $version = $this->container->getParameter('wallabag_core.version'); |
21 | $json = $this->get('serializer')->serialize($version, 'json'); | 23 | $json = $this->get('serializer')->serialize($version, 'json'); |
24 | |||
22 | return (new JsonResponse())->setJson($json); | 25 | return (new JsonResponse())->setJson($json); |
23 | } | 26 | } |
24 | 27 | ||