X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FRepository%2FTagRepository.php;h=c4aeb5949f79fe76a69b8427300dfe625f283d4e;hb=de3b19b2ce227202ab5e4442474441cc4ba10f0b;hp=0f362f79ebb0efdc37d4a9f2599e4100e24723e6;hpb=0a018fe03980b35c9f7aca838e67a8efa43b7f2d;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php
index 0f362f79..c4aeb594 100644
--- a/src/Wallabag/CoreBundle/Repository/TagRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php
@@ -3,21 +3,52 @@
 namespace Wallabag\CoreBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Pagerfanta;
 
 class TagRepository extends EntityRepository
 {
-    public function findByEntries($entryId)
+    /**
+     * Return only the QueryBuilder to retrieve all tags for a given user.
+     *
+     * @param int $userId
+     *
+     * @return QueryBuilder
+     */
+    private function getQbForAllTags($userId)
     {
-        $qb = $this->createQueryBuilder('t')
-            ->select('t')
-            ->leftJoin('t.id', 'u')
-            ->where('e.isStarred = true')
-            ->andWhere('u.id =:userId')->setParameter('userId', $userId)
-            ->orderBy('e.createdAt', 'desc')
-            ->getQuery();
+        return $this->createQueryBuilder('t')
+            ->leftJoin('t.entries', 'e')
+            ->where('e.user = :userId')->setParameter('userId', $userId);
+    }
+
+    /**
+     * Find Tags and return a Pager.
+     *
+     * @param int $userId
+     *
+     * @return Pagerfanta
+     */
+    public function findTags($userId)
+    {
+        $qb = $this->getQbForAllTags($userId);
 
-        $paginator = new Paginator($qb);
+        $pagerAdapter = new DoctrineORMAdapter($qb);
 
-        return $paginator;
+        return new Pagerfanta($pagerAdapter);
+    }
+
+    /**
+     * Find Tags.
+     *
+     * @param int $userId
+     *
+     * @return array
+     */
+    public function findAllTags($userId)
+    {
+        return $this->getQbForAllTags($userId)
+            ->getQuery()
+            ->getResult();
     }
 }