pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #1069 from wallabag/v2-fix-return-entries

Browse Source 
GET /api/entries returns object, no more array
This commit is contained in:
Jeremy
2015-02-10 14:51:32 +01:00
parent 2c0ffcf397 017e20895f
commit f59f45d740
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/WallabagRestController.php
View File

@ -68,7 +68,7 @@ class WallabagRestController extends Controller
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $isDeleted, $sort, $order); ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $isDeleted, $sort, $order);
if (!is_array($entries)) { if (!($entries)) {
throw $this->createNotFoundException(); throw $this->createNotFoundException();
} }

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

@ -98,7 +98,7 @@ class EntryRepository extends EntityRepository
* @param string $sort * @param string $sort
* @param string $order * @param string $order
* *
* @return ArrayCollection * @return array
*/ */
public function findEntries($userId, $isArchived = null, $isStarred = null, $isDeleted = null, $sort = 'created', $order = 'ASC') public function findEntries($userId, $isArchived = null, $isStarred = null, $isDeleted = null, $sort = 'created', $order = 'ASC')
{ {
@ -126,6 +126,6 @@ class EntryRepository extends EntityRepository
return $qb return $qb
->getQuery() ->getQuery()
->getResult(Query::HYDRATE_ARRAY); ->getResult();
} }
} }