Renamed methods

diff --git a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
index 3af53805bd1a9db1741525ffc801b6a1696c9334..da3613089ced7a19d5e6b74961dc251c39a233b1 100644 (file)
--- 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 b2814aded0a7202b54a161ae818f6a6a5e91d46e..1a80cc1ac12f61cd1d9512bd4d9177636b55e4f6 100644 (file)
--- 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 b78e244ecda63d1ca8834768f1602cb82cbe3488..6c63a6a2792e8f276d49b098eed055c688834d8e 100644 (file)
--- 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')