X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FTwig%2FWallabagExtension.php;h=fb4c7412395f4affcb3b4b73f844ea06d498d4cc;hb=19ca0b2f355a657dd296bfa782473ffd45280572;hp=974b86a97aab2c9da636ad7603e0feae2aef16ce;hpb=c3b53188d75a01e92f2be7204fc961a7636a1827;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
index 974b86a9..fb4c7412 100644
--- a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
+++ b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
@@ -4,16 +4,21 @@ namespace Wallabag\CoreBundle\Twig;
 
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\CoreBundle\Repository\TagRepository;
 
 class WallabagExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
 {
     private $tokenStorage;
-    private $repository;
+    private $entryRepository;
+    private $tagRepository;
+    private $lifeTime;
 
-    public function __construct(EntryRepository $repository = null, TokenStorageInterface $tokenStorage = null)
+    public function __construct(EntryRepository $entryRepository = null, TagRepository $tagRepository = null, TokenStorageInterface $tokenStorage = null, $lifeTime = 0)
     {
-        $this->repository = $repository;
+        $this->entryRepository = $entryRepository;
+        $this->tagRepository = $tagRepository;
         $this->tokenStorage = $tokenStorage;
+        $this->lifeTime = $lifeTime;
     }
 
     public function getFilters()
@@ -27,6 +32,7 @@ class WallabagExtension extends \Twig_Extension implements \Twig_Extension_Globa
     {
         return array(
             new \Twig_SimpleFunction('count_entries', [$this, 'countEntries']),
+            new \Twig_SimpleFunction('count_tags', [$this, 'countTags']),
         );
     }
 
@@ -47,24 +53,24 @@ class WallabagExtension extends \Twig_Extension implements \Twig_Extension_Globa
         $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
 
         if (null === $user || !is_object($user)) {
-            return [];
+            return 0;
         }
 
         switch ($type) {
             case 'starred':
-                $qb = $this->repository->getBuilderForStarredByUser($user->getId());
+                $qb = $this->entryRepository->getBuilderForStarredByUser($user->getId());
                 break;
 
             case 'archive':
-                $qb = $this->repository->getBuilderForArchiveByUser($user->getId());
+                $qb = $this->entryRepository->getBuilderForArchiveByUser($user->getId());
                 break;
 
             case 'unread':
-                $qb = $this->repository->getBuilderForUnreadByUser($user->getId());
+                $qb = $this->entryRepository->getBuilderForUnreadByUser($user->getId());
                 break;
 
             case 'all':
-                $qb = $this->repository->getBuilderForAllByUser($user->getId());
+                $qb = $this->entryRepository->getBuilderForAllByUser($user->getId());
                 break;
 
             default:
@@ -78,11 +84,27 @@ class WallabagExtension extends \Twig_Extension implements \Twig_Extension_Globa
             ->groupBy('e.id')
             ->getQuery();
 
-        $data = $this->repository
-            ->enableCache($query)
-            ->getArrayResult();
+        $query->useQueryCache(true);
+        $query->useResultCache(true);
+        $query->setResultCacheLifetime($this->lifeTime);
 
-        return count($data);
+        return count($query->getArrayResult());
+    }
+
+    /**
+     * Return number of tags.
+     *
+     * @return int
+     */
+    public function countTags()
+    {
+        $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
+
+        if (null === $user || !is_object($user)) {
+            return 0;
+        }
+
+        return $this->tagRepository->countAllTags($user->getId());
     }
 
     public function getName()