From 531c8d0a5c55fa93438e227a7d349235fbd31d28 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 13 Jun 2017 18:48:10 +0200
Subject: Changed RSS to Atom feed and improve paging

---
 .../ParamConverter/UsernameFeedTokenConverter.php  | 91 ++++++++++++++++++++++
 .../ParamConverter/UsernameRssTokenConverter.php   | 91 ----------------------
 2 files changed, 91 insertions(+), 91 deletions(-)
 create mode 100644 src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php
 delete mode 100644 src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php

(limited to 'src/Wallabag/CoreBundle/ParamConverter')

diff --git a/src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php b/src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php
new file mode 100644
index 00000000..e220abfc
--- /dev/null
+++ b/src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Wallabag\CoreBundle\ParamConverter;
+
+use Doctrine\Common\Persistence\ManagerRegistry;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Wallabag\UserBundle\Entity\User;
+
+/**
+ * ParamConverter used in the Feed controller to retrieve the right user according to
+ * username & token given in the url.
+ *
+ * @see http://stfalcon.com/en/blog/post/symfony2-custom-paramconverter
+ */
+class UsernameFeedTokenConverter implements ParamConverterInterface
+{
+    private $registry;
+
+    /**
+     * @param ManagerRegistry $registry Manager registry
+     */
+    public function __construct(ManagerRegistry $registry = null)
+    {
+        $this->registry = $registry;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * Check, if object supported by our converter
+     */
+    public function supports(ParamConverter $configuration)
+    {
+        // If there is no manager, this means that only Doctrine DBAL is configured
+        // In this case we can do nothing and just return
+        if (null === $this->registry || !\count($this->registry->getManagers())) {
+            return false;
+        }
+
+        // Check, if option class was set in configuration
+        if (null === $configuration->getClass()) {
+            return false;
+        }
+
+        // Get actual entity manager for class
+        $em = $this->registry->getManagerForClass($configuration->getClass());
+
+        // Check, if class name is what we need
+        if (null !== $em && 'Wallabag\UserBundle\Entity\User' !== $em->getClassMetadata($configuration->getClass())->getName()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * Applies converting
+     *
+     * @throws \InvalidArgumentException When route attributes are missing
+     * @throws NotFoundHttpException     When object not found
+     */
+    public function apply(Request $request, ParamConverter $configuration)
+    {
+        $username = $request->attributes->get('username');
+        $feedToken = $request->attributes->get('token');
+
+        if (!$request->attributes->has('username') || !$request->attributes->has('token')) {
+            return false;
+        }
+
+        // Get actual entity manager for class
+        $em = $this->registry->getManagerForClass($configuration->getClass());
+
+        $userRepository = $em->getRepository($configuration->getClass());
+
+        // Try to find user by its username and config feed_token
+        $user = $userRepository->findOneByUsernameAndFeedtoken($username, $feedToken);
+
+        if (null === $user || !($user instanceof User)) {
+            throw new NotFoundHttpException(sprintf('%s not found.', $configuration->getClass()));
+        }
+
+        // Map found user to the route's parameter
+        $request->attributes->set($configuration->getName(), $user);
+    }
+}
diff --git a/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php b/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php
deleted file mode 100644
index 4a2fcab5..00000000
--- a/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\ParamConverter;
-
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Wallabag\UserBundle\Entity\User;
-
-/**
- * ParamConverter used in the RSS controller to retrieve the right user according to
- * username & token given in the url.
- *
- * @see http://stfalcon.com/en/blog/post/symfony2-custom-paramconverter
- */
-class UsernameRssTokenConverter implements ParamConverterInterface
-{
-    private $registry;
-
-    /**
-     * @param ManagerRegistry $registry Manager registry
-     */
-    public function __construct(ManagerRegistry $registry = null)
-    {
-        $this->registry = $registry;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Check, if object supported by our converter
-     */
-    public function supports(ParamConverter $configuration)
-    {
-        // If there is no manager, this means that only Doctrine DBAL is configured
-        // In this case we can do nothing and just return
-        if (null === $this->registry || !\count($this->registry->getManagers())) {
-            return false;
-        }
-
-        // Check, if option class was set in configuration
-        if (null === $configuration->getClass()) {
-            return false;
-        }
-
-        // Get actual entity manager for class
-        $em = $this->registry->getManagerForClass($configuration->getClass());
-
-        // Check, if class name is what we need
-        if (null !== $em && 'Wallabag\UserBundle\Entity\User' !== $em->getClassMetadata($configuration->getClass())->getName()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Applies converting
-     *
-     * @throws \InvalidArgumentException When route attributes are missing
-     * @throws NotFoundHttpException     When object not found
-     */
-    public function apply(Request $request, ParamConverter $configuration)
-    {
-        $username = $request->attributes->get('username');
-        $rssToken = $request->attributes->get('token');
-
-        if (!$request->attributes->has('username') || !$request->attributes->has('token')) {
-            return false;
-        }
-
-        // Get actual entity manager for class
-        $em = $this->registry->getManagerForClass($configuration->getClass());
-
-        $userRepository = $em->getRepository($configuration->getClass());
-
-        // Try to find user by its username and config rss_token
-        $user = $userRepository->findOneByUsernameAndRsstoken($username, $rssToken);
-
-        if (null === $user || !($user instanceof User)) {
-            throw new NotFoundHttpException(sprintf('%s not found.', $configuration->getClass()));
-        }
-
-        // Map found user to the route's parameter
-        $request->attributes->set($configuration->getName(), $user);
-    }
-}
-- 
cgit v1.2.3