diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
commit | 39643c6b76d92d509b1af0228b6379d7fdce8a1c (patch) | |
tree | 931dceef7dbc8ae9911d01ded709d558417a6cdd /src/Wallabag/ApiBundle/Controller | |
parent | 488a468e3e11ff0ab6284afe232bf0f7fa68a8eb (diff) | |
parent | b88cf91fc8371194df78e690983c61ea94f266cd (diff) | |
download | wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.gz wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.zst wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.zip |
Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1
v2 – 1st draft for Pocket import via API & Wallabag v1 import
Diffstat (limited to 'src/Wallabag/ApiBundle/Controller')
-rw-r--r-- | src/Wallabag/ApiBundle/Controller/WallabagRestController.php | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 459c4172..354a6f8e 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |||
@@ -60,7 +60,7 @@ class WallabagRestController extends FOSRestController | |||
60 | * } | 60 | * } |
61 | * ) | 61 | * ) |
62 | * | 62 | * |
63 | * @return Entry | 63 | * @return Response |
64 | */ | 64 | */ |
65 | public function getEntriesAction(Request $request) | 65 | public function getEntriesAction(Request $request) |
66 | { | 66 | { |
@@ -101,7 +101,7 @@ class WallabagRestController extends FOSRestController | |||
101 | * } | 101 | * } |
102 | * ) | 102 | * ) |
103 | * | 103 | * |
104 | * @return Entry | 104 | * @return Response |
105 | */ | 105 | */ |
106 | public function getEntryAction(Entry $entry) | 106 | public function getEntryAction(Entry $entry) |
107 | { | 107 | { |
@@ -124,7 +124,7 @@ class WallabagRestController extends FOSRestController | |||
124 | * } | 124 | * } |
125 | * ) | 125 | * ) |
126 | * | 126 | * |
127 | * @return Entry | 127 | * @return Response |
128 | */ | 128 | */ |
129 | public function postEntriesAction(Request $request) | 129 | public function postEntriesAction(Request $request) |
130 | { | 130 | { |
@@ -166,7 +166,7 @@ class WallabagRestController extends FOSRestController | |||
166 | * } | 166 | * } |
167 | * ) | 167 | * ) |
168 | * | 168 | * |
169 | * @return Entry | 169 | * @return Response |
170 | */ | 170 | */ |
171 | public function patchEntriesAction(Entry $entry, Request $request) | 171 | public function patchEntriesAction(Entry $entry, Request $request) |
172 | { | 172 | { |
@@ -211,7 +211,7 @@ class WallabagRestController extends FOSRestController | |||
211 | * } | 211 | * } |
212 | * ) | 212 | * ) |
213 | * | 213 | * |
214 | * @return Entry | 214 | * @return Response |
215 | */ | 215 | */ |
216 | public function deleteEntriesAction(Entry $entry) | 216 | public function deleteEntriesAction(Entry $entry) |
217 | { | 217 | { |
@@ -235,6 +235,8 @@ class WallabagRestController extends FOSRestController | |||
235 | * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} | 235 | * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} |
236 | * } | 236 | * } |
237 | * ) | 237 | * ) |
238 | * | ||
239 | * @return Response | ||
238 | */ | 240 | */ |
239 | public function getEntriesTagsAction(Entry $entry) | 241 | public function getEntriesTagsAction(Entry $entry) |
240 | { | 242 | { |
@@ -257,6 +259,8 @@ class WallabagRestController extends FOSRestController | |||
257 | * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, | 259 | * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, |
258 | * } | 260 | * } |
259 | * ) | 261 | * ) |
262 | * | ||
263 | * @return Response | ||
260 | */ | 264 | */ |
261 | public function postEntriesTagsAction(Request $request, Entry $entry) | 265 | public function postEntriesTagsAction(Request $request, Entry $entry) |
262 | { | 266 | { |
@@ -286,6 +290,8 @@ class WallabagRestController extends FOSRestController | |||
286 | * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} | 290 | * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} |
287 | * } | 291 | * } |
288 | * ) | 292 | * ) |
293 | * | ||
294 | * @return Response | ||
289 | */ | 295 | */ |
290 | public function deleteEntriesTagsAction(Entry $entry, Tag $tag) | 296 | public function deleteEntriesTagsAction(Entry $entry, Tag $tag) |
291 | { | 297 | { |
@@ -306,6 +312,8 @@ class WallabagRestController extends FOSRestController | |||
306 | * Retrieve all tags. | 312 | * Retrieve all tags. |
307 | * | 313 | * |
308 | * @ApiDoc() | 314 | * @ApiDoc() |
315 | * | ||
316 | * @return Response | ||
309 | */ | 317 | */ |
310 | public function getTagsAction() | 318 | public function getTagsAction() |
311 | { | 319 | { |
@@ -328,6 +336,8 @@ class WallabagRestController extends FOSRestController | |||
328 | * {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag"} | 336 | * {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag"} |
329 | * } | 337 | * } |
330 | * ) | 338 | * ) |
339 | * | ||
340 | * @return Response | ||
331 | */ | 341 | */ |
332 | public function deleteTagAction(Tag $tag) | 342 | public function deleteTagAction(Tag $tag) |
333 | { | 343 | { |