devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3362 from sviande/fix_3361_api_warning

Browse Source 
Fix #3361 check type for tags in entry repository
This commit is contained in:
Jérémy Benoist 2017-10-18 11:16:50 +02:00 committed by GitHub
commit 91f9bacf73
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/ApiBundle/Controller/EntryRestController.php
View File

@ -102,7 +102,7 @@ class EntryRestController extends WallabagRestController
$order = $request->query->get('order', 'desc'); $order = $request->query->get('order', 'desc');
$page = (int) $request->query->get('page', 1); $page = (int) $request->query->get('page', 1);
$perPage = (int) $request->query->get('perPage', 30); $perPage = (int) $request->query->get('perPage', 30);
$tags = $request->query->get('tags', ''); $tags = is_array($request->query->get('tags')) ? '' : (string) $request->query->get('tags', '');
$since = $request->query->get('since', 0); $since = $request->query->get('since', 0);
/** @var \Pagerfanta\Pagerfanta $pager */ /** @var \Pagerfanta\Pagerfanta $pager */

2
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View File

@ -151,7 +151,7 @@ class EntryRepository extends EntityRepository
$qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since))); $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since)));
} }
if ('' !== $tags) { if (is_string($tags) && '' !== $tags) {
foreach (explode(',', $tags) as $i => $tag) { foreach (explode(',', $tags) as $i => $tag) {
$entryAlias = 'e' . $i; $entryAlias = 'e' . $i;
$tagAlias = 't' . $i; $tagAlias = 't' . $i;

7
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
View File

@ -308,6 +308,13 @@ class EntryRestControllerTest extends WallabagApiTestCase
$this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type')); $this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
} }
public function testGetTaggedEntriesWithBadParams()
{
$this->client->request('GET', '/api/entries', ['tags' => ['foo', 'bar']]);
$this->assertSame(200, $this->client->getResponse()->getStatusCode());
}
public function testGetDatedEntries() public function testGetDatedEntries()
{ {
$this->client->request('GET', '/api/entries', ['since' => 1443274283]); $this->client->request('GET', '/api/entries', ['since' => 1443274283]);