diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | |
parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php index f9066bee..7d3798b9 100644 --- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php +++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | |||
@@ -5,16 +5,16 @@ namespace Wallabag\CoreBundle\Helper; | |||
5 | use Pagerfanta\Adapter\AdapterInterface; | 5 | use Pagerfanta\Adapter\AdapterInterface; |
6 | use Pagerfanta\Pagerfanta; | 6 | use Pagerfanta\Pagerfanta; |
7 | use Symfony\Component\Routing\Router; | 7 | use Symfony\Component\Routing\Router; |
8 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; | 8 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
9 | 9 | ||
10 | class PreparePagerForEntries | 10 | class PreparePagerForEntries |
11 | { | 11 | { |
12 | private $user; | ||
13 | private $router; | 12 | private $router; |
13 | private $tokenStorage; | ||
14 | 14 | ||
15 | public function __construct(TokenStorage $token, Router $router) | 15 | public function __construct(TokenStorageInterface $tokenStorage, Router $router) |
16 | { | 16 | { |
17 | $this->user = $token->getToken()->getUser(); | 17 | $this->tokenStorage = $tokenStorage; |
18 | $this->router = $router; | 18 | $this->router = $router; |
19 | } | 19 | } |
20 | 20 | ||
@@ -26,8 +26,14 @@ class PreparePagerForEntries | |||
26 | */ | 26 | */ |
27 | public function prepare(AdapterInterface $adapter, $page = 1) | 27 | public function prepare(AdapterInterface $adapter, $page = 1) |
28 | { | 28 | { |
29 | $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; | ||
30 | |||
31 | if (null === $user || !is_object($user)) { | ||
32 | return null; | ||
33 | } | ||
34 | |||
29 | $entries = new Pagerfanta($adapter); | 35 | $entries = new Pagerfanta($adapter); |
30 | $entries->setMaxPerPage($this->user->getConfig()->getItemsPerPage()); | 36 | $entries->setMaxPerPage($user->getConfig()->getItemsPerPage()); |
31 | 37 | ||
32 | return $entries; | 38 | return $entries; |
33 | } | 39 | } |