diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
commit | 16dabc326311f084d671be188c7941bbb3c341c9 (patch) | |
tree | 3210a7688ea2bfa1bff5fd0422b52adf570edcdc /src/Wallabag/CoreBundle/Controller/RssController.php | |
parent | fdef5f460524215d806e244e5546865f4b8e01df (diff) | |
parent | 8263e71192989dc0fd28a41ac22f9c5b32eb11c4 (diff) | |
download | wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.gz wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.zst wallabag-16dabc326311f084d671be188c7941bbb3c341c9.zip |
Merge pull request #1436 from wallabag/v2-register
Public registration & oAuth2 \o/
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/RssController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/RssController.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index 6121f361..023a6228 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php | |||
@@ -5,7 +5,7 @@ namespace Wallabag\CoreBundle\Controller; | |||
5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
7 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 7 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
8 | use Wallabag\CoreBundle\Entity\User; | 8 | use Wallabag\UserBundle\Entity\User; |
9 | use Wallabag\CoreBundle\Entity\Entry; | 9 | use Wallabag\CoreBundle\Entity\Entry; |
10 | use Pagerfanta\Adapter\DoctrineORMAdapter; | 10 | use Pagerfanta\Adapter\DoctrineORMAdapter; |
11 | use Pagerfanta\Pagerfanta; | 11 | use Pagerfanta\Pagerfanta; |
@@ -16,7 +16,7 @@ class RssController extends Controller | |||
16 | * Shows unread entries for current user. | 16 | * Shows unread entries for current user. |
17 | * | 17 | * |
18 | * @Route("/{username}/{token}/unread.xml", name="unread_rss", defaults={"_format"="xml"}) | 18 | * @Route("/{username}/{token}/unread.xml", name="unread_rss", defaults={"_format"="xml"}) |
19 | * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") | 19 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter") |
20 | * | 20 | * |
21 | * @return \Symfony\Component\HttpFoundation\Response | 21 | * @return \Symfony\Component\HttpFoundation\Response |
22 | */ | 22 | */ |
@@ -29,7 +29,7 @@ class RssController extends Controller | |||
29 | * Shows read entries for current user. | 29 | * Shows read entries for current user. |
30 | * | 30 | * |
31 | * @Route("/{username}/{token}/archive.xml", name="archive_rss") | 31 | * @Route("/{username}/{token}/archive.xml", name="archive_rss") |
32 | * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") | 32 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter") |
33 | * | 33 | * |
34 | * @return \Symfony\Component\HttpFoundation\Response | 34 | * @return \Symfony\Component\HttpFoundation\Response |
35 | */ | 35 | */ |
@@ -42,7 +42,7 @@ class RssController extends Controller | |||
42 | * Shows starred entries for current user. | 42 | * Shows starred entries for current user. |
43 | * | 43 | * |
44 | * @Route("/{username}/{token}/starred.xml", name="starred_rss") | 44 | * @Route("/{username}/{token}/starred.xml", name="starred_rss") |
45 | * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") | 45 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter") |
46 | * | 46 | * |
47 | * @return \Symfony\Component\HttpFoundation\Response | 47 | * @return \Symfony\Component\HttpFoundation\Response |
48 | */ | 48 | */ |