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

Rename method from *username to *user

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2017-03-30 16:07:48 +02:00
parent 90f95027a8
commit 273b6f0658
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,7 +227,7 @@ class EntryController extends Controller
public function showUnreadAction(Request $request, $page) public function showUnreadAction(Request $request, $page)
{ {
// load the quickstart if no entry in database // load the quickstart if no entry in database
if ($page == 1 && $this->get('wallabag_core.entry_repository')->countAllEntriesByUsername($this->getUser()->getId()) == 0) { if ($page == 1 && $this->get('wallabag_core.entry_repository')->countAllEntriesByUser($this->getUser()->getId()) == 0) {
return $this->redirect($this->generateUrl('quickstart')); return $this->redirect($this->generateUrl('quickstart'));
} }

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

@ -328,7 +328,7 @@ class EntryRepository extends EntityRepository
* *
* @return int * @return int
*/ */
public function countAllEntriesByUsername($userId) public function countAllEntriesByUser($userId)
{ {
$qb = $this->createQueryBuilder('e') $qb = $this->createQueryBuilder('e')
->select('count(e)') ->select('count(e)')

4
tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
View File

@ -798,7 +798,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
$entryReset = $em $entryReset = $em
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->countAllEntriesByUsername($user->getId()); ->countAllEntriesByUser($user->getId());
$this->assertEquals(0, $entryReset, 'Entries were reset'); $this->assertEquals(0, $entryReset, 'Entries were reset');
} }
@ -843,7 +843,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
$entryReset = $em $entryReset = $em
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->countAllEntriesByUsername($user->getId()); ->countAllEntriesByUser($user->getId());
$this->assertEquals(0, $entryReset, 'Entries were reset'); $this->assertEquals(0, $entryReset, 'Entries were reset');