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

2 files changed, 21 insertions, 105 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/DeveloperController.php
deleted file mode 100644
index f3492b74..00000000
--- a/src/Wallabag/CoreBundle/Controller/DeveloperController.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Controller;
-
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Wallabag\ApiBundle\Entity\Client;
-use Wallabag\CoreBundle\Form\Type\ClientType;
-
-class DeveloperController extends Controller
-{
-    /**
-     * List all clients and link to create a new one.
-     *
-     * @Route("/developer", name="developer")
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function indexAction()
-    {
-        $clients = $this->getDoctrine()->getRepository('WallabagApiBundle:Client')->findAll();
-
-        return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [
-            'clients' => $clients,
-        ]);
-    }
-
-    /**
-     * Create a client (an app).
-     *
-     * @param Request $request
-     *
-     * @Route("/developer/client/create", name="developer_create_client")
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function createClientAction(Request $request)
-    {
-        $em = $this->getDoctrine()->getManager();
-        $client = new Client();
-        $clientForm = $this->createForm(ClientType::class, $client);
-        $clientForm->handleRequest($request);
-
-        if ($clientForm->isValid()) {
-            $client->setAllowedGrantTypes(['token', 'authorization_code', 'password', 'refresh_token']);
-            $em->persist($client);
-            $em->flush();
-
-            $this->get('session')->getFlashBag()->add(
-                'notice',
-                $this->get('translator')->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()])
-            );
-
-            return $this->render('@WallabagCore/themes/common/Developer/client_parameters.html.twig', [
-                'client_id' => $client->getPublicId(),
-                'client_secret' => $client->getSecret(),
-                'client_name' => $client->getName(),
-            ]);
-        }
-
-        return $this->render('@WallabagCore/themes/common/Developer/client.html.twig', [
-            'form' => $clientForm->createView(),
-        ]);
-    }
-
-    /**
-     * Remove a client.
-     *
-     * @param Client $client
-     *
-     * @Route("/developer/client/delete/{id}", requirements={"id" = "\d+"}, name="developer_delete_client")
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
-     */
-    public function deleteClientAction(Client $client)
-    {
-        $em = $this->getDoctrine()->getManager();
-        $em->remove($client);
-        $em->flush();
-
-        $this->get('session')->getFlashBag()->add(
-            'notice',
-            $this->get('translator')->trans('flashes.developer.notice.client_deleted', ['%name%' => $client->getName()])
-        );
-
-        return $this->redirect($this->generateUrl('developer'));
-    }
-
-    /**
-     * Display developer how to use an existing app.
-     *
-     * @Route("/developer/howto/first-app", name="developer_howto_firstapp")
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function howtoFirstAppAction()
-    {
-        return $this->render('@WallabagCore/themes/common/Developer/howto_app.html.twig');
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 623a6146..5acc6852 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -63,10 +63,12 @@ class TagController extends Controller
         $entry->removeTag($tag);
         $em = $this->getDoctrine()->getManager();
         $em->flush();
-        if (count($tag->getEntries()) == 0) {
+
+        // remove orphan tag in case no entries are associated to it
+        if (count($tag->getEntries()) === 0) {
             $em->remove($tag);
+            $em->flush();
         }
-        $em->flush();
 
         $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
 
@@ -84,10 +86,25 @@ class TagController extends Controller
     {
         $tags = $this->getDoctrine()
             ->getRepository('WallabagCoreBundle:Tag')
-            ->findAllTagsWithEntries($this->getUser()->getId());
+            ->findAllTags($this->getUser()->getId());
+
+        $flatTags = [];
+
+        foreach ($tags as $key => $tag) {
+            $nbEntries = $this->getDoctrine()
+                ->getRepository('WallabagCoreBundle:Entry')
+                ->countAllEntriesByUserIdAndTagId($this->getUser()->getId(), $tag['id']);
+
+            $flatTags[] = [
+                'id' => $tag['id'],
+                'label' => $tag['label'],
+                'slug' => $tag['slug'],
+                'nbEntries' => $nbEntries,
+            ];
+        }
 
         return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [
-            'tags' => $tags,
+            'tags' => $flatTags,
         ]);
     }