From 13a592a1288d7deb49211838368583c0109a5fbd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 31 Mar 2017 17:03:08 +0200 Subject: [PATCH] Renamed methods --- .../AnnotationBundle/Repository/AnnotationRepository.php | 2 +- src/Wallabag/CoreBundle/Controller/ConfigController.php | 4 ++-- src/Wallabag/CoreBundle/Repository/TagRepository.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php index 3af53805..da361308 100644 --- a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php +++ b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php @@ -130,7 +130,7 @@ class AnnotationRepository extends EntityRepository * * @return mixed */ - public function findAllByArchivedEntriesAndUserId($userId) + public function findAllArchivedEntriesByUser($userId) { return $this->createQueryBuilder('a') ->leftJoin('a.entry', 'e') diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index b2814ade..1a80cc1a 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -329,7 +329,7 @@ class ConfigController extends Controller */ private function removeTagsForArchivedByUserId($userId) { - $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findTagsForArchivedArticles($userId); + $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findForArchivedArticlesByUser($userId); $this->removeAllTagsByStatusAndUserId($tags, $userId); } @@ -339,7 +339,7 @@ class ConfigController extends Controller $archivedEntriesAnnotations = $this->getDoctrine() ->getRepository('WallabagAnnotationBundle:Annotation') - ->findAllByArchivedEntriesAndUserId($userId); + ->findAllArchivedEntriesByUser($userId); foreach ($archivedEntriesAnnotations as $archivedEntriesAnnotation) { $em->remove($archivedEntriesAnnotation); diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php index b78e244e..6c63a6a2 100644 --- a/src/Wallabag/CoreBundle/Repository/TagRepository.php +++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php @@ -77,7 +77,7 @@ class TagRepository extends EntityRepository ->getSingleResult(); } - public function findTagsForArchivedArticles($userId) + public function findForArchivedArticlesByUser($userId) { $ids = $this->createQueryBuilder('t') ->select('t.id') -- 2.41.0