Merge remote-tracking branch 'origin/master' into 2.3

[github/wallabag/wallabag.git] / src / Wallabag / AnnotationBundle / Repository / AnnotationRepository.php

diff --git a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
index 23f21c3e3630a0e9636348e1e8871af94e083dee..da3613089ced7a19d5e6b74961dc251c39a233b1 100644 (file)
--- a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
+++ b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
@@ -124,12 +124,13 @@ class AnnotationRepository extends EntityRepository
     }
 
     /**
-     * Find all annotations related to archived entries
+     * Find all annotations related to archived entries.
      *
      * @param $userId
+     *
      * @return mixed
      */
-    public function findAllByArchivedEntriesAndUserId($userId)
+    public function findAllArchivedEntriesByUser($userId)
     {
         return $this->createQueryBuilder('a')
             ->leftJoin('a.entry', 'e')