mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-05 23:18:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2556 from wallabag/replace-tokenstorage

Browse source 
Replaced TokenStorage with TokenStorageInterface
This commit is contained in:
Nicolas Lœuillet 2016-11-07 11:13:50 +01:00 committed by GitHub
commit a4de2351a0
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
View file

@ -12,7 +12,7 @@ use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
class EntryFilterType extends AbstractType class EntryFilterType extends AbstractType
{ {
@ -23,12 +23,17 @@ class EntryFilterType extends AbstractType
* Repository & user are used to get a list of language entries for this user. * Repository & user are used to get a list of language entries for this user.
* *
* @param EntityRepository $entryRepository * @param EntityRepository $entryRepository
* @param TokenStorage $token * @param TokenStorageInterface $tokenStorage
*/ */
public function __construct(EntityRepository $entryRepository, TokenStorage $token) public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage)
{ {
$this->repository = $entryRepository; $this->repository = $entryRepository;
$this->user = $token->getToken()->getUser();
$this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null;
if (null === $this->user || !is_object($this->user)) {
return null;
}
} }
public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)

16
src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
View file

@ -5,16 +5,16 @@ namespace Wallabag\CoreBundle\Helper;
use Pagerfanta\Adapter\AdapterInterface; use Pagerfanta\Adapter\AdapterInterface;
use Pagerfanta\Pagerfanta; use Pagerfanta\Pagerfanta;
use Symfony\Component\Routing\Router; use Symfony\Component\Routing\Router;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
class PreparePagerForEntries class PreparePagerForEntries
{ {
private $user;
private $router; private $router;
private $tokenStorage;
public function __construct(TokenStorage $token, Router $router) public function __construct(TokenStorageInterface $tokenStorage, Router $router)
{ {
$this->user = $token->getToken()->getUser(); $this->tokenStorage = $tokenStorage;
$this->router = $router; $this->router = $router;
} }
@ -26,8 +26,14 @@ class PreparePagerForEntries
*/ */
public function prepare(AdapterInterface $adapter, $page = 1) public function prepare(AdapterInterface $adapter, $page = 1)
{ {
$user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
if (null === $user || !is_object($user)) {
return null;
}
$entries = new Pagerfanta($adapter); $entries = new Pagerfanta($adapter);
$entries->setMaxPerPage($this->user->getConfig()->getItemsPerPage()); $entries->setMaxPerPage($user->getConfig()->getItemsPerPage());
return $entries; return $entries;
} }