diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-04 11:40:48 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-04 11:46:18 +0100 |
commit | fba9e7d44d5987a603add50dc450f50079340dcc (patch) | |
tree | 501001e8866d7c1c7c4e22c384b208b68aff257b /src/Wallabag | |
parent | 11a452813c5c048174f0d827c2a171bb53520d0a (diff) | |
download | wallabag-fba9e7d44d5987a603add50dc450f50079340dcc.tar.gz wallabag-fba9e7d44d5987a603add50dc450f50079340dcc.tar.zst wallabag-fba9e7d44d5987a603add50dc450f50079340dcc.zip |
Remove 'content' from API
Waiting to find a good solution to avoid side problem since user can no define the content
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/ApiBundle/Controller/WallabagRestController.php | 6 | ||||
-rw-r--r-- | src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php | 16 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 28145e45..35a90edd 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |||
@@ -99,7 +99,6 @@ class WallabagRestController extends FOSRestController | |||
99 | * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, | 99 | * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, |
100 | * {"name"="starred", "dataType"="boolean", "required"=false, "format"="true or false", "description"="entry already starred"}, | 100 | * {"name"="starred", "dataType"="boolean", "required"=false, "format"="true or false", "description"="entry already starred"}, |
101 | * {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false", "description"="entry already archived"}, | 101 | * {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false", "description"="entry already archived"}, |
102 | * {"name"="content", "dataType"="string", "required"=false, "format"="content", "description"="content you want to pass directly"}, | ||
103 | * } | 102 | * } |
104 | * ) | 103 | * ) |
105 | * | 104 | * |
@@ -110,7 +109,6 @@ class WallabagRestController extends FOSRestController | |||
110 | $this->validateAuthentication(); | 109 | $this->validateAuthentication(); |
111 | 110 | ||
112 | $url = $request->request->get('url'); | 111 | $url = $request->request->get('url'); |
113 | $content = $request->request->get('content'); | ||
114 | $isArchived = $request->request->get('archive'); | 112 | $isArchived = $request->request->get('archive'); |
115 | $isStarred = $request->request->get('starred'); | 113 | $isStarred = $request->request->get('starred'); |
116 | 114 | ||
@@ -132,10 +130,6 @@ class WallabagRestController extends FOSRestController | |||
132 | $entry->setArchived(true); | 130 | $entry->setArchived(true); |
133 | } | 131 | } |
134 | 132 | ||
135 | if (!empty($content)) { | ||
136 | $entry->setContent($content); | ||
137 | } | ||
138 | |||
139 | $em = $this->getDoctrine()->getManager(); | 133 | $em = $this->getDoctrine()->getManager(); |
140 | $em->persist($entry); | 134 | $em->persist($entry); |
141 | 135 | ||
diff --git a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php index 6e64d84f..630b75bf 100644 --- a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php +++ b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php | |||
@@ -180,22 +180,6 @@ class WallabagRestControllerTest extends WallabagApiTestCase | |||
180 | $this->assertEquals(false, $content['is_starred']); | 180 | $this->assertEquals(false, $content['is_starred']); |
181 | } | 181 | } |
182 | 182 | ||
183 | public function testPostEntryWithContent() | ||
184 | { | ||
185 | $this->client->request('POST', '/api/entries.json', array( | ||
186 | 'url' => 'http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', | ||
187 | 'content' => 'This is a new content for my entry', | ||
188 | )); | ||
189 | |||
190 | $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); | ||
191 | |||
192 | $content = json_decode($this->client->getResponse()->getContent(), true); | ||
193 | |||
194 | $this->assertGreaterThan(0, $content['id']); | ||
195 | $this->assertEquals('http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', $content['url']); | ||
196 | $this->assertEquals('This is a new content for my entry', $content['content']); | ||
197 | } | ||
198 | |||
199 | public function testPatchEntry() | 183 | public function testPatchEntry() |
200 | { | 184 | { |
201 | $entry = $this->client->getContainer() | 185 | $entry = $this->client->getContainer() |