Merge pull request #2555 from dkrmr/fix_update_script

Reorder variable assignation in update.sh script, fix #2554

diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index 3c597b5db51a44af1619364297776df744c8ef3c..a3e36fddd344304ed9c5630a38a905fba27f8bf8 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -12,7 +12,7 @@ use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 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
 {
@@ -22,13 +22,18 @@ class EntryFilterType extends AbstractType
     /**
      * Repository & user are used to get a list of language entries for this user.
      *
-     * @param EntityRepository $entryRepository
-     * @param TokenStorage     $token
+     * @param EntityRepository      $entryRepository
+     * @param TokenStorageInterface $tokenStorage
      */
-    public function __construct(EntityRepository $entryRepository, TokenStorage $token)
+    public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage)
     {
         $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)

diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
index f9066bee7dfab1d24acaf2a9cee41bcd01809467..7d3798b95523b96e13c789df9abb0de18a101a78 100644 (file)
--- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
+++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
@@ -5,16 +5,16 @@ namespace Wallabag\CoreBundle\Helper;
 use Pagerfanta\Adapter\AdapterInterface;
 use Pagerfanta\Pagerfanta;
 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
 {
-    private $user;
     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;
     }
 
@@ -26,8 +26,14 @@ class PreparePagerForEntries
      */
     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->setMaxPerPage($this->user->getConfig()->getItemsPerPage());
+        $entries->setMaxPerPage($user->getConfig()->getItemsPerPage());
 
         return $entries;
     }