oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Upgrade from lexik/form-filter-bundle to spiriitlabs/form-filter-bundle

Browse source
This commit is contained in:
Yassine Guedidi 2024-01-19 21:43:33 +01:00
parent 17c9dbdbff
commit 25474a7b99
10 changed files with 74 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/EntryController.php
View file

@ -5,10 +5,10 @@ namespace Wallabag\CoreBundle\Controller;
use Craue\ConfigBundle\Util\Config;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\NoResultException;
use Lexik\Bundle\FormFilterBundle\Filter\FilterBuilderUpdaterInterface;
use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
use Pagerfanta\Exception\OutOfRangeCurrentPageException;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
use Spiriit\Bundle\FormFilterBundle\Filter\FilterBuilderUpdaterInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;

6
src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
View file

@ -2,12 +2,12 @@
namespace Wallabag\CoreBundle\Event\Subscriber;
use Lexik\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
use Lexik\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
use Spiriit\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
use Spiriit\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
* This custom class override the default behavior of LexikFilterBundle on `filter_date_range`
* This custom class override the default behavior of SpiriitFormFilterBundle on `filter_date_range`
* It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59).
*/
class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface

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

@ -2,14 +2,14 @@
namespace Wallabag\CoreBundle\Form\Type;
use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType;
use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType;
use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberFilterType;
use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType;
use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType;
use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
use Spiriit\Bundle\FormFilterBundle\Filter\FilterOperands;
use Spiriit\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType;
use Spiriit\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
use Spiriit\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType;
use Spiriit\Bundle\FormFilterBundle\Filter\Form\Type\NumberFilterType;
use Spiriit\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType;
use Spiriit\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType;
use Spiriit\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\HttpFoundation\Response;

2
src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
View file

@ -113,7 +113,6 @@
<tr><td>kphoen/rulerz</td><td>MIT</td></tr>
<tr><td>kphoen/rulerz-bundle</td><td>MIT</td></tr>
<tr><td>kriswallsmith/assetic</td><td>MIT</td></tr>
<tr><td>lexik/form-filter-bundle</td><td>MIT</td></tr>
<tr><td>mgargano/simplehtmldom</td><td>MIT</td></tr>
<tr><td>michelf/php-markdown</td><td>BSD-3-Clause</td></tr>
<tr><td>monolog/monolog</td><td>MIT</td></tr>
@ -132,6 +131,7 @@
<tr><td>sensio/framework-extra-bundle</td><td>MIT</td></tr>
<tr><td>simplepie/simplepie</td><td>BSD-3-Clause</td></tr>
<tr><td>smalot/pdfparser</td><td>GPL-3.0</td></tr>
<tr><td>spiriitlabs/form-filter-bundle</td><td>MIT</td></tr>
<tr><td>sonata-project/google-authenticator</td><td>MIT</td></tr>
<tr><td>stof/doctrine-extensions-bundle</td><td>MIT</td></tr>
<tr><td>symfony/assetic-bundle</td><td>MIT</td></tr>