X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FForm%2FType%2FEntryFilterType.php;h=ee66c728a88558cd21511076782418ef62674ab3;hb=68cb89a5161351dd730871fc834bf147204a2a07;hp=8e2883f766a5614ffe5a0ed449e33c9e20dd2c17;hpb=8add306204f2ad331dafe091bb9d168ce7781df7;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index 8e2883f7..ee66c728 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -13,7 +13,7 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 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
 {
@@ -23,13 +23,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)
@@ -85,7 +90,7 @@ class EntryFilterType extends AbstractType
                     if (strlen($value) <= 2 || empty($value)) {
                         return;
                     }
-                    $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%'));
+                    $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->lower($filterQuery->getExpr()->literal('%'.$value.'%')));
 
                     return $filterQuery->createCondition($expression);
                 },