diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-07-03 13:39:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-03 13:39:54 +0200 |
commit | 71e1cbc8eb5928d393b0772055d6b711e90a09b3 (patch) | |
tree | 71795eadcf13fda9198b8cd9a3da26d51826bbd9 /src/Wallabag/CoreBundle/Controller/RssController.php | |
parent | 822c877949aff8ae57677671115f8f4fc69588d5 (diff) | |
parent | 38520658addc217f127b0627ea28dcf8d6e6178c (diff) | |
download | wallabag-71e1cbc8eb5928d393b0772055d6b711e90a09b3.tar.gz wallabag-71e1cbc8eb5928d393b0772055d6b711e90a09b3.tar.zst wallabag-71e1cbc8eb5928d393b0772055d6b711e90a09b3.zip |
Merge pull request #3258 from wallabag/cs-fixer
Add a real configuration for CS-Fixer
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/RssController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/RssController.php | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index e87dd9a1..e84044b1 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php | |||
@@ -2,19 +2,19 @@ | |||
2 | 2 | ||
3 | namespace Wallabag\CoreBundle\Controller; | 3 | namespace Wallabag\CoreBundle\Controller; |
4 | 4 | ||
5 | use Pagerfanta\Adapter\DoctrineORMAdapter; | ||
6 | use Pagerfanta\Adapter\ArrayAdapter; | 5 | use Pagerfanta\Adapter\ArrayAdapter; |
6 | use Pagerfanta\Adapter\DoctrineORMAdapter; | ||
7 | use Pagerfanta\Exception\OutOfRangeCurrentPageException; | 7 | use Pagerfanta\Exception\OutOfRangeCurrentPageException; |
8 | use Pagerfanta\Pagerfanta; | 8 | use Pagerfanta\Pagerfanta; |
9 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; | 9 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
10 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 10 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
11 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | ||
11 | use Symfony\Component\HttpFoundation\Request; | 12 | use Symfony\Component\HttpFoundation\Request; |
12 | use Symfony\Component\HttpFoundation\Response; | 13 | use Symfony\Component\HttpFoundation\Response; |
13 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 14 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
14 | use Wallabag\CoreBundle\Entity\Entry; | 15 | use Wallabag\CoreBundle\Entity\Entry; |
15 | use Wallabag\CoreBundle\Entity\Tag; | 16 | use Wallabag\CoreBundle\Entity\Tag; |
16 | use Wallabag\UserBundle\Entity\User; | 17 | use Wallabag\UserBundle\Entity\User; |
17 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | ||
18 | 18 | ||
19 | class RssController extends Controller | 19 | class RssController extends Controller |
20 | { | 20 | { |
@@ -113,7 +113,7 @@ class RssController extends Controller | |||
113 | $entries->setCurrentPage($page); | 113 | $entries->setCurrentPage($page); |
114 | } catch (OutOfRangeCurrentPageException $e) { | 114 | } catch (OutOfRangeCurrentPageException $e) { |
115 | if ($page > 1) { | 115 | if ($page > 1) { |
116 | return $this->redirect($url.'?page='.$entries->getNbPages(), 302); | 116 | return $this->redirect($url . '?page=' . $entries->getNbPages(), 302); |
117 | } | 117 | } |
118 | } | 118 | } |
119 | 119 | ||
@@ -121,7 +121,7 @@ class RssController extends Controller | |||
121 | '@WallabagCore/themes/common/Entry/entries.xml.twig', | 121 | '@WallabagCore/themes/common/Entry/entries.xml.twig', |
122 | [ | 122 | [ |
123 | 'url_html' => $this->generateUrl('tag_entries', ['slug' => $tag->getSlug()], UrlGeneratorInterface::ABSOLUTE_URL), | 123 | 'url_html' => $this->generateUrl('tag_entries', ['slug' => $tag->getSlug()], UrlGeneratorInterface::ABSOLUTE_URL), |
124 | 'type' => 'tag ('.$tag->getLabel().')', | 124 | 'type' => 'tag (' . $tag->getLabel() . ')', |
125 | 'url' => $url, | 125 | 'url' => $url, |
126 | 'entries' => $entries, | 126 | 'entries' => $entries, |
127 | ], | 127 | ], |
@@ -147,19 +147,15 @@ class RssController extends Controller | |||
147 | case 'starred': | 147 | case 'starred': |
148 | $qb = $repository->getBuilderForStarredByUser($user->getId()); | 148 | $qb = $repository->getBuilderForStarredByUser($user->getId()); |
149 | break; | 149 | break; |
150 | |||
151 | case 'archive': | 150 | case 'archive': |
152 | $qb = $repository->getBuilderForArchiveByUser($user->getId()); | 151 | $qb = $repository->getBuilderForArchiveByUser($user->getId()); |
153 | break; | 152 | break; |
154 | |||
155 | case 'unread': | 153 | case 'unread': |
156 | $qb = $repository->getBuilderForUnreadByUser($user->getId()); | 154 | $qb = $repository->getBuilderForUnreadByUser($user->getId()); |
157 | break; | 155 | break; |
158 | |||
159 | case 'all': | 156 | case 'all': |
160 | $qb = $repository->getBuilderForAllByUser($user->getId()); | 157 | $qb = $repository->getBuilderForAllByUser($user->getId()); |
161 | break; | 158 | break; |
162 | |||
163 | default: | 159 | default: |
164 | throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); | 160 | throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); |
165 | } | 161 | } |
@@ -171,7 +167,7 @@ class RssController extends Controller | |||
171 | $entries->setMaxPerPage($perPage); | 167 | $entries->setMaxPerPage($perPage); |
172 | 168 | ||
173 | $url = $this->generateUrl( | 169 | $url = $this->generateUrl( |
174 | $type.'_rss', | 170 | $type . '_rss', |
175 | [ | 171 | [ |
176 | 'username' => $user->getUsername(), | 172 | 'username' => $user->getUsername(), |
177 | 'token' => $user->getConfig()->getRssToken(), | 173 | 'token' => $user->getConfig()->getRssToken(), |
@@ -183,7 +179,7 @@ class RssController extends Controller | |||
183 | $entries->setCurrentPage((int) $page); | 179 | $entries->setCurrentPage((int) $page); |
184 | } catch (OutOfRangeCurrentPageException $e) { | 180 | } catch (OutOfRangeCurrentPageException $e) { |
185 | if ($page > 1) { | 181 | if ($page > 1) { |
186 | return $this->redirect($url.'?page='.$entries->getNbPages(), 302); | 182 | return $this->redirect($url . '?page=' . $entries->getNbPages(), 302); |
187 | } | 183 | } |
188 | } | 184 | } |
189 | 185 | ||