diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-03-08 10:09:57 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-03-08 10:09:57 +0100 |
commit | d442cf4a92118a96926865447560b89e129d73dd (patch) | |
tree | 1c820015be10850fd48897ca663e1a5804b94bdd /src/Wallabag | |
parent | 807037884f0085cd39fe4b41cacd82be14e309d9 (diff) | |
parent | 6f8310b445ce0aeb40aeed78501a6e113c05c087 (diff) | |
download | wallabag-d442cf4a92118a96926865447560b89e129d73dd.tar.gz wallabag-d442cf4a92118a96926865447560b89e129d73dd.tar.zst wallabag-d442cf4a92118a96926865447560b89e129d73dd.zip |
Merge pull request #1761 from wallabag/v2-API-version
V2 api version
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/ApiBundle/Controller/WallabagRestController.php | 15 | ||||
-rw-r--r-- | src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php | 11 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 35a90edd..29cab1f4 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |||
@@ -340,6 +340,21 @@ class WallabagRestController extends FOSRestController | |||
340 | 340 | ||
341 | return $this->renderJsonResponse($json); | 341 | return $this->renderJsonResponse($json); |
342 | } | 342 | } |
343 | /** | ||
344 | * Retrieve version number. | ||
345 | * | ||
346 | * @ApiDoc() | ||
347 | * | ||
348 | * @return Response | ||
349 | */ | ||
350 | public function getVersionAction() | ||
351 | { | ||
352 | $version = $this->container->getParameter('wallabag_core.version'); | ||
353 | |||
354 | $json = $this->get('serializer')->serialize($version, 'json'); | ||
355 | |||
356 | return $this->renderJsonResponse($json); | ||
357 | } | ||
343 | 358 | ||
344 | /** | 359 | /** |
345 | * Validate that the first id is equal to the second one. | 360 | * Validate that the first id is equal to the second one. |
diff --git a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php index 630b75bf..a705f9de 100644 --- a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php +++ b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php | |||
@@ -336,4 +336,15 @@ class WallabagRestControllerTest extends WallabagApiTestCase | |||
336 | 336 | ||
337 | $this->assertCount(0, $entries); | 337 | $this->assertCount(0, $entries); |
338 | } | 338 | } |
339 | |||
340 | public function testGetVersion() | ||
341 | { | ||
342 | $this->client->request('GET', '/api/version'); | ||
343 | |||
344 | $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); | ||
345 | |||
346 | $content = json_decode($this->client->getResponse()->getContent(), true); | ||
347 | |||
348 | $this->assertEquals($this->client->getContainer()->getParameter('wallabag_core.version'), $content); | ||
349 | } | ||
339 | } | 350 | } |