From f1e543ab58d043e9e3dae6038705c5ec52a85f51 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 8 Feb 2020 21:46:46 +0100
Subject: [PATCH 001/264] Add 3.0.x-dev branch

---
 README.md     | 2 ++
 composer.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 694692c..bf05412 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,5 @@ EcommitCrudBundle
 ==================
 
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/ee0677db-2ad9-4248-9b61-ab00020317b5/big.png)](https://insight.sensiolabs.com/projects/ee0677db-2ad9-4248-9b61-ab00020317b5)
+
+**WARNING: This branch is under development. Not use in production. You can use stable versions or 2.5 branch.**
diff --git a/composer.json b/composer.json
index 66d9b73..afb3e68 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }

From b735b8e5a329c2ee5890010be1b655cc5b96a28c Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 25 Apr 2020 19:02:33 +0200
Subject: [PATCH 002/264] Remove depreciations

---
 Controller/CrudControllerTrait.php            | 31 +------------------
 Crud/Crud.php                                 | 16 ----------
 DoctrineExtension/Paginate.php                | 21 +------------
 Form/Filter/FieldFilterEntity.php             | 13 +-------
 ...ieldFilterJqueryAutocompleteEntityAjax.php | 13 +-------
 Form/Filter/FieldFilterSelect2EntityAjax.php  | 13 +-------
 .../FieldFilterTokenInputEntitiesAjax.php     | 13 +-------
 Helper/CrudHelper.php                         |  2 +-
 Paginator/ArrayPaginator.php                  | 28 -----------------
 Paginator/DoctrineDBALPaginator.php           | 14 ---------
 10 files changed, 7 insertions(+), 157 deletions(-)

diff --git a/Controller/CrudControllerTrait.php b/Controller/CrudControllerTrait.php
index 9e1caab..dd519fe 100644
--- a/Controller/CrudControllerTrait.php
+++ b/Controller/CrudControllerTrait.php
@@ -80,36 +80,7 @@ protected function afterBuildQuery()
      * @param string $action Action
      * @return string
      */
-    protected function getTemplateName($action)
-    {
-        trigger_error('The "getTemplateName" must be overrided. This method will soon be abstract.', E_USER_DEPRECATED);
-
-        return $this->getPathView($action);
-    }
-
-    /**
-     * Returns the path of the template given
-     *
-     * @param string $name Template name
-     * @return string
-     * @deprecated Deprecated since version 2.4. Override getTemplateName method instead.
-     */
-    protected function getPathView($name)
-    {
-        trigger_error('The "getPathView" method is deprecated since version 2.4. Override "getTemplateName" method instead.', E_USER_DEPRECATED);
-
-        if (preg_match('/^(?P<vendor>\w+)\\\(?P<bundle>\w+)\\\Controller\\\(?P<controller>\w+)Controller$/', get_class($this), $matches)) {
-            return sprintf('%s%s:%s:%s.html.twig', $matches['vendor'], $matches['bundle'], $matches['controller'], $name);
-        } elseif (preg_match('/^(?P<vendor>\w+)\\\(?P<bundle>\w+)\\\Controller\\\(?P<dir>\w+)\\\(?P<controller>\w+)Controller$/', get_class($this), $matches)) {
-            return sprintf('%s%s:%s/%s:%s.html.twig', $matches['vendor'], $matches['bundle'], $matches['dir'], $matches['controller'], $name);
-        } elseif (preg_match('/^AppBundle\\\Controller\\\(?P<controller>\w+)Controller$/', get_class($this), $matches)) {
-            return sprintf('AppBundle:%s:%s.html.twig', $matches['controller'], $name);
-        } elseif (preg_match('/^AppBundle\\\Controller\\\(?P<dir>\w+)\\\(?P<controller>\w+)Controller$/', get_class($this), $matches)) {
-            return sprintf('AppBundle:%s/%s:%s.html.twig', $matches['dir'], $matches['controller'], $name);
-        }
-
-        new \Exception('getPathView: Bad structure');
-    }
+    abstract protected function getTemplateName($action);
 
     public function autoAjaxListAction()
     {
diff --git a/Crud/Crud.php b/Crud/Crud.php
index ea1320f..0dd2238 100644
--- a/Crud/Crud.php
+++ b/Crud/Crud.php
@@ -51,7 +51,6 @@ class Crud
     protected $defaultFormSearcherData = null;
 
     protected $queryBuilder = null;
-    protected $useDbal = false; //Deprecated. Not used
     protected $persistentSettings = false;
     protected $updateDatabase = false;
     protected $paginator = null;
@@ -367,21 +366,6 @@ public function setBuildPaginator($value)
         return $this;
     }
 
-    /*
-     * Use (or not) DBAL
-     * 
-     * @param bool $value
-     * @deprecated Deprecated since version 2.3.
-     */
-    public function setUseDbal($value)
-    {
-        trigger_error('setUseDbal is deprecated since 2.3 version.', E_USER_DEPRECATED);
-
-        $this->useDbal = $value;
-
-        return $this;
-    }
-
     /*
      * Use (or not) persistent settings
      * 
diff --git a/DoctrineExtension/Paginate.php b/DoctrineExtension/Paginate.php
index 0b40e58..8e45236 100644
--- a/DoctrineExtension/Paginate.php
+++ b/DoctrineExtension/Paginate.php
@@ -12,7 +12,6 @@
 namespace Ecommit\CrudBundle\DoctrineExtension;
 
 use Doctrine\ORM\NativeQuery;
-use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Tools\Pagination\Paginator;
@@ -26,25 +25,7 @@
 class Paginate
 {
     /**
-     * Returns total results (SQL function "count")
-     * 
-     * @param Query $query
-     * @param bool $simplifiedRequest  Use simplified request (not subrequest and not order by) or not
-     * @return int
-     * @deprecated Deprecated since version 2.4. Use countQueryBuilder or Doctrine\ORM\Tools\Pagination\Paginator::count method instead.
-     */
-    static public function count(Query $query, $simplifiedRequest = true)
-    {
-        trigger_error('Paginate::count is deprecated since 2.4 version. Use countQueryBuilder or Doctrine\ORM\Tools\Pagination\Paginator::count method instead.', E_USER_DEPRECATED);
-
-        $doctrinePaginator = new Paginator($query);
-        $doctrinePaginator->setUseOutputWalkers(!$simplifiedRequest);
-
-        return $doctrinePaginator->count();
-    }
-
-    /**
-     * @param \Doctrine\ORM\QueryBuilde|\Doctrine\DBAL\Query\QueryBuilder $queryBuilder
+     * @param \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder $queryBuilder
      * @param array $options
      * @return int
      * @throws \Exception
diff --git a/Form/Filter/FieldFilterEntity.php b/Form/Filter/FieldFilterEntity.php
index 09cf17f..d7e34e5 100644
--- a/Form/Filter/FieldFilterEntity.php
+++ b/Form/Filter/FieldFilterEntity.php
@@ -14,7 +14,6 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Ecommit\JavascriptBundle\Form\Type\EntityNormalizerTrait;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 
@@ -36,17 +35,7 @@ protected function configureOptions(OptionsResolver $resolver)
 
         $resolver->setDefaults(
             array(
-                'property' => null, // deprecated since 2.2, use "choice_label"
-                'choice_label' => function (Options $options) {
-                    // BC with the "property" option
-                    if ($options['property']) {
-                        trigger_error('The "property" option is deprecated since version 2.2. Use "choice_label" instead.', E_USER_DEPRECATED);
-
-                        return $options['property'];
-                    }
-
-                    return null;
-                },
+                'choice_label' => null,
                 'em' => null,
                 'query_builder' => null,
                 'identifier' => null,
diff --git a/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php b/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
index 860f14c..144b5aa 100644
--- a/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
+++ b/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
@@ -13,7 +13,6 @@
 use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
 use Ecommit\JavascriptBundle\Form\Type\JqueryAutocompleteEntityAjaxType;
 use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints as Assert;
 
@@ -28,17 +27,7 @@ protected function configureOptions(OptionsResolver $resolver)
             array(
                 'em' => null,
                 'query_builder' => null,
-                'property' => null, // deprecated since 2.2, use "choice_label"
-                'choice_label' => function (Options $options) {
-                    // BC with the "property" option
-                    if ($options['property']) {
-                        trigger_error('The "property" option is deprecated since version 2.2. Use "choice_label" instead.', E_USER_DEPRECATED);
-
-                        return $options['property'];
-                    }
-
-                    return null;
-                },
+                'choice_label' => null,
                 'identifier' => null,
                 'url' => null, //Required in FormType if route_name is empty
                 'route_name' => null,
diff --git a/Form/Filter/FieldFilterSelect2EntityAjax.php b/Form/Filter/FieldFilterSelect2EntityAjax.php
index 0b3af32..06c0b5e 100644
--- a/Form/Filter/FieldFilterSelect2EntityAjax.php
+++ b/Form/Filter/FieldFilterSelect2EntityAjax.php
@@ -12,7 +12,6 @@
 
 use Ecommit\JavascriptBundle\Form\Type\Select2\Select2EntityAjaxType;
 use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class FieldFilterSelect2EntityAjax extends FieldFilterChoice
@@ -26,17 +25,7 @@ protected function configureOptions(OptionsResolver $resolver)
             array(
                 'em' => null,
                 'query_builder' => null,
-                'property' => null, // deprecated since 2.2, use "choice_label"
-                'choice_label' => function (Options $options) {
-                    // BC with the "property" option
-                    if ($options['property']) {
-                        trigger_error('The "property" option is deprecated since version 2.2. Use "choice_label" instead.', E_USER_DEPRECATED);
-
-                        return $options['property'];
-                    }
-
-                    return null;
-                },
+                'choice_label' => null,
                 'identifier' => null,
                 'url' => null, //Required in FormType if route_name is empty
                 'route_name' => null,
diff --git a/Form/Filter/FieldFilterTokenInputEntitiesAjax.php b/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
index 271cd9a..7364b18 100644
--- a/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
+++ b/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
@@ -14,7 +14,6 @@
 use Ecommit\JavascriptBundle\Form\Type\TokenInputEntitiesAjaxType;
 use Ecommit\UtilBundle\Util\Util;
 use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints as Assert;
 
@@ -29,17 +28,7 @@ protected function configureOptions(OptionsResolver $resolver)
             array(
                 'em' => null,
                 'query_builder' => null,
-                'property' => null, // deprecated since 2.2, use "choice_label"
-                'choice_label' => function (Options $options) {
-                    // BC with the "property" option
-                    if ($options['property']) {
-                        trigger_error('The "property" option is deprecated since version 2.2. Use "choice_label" instead.', E_USER_DEPRECATED);
-
-                        return $options['property'];
-                    }
-
-                    return null;
-                },
+                'choice_label' => null,
                 'identifier' => null,
                 'url' => null, //Required in FormType if route_name is empty
                 'route_name' => null,
diff --git a/Helper/CrudHelper.php b/Helper/CrudHelper.php
index a34a95c..32d22c9 100644
--- a/Helper/CrudHelper.php
+++ b/Helper/CrudHelper.php
@@ -673,7 +673,7 @@ public function remoteModal($modalId, $url, $options, $ajaxOptions)
      * Returns modal form tag
      *
      * @param string $modalId Modal id
-     * @param FormView|string $form The form or the url. Url is deprecated since 2.2 version
+     * @param FormView|string $form The form or the url.
      * @param array $ajaxOptions Ajax options
      * @param array $htmlOptions Html options
      * @return string
diff --git a/Paginator/ArrayPaginator.php b/Paginator/ArrayPaginator.php
index 42843b0..00fa575 100644
--- a/Paginator/ArrayPaginator.php
+++ b/Paginator/ArrayPaginator.php
@@ -47,34 +47,6 @@ public function init()
         }
     }
 
-    /**
-     * Set an array of results
-     *
-     * @param array|ArrayIterator $results
-     * @return ArrayPaginator
-     * @deprecated Deprecated since version 2.2. Use setData method instead.
-     */
-    public function setResults($results)
-    {
-        trigger_error('setResults is deprecated since 2.2 version. Use setData instead', E_USER_DEPRECATED);
-
-        return $this->setData($results);
-    }
-
-    /**
-     * Set an array of results without slice
-     *
-     * @param array|ArrayIterator $results
-     * @param Int $manualCountResults
-     * @deprecated Deprecated since version 2.2. Use setDataWithoutSlice method instead.
-     */
-    public function setResultsWithoutSlice($results, $manualCountResults)
-    {
-        trigger_error('setResultsWithoutSlice is deprecated since 2.2 version. Use setDataWithoutSlice instead', E_USER_DEPRECATED);
-
-        return $this->setDataWithoutSlice($results, $manualCountResults);
-    }
-
     /**
      * Set an array of results
      *
diff --git a/Paginator/DoctrineDBALPaginator.php b/Paginator/DoctrineDBALPaginator.php
index 3b07fa9..698e287 100644
--- a/Paginator/DoctrineDBALPaginator.php
+++ b/Paginator/DoctrineDBALPaginator.php
@@ -37,20 +37,6 @@ public function initPaginator()
         }
     }
 
-    /**
-     * Sets the QueryBuilder
-     *
-     * @param mixed $query
-     * @return DoctrineDBALPaginator
-     * @deprecated Deprecated since version 2.2. Use setQueryBuilder method instead.
-     */
-    public function setDbalQueryBuilder($query)
-    {
-        trigger_error('setDbalQueryBuilder is deprecated since 2.2 version. Use setQueryBuilder instead', E_USER_DEPRECATED);
-
-        return $this->setQueryBuilder($query);
-    }
-
     /**
      * {@inheritDoc}
      */

From 253705870711df90e8ecedffc2cfe74bf26a61f7 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 26 Apr 2020 14:21:29 +0200
Subject: [PATCH 003/264] Remove AbstractCrudLegacyController.
 AbstractController extends now
 Symfony\Bundle\FrameworkBundle\Controller\AbstractController (before extended
 Symfony\Component\DependencyInjection\ContainerAwareTrait)

---
 Controller/AbstractCrudController.php       | 21 ++++++----------
 Controller/AbstractCrudLegacyController.php | 27 ---------------------
 2 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 Controller/AbstractCrudLegacyController.php

diff --git a/Controller/AbstractCrudController.php b/Controller/AbstractCrudController.php
index 71eb8b9..5118a90 100644
--- a/Controller/AbstractCrudController.php
+++ b/Controller/AbstractCrudController.php
@@ -11,25 +11,18 @@
 
 namespace Ecommit\CrudBundle\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-abstract class AbstractCrudController implements ContainerAwareInterface
+abstract class AbstractCrudController extends AbstractController
 {
-    use ContainerAwareTrait;
-    use ControllerTrait;
     use CrudControllerTrait;
 
-    /**
-     * Gets a container configuration parameter by its name.
-     *
-     * @return mixed
-     *
-     * @final
-     */
-    protected function getParameter(string $name)
+    public static function getSubscribedServices()
     {
-        return $this->container->getParameter($name);
+        return array_merge(
+            parent::getSubscribedServices(),
+            self::getCrudRequiredServices()
+        );
     }
 }
diff --git a/Controller/AbstractCrudLegacyController.php b/Controller/AbstractCrudLegacyController.php
deleted file mode 100644
index 757c813..0000000
--- a/Controller/AbstractCrudLegacyController.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-
-abstract class AbstractCrudLegacyController extends AbstractController
-{
-    use CrudControllerTrait;
-
-    public static function getSubscribedServices()
-    {
-        return array_merge(
-            parent::getSubscribedServices(),
-            self::getCrudRequiredServices()
-        );
-    }
-}

From 70671b671c89cba24368ec16fe01c1bb65be3b53 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 2 May 2020 19:38:18 +0200
Subject: [PATCH 004/264] Add functional tests

---
 .editorconfig                                 |   9 +
 .gitignore                                    |   5 +
 .travis.yml                                   |  18 +
 Tests/App/Controller/UserController.php       |  64 ++++
 Tests/App/DataFixtures/TestUserFixtures.php   |  46 +++
 Tests/App/Entity/TestUser.php                 |  89 +++++
 Tests/App/Form/Searcher/UserSearcher.php      |  33 ++
 Tests/App/Kernel.php                          |  63 ++++
 Tests/App/config/bootstrap.php                |  10 +
 Tests/App/config/doctrine.yaml                |  22 ++
 Tests/App/config/framework.yaml               |   5 +
 Tests/App/config/routes.yaml                  |  11 +
 Tests/App/config/security.yaml                |   5 +
 Tests/App/config/services.yaml                |  14 +
 Tests/App/public/index.php                    |  27 ++
 Tests/App/templates/layout.html.twig          |  11 +
 Tests/App/templates/user/index.html.twig      |  11 +
 Tests/App/templates/user/list.html.twig       |  29 ++
 Tests/App/templates/user/search.html.twig     |  12 +
 .../Controller/TestCrudControllerTest.php     | 327 ++++++++++++++++++
 Tests/bootstrap.php                           |  33 ++
 composer.json                                 |  50 ++-
 phpunit.xml.dist                              |  26 ++
 23 files changed, 901 insertions(+), 19 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .gitignore
 create mode 100644 .travis.yml
 create mode 100644 Tests/App/Controller/UserController.php
 create mode 100644 Tests/App/DataFixtures/TestUserFixtures.php
 create mode 100644 Tests/App/Entity/TestUser.php
 create mode 100644 Tests/App/Form/Searcher/UserSearcher.php
 create mode 100644 Tests/App/Kernel.php
 create mode 100644 Tests/App/config/bootstrap.php
 create mode 100644 Tests/App/config/doctrine.yaml
 create mode 100644 Tests/App/config/framework.yaml
 create mode 100644 Tests/App/config/routes.yaml
 create mode 100644 Tests/App/config/security.yaml
 create mode 100644 Tests/App/config/services.yaml
 create mode 100644 Tests/App/public/index.php
 create mode 100644 Tests/App/templates/layout.html.twig
 create mode 100644 Tests/App/templates/user/index.html.twig
 create mode 100644 Tests/App/templates/user/list.html.twig
 create mode 100644 Tests/App/templates/user/search.html.twig
 create mode 100644 Tests/Functional/Controller/TestCrudControllerTest.php
 create mode 100644 Tests/bootstrap.php
 create mode 100644 phpunit.xml.dist

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..0e740ce
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+end_of_line = LF
+insert_final_newline = true
+indent_style = space
+indent_size = 4
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d7c9146
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.php_cs.cache
+.phpunit.result.cache
+composer.lock
+Tests/App/var/
+vendor/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..af268da
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+language: php
+php:
+    - 7.2
+    - 7.3
+    - 7.4
+
+env:
+    - DEPENDENCIES="high"
+    - DEPENDENCIES="low"
+
+addons:
+    firefox: latest
+
+install:
+    - if [ "$DEPENDENCIES" = "low" ]; then composer update --prefer-lowest --prefer-stable; else composer install; fi;
+
+script:
+    - php vendor/phpunit/phpunit/phpunit
diff --git a/Tests/App/Controller/UserController.php b/Tests/App/Controller/UserController.php
new file mode 100644
index 0000000..62096ac
--- /dev/null
+++ b/Tests/App/Controller/UserController.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\App\Controller;
+
+use Ecommit\CrudBundle\Controller\AbstractCrudController;
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Tests\App\Entity\TestUser;
+use Ecommit\CrudBundle\Tests\App\Form\Searcher\UserSearcher;
+
+class UserController extends AbstractCrudController
+{
+    protected function configCrud()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $queryBuilder = $em->getRepository(TestUser::class)
+            ->createQueryBuilder('u')
+            ->select('u');
+
+        $crud = $this->createCrud('user');
+        $crud->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
+            ->addColumn('firstName', 'u.firstName', 'first_name')
+            ->addColumn('lastName', 'u.lastName', 'last_name')
+            ->setQueryBuilder($queryBuilder)
+            ->setAvailableResultsPerPage([5, 5, 10, 50], 5)
+            ->setDefaultSort('firstName', Crud::ASC)
+            ->createSearcherForm(new UserSearcher())
+            ->setRoute('user_ajax_list')
+            ->setSearchRoute('user_ajax_search')
+            ->setPersistentSettings(true)
+            ->init();
+
+        return $crud;
+    }
+
+    protected function getTemplateName($action)
+    {
+        return sprintf('user/%s.html.twig', $action);
+    }
+
+    public function listAction()
+    {
+        return $this->autoListAction();
+    }
+
+    public function ajaxListAction()
+    {
+        return $this->autoAjaxListAction();
+    }
+
+    public function ajaxSearchAction()
+    {
+        return $this->autoAjaxSearchAction();
+    }
+}
diff --git a/Tests/App/DataFixtures/TestUserFixtures.php b/Tests/App/DataFixtures/TestUserFixtures.php
new file mode 100644
index 0000000..c5f9e08
--- /dev/null
+++ b/Tests/App/DataFixtures/TestUserFixtures.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\App\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
+use Ecommit\CrudBundle\Tests\App\Entity\TestUser;
+
+class TestUserFixtures extends Fixture
+{
+    public function load(ObjectManager $manager)
+    {
+        $dataSet = [
+            ['Eve', 'Reste'],
+            ['Henri', 'Poste'],
+            ['Henri', 'Plait'],
+            ['Jean', 'Serrien'],
+            ['Clément', 'Tine'],
+            ['Aude', 'Javel'],
+            ['Yvon', 'Embavé'],
+            ['Judie', 'Cieux'],
+            ['Paul', 'Ochon'],
+            ['Sarah', 'Pelle'],
+            ['Thierry', 'Gollo'],
+        ];
+
+        foreach ($dataSet as $data) {
+            $user = new TestUser();
+            $user->setUsername($data[0].$data[1])
+                ->setFirstName($data[0])
+                ->setLastName($data[1]);
+            $manager->persist($user);
+        }
+
+        $manager->flush();
+    }
+}
diff --git a/Tests/App/Entity/TestUser.php b/Tests/App/Entity/TestUser.php
new file mode 100644
index 0000000..9770a7f
--- /dev/null
+++ b/Tests/App/Entity/TestUser.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Ecommit\CrudBundle\Entity\UserCrudInterface;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="user")
+ */
+class TestUser implements UserCrudInterface
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $userId;
+
+    /**
+     * @ORM\Column(type="string", length=180, unique=true)
+     */
+    protected $username;
+
+    /**
+     * @ORM\Column(type="string", length=30)
+     */
+    protected $firstName;
+
+    /**
+     * @ORM\Column(type="string", length=30)
+     */
+    protected $lastName;
+
+    /*
+     * Getters / Setters (auto-generated)
+     */
+
+    public function getUserId(): ?int
+    {
+        return $this->userId;
+    }
+
+    public function setUsername(?string $username): self
+    {
+        $this->username = $username;
+
+        return $this;
+    }
+
+    public function getUsername(): ?string
+    {
+        return $this->username;
+    }
+
+    public function setFirstName(?string $firstName): self
+    {
+        $this->firstName = $firstName;
+
+        return $this;
+    }
+
+    public function getFirstName(): ?string
+    {
+        return $this->firstName;
+    }
+
+    public function setLastName(?string $lastName): self
+    {
+        $this->lastName = $lastName;
+
+        return $this;
+    }
+
+    public function getLastName(): ?string
+    {
+        return $this->lastName;
+    }
+}
diff --git a/Tests/App/Form/Searcher/UserSearcher.php b/Tests/App/Form/Searcher/UserSearcher.php
new file mode 100644
index 0000000..03c2cfe
--- /dev/null
+++ b/Tests/App/Form/Searcher/UserSearcher.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\App\Form\Searcher;
+
+use Ecommit\CrudBundle\Form\Filter as Filter;
+use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
+
+class UserSearcher extends AbstractFormSearcher
+{
+    public $username;
+
+    public $firstName;
+
+    public $lastName;
+
+    public function configureFieldsFilter()
+    {
+        return [
+            new Filter\FieldFilterText('username', 'username', []),
+            new Filter\FieldFilterText('firstName', 'firstName', []),
+            new Filter\FieldFilterText('lastName', 'lastName', []),
+        ];
+    }
+}
diff --git a/Tests/App/Kernel.php b/Tests/App/Kernel.php
new file mode 100644
index 0000000..2f8a99e
--- /dev/null
+++ b/Tests/App/Kernel.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\App;
+
+use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
+use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
+use Ecommit\CrudBundle\EcommitCrudBundle;
+use Ecommit\JavascriptBundle\EcommitJavascriptBundle;
+use Ecommit\UtilBundle\EcommitUtilBundle;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Bundle\SecurityBundle\SecurityBundle;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+use Symfony\Component\Routing\RouteCollectionBuilder;
+
+class Kernel extends BaseKernel
+{
+    use MicroKernelTrait;
+
+    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
+    {
+        $loader->load($this->getProjectDir().'/config/framework.yaml');
+        $loader->load($this->getProjectDir().'/config/doctrine.yaml');
+        $loader->load($this->getProjectDir().'/config/security.yaml');
+        $loader->load($this->getProjectDir().'/config/services.yaml');
+    }
+
+    public function registerBundles()
+    {
+        return [
+            new TwigBundle(),
+            new DoctrineBundle(),
+            new DoctrineFixturesBundle(),
+            new FrameworkBundle(),
+            new SecurityBundle(),
+            new EcommitCrudBundle(),
+            new EcommitJavascriptBundle(),
+            new EcommitUtilBundle(),
+        ];
+    }
+
+    protected function configureRoutes(RouteCollectionBuilder $routes): void
+    {
+        $routes->import($this->getProjectDir().'/config/routes.yaml');
+    }
+
+    public function getProjectDir()
+    {
+        return __DIR__;
+    }
+}
diff --git a/Tests/App/config/bootstrap.php b/Tests/App/config/bootstrap.php
new file mode 100644
index 0000000..442c378
--- /dev/null
+++ b/Tests/App/config/bootstrap.php
@@ -0,0 +1,10 @@
+<?php
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__).'/../../vendor/autoload.php';
+
+$_SERVER += $_ENV;
+$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
+$_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
+$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';
diff --git a/Tests/App/config/doctrine.yaml b/Tests/App/config/doctrine.yaml
new file mode 100644
index 0000000..89219bd
--- /dev/null
+++ b/Tests/App/config/doctrine.yaml
@@ -0,0 +1,22 @@
+doctrine:
+    dbal:
+        connections:
+            default:
+                url: "sqlite:///%kernel.project_dir%/var/app.db"
+                logging: false
+
+    orm:
+        auto_generate_proxy_classes: false
+        entity_managers:
+            default:
+                connection: default
+                auto_mapping: true
+                mappings:
+                    App:
+                        is_bundle: false
+                        type: annotation
+                        dir: '%kernel.project_dir%/Entity'
+                        prefix: 'Ecommit\CrudBundle\Tests\App\Entity'
+                naming_strategy: doctrine.orm.naming_strategy.underscore
+        resolve_target_entities:
+            Ecommit\CrudBundle\Entity\UserCrudInterface: Ecommit\CrudBundle\Tests\App\Entity\TestUser
diff --git a/Tests/App/config/framework.yaml b/Tests/App/config/framework.yaml
new file mode 100644
index 0000000..5b380ad
--- /dev/null
+++ b/Tests/App/config/framework.yaml
@@ -0,0 +1,5 @@
+framework:
+    secret: test
+    test: true
+    session:
+        storage_id: session.storage.mock_file
diff --git a/Tests/App/config/routes.yaml b/Tests/App/config/routes.yaml
new file mode 100644
index 0000000..edea24d
--- /dev/null
+++ b/Tests/App/config/routes.yaml
@@ -0,0 +1,11 @@
+user_list:
+    path: /user
+    controller: Ecommit\CrudBundle\Tests\App\Controller\UserController::listAction
+
+user_ajax_list:
+    path: /user/ajax-list
+    controller: Ecommit\CrudBundle\Tests\App\Controller\UserController::ajaxListAction
+
+user_ajax_search:
+    path: /user/ajax-search
+    controller: Ecommit\CrudBundle\Tests\App\Controller\UserController::ajaxSearchAction
diff --git a/Tests/App/config/security.yaml b/Tests/App/config/security.yaml
new file mode 100644
index 0000000..bd0f9e0
--- /dev/null
+++ b/Tests/App/config/security.yaml
@@ -0,0 +1,5 @@
+security:
+    firewalls:
+        main:
+            pattern: ^/
+            anonymous: true
diff --git a/Tests/App/config/services.yaml b/Tests/App/config/services.yaml
new file mode 100644
index 0000000..b0904a6
--- /dev/null
+++ b/Tests/App/config/services.yaml
@@ -0,0 +1,14 @@
+parameters:
+    locale: 'en'
+
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Ecommit\CrudBundle\Tests\App\DataFixtures\:
+        resource: '../DataFixtures'
+
+    Ecommit\CrudBundle\Tests\App\Controller\:
+        resource: '../Controller'
+        tags: ['controller.service_arguments']
diff --git a/Tests/App/public/index.php b/Tests/App/public/index.php
new file mode 100644
index 0000000..bad74f1
--- /dev/null
+++ b/Tests/App/public/index.php
@@ -0,0 +1,27 @@
+<?php
+
+use Ecommit\CrudBundle\Tests\App\Kernel;
+use Symfony\Component\ErrorHandler\Debug;
+use Symfony\Component\HttpFoundation\Request;
+
+require dirname(__DIR__).'/config/bootstrap.php';
+
+if ($_SERVER['APP_DEBUG']) {
+    umask(0000);
+
+    Debug::enable();
+}
+
+if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
+    Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
+}
+
+if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
+    Request::setTrustedHosts([$trustedHosts]);
+}
+
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+$request = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);
diff --git a/Tests/App/templates/layout.html.twig b/Tests/App/templates/layout.html.twig
new file mode 100644
index 0000000..439fd1a
--- /dev/null
+++ b/Tests/App/templates/layout.html.twig
@@ -0,0 +1,11 @@
+<html>
+    <head>
+        <title>{% block title %}{% endblock %}</title>
+        <script src="https://code.jquery.com/jquery-3.5.0.min.js"></script>
+        {% block stylesheets %}{% endblock %}
+        {% block javascripts %}{% endblock %}
+    </head>
+    <body>
+        {% block content %}{% endblock %}
+    </body>
+</html>
diff --git a/Tests/App/templates/user/index.html.twig b/Tests/App/templates/user/index.html.twig
new file mode 100644
index 0000000..cfafad4
--- /dev/null
+++ b/Tests/App/templates/user/index.html.twig
@@ -0,0 +1,11 @@
+{% extends 'layout.html.twig' %}
+
+{% block content %}
+    <div id="crud_search">
+        {% include 'user/search.html.twig'  %}
+    </div>
+
+    <div id="crud_list">
+        {% include 'user/list.html.twig' %}
+    </div>
+{% endblock %}
diff --git a/Tests/App/templates/user/list.html.twig b/Tests/App/templates/user/list.html.twig
new file mode 100644
index 0000000..bc94ab9
--- /dev/null
+++ b/Tests/App/templates/user/list.html.twig
@@ -0,0 +1,29 @@
+<div>
+    <table class="result">
+        <thead>
+        <tr>
+            {{ crud_th('username', crud) }}
+            {{ crud_th('firstName', crud) }}
+            {{ crud_th('lastName', crud) }}
+        </tr>
+        </thead>
+        <tbody>
+        {% for user in crud.paginator %}
+            <tr data-username="{{ user.username }}">
+                {{ crud_td('username', crud, user.username|lower) }}
+                {{ crud_td('firstName', crud, user.firstName|capitalize) }}
+                {{ crud_td('lastName', crud, user.lastName|capitalize) }}
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+</div>
+
+<div class="info-pagination">
+    {% trans with {'%first%': crud.paginator.firstIndice, '%last%' : crud.paginator.lastIndice} %}Results %first%-%last%{% endtrans %}  -
+    {% trans with {'%page%': crud.paginator.page, '%lastPage%' : crud.paginator.lastPage} %}Page %page%/%lastPage%{% endtrans %}
+</div>
+
+{{ crud_paginator_links(crud) }}
+
+{{ crud_display_settings(crud, {modal: false}) }}
diff --git a/Tests/App/templates/user/search.html.twig b/Tests/App/templates/user/search.html.twig
new file mode 100644
index 0000000..a706b8e
--- /dev/null
+++ b/Tests/App/templates/user/search.html.twig
@@ -0,0 +1,12 @@
+{{ crud_search_form(crud, {}, {'class': 'form-inline'}) }}
+    {{ form_row(crud.searcherform.username) }}
+    {{ form_row(crud.searcherform.firstName) }}
+    {{ form_row(crud.searcherform.lastName) }}
+
+    <div>
+        <button type="submit">
+            {{ 'Search'|trans }}
+        </button>
+        {{ crud_search_reset(crud) }}
+    </div>
+</form>
diff --git a/Tests/Functional/Controller/TestCrudControllerTest.php b/Tests/Functional/Controller/TestCrudControllerTest.php
new file mode 100644
index 0000000..968cbb0
--- /dev/null
+++ b/Tests/Functional/Controller/TestCrudControllerTest.php
@@ -0,0 +1,327 @@
+<?php
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\Controller;
+
+use Ecommit\CrudBundle\Crud\Crud;
+use Symfony\Component\Panther\Client;
+use Symfony\Component\Panther\DomCrawler\Crawler;
+use Symfony\Component\Panther\PantherTestCase;
+
+class CrudControllerTest extends PantherTestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        static::$defaultOptions['browser'] = static::FIREFOX;
+    }
+
+    public function testList(): Client
+    {
+        $client = static::createPantherClient();
+        $client->request('GET', '/user/');
+
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
+        $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testList
+     */
+    public function testChangeSortSense(Client $client): Client
+    {
+        $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[text()="first_name"]');
+        $link->click();
+        $this->waitForAjax($client);
+
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['first_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('YvonEmbavé', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testChangeSortSense
+     */
+    public function testChangeSortColumn(Client $client): Client
+    {
+        $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[text()="last_name"]');
+        $link->click();
+        $this->waitForAjax($client);
+
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testChangeSortColumn
+     */
+    public function testChangeDisplayedColumns(Client $client): Client
+    {
+        $button = $client->getCrawler()->filterXPath('//button[contains(.,"Display Settings")]');
+        $button->first()->click();
+
+        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::input[@value="username"]')->click();
+        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::button[@type="submit"]')->click();
+        $this->waitForAjax($client);
+
+        $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testChangeDisplayedColumns
+     */
+    public function testChangePerPage(Client $client): Client
+    {
+        $button = $client->getCrawler()->filterXPath('//button[contains(., "Display Settings")]');
+        $button->first()->click();
+
+        $form = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::button[@type="submit"]')->form();
+        $form['crud_display_settings_user[resultsPerPage]'] = 10;
+        $client->submit($form);
+        $this->waitForAjax($client);
+
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testChangePerPage
+     */
+    public function testPersistentValuesAfterChangeSortAndSettings(Client $client): Client
+    {
+        $client->request('GET', '/user/');
+
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testPersistentValuesAfterChangeSortAndSettings
+     */
+    public function testChangePage(Client $client): Client
+    {
+        $page = $client->getCrawler()->filterXPath('//ul[@class="pagination"]/li/a[text()="2"]');
+        $page->first()->click();
+        $this->waitForAjax($client);
+
+        $this->assertSame([1, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([2, 2], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('JudieCieux', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testChangePage
+     */
+    public function testPersistentValuesAfterChangePage(Client $client): Client
+    {
+        $client->request('GET', '/user/');
+
+        $this->assertSame([1, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([2, 2], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('JudieCieux', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testPersistentValuesAfterChangePage
+     */
+    public function testSearch(Client $client): Client
+    {
+        $form = $client->getCrawler()->filterXPath('//div[@id="crud_search"]/descendant::button[@type="submit" and contains(text(), "Search")]')->form();
+        $form['crud_search_user[firstName]'] = 'Henri';
+        $client->submit($form);
+        $this->waitForAjax($client);
+
+        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('HenriPoste', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testSearch
+     */
+    public function testPersistentValuesAfterSearch(Client $client): Client
+    {
+        $client->request('GET', '/user/');
+
+        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('HenriPoste', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testPersistentValuesAfterSearch
+     */
+    public function testResetSearch(Client $client): Client
+    {
+        $button = $client->getCrawler()->filterXPath('//div[@id="crud_search"]/descendant::button[contains(text(), "Reset")]');
+        $button->first()->click();
+        $this->waitForAjax($client);
+
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testResetSearch
+     */
+    public function testPersistentValuesAfterResetSearch(Client $client): Client
+    {
+        $client->request('GET', '/user/');
+
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testPersistentValuesAfterResetSearch
+     */
+    public function testResetSettings(Client $client): Client
+    {
+        $button = $client->getCrawler()->filterXPath('//button[contains(., "Display Settings")]');
+        $button->first()->click();
+
+        $button = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::button[contains(text(), "Reset display settings")]');
+        $button->first()->click();
+        $this->waitForAjax($client);
+
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
+        $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testResetSettings
+     */
+    public function testPersistentValuesAfterResetSettings(Client $client): Client
+    {
+        $client->request('GET', '/user/');
+
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
+        $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
+
+        return $client;
+    }
+
+    protected function countRowsAndColumns(Crawler $crawler): array
+    {
+        $rows = $crawler->filterXPath('//table[@class="result"]/tbody/tr');
+        $countRows = \count($rows);
+        $columns = $rows->first()->filterXPath('td');
+        $countColumns = \count($columns);
+
+        return [$countRows, $countColumns];
+    }
+
+    protected function getPagination(Crawler $crawler): array
+    {
+        $infos = $crawler->filterXPath('//div[@class="info-pagination"]')->text();
+
+        preg_match('/^Results \d+\-\d+ \- Page (\d+)\/(\d+)$/', $infos, $groups);
+
+        $page = (int) $groups[1];
+        $countPages = (int) $groups[2];
+
+        return [$page, $countPages];
+    }
+
+    protected function getSort(Crawler $crawler): array
+    {
+        $imageSort = $crawler->filterXPath('//table[@class="result"]/thead/tr/th/img');
+        if (0 === count($imageSort)) {
+            return [];
+        }
+        $imageSort = $imageSort->first();
+
+        switch ($imageSort->getAttribute('alt')) {
+            case '^':
+                $sense = Crud::DESC;
+                break;
+            case 'V':
+                $sense = Crud::ASC;
+                break;
+            default:
+                throw new \Exception('Bad sense');
+        }
+
+        $column = $imageSort->filterXPath('ancestor::th')->last();
+
+        return [$column->text(), $sense];
+    }
+
+    protected function getFirstUsername(Crawler $crawler): ?string
+    {
+        $rows = $crawler->filterXPath('//table[@class="result"]/tbody/tr');
+        if (0 === \count($rows)) {
+            return null;
+        }
+
+        return $rows->first()->getAttribute('data-username');
+    }
+
+    protected function waitForAjax(Client $client, int $timeout = 5): void
+    {
+        $driver = $client->getWebDriver();
+
+        $driver->wait($timeout, 500)->until(static function ($driver) {
+            return !$driver->executeScript('return (typeof jQuery !== "undefined" && jQuery.active);');
+        });
+    }
+}
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
new file mode 100644
index 0000000..a5029b4
--- /dev/null
+++ b/Tests/bootstrap.php
@@ -0,0 +1,33 @@
+<?php
+
+require __DIR__.'/App/config/bootstrap.php';
+
+function bootstrap(): void
+{
+    $kernel = new \Ecommit\CrudBundle\Tests\App\Kernel('test', true);
+    $kernel->boot();
+
+    $application = new \Symfony\Bundle\FrameworkBundle\Console\Application($kernel);
+    $application->setAutoExit(false);
+
+    $application->run(new \Symfony\Component\Console\Input\ArrayInput([
+        'command' => 'doctrine:database:drop',
+        '--force' => true,
+    ]));
+
+    $application->run(new \Symfony\Component\Console\Input\ArrayInput([
+        'command' => 'doctrine:database:create',
+    ]));
+
+    $application->run(new \Symfony\Component\Console\Input\ArrayInput([
+        'command' => 'doctrine:schema:update',
+        '--force' => true,
+    ]));
+
+    $application->run(new \Symfony\Component\Console\Input\ArrayInput([
+        'command' => 'doctrine:fixtures:load',
+        '--no-interaction' => true,
+    ]));
+}
+
+bootstrap();
diff --git a/composer.json b/composer.json
index afb3e68..98da978 100644
--- a/composer.json
+++ b/composer.json
@@ -10,30 +10,42 @@
         }
     ],
     "require": {
+        "php": "^7.2",
         "doctrine/common": "*",
-        "doctrine/doctrine-bundle": "^1.12|^2.0",
-        "doctrine/orm": "~2.3",
-        "doctrine/persistence": "*",
-        "ecommit/javascript-bundle": "2.5.*@dev",
-        "ecommit/util-bundle": "2.5.*@dev",
-        "symfony/config": "^4.2|^5.0",
-        "symfony/dependency-injection": "^4.2|^5.0",
-        "symfony/doctrine-bridge": "^4.2|^5.0",
-        "symfony/form": "^4.2|^5.0",
-        "symfony/framework-bundle": "^4.2|^5.0",
-        "symfony/http-foundation": "^4.2|^5.0",
-        "symfony/http-kernel": "^4.2|^5.0",
-        "symfony/options-resolver": "^4.2|^5.0",
-        "symfony/property-access": "^4.2|^5.0",
-        "symfony/security-bundle": "^4.2|^5.0",
-        "symfony/translation": "^4.2|^5.0",
-        "symfony/twig-bundle": "^4.2|^5.0",
-        "symfony/validator": "^4.2|^5.0",
-        "twig/extensions": "^1.0"
+        "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
+        "doctrine/orm": "^2.6.3",
+        "doctrine/persistence": "^1.3",
+        "ecommit/javascript-bundle": "^2.5.1",
+        "ecommit/util-bundle": "^2.5.1",
+        "symfony/asset": "^4.4|^5.0",
+        "symfony/config": "^4.4|^5.0",
+        "symfony/dependency-injection": "^4.4|^5.0",
+        "symfony/doctrine-bridge": "^4.4|^5.0",
+        "symfony/form": "^4.4|^5.0",
+        "symfony/framework-bundle": "^4.4|^5.0",
+        "symfony/http-foundation": "^4.4|^5.0",
+        "symfony/http-kernel": "^4.4|^5.0",
+        "symfony/options-resolver": "^4.4|^5.0",
+        "symfony/property-access": "^4.4|^5.0",
+        "symfony/routing": "^4.4|^5.0",
+        "symfony/security-bundle": "^4.4|^5.0",
+        "symfony/translation": "^4.4|^5.0",
+        "symfony/twig-bundle": "^4.4|^5.0",
+        "symfony/validator": "^4.4|^5.0",
+        "twig/extensions": "^1.0",
+        "twig/twig": "^2.12.0|^3.0"
+    },
+    "require-dev": {
+        "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "phpunit/phpunit": "^8.4",
+        "symfony/panther": "^0.7.1"
     },
     "autoload": {
         "psr-4": { "Ecommit\\CrudBundle\\": "" }
     },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "3.0.x-dev"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..b3cde74
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.0/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         bootstrap="Tests/bootstrap.php"
+>
+    <php>
+        <env name="KERNEL_CLASS" value="Ecommit\CrudBundle\Tests\App\Kernel" />
+        <env name="APP_ENV" value="test"/>
+        <server name="PANTHER_WEB_SERVER_DIR" value="./Tests/App/public" />
+    </php>
+
+    <extensions>
+        <extension class="Symfony\Component\Panther\ServerExtension" />
+    </extensions>
+
+    <testsuites>
+        <testsuite name="Project Test Suite">
+            <directory>Tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

From 99f7ede3ce360208f1ca2367e053368f10405d23 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 5 May 2020 13:05:16 +0200
Subject: [PATCH 005/264] Move all files to src and tests

---
 .gitignore                                          |   4 ++--
 composer.json                                       |   5 ++++-
 phpunit.xml.dist                                    |   6 +++---
 .../Controller}/AbstractCrudController.php          |   0
 .../Controller}/CrudControllerTrait.php             |   0
 {Crud => src/Crud}/Crud.php                         |   0
 {Crud => src/Crud}/CrudColumn.php                   |   0
 {Crud => src/Crud}/CrudFactory.php                  |   0
 {Crud => src/Crud}/CrudSession.php                  |   0
 {Crud => src/Crud}/QueryBuilderInterface.php        |   0
 .../Crud}/QueryBuilderParameterInterface.php        |   0
 {Crud => src/Crud}/Rest/RestQueryBuilder.php        |   0
 .../Crud}/Rest/RestQueryBuilderParameter.php        |   0
 .../DependencyInjection}/Configuration.php          |   0
 .../DependencyInjection}/EcommitCrudExtension.php   |   0
 .../DoctrineExtension}/Paginate.php                 |   0
 .../DoctrineExtension}/QueryBuilderFilter.php       |   0
 EcommitCrudBundle.php => src/EcommitCrudBundle.php  |   0
 {Entity => src/Entity}/UserCrudInterface.php        |   0
 {Entity => src/Entity}/UserCrudSettings.php         |   0
 .../EventListener}/MappingEntities.php              |   0
 {Form => src/Form}/Filter/AbstractFieldFilter.php   |   0
 {Form => src/Form}/Filter/FieldFilterBoolean.php    |   0
 {Form => src/Form}/Filter/FieldFilterChoice.php     |   0
 {Form => src/Form}/Filter/FieldFilterDate.php       |   0
 .../Form}/Filter/FieldFilterDoctrineInterface.php   |   0
 {Form => src/Form}/Filter/FieldFilterEmpty.php      |   0
 {Form => src/Form}/Filter/FieldFilterEntity.php     |   0
 {Form => src/Form}/Filter/FieldFilterInteger.php    |   0
 .../FieldFilterJqueryAutocompleteEntityAjax.php     |   0
 {Form => src/Form}/Filter/FieldFilterNumber.php     |   0
 .../Form}/Filter/FieldFilterSelect2Choice.php       |   0
 .../Form}/Filter/FieldFilterSelect2Country.php      |   0
 .../Form}/Filter/FieldFilterSelect2Entity.php       |   0
 .../Form}/Filter/FieldFilterSelect2EntityAjax.php   |   0
 {Form => src/Form}/Filter/FieldFilterText.php       |   0
 .../Filter/FieldFilterTokenInputEntitiesAjax.php    |   0
 .../Form}/Searcher/AbstractFormSearcher.php         |   0
 {Form => src/Form}/Type/DisplaySettingsType.php     |   0
 {Form => src/Form}/Type/FormSearchType.php          |   0
 {Helper => src/Helper}/CrudHelper.php               |   0
 .../Paginator}/AbstractDoctrinePaginator.php        |   0
 {Paginator => src/Paginator}/AbstractPaginator.php  |   0
 {Paginator => src/Paginator}/ArrayPaginator.php     |   0
 .../Paginator}/DoctrineDBALPaginator.php            |   0
 .../Paginator}/DoctrineORMPaginator.php             |   0
 {Resources => src/Resources}/config/services.xml    |   0
 {Resources => src/Resources}/doc/config.sample.yml  |   0
 .../Resources}/public/images/i16/LICENSE            |   0
 .../Resources}/public/images/i16/list.png           | Bin
 .../public/images/i16/resultset_first.png           | Bin
 .../Resources}/public/images/i16/resultset_last.png | Bin
 .../Resources}/public/images/i16/resultset_next.png | Bin
 .../public/images/i16/resultset_previous.png        | Bin
 .../Resources}/public/images/i16/sort_decrease.png  | Bin
 .../Resources}/public/images/i16/sort_incr.png      | Bin
 .../Resources}/public/js/scrollToFirstMessage.js    |   0
 .../Resources}/translations/messages.en.yml         |   0
 .../Resources}/translations/messages.fr.yml         |   0
 .../Resources}/views/Crud/double_search.html.twig   |   0
 .../views/Crud/form_settings_modal.html.twig        |   0
 .../Crud/form_settings_modal_bootstrap.html.twig    |   0
 .../views/Crud/form_settings_nomodal.html.twig      |   0
 .../Crud/form_settings_nomodal_bootstrap.html.twig  |   0
 .../Form/bootstrap_3_horizontal_layout.html.twig    |   0
 .../views/Form/bootstrap_3_layout.html.twig         |   0
 .../Resources}/views/Form/div_layout.html.twig      |   0
 {Twig => src/Twig}/CrudExtension.php                |   0
 {Tests => tests}/App/Controller/UserController.php  |   0
 .../App/DataFixtures/TestUserFixtures.php           |   0
 {Tests => tests}/App/Entity/TestUser.php            |   0
 {Tests => tests}/App/Form/Searcher/UserSearcher.php |   0
 {Tests => tests}/App/Kernel.php                     |   0
 {Tests => tests}/App/config/bootstrap.php           |   0
 {Tests => tests}/App/config/doctrine.yaml           |   0
 {Tests => tests}/App/config/framework.yaml          |   0
 {Tests => tests}/App/config/routes.yaml             |   0
 {Tests => tests}/App/config/security.yaml           |   0
 {Tests => tests}/App/config/services.yaml           |   0
 {Tests => tests}/App/public/index.php               |   0
 {Tests => tests}/App/templates/layout.html.twig     |   0
 {Tests => tests}/App/templates/user/index.html.twig |   0
 {Tests => tests}/App/templates/user/list.html.twig  |   0
 .../App/templates/user/search.html.twig             |   0
 .../Controller/TestCrudControllerTest.php           |   0
 {Tests => tests}/bootstrap.php                      |   0
 86 files changed, 9 insertions(+), 6 deletions(-)
 rename {Controller => src/Controller}/AbstractCrudController.php (100%)
 rename {Controller => src/Controller}/CrudControllerTrait.php (100%)
 rename {Crud => src/Crud}/Crud.php (100%)
 rename {Crud => src/Crud}/CrudColumn.php (100%)
 rename {Crud => src/Crud}/CrudFactory.php (100%)
 rename {Crud => src/Crud}/CrudSession.php (100%)
 rename {Crud => src/Crud}/QueryBuilderInterface.php (100%)
 rename {Crud => src/Crud}/QueryBuilderParameterInterface.php (100%)
 rename {Crud => src/Crud}/Rest/RestQueryBuilder.php (100%)
 rename {Crud => src/Crud}/Rest/RestQueryBuilderParameter.php (100%)
 rename {DependencyInjection => src/DependencyInjection}/Configuration.php (100%)
 rename {DependencyInjection => src/DependencyInjection}/EcommitCrudExtension.php (100%)
 rename {DoctrineExtension => src/DoctrineExtension}/Paginate.php (100%)
 rename {DoctrineExtension => src/DoctrineExtension}/QueryBuilderFilter.php (100%)
 rename EcommitCrudBundle.php => src/EcommitCrudBundle.php (100%)
 rename {Entity => src/Entity}/UserCrudInterface.php (100%)
 rename {Entity => src/Entity}/UserCrudSettings.php (100%)
 rename {EventListener => src/EventListener}/MappingEntities.php (100%)
 rename {Form => src/Form}/Filter/AbstractFieldFilter.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterBoolean.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterChoice.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterDate.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterDoctrineInterface.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterEmpty.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterEntity.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterInteger.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterJqueryAutocompleteEntityAjax.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterNumber.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterSelect2Choice.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterSelect2Country.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterSelect2Entity.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterSelect2EntityAjax.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterText.php (100%)
 rename {Form => src/Form}/Filter/FieldFilterTokenInputEntitiesAjax.php (100%)
 rename {Form => src/Form}/Searcher/AbstractFormSearcher.php (100%)
 rename {Form => src/Form}/Type/DisplaySettingsType.php (100%)
 rename {Form => src/Form}/Type/FormSearchType.php (100%)
 rename {Helper => src/Helper}/CrudHelper.php (100%)
 rename {Paginator => src/Paginator}/AbstractDoctrinePaginator.php (100%)
 rename {Paginator => src/Paginator}/AbstractPaginator.php (100%)
 rename {Paginator => src/Paginator}/ArrayPaginator.php (100%)
 rename {Paginator => src/Paginator}/DoctrineDBALPaginator.php (100%)
 rename {Paginator => src/Paginator}/DoctrineORMPaginator.php (100%)
 rename {Resources => src/Resources}/config/services.xml (100%)
 rename {Resources => src/Resources}/doc/config.sample.yml (100%)
 rename {Resources => src/Resources}/public/images/i16/LICENSE (100%)
 rename {Resources => src/Resources}/public/images/i16/list.png (100%)
 rename {Resources => src/Resources}/public/images/i16/resultset_first.png (100%)
 rename {Resources => src/Resources}/public/images/i16/resultset_last.png (100%)
 rename {Resources => src/Resources}/public/images/i16/resultset_next.png (100%)
 rename {Resources => src/Resources}/public/images/i16/resultset_previous.png (100%)
 rename {Resources => src/Resources}/public/images/i16/sort_decrease.png (100%)
 rename {Resources => src/Resources}/public/images/i16/sort_incr.png (100%)
 rename {Resources => src/Resources}/public/js/scrollToFirstMessage.js (100%)
 rename {Resources => src/Resources}/translations/messages.en.yml (100%)
 rename {Resources => src/Resources}/translations/messages.fr.yml (100%)
 rename {Resources => src/Resources}/views/Crud/double_search.html.twig (100%)
 rename {Resources => src/Resources}/views/Crud/form_settings_modal.html.twig (100%)
 rename {Resources => src/Resources}/views/Crud/form_settings_modal_bootstrap.html.twig (100%)
 rename {Resources => src/Resources}/views/Crud/form_settings_nomodal.html.twig (100%)
 rename {Resources => src/Resources}/views/Crud/form_settings_nomodal_bootstrap.html.twig (100%)
 rename {Resources => src/Resources}/views/Form/bootstrap_3_horizontal_layout.html.twig (100%)
 rename {Resources => src/Resources}/views/Form/bootstrap_3_layout.html.twig (100%)
 rename {Resources => src/Resources}/views/Form/div_layout.html.twig (100%)
 rename {Twig => src/Twig}/CrudExtension.php (100%)
 rename {Tests => tests}/App/Controller/UserController.php (100%)
 rename {Tests => tests}/App/DataFixtures/TestUserFixtures.php (100%)
 rename {Tests => tests}/App/Entity/TestUser.php (100%)
 rename {Tests => tests}/App/Form/Searcher/UserSearcher.php (100%)
 rename {Tests => tests}/App/Kernel.php (100%)
 rename {Tests => tests}/App/config/bootstrap.php (100%)
 rename {Tests => tests}/App/config/doctrine.yaml (100%)
 rename {Tests => tests}/App/config/framework.yaml (100%)
 rename {Tests => tests}/App/config/routes.yaml (100%)
 rename {Tests => tests}/App/config/security.yaml (100%)
 rename {Tests => tests}/App/config/services.yaml (100%)
 rename {Tests => tests}/App/public/index.php (100%)
 rename {Tests => tests}/App/templates/layout.html.twig (100%)
 rename {Tests => tests}/App/templates/user/index.html.twig (100%)
 rename {Tests => tests}/App/templates/user/list.html.twig (100%)
 rename {Tests => tests}/App/templates/user/search.html.twig (100%)
 rename {Tests => tests}/Functional/Controller/TestCrudControllerTest.php (100%)
 rename {Tests => tests}/bootstrap.php (100%)

diff --git a/.gitignore b/.gitignore
index d7c9146..aedc937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .php_cs.cache
 .phpunit.result.cache
 composer.lock
-Tests/App/var/
-vendor/
+/tests/App/var/
+/vendor/
diff --git a/composer.json b/composer.json
index 98da978..b98f876 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,10 @@
         "symfony/panther": "^0.7.1"
     },
     "autoload": {
-        "psr-4": { "Ecommit\\CrudBundle\\": "" }
+        "psr-4": { "Ecommit\\CrudBundle\\": "src/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Ecommit\\CrudBundle\\Tests\\": "tests/" }
     },
     "config": {
         "sort-packages": true
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b3cde74..513eb68 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -6,12 +6,12 @@
          backupGlobals="false"
          colors="true"
          beStrictAboutTestsThatDoNotTestAnything="false"
-         bootstrap="Tests/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <env name="KERNEL_CLASS" value="Ecommit\CrudBundle\Tests\App\Kernel" />
         <env name="APP_ENV" value="test"/>
-        <server name="PANTHER_WEB_SERVER_DIR" value="./Tests/App/public" />
+        <server name="PANTHER_WEB_SERVER_DIR" value="./tests/App/public" />
     </php>
 
     <extensions>
@@ -20,7 +20,7 @@
 
     <testsuites>
         <testsuite name="Project Test Suite">
-            <directory>Tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/Controller/AbstractCrudController.php b/src/Controller/AbstractCrudController.php
similarity index 100%
rename from Controller/AbstractCrudController.php
rename to src/Controller/AbstractCrudController.php
diff --git a/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
similarity index 100%
rename from Controller/CrudControllerTrait.php
rename to src/Controller/CrudControllerTrait.php
diff --git a/Crud/Crud.php b/src/Crud/Crud.php
similarity index 100%
rename from Crud/Crud.php
rename to src/Crud/Crud.php
diff --git a/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
similarity index 100%
rename from Crud/CrudColumn.php
rename to src/Crud/CrudColumn.php
diff --git a/Crud/CrudFactory.php b/src/Crud/CrudFactory.php
similarity index 100%
rename from Crud/CrudFactory.php
rename to src/Crud/CrudFactory.php
diff --git a/Crud/CrudSession.php b/src/Crud/CrudSession.php
similarity index 100%
rename from Crud/CrudSession.php
rename to src/Crud/CrudSession.php
diff --git a/Crud/QueryBuilderInterface.php b/src/Crud/QueryBuilderInterface.php
similarity index 100%
rename from Crud/QueryBuilderInterface.php
rename to src/Crud/QueryBuilderInterface.php
diff --git a/Crud/QueryBuilderParameterInterface.php b/src/Crud/QueryBuilderParameterInterface.php
similarity index 100%
rename from Crud/QueryBuilderParameterInterface.php
rename to src/Crud/QueryBuilderParameterInterface.php
diff --git a/Crud/Rest/RestQueryBuilder.php b/src/Crud/Rest/RestQueryBuilder.php
similarity index 100%
rename from Crud/Rest/RestQueryBuilder.php
rename to src/Crud/Rest/RestQueryBuilder.php
diff --git a/Crud/Rest/RestQueryBuilderParameter.php b/src/Crud/Rest/RestQueryBuilderParameter.php
similarity index 100%
rename from Crud/Rest/RestQueryBuilderParameter.php
rename to src/Crud/Rest/RestQueryBuilderParameter.php
diff --git a/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
similarity index 100%
rename from DependencyInjection/Configuration.php
rename to src/DependencyInjection/Configuration.php
diff --git a/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
similarity index 100%
rename from DependencyInjection/EcommitCrudExtension.php
rename to src/DependencyInjection/EcommitCrudExtension.php
diff --git a/DoctrineExtension/Paginate.php b/src/DoctrineExtension/Paginate.php
similarity index 100%
rename from DoctrineExtension/Paginate.php
rename to src/DoctrineExtension/Paginate.php
diff --git a/DoctrineExtension/QueryBuilderFilter.php b/src/DoctrineExtension/QueryBuilderFilter.php
similarity index 100%
rename from DoctrineExtension/QueryBuilderFilter.php
rename to src/DoctrineExtension/QueryBuilderFilter.php
diff --git a/EcommitCrudBundle.php b/src/EcommitCrudBundle.php
similarity index 100%
rename from EcommitCrudBundle.php
rename to src/EcommitCrudBundle.php
diff --git a/Entity/UserCrudInterface.php b/src/Entity/UserCrudInterface.php
similarity index 100%
rename from Entity/UserCrudInterface.php
rename to src/Entity/UserCrudInterface.php
diff --git a/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
similarity index 100%
rename from Entity/UserCrudSettings.php
rename to src/Entity/UserCrudSettings.php
diff --git a/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
similarity index 100%
rename from EventListener/MappingEntities.php
rename to src/EventListener/MappingEntities.php
diff --git a/Form/Filter/AbstractFieldFilter.php b/src/Form/Filter/AbstractFieldFilter.php
similarity index 100%
rename from Form/Filter/AbstractFieldFilter.php
rename to src/Form/Filter/AbstractFieldFilter.php
diff --git a/Form/Filter/FieldFilterBoolean.php b/src/Form/Filter/FieldFilterBoolean.php
similarity index 100%
rename from Form/Filter/FieldFilterBoolean.php
rename to src/Form/Filter/FieldFilterBoolean.php
diff --git a/Form/Filter/FieldFilterChoice.php b/src/Form/Filter/FieldFilterChoice.php
similarity index 100%
rename from Form/Filter/FieldFilterChoice.php
rename to src/Form/Filter/FieldFilterChoice.php
diff --git a/Form/Filter/FieldFilterDate.php b/src/Form/Filter/FieldFilterDate.php
similarity index 100%
rename from Form/Filter/FieldFilterDate.php
rename to src/Form/Filter/FieldFilterDate.php
diff --git a/Form/Filter/FieldFilterDoctrineInterface.php b/src/Form/Filter/FieldFilterDoctrineInterface.php
similarity index 100%
rename from Form/Filter/FieldFilterDoctrineInterface.php
rename to src/Form/Filter/FieldFilterDoctrineInterface.php
diff --git a/Form/Filter/FieldFilterEmpty.php b/src/Form/Filter/FieldFilterEmpty.php
similarity index 100%
rename from Form/Filter/FieldFilterEmpty.php
rename to src/Form/Filter/FieldFilterEmpty.php
diff --git a/Form/Filter/FieldFilterEntity.php b/src/Form/Filter/FieldFilterEntity.php
similarity index 100%
rename from Form/Filter/FieldFilterEntity.php
rename to src/Form/Filter/FieldFilterEntity.php
diff --git a/Form/Filter/FieldFilterInteger.php b/src/Form/Filter/FieldFilterInteger.php
similarity index 100%
rename from Form/Filter/FieldFilterInteger.php
rename to src/Form/Filter/FieldFilterInteger.php
diff --git a/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php b/src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
similarity index 100%
rename from Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
rename to src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
diff --git a/Form/Filter/FieldFilterNumber.php b/src/Form/Filter/FieldFilterNumber.php
similarity index 100%
rename from Form/Filter/FieldFilterNumber.php
rename to src/Form/Filter/FieldFilterNumber.php
diff --git a/Form/Filter/FieldFilterSelect2Choice.php b/src/Form/Filter/FieldFilterSelect2Choice.php
similarity index 100%
rename from Form/Filter/FieldFilterSelect2Choice.php
rename to src/Form/Filter/FieldFilterSelect2Choice.php
diff --git a/Form/Filter/FieldFilterSelect2Country.php b/src/Form/Filter/FieldFilterSelect2Country.php
similarity index 100%
rename from Form/Filter/FieldFilterSelect2Country.php
rename to src/Form/Filter/FieldFilterSelect2Country.php
diff --git a/Form/Filter/FieldFilterSelect2Entity.php b/src/Form/Filter/FieldFilterSelect2Entity.php
similarity index 100%
rename from Form/Filter/FieldFilterSelect2Entity.php
rename to src/Form/Filter/FieldFilterSelect2Entity.php
diff --git a/Form/Filter/FieldFilterSelect2EntityAjax.php b/src/Form/Filter/FieldFilterSelect2EntityAjax.php
similarity index 100%
rename from Form/Filter/FieldFilterSelect2EntityAjax.php
rename to src/Form/Filter/FieldFilterSelect2EntityAjax.php
diff --git a/Form/Filter/FieldFilterText.php b/src/Form/Filter/FieldFilterText.php
similarity index 100%
rename from Form/Filter/FieldFilterText.php
rename to src/Form/Filter/FieldFilterText.php
diff --git a/Form/Filter/FieldFilterTokenInputEntitiesAjax.php b/src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
similarity index 100%
rename from Form/Filter/FieldFilterTokenInputEntitiesAjax.php
rename to src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
diff --git a/Form/Searcher/AbstractFormSearcher.php b/src/Form/Searcher/AbstractFormSearcher.php
similarity index 100%
rename from Form/Searcher/AbstractFormSearcher.php
rename to src/Form/Searcher/AbstractFormSearcher.php
diff --git a/Form/Type/DisplaySettingsType.php b/src/Form/Type/DisplaySettingsType.php
similarity index 100%
rename from Form/Type/DisplaySettingsType.php
rename to src/Form/Type/DisplaySettingsType.php
diff --git a/Form/Type/FormSearchType.php b/src/Form/Type/FormSearchType.php
similarity index 100%
rename from Form/Type/FormSearchType.php
rename to src/Form/Type/FormSearchType.php
diff --git a/Helper/CrudHelper.php b/src/Helper/CrudHelper.php
similarity index 100%
rename from Helper/CrudHelper.php
rename to src/Helper/CrudHelper.php
diff --git a/Paginator/AbstractDoctrinePaginator.php b/src/Paginator/AbstractDoctrinePaginator.php
similarity index 100%
rename from Paginator/AbstractDoctrinePaginator.php
rename to src/Paginator/AbstractDoctrinePaginator.php
diff --git a/Paginator/AbstractPaginator.php b/src/Paginator/AbstractPaginator.php
similarity index 100%
rename from Paginator/AbstractPaginator.php
rename to src/Paginator/AbstractPaginator.php
diff --git a/Paginator/ArrayPaginator.php b/src/Paginator/ArrayPaginator.php
similarity index 100%
rename from Paginator/ArrayPaginator.php
rename to src/Paginator/ArrayPaginator.php
diff --git a/Paginator/DoctrineDBALPaginator.php b/src/Paginator/DoctrineDBALPaginator.php
similarity index 100%
rename from Paginator/DoctrineDBALPaginator.php
rename to src/Paginator/DoctrineDBALPaginator.php
diff --git a/Paginator/DoctrineORMPaginator.php b/src/Paginator/DoctrineORMPaginator.php
similarity index 100%
rename from Paginator/DoctrineORMPaginator.php
rename to src/Paginator/DoctrineORMPaginator.php
diff --git a/Resources/config/services.xml b/src/Resources/config/services.xml
similarity index 100%
rename from Resources/config/services.xml
rename to src/Resources/config/services.xml
diff --git a/Resources/doc/config.sample.yml b/src/Resources/doc/config.sample.yml
similarity index 100%
rename from Resources/doc/config.sample.yml
rename to src/Resources/doc/config.sample.yml
diff --git a/Resources/public/images/i16/LICENSE b/src/Resources/public/images/i16/LICENSE
similarity index 100%
rename from Resources/public/images/i16/LICENSE
rename to src/Resources/public/images/i16/LICENSE
diff --git a/Resources/public/images/i16/list.png b/src/Resources/public/images/i16/list.png
similarity index 100%
rename from Resources/public/images/i16/list.png
rename to src/Resources/public/images/i16/list.png
diff --git a/Resources/public/images/i16/resultset_first.png b/src/Resources/public/images/i16/resultset_first.png
similarity index 100%
rename from Resources/public/images/i16/resultset_first.png
rename to src/Resources/public/images/i16/resultset_first.png
diff --git a/Resources/public/images/i16/resultset_last.png b/src/Resources/public/images/i16/resultset_last.png
similarity index 100%
rename from Resources/public/images/i16/resultset_last.png
rename to src/Resources/public/images/i16/resultset_last.png
diff --git a/Resources/public/images/i16/resultset_next.png b/src/Resources/public/images/i16/resultset_next.png
similarity index 100%
rename from Resources/public/images/i16/resultset_next.png
rename to src/Resources/public/images/i16/resultset_next.png
diff --git a/Resources/public/images/i16/resultset_previous.png b/src/Resources/public/images/i16/resultset_previous.png
similarity index 100%
rename from Resources/public/images/i16/resultset_previous.png
rename to src/Resources/public/images/i16/resultset_previous.png
diff --git a/Resources/public/images/i16/sort_decrease.png b/src/Resources/public/images/i16/sort_decrease.png
similarity index 100%
rename from Resources/public/images/i16/sort_decrease.png
rename to src/Resources/public/images/i16/sort_decrease.png
diff --git a/Resources/public/images/i16/sort_incr.png b/src/Resources/public/images/i16/sort_incr.png
similarity index 100%
rename from Resources/public/images/i16/sort_incr.png
rename to src/Resources/public/images/i16/sort_incr.png
diff --git a/Resources/public/js/scrollToFirstMessage.js b/src/Resources/public/js/scrollToFirstMessage.js
similarity index 100%
rename from Resources/public/js/scrollToFirstMessage.js
rename to src/Resources/public/js/scrollToFirstMessage.js
diff --git a/Resources/translations/messages.en.yml b/src/Resources/translations/messages.en.yml
similarity index 100%
rename from Resources/translations/messages.en.yml
rename to src/Resources/translations/messages.en.yml
diff --git a/Resources/translations/messages.fr.yml b/src/Resources/translations/messages.fr.yml
similarity index 100%
rename from Resources/translations/messages.fr.yml
rename to src/Resources/translations/messages.fr.yml
diff --git a/Resources/views/Crud/double_search.html.twig b/src/Resources/views/Crud/double_search.html.twig
similarity index 100%
rename from Resources/views/Crud/double_search.html.twig
rename to src/Resources/views/Crud/double_search.html.twig
diff --git a/Resources/views/Crud/form_settings_modal.html.twig b/src/Resources/views/Crud/form_settings_modal.html.twig
similarity index 100%
rename from Resources/views/Crud/form_settings_modal.html.twig
rename to src/Resources/views/Crud/form_settings_modal.html.twig
diff --git a/Resources/views/Crud/form_settings_modal_bootstrap.html.twig b/src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig
similarity index 100%
rename from Resources/views/Crud/form_settings_modal_bootstrap.html.twig
rename to src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig
diff --git a/Resources/views/Crud/form_settings_nomodal.html.twig b/src/Resources/views/Crud/form_settings_nomodal.html.twig
similarity index 100%
rename from Resources/views/Crud/form_settings_nomodal.html.twig
rename to src/Resources/views/Crud/form_settings_nomodal.html.twig
diff --git a/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig b/src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig
similarity index 100%
rename from Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig
rename to src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig
diff --git a/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
similarity index 100%
rename from Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
rename to src/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
diff --git a/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Resources/views/Form/bootstrap_3_layout.html.twig
similarity index 100%
rename from Resources/views/Form/bootstrap_3_layout.html.twig
rename to src/Resources/views/Form/bootstrap_3_layout.html.twig
diff --git a/Resources/views/Form/div_layout.html.twig b/src/Resources/views/Form/div_layout.html.twig
similarity index 100%
rename from Resources/views/Form/div_layout.html.twig
rename to src/Resources/views/Form/div_layout.html.twig
diff --git a/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
similarity index 100%
rename from Twig/CrudExtension.php
rename to src/Twig/CrudExtension.php
diff --git a/Tests/App/Controller/UserController.php b/tests/App/Controller/UserController.php
similarity index 100%
rename from Tests/App/Controller/UserController.php
rename to tests/App/Controller/UserController.php
diff --git a/Tests/App/DataFixtures/TestUserFixtures.php b/tests/App/DataFixtures/TestUserFixtures.php
similarity index 100%
rename from Tests/App/DataFixtures/TestUserFixtures.php
rename to tests/App/DataFixtures/TestUserFixtures.php
diff --git a/Tests/App/Entity/TestUser.php b/tests/App/Entity/TestUser.php
similarity index 100%
rename from Tests/App/Entity/TestUser.php
rename to tests/App/Entity/TestUser.php
diff --git a/Tests/App/Form/Searcher/UserSearcher.php b/tests/App/Form/Searcher/UserSearcher.php
similarity index 100%
rename from Tests/App/Form/Searcher/UserSearcher.php
rename to tests/App/Form/Searcher/UserSearcher.php
diff --git a/Tests/App/Kernel.php b/tests/App/Kernel.php
similarity index 100%
rename from Tests/App/Kernel.php
rename to tests/App/Kernel.php
diff --git a/Tests/App/config/bootstrap.php b/tests/App/config/bootstrap.php
similarity index 100%
rename from Tests/App/config/bootstrap.php
rename to tests/App/config/bootstrap.php
diff --git a/Tests/App/config/doctrine.yaml b/tests/App/config/doctrine.yaml
similarity index 100%
rename from Tests/App/config/doctrine.yaml
rename to tests/App/config/doctrine.yaml
diff --git a/Tests/App/config/framework.yaml b/tests/App/config/framework.yaml
similarity index 100%
rename from Tests/App/config/framework.yaml
rename to tests/App/config/framework.yaml
diff --git a/Tests/App/config/routes.yaml b/tests/App/config/routes.yaml
similarity index 100%
rename from Tests/App/config/routes.yaml
rename to tests/App/config/routes.yaml
diff --git a/Tests/App/config/security.yaml b/tests/App/config/security.yaml
similarity index 100%
rename from Tests/App/config/security.yaml
rename to tests/App/config/security.yaml
diff --git a/Tests/App/config/services.yaml b/tests/App/config/services.yaml
similarity index 100%
rename from Tests/App/config/services.yaml
rename to tests/App/config/services.yaml
diff --git a/Tests/App/public/index.php b/tests/App/public/index.php
similarity index 100%
rename from Tests/App/public/index.php
rename to tests/App/public/index.php
diff --git a/Tests/App/templates/layout.html.twig b/tests/App/templates/layout.html.twig
similarity index 100%
rename from Tests/App/templates/layout.html.twig
rename to tests/App/templates/layout.html.twig
diff --git a/Tests/App/templates/user/index.html.twig b/tests/App/templates/user/index.html.twig
similarity index 100%
rename from Tests/App/templates/user/index.html.twig
rename to tests/App/templates/user/index.html.twig
diff --git a/Tests/App/templates/user/list.html.twig b/tests/App/templates/user/list.html.twig
similarity index 100%
rename from Tests/App/templates/user/list.html.twig
rename to tests/App/templates/user/list.html.twig
diff --git a/Tests/App/templates/user/search.html.twig b/tests/App/templates/user/search.html.twig
similarity index 100%
rename from Tests/App/templates/user/search.html.twig
rename to tests/App/templates/user/search.html.twig
diff --git a/Tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
similarity index 100%
rename from Tests/Functional/Controller/TestCrudControllerTest.php
rename to tests/Functional/Controller/TestCrudControllerTest.php
diff --git a/Tests/bootstrap.php b/tests/bootstrap.php
similarity index 100%
rename from Tests/bootstrap.php
rename to tests/bootstrap.php

From e31674ba4f98b63d90ebd5f9cd585fd6c507a6c5 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 5 May 2020 13:10:48 +0200
Subject: [PATCH 006/264] Insight badge replaced by Travis badge

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bf05412..47ddce5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
-EcommitCrudBundle
-==================
+# EcommitCrudBundle
+
+
+[![Build Status](https://travis-ci.org/e-commit/EcommitCrudBundle.svg?branch=master)](https://travis-ci.org/e-commit/EcommitCrudBundle)
 
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/ee0677db-2ad9-4248-9b61-ab00020317b5/big.png)](https://insight.sensiolabs.com/projects/ee0677db-2ad9-4248-9b61-ab00020317b5)
 
 **WARNING: This branch is under development. Not use in production. You can use stable versions or 2.5 branch.**

From 40c3019a3ec59c9af09867fb76151be143245116 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 5 May 2020 14:34:49 +0200
Subject: [PATCH 007/264] Fix CS

---
 .php_cs.dist                                  |  42 ++
 .travis.yml                                   |   1 +
 composer.json                                 |   1 +
 src/Controller/AbstractCrudController.php     |   3 +-
 src/Controller/CrudControllerTrait.php        |  29 +-
 src/Crud/Crud.php                             | 369 +++++++++---------
 src/Crud/CrudColumn.php                       |  22 +-
 src/Crud/CrudFactory.php                      |   6 +-
 src/Crud/CrudSession.php                      |  16 +-
 src/Crud/QueryBuilderInterface.php            |   8 +-
 src/Crud/QueryBuilderParameterInterface.php   |   5 +-
 src/Crud/Rest/RestQueryBuilder.php            |  40 +-
 src/Crud/Rest/RestQueryBuilderParameter.php   |   5 +-
 src/DependencyInjection/Configuration.php     |   9 +-
 .../EcommitCrudExtension.php                  |  15 +-
 src/DoctrineExtension/Paginate.php            |  63 +--
 src/DoctrineExtension/QueryBuilderFilter.php  | 147 ++++---
 src/EcommitCrudBundle.php                     |   2 +
 src/Entity/UserCrudInterface.php              |   2 +
 src/Entity/UserCrudSettings.php               |  79 ++--
 src/EventListener/MappingEntities.php         |  19 +-
 src/Form/Filter/AbstractFieldFilter.php       |  61 ++-
 src/Form/Filter/FieldFilterBoolean.php        |  38 +-
 src/Form/Filter/FieldFilterChoice.php         |  51 +--
 src/Form/Filter/FieldFilterDate.php           |  88 +++--
 .../Filter/FieldFilterDoctrineInterface.php   |   3 +
 src/Form/Filter/FieldFilterEmpty.php          |  10 +-
 src/Form/Filter/FieldFilterEntity.php         |  27 +-
 src/Form/Filter/FieldFilterInteger.php        |  32 +-
 ...ieldFilterJqueryAutocompleteEntityAjax.php |  37 +-
 src/Form/Filter/FieldFilterNumber.php         |   4 +-
 src/Form/Filter/FieldFilterSelect2Choice.php  |   9 +-
 src/Form/Filter/FieldFilterSelect2Country.php |   9 +-
 src/Form/Filter/FieldFilterSelect2Entity.php  |   7 +-
 .../Filter/FieldFilterSelect2EntityAjax.php   |  23 +-
 src/Form/Filter/FieldFilterText.php           |  30 +-
 .../FieldFilterTokenInputEntitiesAjax.php     |  48 +--
 src/Form/Searcher/AbstractFormSearcher.php    |  50 +--
 src/Form/Type/DisplaySettingsType.php         |  30 +-
 src/Form/Type/FormSearchType.php              |  22 +-
 src/Helper/CrudHelper.php                     | 304 ++++++++-------
 src/Paginator/AbstractDoctrinePaginator.php   |  30 +-
 src/Paginator/AbstractPaginator.php           |  59 +--
 src/Paginator/ArrayPaginator.php              |  22 +-
 src/Paginator/DoctrineDBALPaginator.php       |  14 +-
 src/Paginator/DoctrineORMPaginator.php        |  30 +-
 src/Twig/CrudExtension.php                    | 117 +++---
 tests/App/Controller/UserController.php       |   2 +
 tests/App/DataFixtures/TestUserFixtures.php   |   4 +-
 tests/App/Entity/TestUser.php                 |   2 +
 tests/App/Form/Searcher/UserSearcher.php      |   2 +
 tests/App/Kernel.php                          |  13 +-
 tests/App/config/bootstrap.php                |  11 +-
 tests/App/public/index.php                    |  11 +
 .../Controller/TestCrudControllerTest.php     |   6 +-
 tests/bootstrap.php                           |  11 +
 56 files changed, 1158 insertions(+), 942 deletions(-)
 create mode 100644 .php_cs.dist

diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 0000000..b07196c
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,42 @@
+<?php
+
+$fileHeaderComment = <<<COMMENT
+This file is part of the EcommitCrudBundle package.
+
+(c) E-commit <contact@e-commit.fr>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+COMMENT;
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+    ->exclude('tests/App/var')
+;
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        '@DoctrineAnnotation' => true,
+        '@PHP56Migration' =>  true,
+        '@PHP56Migration:risky' => true,
+        '@PHP71Migration' => true,
+        '@PHP71Migration:risky' => true,
+        '@PHP73Migration' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'fopen_flags' => true,
+        'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
+        'linebreak_after_opening_tag' => true,
+        'mb_str_functions' => true,
+        'no_php4_constructor' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_imports' => true,
+        'phpdoc_order' => true,
+        'protected_to_private' => false,
+    ])
+    ->setFinder($finder)
+;
diff --git a/.travis.yml b/.travis.yml
index af268da..d43d51d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,3 +16,4 @@ install:
 
 script:
     - php vendor/phpunit/phpunit/phpunit
+    - php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
diff --git a/composer.json b/composer.json
index b98f876..e7a45d9 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,7 @@
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "friendsofphp/php-cs-fixer": "^2.16.1",
         "phpunit/phpunit": "^8.4",
         "symfony/panther": "^0.7.1"
     },
diff --git a/src/Controller/AbstractCrudController.php b/src/Controller/AbstractCrudController.php
index 5118a90..c437d26 100644
--- a/src/Controller/AbstractCrudController.php
+++ b/src/Controller/AbstractCrudController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -12,7 +14,6 @@
 namespace Ecommit\CrudBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
 
 abstract class AbstractCrudController extends AbstractController
 {
diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index dd519fe..05a5d86 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -24,6 +26,7 @@ trait CrudControllerTrait
 
     /**
      * @param $sessionName
+     *
      * @return Crud
      */
     protected function createCrud($sessionName)
@@ -35,7 +38,7 @@ public function autoListAction()
     {
         $data = $this->prepareList();
 
-        return $this->renderCrud($this->getTemplateName('index'), \array_merge($data, array('crud' => $this->cm)));
+        return $this->renderCrud($this->getTemplateName('index'), array_merge($data, ['crud' => $this->cm]));
     }
 
     protected function prepareList()
@@ -51,33 +54,33 @@ protected function prepareList()
     }
 
     /**
-     * Configures and returns the CRUD
+     * Configures and returns the CRUD.
      *
      * @return Crud
      */
     abstract protected function configCrud();
 
     /**
-     *
      * @return array
      */
     protected function addDataAfterBuildQuery()
     {
-        return array();
+        return [];
     }
 
-    protected function beforeBuildQuery()
+    protected function beforeBuildQuery(): void
     {
     }
 
-    protected function afterBuildQuery()
+    protected function afterBuildQuery(): void
     {
     }
 
     /**
-     * Returns template for action
+     * Returns template for action.
      *
      * @param string $action Action
+     *
      * @return string
      */
     abstract protected function getTemplateName($action);
@@ -90,7 +93,7 @@ public function autoAjaxListAction()
         }
         $data = $this->prepareList();
 
-        return $this->renderCrud($this->getTemplateName('list'), \array_merge($data, array('crud' => $this->cm)));
+        return $this->renderCrud($this->getTemplateName('list'), array_merge($data, ['crud' => $this->cm]));
     }
 
     public function autoAjaxSearchAction()
@@ -102,18 +105,18 @@ public function autoAjaxSearchAction()
         $data = $this->processSearch();
         $renderSearch = $this->renderCrudView(
             $this->getTemplateName('search'),
-            \array_merge($data, array('crud' => $this->cm))
+            array_merge($data, ['crud' => $this->cm])
         );
-        $renderList = $this->renderCrudView($this->getTemplateName('list'), \array_merge($data, array('crud' => $this->cm)));
+        $renderList = $this->renderCrudView($this->getTemplateName('list'), array_merge($data, ['crud' => $this->cm]));
 
         return $this->renderCrud(
             '@EcommitCrud/Crud/double_search.html.twig',
-            array(
+            [
                 'id_search' => $this->cm->getDivIdSearch(),
                 'id_list' => $this->cm->getDivIdList(),
                 'render_search' => $renderSearch,
-                'render_list' => $renderList
-            )
+                'render_list' => $renderList,
+            ]
         );
     }
 
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 0dd2238..9825778 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -26,8 +28,8 @@
 
 class Crud
 {
-    const DESC = 'DESC';
-    const ASC = 'ASC';
+    public const DESC = 'DESC';
+    public const ASC = 'ASC';
 
     protected $sessionName;
 
@@ -41,11 +43,11 @@ class Crud
      */
     protected $formSearcher = null;
 
-    protected $availableColumns = array();
-    protected $availableVirtualColumns = array();
-    protected $availableResultsPerPage = array();
+    protected $availableColumns = [];
+    protected $availableVirtualColumns = [];
+    protected $availableResultsPerPage = [];
     protected $defaultSort = null;
-    protected $defaultPersonalizedSort = array();
+    protected $defaultPersonalizedSort = [];
     protected $defaultSense = null;
     protected $defaultResultsPerPage = null;
     protected $defaultFormSearcherData = null;
@@ -62,9 +64,9 @@ class Crud
      * Router
      */
     protected $routeName = null;
-    protected $routeParams = array();
+    protected $routeParams = [];
     protected $searchRouteName = null;
-    protected $searchRouteParams = array();
+    protected $searchRouteParams = [];
 
     protected $divIdSearch = 'crud_search';
     protected $divIdList = 'crud_list';
@@ -100,9 +102,10 @@ class Crud
     protected $templateConfiguration;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param string $sessionName Session name
+     *
      * @return Crud
      */
     public function __construct(
@@ -112,9 +115,9 @@ public function __construct(
         Request $request,
         Registry $registry,
         $user,
-        array $templateConfiguration = array()
+        array $templateConfiguration = []
     ) {
-        if (!\preg_match('/^[a-zA-Z0-9_]{1,50}$/', $sessionName)) {
+        if (!preg_match('/^[a-zA-Z0-9_]{1,50}$/', $sessionName)) {
             throw new \Exception('Variable sessionName is not given or is invalid');
         }
         $this->sessionName = $sessionName;
@@ -132,32 +135,33 @@ public function __construct(
     }
 
     /**
-     * Add a column inside the crud
+     * Add a column inside the crud.
+     *
+     * @param string $id      Column id (used everywhere inside the crud)
+     * @param string $alias   Column SQL alias
+     * @param string $label   Column label (used in the header table)
+     * @param array  $options Options:
+     *                        * sortable: If the column is sortable (Default: true)
+     *                        * default_displayed: If the column is displayed, by default (Default: true)
+     *                        * alias_search: Column SQL alias, used during searchs. If null, $alias is used.
+     *                        * alias_sort: Column(s) SQL alias (string or array of strings), used during sorting. If null, $alias is used.
      *
-     * @param string $id Column id (used everywhere inside the crud)
-     * @param string $alias Column SQL alias
-     * @param string $label Column label (used in the header table)
-     * @param array $options Options:
-     *      * sortable: If the column is sortable (Default: true)
-     *      * default_displayed: If the column is displayed, by default (Default: true)
-     *      * alias_search: Column SQL alias, used during searchs. If null, $alias is used.
-     *      * alias_sort: Column(s) SQL alias (string or array of strings), used during sorting. If null, $alias is used.
      * @return Crud
      */
-    public function addColumn($id, $alias, $label, $options = array())
+    public function addColumn($id, $alias, $label, $options = [])
     {
-        if (\strlen($id) > 30) {
+        if (\mb_strlen($id) > 30) {
             throw new \Exception('Column id is too long');
         }
 
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
-            array(
+            [
                 'sortable' => true,
                 'default_displayed' => true,
                 'alias_search' => null,
                 'alias_sort' => null,
-            )
+            ]
         );
         $resolver->setAllowedTypes('sortable', 'bool');
         $resolver->setAllowedTypes('default_displayed', 'bool');
@@ -178,10 +182,11 @@ public function addColumn($id, $alias, $label, $options = array())
     }
 
     /**
-     * Add a virtual column inside the crud
+     * Add a virtual column inside the crud.
+     *
+     * @param string $id          Column id (used everywhere inside the crud)
+     * @param string $aliasSearch column SQL alias, used during searchs
      *
-     * @param string $id Column id (used everywhere inside the crud)
-     * @param string $aliasSearch Column SQL alias, used during searchs.
      * @return Crud
      */
     public function addVirtualColumn($id, $aliasSearch)
@@ -193,7 +198,7 @@ public function addVirtualColumn($id, $aliasSearch)
     }
 
     /**
-     * Gets the query builder
+     * Gets the query builder.
      *
      * @return QueryBuilder
      */
@@ -203,9 +208,10 @@ public function getQueryBuilder()
     }
 
     /**
-     * Sets the query builder
+     * Sets the query builder.
      *
      * @param QueryBuilder $queryBuilder
+     *
      * @return Crud
      */
     public function setQueryBuilder($queryBuilder)
@@ -221,7 +227,7 @@ public function setQueryBuilder($queryBuilder)
     }
 
     /**
-     * Returns available results per page
+     * Returns available results per page.
      *
      * @return array
      */
@@ -231,13 +237,13 @@ public function getAvailableResultsPerPage()
     }
 
     /**
-     * Sets available results per page
+     * Sets available results per page.
      *
-     * @param array $availableResultsPerPage
      * @param int $defaultValue
+     *
      * @return Crud
      */
-    public function setAvailableResultsPerPage(Array $availableResultsPerPage, $defaultValue)
+    public function setAvailableResultsPerPage(array $availableResultsPerPage, $defaultValue)
     {
         $this->availableResultsPerPage = $availableResultsPerPage;
         $this->defaultResultsPerPage = $defaultValue;
@@ -246,10 +252,11 @@ public function setAvailableResultsPerPage(Array $availableResultsPerPage, $defa
     }
 
     /**
-     * Set the default sort
+     * Set the default sort.
+     *
+     * @param string $sort  Column id
+     * @param const  $sense Sense (Crud::ASC / Crud::DESC)
      *
-     * @param string $sort Column id
-     * @param const $sense Sense (Crud::ASC / Crud::DESC)
      * @return Crud
      */
     public function setDefaultSort($sort, $sense)
@@ -261,11 +268,12 @@ public function setDefaultSort($sort, $sense)
     }
 
     /**
-     * Set the default personalized sort
+     * Set the default personalized sort.
      *
      * @param array $criterias Criterias :
-     *   If key is defined: Key = Sort  Value = Sense
-     *   If key is not defined: Value = Sort
+     *                         If key is defined: Key = Sort  Value = Sense
+     *                         If key is not defined: Value = Sort
+     *
      * @return Crud
      */
     public function setDefaultPersonalizedSort(array $criterias)
@@ -279,13 +287,14 @@ public function setDefaultPersonalizedSort(array $criterias)
     }
 
     /**
-     * Sets the list route
+     * Sets the list route.
      *
      * @param string $routeName
-     * @param array $parameters
+     * @param array  $parameters
+     *
      * @return Crud
      */
-    public function setRoute($routeName, $parameters = array())
+    public function setRoute($routeName, $parameters = [])
     {
         $this->routeName = $routeName;
         $this->routeParams = $parameters;
@@ -294,7 +303,7 @@ public function setRoute($routeName, $parameters = array())
     }
 
     /**
-     * Returns the route name
+     * Returns the route name.
      *
      * @return string
      */
@@ -304,7 +313,7 @@ public function getRouteName()
     }
 
     /**
-     * Returns the route params
+     * Returns the route params.
      *
      * @return array
      */
@@ -314,26 +323,28 @@ public function getRouteParams()
     }
 
     /**
-     * Returns the list url
+     * Returns the list url.
      *
      * @param array $parameters Additional parameters
+     *
      * @return string
      */
-    public function getUrl($parameters = array())
+    public function getUrl($parameters = [])
     {
-        $parameters = \array_merge($this->routeParams, $parameters);
+        $parameters = array_merge($this->routeParams, $parameters);
 
         return $this->router->generate($this->routeName, $parameters);
     }
 
     /**
-     * Sets the search route
+     * Sets the search route.
      *
      * @param string $routeName
-     * @param array $parameters
+     * @param array  $parameters
+     *
      * @return Crud
      */
-    public function setSearchRoute($routeName, $parameters = array())
+    public function setSearchRoute($routeName, $parameters = [])
     {
         $this->searchRouteName = $routeName;
         $this->searchRouteParams = $parameters;
@@ -342,20 +353,21 @@ public function setSearchRoute($routeName, $parameters = array())
     }
 
     /**
-     * Returns the search url
+     * Returns the search url.
      *
      * @param array $parameters Additional parameters
+     *
      * @return string
      */
-    public function getSearchUrl($parameters = array())
+    public function getSearchUrl($parameters = [])
     {
-        $parameters = \array_merge($this->searchRouteParams, $parameters);
+        $parameters = array_merge($this->searchRouteParams, $parameters);
 
         return $this->router->generate($this->searchRouteName, $parameters);
     }
 
     /**
-     * Enables (or not) the auto build paginator
+     * Enables (or not) the auto build paginator.
      *
      * @param bool|closure|array $value
      */
@@ -368,7 +380,7 @@ public function setBuildPaginator($value)
 
     /*
      * Use (or not) persistent settings
-     * 
+     *
      * @param bool $value
      */
     public function setPersistentSettings($value)
@@ -382,14 +394,14 @@ public function setPersistentSettings($value)
     }
 
     /**
-     * Adds search form
+     * Adds search form.
+     *
+     * @param string|null $type    The type of the form. If null, FormSearchType is used
+     * @param array       $options The options
      *
-     * @param AbstractFormSearcher $defaultFormSearcherData
-     * @param null|string $type The type of the form. If null, FormSearchType is used
-     * @param array $options  The options
      * @return Crud
      */
-    public function createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = array())
+    public function createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = [])
     {
         $this->defaultFormSearcherData = $defaultFormSearcherData;
         $this->initializeFieldsFilter($defaultFormSearcherData);
@@ -402,14 +414,12 @@ public function createSearcherForm(AbstractFormSearcher $defaultFormSearcherData
         }
         foreach ($defaultFormSearcherData->getFieldsFilter($this->registry) as $field) {
             if (!($field instanceof \Ecommit\CrudBundle\Form\Filter\AbstractFieldFilter)) {
-                throw new \Exception(
-                    'Crud: AbstractFormSearcher: getFieldsFilter() must only returns AbstractFieldFilter implementations'
-                );
+                throw new \Exception('Crud: AbstractFormSearcher: getFieldsFilter() must only returns AbstractFieldFilter implementations');
             }
 
             $formBuilder = $field->addField($formBuilder);
         }
-        //Global 
+        //Global
         $formBuilder = $defaultFormSearcherData->globalBuildForm($formBuilder);
         $this->formSearcher = $formBuilder;
 
@@ -417,10 +427,9 @@ public function createSearcherForm(AbstractFormSearcher $defaultFormSearcherData
     }
 
     /**
-     * Process search form
-     *
+     * Process search form.
      */
-    public function processForm()
+    public function processForm(): void
     {
         if (empty($this->defaultFormSearcherData)) {
             throw new NotFoundHttpException('Crud: Form searcher does not exist');
@@ -429,7 +438,7 @@ public function processForm()
         if ($this->request->query->has('raz')) {
             return;
         }
-        if ($this->request->getMethod() == 'POST') {
+        if ('POST' == $this->request->getMethod()) {
             if ($this->displayResultsOnlyIfSearch) {
                 $this->displayResults = false;
             }
@@ -445,11 +454,11 @@ public function processForm()
     }
 
     /**
-     * User action: Changes search form values
+     * User action: Changes search form values.
      *
-     * @param Object $value
+     * @param object $value
      */
-    protected function changeFilterValues($value)
+    protected function changeFilterValues($value): void
     {
         if (empty($this->defaultFormSearcherData)) {
             return;
@@ -462,16 +471,16 @@ protected function changeFilterValues($value)
     }
 
     /**
-     * User action: Changes page number
+     * User action: Changes page number.
      *
      * @param string $value Page number
      */
-    protected function changePage($value)
+    protected function changePage($value): void
     {
         if (!is_scalar($value)) {
             $value = 1;
         }
-        $value = \intval($value);
+        $value = (int) $value;
         if ($value > 1000000000000) {
             $value = 1;
         }
@@ -479,15 +488,14 @@ protected function changePage($value)
     }
 
     /**
-     * Saves user value
-     *
+     * Saves user value.
      */
-    protected function save()
+    protected function save(): void
     {
         //Save in session
         $session = $this->request->getSession();
         $sessionValuesClean = clone $this->sessionValues;
-        if (is_object($this->sessionValues->formSearcherData)) {
+        if (\is_object($this->sessionValues->formSearcherData)) {
             $sessionValuesClean->formSearcherData = clone $this->sessionValues->formSearcherData;
             $sessionValuesClean->formSearcherData->clear();
         }
@@ -496,10 +504,10 @@ protected function save()
         //Save in database
         if ($this->persistentSettings && $this->updateDatabase) {
             $objectDatabase = $this->registry->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
-                array(
+                [
                     'user' => $this->user,
-                    'crudName' => $this->sessionName
-                )
+                    'crudName' => $this->sessionName,
+                ]
             );
             $em = $this->registry->getManager();
 
@@ -526,19 +534,19 @@ protected function save()
     }
 
     /**
-     * Return default displayed columns
+     * Return default displayed columns.
      *
      * @return array
      */
     public function getDefaultDisplayedColumns()
     {
-        $columns = array();
+        $columns = [];
         foreach ($this->availableColumns as $column) {
             if ($column->defaultDisplayed) {
                 $columns[] = $column->id;
             }
         }
-        if (count($columns) == 0) {
+        if (0 == \count($columns)) {
             throw new \Exception('Config Crud: One column displayed is required');
         }
 
@@ -546,27 +554,26 @@ public function getDefaultDisplayedColumns()
     }
 
     /**
-     * Inits the CRUD
-     *
+     * Inits the CRUD.
      */
-    public function init()
+    public function init(): void
     {
         //Cheks not empty values
-        $check_values = array(
+        $check_values = [
             'availableColumns',
             'availableResultsPerPage',
             'defaultSort',
             'defaultSense',
             'defaultResultsPerPage',
             'queryBuilder',
-            'routeName'
-        );
+            'routeName',
+        ];
         if (!empty($this->defaultFormSearcherData)) {
             $check_values[] = 'searchRouteName';
         }
         foreach ($check_values as $value) {
             if (empty($this->$value)) {
-                throw new \Exception('Config Crud: Option ' . $value . ' is required');
+                throw new \Exception('Config Crud: Option '.$value.' is required');
             }
         }
 
@@ -606,16 +613,13 @@ public function init()
 
     /**
      * Init "fieldFilters" property in $formSearcherData object
-     * Inject the registry in $formSearcherData objet if implements FieldFilterDoctrineInterface
-     * @param AbstractFormSearcher $formSearcherData
+     * Inject the registry in $formSearcherData objet if implements FieldFilterDoctrineInterface.
      */
-    protected function initializeFieldsFilter(AbstractFormSearcher $formSearcherData)
+    protected function initializeFieldsFilter(AbstractFormSearcher $formSearcherData): void
     {
         foreach ($formSearcherData->getFieldsFilter($this->registry) as $field) {
             if (!($field instanceof \Ecommit\CrudBundle\Form\Filter\AbstractFieldFilter)) {
-                throw new \Exception(
-                    'Crud: AbstractFormSearcher: getFieldsFilter() must only returns AbstractFieldFilter implementations'
-                );
+                throw new \Exception('Crud: AbstractFormSearcher: getFieldsFilter() must only returns AbstractFieldFilter implementations');
             }
 
             if (isset($this->availableColumns[$field->getColumnId()])) {
@@ -623,22 +627,17 @@ protected function initializeFieldsFilter(AbstractFormSearcher $formSearcherData
             } elseif (isset($this->availableVirtualColumns[$field->getColumnId()])) {
                 $column = $this->availableVirtualColumns[$field->getColumnId()];
             } else {
-                throw new \Exception(
-                    'Crud: AbstractFormSearcher: getFieldsFilter(): Column id does not exit: ' . $field->getColumnId(
-                    )
-                );
+                throw new \Exception('Crud: AbstractFormSearcher: getFieldsFilter(): Column id does not exit: '.$field->getColumnId());
             }
 
             $field->setLabel($column->label, $formSearcherData->displayLabelInErrors());
         }
     }
 
-
     /**
-     * Load user values
-     *
+     * Load user values.
      */
-    protected function load()
+    protected function load(): void
     {
         $session = $this->request->getSession();
         $object = $session->get($this->sessionName); //Load from session
@@ -657,10 +656,10 @@ protected function load()
         //Only if persistent settings is enabled
         if ($this->persistentSettings) {
             $objectDatabase = $this->registry->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
-                array(
+                [
                     'user' => $this->user,
-                    'crudName' => $this->sessionName
-                )
+                    'crudName' => $this->sessionName,
+                ]
             );
             if ($objectDatabase) {
                 $this->sessionValues = $objectDatabase->transformToCrudSession(new CrudSession());
@@ -684,9 +683,9 @@ protected function load()
     }
 
     /**
-     * Checks user values
+     * Checks user values.
      */
-    protected function checkCrudSession()
+    protected function checkCrudSession(): void
     {
         //Forces change => checks
         $this->changeNumberResultsDisplayed($this->sessionValues->resultsPerPage);
@@ -698,14 +697,14 @@ protected function checkCrudSession()
     }
 
     /**
-     * User Action: Changes number of displayed results
+     * User Action: Changes number of displayed results.
      *
      * @param int $value
      */
-    protected function changeNumberResultsDisplayed($value)
+    protected function changeNumberResultsDisplayed($value): void
     {
         $oldValue = $this->sessionValues->resultsPerPage;
-        if (in_array($value, $this->availableResultsPerPage)) {
+        if (\in_array($value, $this->availableResultsPerPage)) {
             $this->sessionValues->resultsPerPage = $value;
         } else {
             $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
@@ -713,7 +712,7 @@ protected function changeNumberResultsDisplayed($value)
         $this->testIfDatabaseMustMeUpdated($oldValue, $value);
     }
 
-    protected function testIfDatabaseMustMeUpdated($oldValue, $new_value)
+    protected function testIfDatabaseMustMeUpdated($oldValue, $new_value): void
     {
         if ($oldValue != $new_value) {
             $this->updateDatabase = true;
@@ -721,24 +720,24 @@ protected function testIfDatabaseMustMeUpdated($oldValue, $new_value)
     }
 
     /**
-     * User Action: Changes displayed columns
+     * User Action: Changes displayed columns.
      *
      * @param array $value (columns id)
      */
-    protected function changeColumnsDisplayed($value)
+    protected function changeColumnsDisplayed($value): void
     {
         $oldValue = $this->sessionValues->displayedColumns;
-        if (!is_array($value)) {
+        if (!\is_array($value)) {
             $value = $this->getDefaultDisplayedColumns();
         }
-        $newDisplayedColumns = array();
+        $newDisplayedColumns = [];
         $availableColumns = $this->availableColumns;
         foreach ($value as $column_name) {
-            if (array_key_exists($column_name, $availableColumns)) {
+            if (\array_key_exists($column_name, $availableColumns)) {
                 $newDisplayedColumns[] = $column_name;
             }
         }
-        if (count($newDisplayedColumns) == 0) {
+        if (0 == \count($newDisplayedColumns)) {
             $newDisplayedColumns = $this->getDefaultDisplayedColumns();
         }
         $this->sessionValues->displayedColumns = $newDisplayedColumns;
@@ -746,16 +745,16 @@ protected function changeColumnsDisplayed($value)
     }
 
     /**
-     * User Action: Changes sort
+     * User Action: Changes sort.
      *
      * @param string $value Column id
      */
-    protected function changeSort($value)
+    protected function changeSort($value): void
     {
         $oldValue = $this->sessionValues->sort;
         $availableColumns = $this->availableColumns;
-        if ((is_scalar($value) && array_key_exists($value, $availableColumns) && $availableColumns[$value]->sortable)
-            || (is_scalar($value) && $value == 'defaultPersonalizedSort' && $this->defaultPersonalizedSort)) {
+        if ((is_scalar($value) && \array_key_exists($value, $availableColumns) && $availableColumns[$value]->sortable)
+            || (is_scalar($value) && 'defaultPersonalizedSort' == $value && $this->defaultPersonalizedSort)) {
             $this->sessionValues->sort = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
@@ -765,14 +764,14 @@ protected function changeSort($value)
     }
 
     /**
-     * User action: Changes sense
+     * User action: Changes sense.
      *
      * @param const $value Sens (ASC / DESC)
      */
-    protected function changeSense($value)
+    protected function changeSense($value): void
     {
         $oldValue = $this->sessionValues->sense;
-        if (is_scalar($value) && ($value == self::ASC || $value == self::DESC)) {
+        if (is_scalar($value) && (self::ASC == $value || self::DESC == $value)) {
             $this->sessionValues->sense = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
@@ -782,10 +781,9 @@ protected function changeSense($value)
     }
 
     /**
-     * Process request
-     *
+     * Process request.
      */
-    protected function processRequest()
+    protected function processRequest(): void
     {
         if ($this->request->query->has('razsettings')) {
             //Reset display settings
@@ -801,10 +799,10 @@ protected function processRequest()
         $displaySettingsFormName = sprintf('crud_display_settings_%s', $this->sessionName);
         if ($this->request->request->has($displaySettingsFormName)) {
             $displaySettings = $this->request->request->get($displaySettingsFormName);
-            if (is_array($displaySettings) && isset($displaySettings['displayedColumns'])) {
+            if (\is_array($displaySettings) && isset($displaySettings['displayedColumns'])) {
                 $this->changeColumnsDisplayed($displaySettings['displayedColumns']);
             }
-            if (is_array($displaySettings) && isset($displaySettings['resultsPerPage'])) {
+            if (\is_array($displaySettings) && isset($displaySettings['resultsPerPage'])) {
                 $this->changeNumberResultsDisplayed($displaySettings['resultsPerPage']);
             }
         }
@@ -820,10 +818,9 @@ protected function processRequest()
     }
 
     /**
-     * Reset display settings
-     *
+     * Reset display settings.
      */
-    protected function razDisplaySettings()
+    protected function razDisplaySettings(): void
     {
         $this->sessionValues->displayedColumns = $this->getDefaultDisplayedColumns();
         $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
@@ -835,17 +832,16 @@ protected function razDisplaySettings()
             $qb = $this->registry->getManager()->createQueryBuilder();
             $qb->delete('EcommitCrudBundle:UserCrudSettings', 's')
                 ->andWhere('s.user = :user AND s.crudName = :crud_name')
-                ->setParameters(array('user' => $this->user, 'crud_name' => $this->sessionName))
+                ->setParameters(['user' => $this->user, 'crud_name' => $this->sessionName])
                 ->getQuery()
                 ->execute();
         }
     }
 
     /**
-     * Reset search form values
-     *
+     * Reset search form values.
      */
-    public function raz()
+    public function raz(): void
     {
         if ($this->defaultFormSearcherData) {
             $newValue = clone $this->defaultFormSearcherData;
@@ -861,10 +857,9 @@ public function raz()
     }
 
     /**
-     * Reset sort
-     *
+     * Reset sort.
      */
-    public function razSort()
+    public function razSort(): void
     {
         $this->sessionValues->sense = $this->defaultSense;
         $this->sessionValues->sort = $this->defaultSort;
@@ -872,17 +867,16 @@ public function razSort()
     }
 
     /**
-     * Builds the query
-     *
+     * Builds the query.
      */
-    public function buildQuery()
+    public function buildQuery(): void
     {
         //Builds query
         $columnSortId = $this->sessionValues->sort;
-        if ($columnSortId == 'defaultPersonalizedSort') {
+        if ('defaultPersonalizedSort' == $columnSortId) {
             //Default personalised sort is used
             foreach ($this->defaultPersonalizedSort as $key => $value) {
-                if (is_int($key)) {
+                if (\is_int($key)) {
                     $sort = $value;
                     $sense = $this->defaultSense;
                 } else {
@@ -897,7 +891,7 @@ public function buildQuery()
                 //Sort alias is not defined. Alias is used
                 $columnSortAlias = $this->availableColumns[$columnSortId]->alias;
                 $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
-            } elseif (is_array($columnSortAlias)) {
+            } elseif (\is_array($columnSortAlias)) {
                 //Sort alias is defined in many columns
                 foreach ($columnSortAlias as $oneColumnSortAlias) {
                     $this->queryBuilder->addOrderBy($oneColumnSortAlias, $this->sessionValues->sense);
@@ -921,10 +915,7 @@ public function buildQuery()
                 } elseif (isset($this->availableVirtualColumns[$field->getColumnId()])) {
                     $column = $this->availableVirtualColumns[$field->getColumnId()];
                 } else {
-                    throw new \Exception(
-                        'Crud: AbstractFormSearcher: getFieldsFilter(): Column id does not exit: ' . $field->getColumnId(
-                        )
-                    );
+                    throw new \Exception('Crud: AbstractFormSearcher: getFieldsFilter(): Column id does not exit: '.$field->getColumnId());
                 }
 
                 //Get alias search
@@ -945,20 +936,19 @@ public function buildQuery()
             $this->queryBuilder = $this->sessionValues->formSearcherData->globalChangeQuery($this->queryBuilder);
         }
 
-
         //Builds paginator
         if ($this->displayResults) {
-            if (is_object($this->buildPaginator) && $this->buildPaginator instanceof \Closure) {
+            if (\is_object($this->buildPaginator) && $this->buildPaginator instanceof \Closure) {
                 //Case: Manual paginator (by closure) is enabled
                 $this->paginator = $this->buildPaginator->__invoke(
                     $this->queryBuilder,
                     $this->sessionValues->page,
                     $this->sessionValues->resultsPerPage
                 );
-            } elseif (true === $this->buildPaginator || is_array($this->buildPaginator)) {
+            } elseif (true === $this->buildPaginator || \is_array($this->buildPaginator)) {
                 //Case: Auto paginator is enabled
-                $paginatorOptions = array();
-                if (is_array($this->buildPaginator)) {
+                $paginatorOptions = [];
+                if (\is_array($this->buildPaginator)) {
                     $paginatorOptions = $this->buildPaginator;
                 }
 
@@ -974,7 +964,8 @@ public function buildQuery()
     }
 
     /**
-     * Return default results per page
+     * Return default results per page.
+     *
      * @return int
      */
     public function getDefaultResultsPerPage()
@@ -983,10 +974,9 @@ public function getDefaultResultsPerPage()
     }
 
     /**
-     * Clears this object, before sending it to template
-     *
+     * Clears this object, before sending it to template.
      */
-    public function clearTemplate()
+    public function clearTemplate(): void
     {
         $this->queryBuilder = null;
         $this->formFactory = null;
@@ -1001,7 +991,7 @@ public function clearTemplate()
     }
 
     /**
-     * Returns availabled columns
+     * Returns availabled columns.
      *
      * @return array
      */
@@ -1011,20 +1001,20 @@ public function getColumns()
     }
 
     /**
-     * Returns one column
+     * Returns one column.
      *
-     * @return CrudColumn   $columnId
+     * @return CrudColumn $columnId
      */
     public function getColumn($columnId)
     {
         if (isset($this->availableColumns[$columnId])) {
             return $this->availableColumns[$columnId];
         }
-        throw new \Exception('Crud: Column ' . $columnId . ' does not exist');
+        throw new \Exception('Crud: Column '.$columnId.' does not exist');
     }
 
     /**
-     * Returns user values
+     * Returns user values.
      *
      * @return CrudSession
      */
@@ -1034,8 +1024,9 @@ public function getSessionValues()
     }
 
     /**
-     * Returns the paginator
-     * @return Object
+     * Returns the paginator.
+     *
+     * @return object
      */
     public function getPaginator()
     {
@@ -1043,9 +1034,9 @@ public function getPaginator()
     }
 
     /**
-     * Sets the paginator
+     * Sets the paginator.
      *
-     * @param Object $value
+     * @param object $value
      */
     public function setPaginator($value)
     {
@@ -1055,7 +1046,7 @@ public function setPaginator($value)
     }
 
     /**
-     * Returns the search form
+     * Returns the search form.
      *
      * @return FormBuilder (before init) or Form (before clearTemplate) or FormView (after clearTemplate)
      */
@@ -1065,7 +1056,7 @@ public function getSearcherForm()
     }
 
     /**
-     * Returns the div id search
+     * Returns the div id search.
      *
      * @return string
      */
@@ -1075,9 +1066,10 @@ public function getDivIdSearch()
     }
 
     /**
-     * Sets the div id search
+     * Sets the div id search.
      *
      * @param string
+     *
      * @return Crud
      */
     public function setDivIdSearch($divIdSearch)
@@ -1088,7 +1080,7 @@ public function setDivIdSearch($divIdSearch)
     }
 
     /**
-     * Returns the div id list
+     * Returns the div id list.
      *
      * @return string
      */
@@ -1098,9 +1090,10 @@ public function getDivIdList()
     }
 
     /**
-     * Sets the div id list
+     * Sets the div id list.
      *
      * @param string
+     *
      * @return Crud
      */
     public function setDivIdList($divIdList)
@@ -1111,7 +1104,7 @@ public function setDivIdList($divIdList)
     }
 
     /**
-     * Gets session name
+     * Gets session name.
      *
      * @return string
      */
@@ -1121,7 +1114,7 @@ public function getSessionName()
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getDisplayResultsOnlyIfSearch()
     {
@@ -1129,7 +1122,8 @@ public function getDisplayResultsOnlyIfSearch()
     }
 
     /**
-     * @param boolean $displayResultsOnlyIfSearch
+     * @param bool $displayResultsOnlyIfSearch
+     *
      * @return Crud
      */
     public function setDisplayResultsOnlyIfSearch($displayResultsOnlyIfSearch)
@@ -1140,7 +1134,7 @@ public function setDisplayResultsOnlyIfSearch($displayResultsOnlyIfSearch)
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getDisplayResults()
     {
@@ -1149,6 +1143,7 @@ public function getDisplayResults()
 
     /**
      * @param bool $displayResults
+     *
      * @return Crud
      */
     public function setDisplayResults($displayResults)
@@ -1160,12 +1155,12 @@ public function setDisplayResults($displayResults)
 
     /**
      * @param string $functionName
-     * @param mixed $value
+     * @param mixed  $value
      */
-    public function configureTemplate($functionName, $value)
+    public function configureTemplate($functionName, $value): void
     {
         if (!self::validateConfigureTemplateFunctionName($functionName)) {
-            throw new \Exception(\sprintf('%s method is not allowed in configureTemplate', $functionName));
+            throw new \Exception(sprintf('%s method is not allowed in configureTemplate', $functionName));
         }
 
         if (isset($this->templateConfiguration[$functionName])) {
@@ -1180,11 +1175,12 @@ public function configureTemplate($functionName, $value)
 
     /**
      * @param string $functionName
+     *
      * @return bool
      */
     public static function validateConfigureTemplateFunctionName($functionName)
     {
-        $functionsAllowed = array(
+        $functionsAllowed = [
             'paginator_links',
             'crud_paginator_links',
             'crud_th',
@@ -1192,13 +1188,14 @@ public static function validateConfigureTemplateFunctionName($functionName)
             'crud_search_reset',
             'crud_remote_modal',
             'crud_display_settings',
-        );
+        ];
 
-        return in_array($functionName, $functionsAllowed);
+        return \in_array($functionName, $functionsAllowed);
     }
 
     /**
      * @param string $functionName
+     *
      * @return array
      */
     public function getTemplateConfiguration($functionName)
@@ -1207,6 +1204,6 @@ public function getTemplateConfiguration($functionName)
             return $this->templateConfiguration[$functionName];
         }
 
-        return array();
+        return [];
     }
 }
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index 799af5d..b8fe869 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -20,17 +22,17 @@ class CrudColumn
     public $label;
     public $sortable;
     public $defaultDisplayed;
-    
+
     /**
-     * Constructor
-     * 
-     * @param string $id   Column id (used everywhere inside the crud)
-     * @param string $alias   Column SQL alias
-     * @param string $label   Column label (used in the header table)
-     * @param bool $sortable   If the column is sortable
-     * @param bool $defaultDisplayed   If the column is displayed, by default
-     * @param string $aliasSearch    Column SQL alias, used during searchs
-     * @param string $aliasSort    Column(s) SQL alias (string or array of strings), used during sorting
+     * Constructor.
+     *
+     * @param string $id               Column id (used everywhere inside the crud)
+     * @param string $alias            Column SQL alias
+     * @param string $label            Column label (used in the header table)
+     * @param bool   $sortable         If the column is sortable
+     * @param bool   $defaultDisplayed If the column is displayed, by default
+     * @param string $aliasSearch      Column SQL alias, used during searchs
+     * @param string $aliasSort        Column(s) SQL alias (string or array of strings), used during sorting
      */
     public function __construct($id, $alias, $label, $sortable, $defaultDisplayed, $aliasSearch, $aliasSort)
     {
diff --git a/src/Crud/CrudFactory.php b/src/Crud/CrudFactory.php
index d66fd6d..1561f5d 100644
--- a/src/Crud/CrudFactory.php
+++ b/src/Crud/CrudFactory.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -66,6 +69,7 @@ public function __construct(
 
     /**
      * @param $sessionName
+     *
      * @return Crud
      */
     public function create($sessionName)
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index 7b2931a..252b3a4 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -17,42 +19,42 @@ class CrudSession
 {
     /**
      * Search's object (used by "setData" inside the form). Used to
-     * save the data of the search form
+     * save the data of the search form.
      *
      * @var AbstractFormSearcher
      */
     public $formSearcherData = null;
 
     /**
-     * Number of results, in one page
+     * Number of results, in one page.
      *
      * @var int
      */
     public $resultsPerPage = null;
 
     /**
-     * Displayed colums
+     * Displayed colums.
      *
      * @var type
      */
-    public $displayedColumns = array();
+    public $displayedColumns = [];
 
     /**
-     * Sortable: Sort (Column id)
+     * Sortable: Sort (Column id).
      *
      * @var type
      */
     public $sort = null;
 
     /**
-     * Sortable: Sens (ASC / DESC)
+     * Sortable: Sens (ASC / DESC).
      *
      * @var type
      */
     public $sense = null;
 
     /**
-     * Page number
+     * Page number.
      *
      * @var int
      */
diff --git a/src/Crud/QueryBuilderInterface.php b/src/Crud/QueryBuilderInterface.php
index c085b2f..767a448 100644
--- a/src/Crud/QueryBuilderInterface.php
+++ b/src/Crud/QueryBuilderInterface.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -24,8 +27,5 @@ public function addOrderBy($sort, $sense);
      */
     public function orderBy($sort, $sense);
 
-    /**
-     * @param QueryBuilderParameterInterface $parameter
-     */
     public function addParameter(QueryBuilderParameterInterface $parameter);
 }
diff --git a/src/Crud/QueryBuilderParameterInterface.php b/src/Crud/QueryBuilderParameterInterface.php
index 9dec07e..49b1a46 100644
--- a/src/Crud/QueryBuilderParameterInterface.php
+++ b/src/Crud/QueryBuilderParameterInterface.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
diff --git a/src/Crud/Rest/RestQueryBuilder.php b/src/Crud/Rest/RestQueryBuilder.php
index 7dcaa3e..9e963a2 100644
--- a/src/Crud/Rest/RestQueryBuilder.php
+++ b/src/Crud/Rest/RestQueryBuilder.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -28,12 +31,12 @@ class RestQueryBuilder implements QueryBuilderInterface
     /**
      * @var array
      */
-    protected $queryParameters = array();
+    protected $queryParameters = [];
 
     /**
      * @var array
      */
-    protected $formParameters = array();
+    protected $formParameters = [];
 
     /**
      * @var string
@@ -53,15 +56,16 @@ class RestQueryBuilder implements QueryBuilderInterface
     /**
      * @var array
      */
-    protected $orders = array();
+    protected $orders = [];
 
     /**
      * RestQueryBuilder constructor.
+     *
      * @param string $url
      * @param string $method
-     * @param array $defaultParameters Array of RestQueryBuilderParameter objects
+     * @param array  $defaultParameters Array of RestQueryBuilderParameter objects
      */
-    public function __construct($url, $method, $defaultParameters = array())
+    public function __construct($url, $method, $defaultParameters = [])
     {
         $this->url = $url;
         $this->method = $method;
@@ -71,7 +75,6 @@ public function __construct($url, $method, $defaultParameters = array())
     }
 
     /**
-     * @param \Closure $orderBuilder
      * @return $this
      */
     public function setOrderBuilder(\Closure $orderBuilder)
@@ -82,7 +85,6 @@ public function setOrderBuilder(\Closure $orderBuilder)
     }
 
     /**
-     * @param \Closure $paginationBuilder
      * @return $this
      */
     public function setPaginationBuilder(\Closure $paginationBuilder)
@@ -96,8 +98,10 @@ public function setPaginationBuilder(\Closure $paginationBuilder)
      * @param string $parameter
      * @param string $value
      * @param string $method
-     * @return $this
+     *
      * @throws \Exception
+     *
+     * @return $this
      */
     public function addParameter(QueryBuilderParameterInterface $parameter)
     {
@@ -125,6 +129,7 @@ public function addParameter(QueryBuilderParameterInterface $parameter)
     /**
      * @param string $sort
      * @param string $sense
+     *
      * @return $this
      */
     public function addOrderBy($sort, $sense)
@@ -137,29 +142,32 @@ public function addOrderBy($sort, $sense)
     /**
      * @param string $sort
      * @param string $sense
+     *
      * @return $this
      */
     public function orderBy($sort, $sense)
     {
-        $this->orders = array();
+        $this->orders = [];
         $this->addOrderBy($sort, $sense);
 
         return $this;
     }
 
     /**
-     * @param int $page
-     * @param int $resultsPerPage
+     * @param int   $page
+     * @param int   $resultsPerPage
      * @param array $options
-     * @return mixed|\Psr\Http\Message\ResponseInterface
+     *
      * @throws \Exception
+     *
+     * @return mixed|\Psr\Http\Message\ResponseInterface
      */
-    public function getResponse($page, $resultsPerPage, $options = array())
+    public function getResponse($page, $resultsPerPage, $options = [])
     {
         $client = new \GuzzleHttp\Client();
 
         //Add paginator parameters
-        if  ($this->paginationBuilder && $this->paginationBuilder instanceof \Closure) {
+        if ($this->paginationBuilder && $this->paginationBuilder instanceof \Closure) {
             $parameters = $this->paginationBuilder->__invoke($page, $resultsPerPage);
             foreach ($parameters as $parameter) {
                 $this->addParameter($parameter);
@@ -167,7 +175,7 @@ public function getResponse($page, $resultsPerPage, $options = array())
         }
 
         //Add sort parameters
-        if  (count($this->orders) > 0 && $this->orderBuilder && $this->orderBuilder instanceof \Closure) {
+        if (\count($this->orders) > 0 && $this->orderBuilder && $this->orderBuilder instanceof \Closure) {
             $parameters = $this->orderBuilder->__invoke($this->orders);
             foreach ($parameters as $parameter) {
                 $this->addParameter($parameter);
diff --git a/src/Crud/Rest/RestQueryBuilderParameter.php b/src/Crud/Rest/RestQueryBuilderParameter.php
index 5b7d24e..444977e 100644
--- a/src/Crud/Rest/RestQueryBuilderParameter.php
+++ b/src/Crud/Rest/RestQueryBuilderParameter.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index aea2c09..8f7aa19 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -16,14 +18,14 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from your config files
+ * This is the class that validates and merges configuration from your config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getConfigTreeBuilder()
     {
@@ -33,7 +35,7 @@ public function getConfigTreeBuilder()
         $rootNode
             ->children()
                 ->arrayNode('template_configuration')
-                    ->treatNullLike(array())
+                    ->treatNullLike([])
                     ->prototype('variable')
                     ->end()
                     ->validate()
@@ -60,4 +62,3 @@ public function getConfigTreeBuilder()
         return $treeBuilder;
     }
 }
-
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index 3d06ea1..e07a6a6 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -11,14 +13,13 @@
 
 namespace Ecommit\CrudBundle\DependencyInjection;
 
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-class EcommitCrudExtension extends Extension 
+class EcommitCrudExtension extends Extension
 {
-    
     /**
      * Loads a specific configuration.
      *
@@ -27,15 +28,15 @@ class EcommitCrudExtension extends Extension
      *
      * @throws \InvalidArgumentException When provided tag is not defined in this extension
      */
-    public function load(array $config, ContainerBuilder $container) 
+    public function load(array $config, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $config);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
 
         $container->setParameter('ecommit_crud.template_configuration', $config['template_configuration']);
-        $container->setParameter('ecommit_crud.images', array('th_image_up' => $config['images']['th_image_up'], 'th_image_down' => $config['images']['th_image_down']));
+        $container->setParameter('ecommit_crud.images', ['th_image_up' => $config['images']['th_image_up'], 'th_image_down' => $config['images']['th_image_down']]);
     }
 }
diff --git a/src/DoctrineExtension/Paginate.php b/src/DoctrineExtension/Paginate.php
index 8e45236..1c6c4a1 100644
--- a/src/DoctrineExtension/Paginate.php
+++ b/src/DoctrineExtension/Paginate.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -26,11 +28,12 @@ class Paginate
 {
     /**
      * @param \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder $queryBuilder
-     * @param array $options
-     * @return int
+     *
      * @throws \Exception
+     *
+     * @return int
      */
-    static public function countQueryBuilder($queryBuilder, array $options = array())
+    public static function countQueryBuilder($queryBuilder, array $options = [])
     {
         if ($queryBuilder instanceof \Doctrine\ORM\QueryBuilder) {
             $useORM = true;
@@ -41,7 +44,7 @@ static public function countQueryBuilder($queryBuilder, array $options = array()
         }
 
         $resolver = new OptionsResolver();
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             //Behavior. Availabled values:
             //  - count_by_alias: Use alias. Option "alias" is required
             //  - count_by_sub_request: Use sub request
@@ -51,14 +54,14 @@ static public function countQueryBuilder($queryBuilder, array $options = array()
             'alias' => null,
             //Used when behavior=count_by_alias
             'distinct_alias' => true,
-        ));
-        $resolver->setAllowedTypes('distinct_alias', array('boolean'));
+        ]);
+        $resolver->setAllowedTypes('distinct_alias', ['boolean']);
         if ($useORM) {
-            $resolver->setAllowedValues('behavior', array('count_by_alias', 'count_by_sub_request', 'orm'));
+            $resolver->setAllowedValues('behavior', ['count_by_alias', 'count_by_sub_request', 'orm']);
             //Use only when ORM and behavior=orm
             $resolver->setDefault('simplified_request', true);
         } else {
-            $resolver->setAllowedValues('behavior', array('count_by_alias', 'count_by_sub_request'));
+            $resolver->setAllowedValues('behavior', ['count_by_alias', 'count_by_sub_request']);
         }
         $options = $resolver->resolve($options);
         if ('count_by_alias' === $options['behavior'] && null === $options['alias']) {
@@ -75,8 +78,8 @@ static public function countQueryBuilder($queryBuilder, array $options = array()
             } elseif ('count_by_alias' === $options['behavior']) {
                 /** @var \Doctrine\ORM\QueryBuilder $countQueryBuilder */
                 $countQueryBuilder = clone $queryBuilder;
-                $distinct = ($options['distinct_alias'])? 'DISTINCT ' : '';
-                $countQueryBuilder->select(\sprintf('count(%s%s)', $distinct, $options['alias']));
+                $distinct = ($options['distinct_alias']) ? 'DISTINCT ' : '';
+                $countQueryBuilder->select(sprintf('count(%s%s)', $distinct, $options['alias']));
                 $countQueryBuilder->resetDQLPart('orderBy');
 
                 return  (int) $countQueryBuilder->getQuery()->getSingleScalarResult();
@@ -86,13 +89,13 @@ static public function countQueryBuilder($queryBuilder, array $options = array()
                 $cloneQueryBuilder->resetDQLPart('orderBy');
                 $rsm = new ResultSetMapping();
                 $rsm->addScalarResult('cnt', 'cnt');
-                $countSql = \sprintf('SELECT count(*) as cnt FROM (%s) mainquery', $cloneQueryBuilder->getQuery()->getSQL());
+                $countSql = sprintf('SELECT count(*) as cnt FROM (%s) mainquery', $cloneQueryBuilder->getQuery()->getSQL());
                 /** @var NativeQuery $countQuery */
                 $countQuery = $queryBuilder->getEntityManager()->createNativeQuery($countSql, $rsm);
                 $i = 0;
                 /** @var Parameter $parameter */
                 foreach ($queryBuilder->getParameters() as $parameter) {
-                    $i++;
+                    ++$i;
                     $countQuery->setParameter($i, $parameter->getValue(), $parameter->getType());
                 }
 
@@ -102,8 +105,8 @@ static public function countQueryBuilder($queryBuilder, array $options = array()
             if ('count_by_alias' === $options['behavior']) {
                 /** @var \Doctrine\DBAL\Query\QueryBuilder $countQueryBuilder */
                 $countQueryBuilder = clone $queryBuilder;
-                $distinct = ($options['distinct_alias'])? 'DISTINCT ' : '';
-                $countQueryBuilder->select(\sprintf('count(%s%s)', $distinct, $options['alias']));
+                $distinct = ($options['distinct_alias']) ? 'DISTINCT ' : '';
+                $countQueryBuilder->select(sprintf('count(%s%s)', $distinct, $options['alias']));
                 $countQueryBuilder->resetQueryPart('orderBy');
 
                 return (int) $countQueryBuilder->execute()->fetchColumn(0);
@@ -115,7 +118,7 @@ static public function countQueryBuilder($queryBuilder, array $options = array()
 
                 $queryBuilderCount->resetQueryParts(); //Remove Query Parts
                 $queryBuilderCount->select('count(*)')
-                    ->from('(' . $queryBuilderClone->getSql() . ')', 'mainquery');
+                    ->from('('.$queryBuilderClone->getSql().')', 'mainquery');
 
                 return (int) $queryBuilderCount->execute()->fetchColumn(0);
             }
@@ -124,6 +127,7 @@ static public function countQueryBuilder($queryBuilder, array $options = array()
 
     /**
      * @param \Doctrine\ORM\QueryBuilde|\Doctrine\DBAL\Query\QueryBuilder $queryBuilder
+     *
      * @return string
      */
     public static function getDefaultCountBehavior($queryBuilder)
@@ -139,13 +143,14 @@ public static function getDefaultCountBehavior($queryBuilder)
 
     /**
      * @param \Doctrine\ORM\QueryBuilde|\Doctrine\DBAL\Query\QueryBuilder $queryBuilder
-     * @param int $page Page number to display
-     * @param int $perPage Results per page
-     * @param array $options
-     * @return AbstractPaginator
+     * @param int                                                         $page         Page number to display
+     * @param int                                                         $perPage      Results per page
+     *
      * @throws \Exception
+     *
+     * @return AbstractPaginator
      */
-    static public function createDoctrinePaginator($queryBuilder, $page, $perPage, array $options = array())
+    public static function createDoctrinePaginator($queryBuilder, $page, $perPage, array $options = [])
     {
         if ($queryBuilder instanceof \Doctrine\ORM\QueryBuilder) {
             $useORM = true;
@@ -156,7 +161,7 @@ static public function createDoctrinePaginator($queryBuilder, $page, $perPage, a
         }
 
         $resolver = new OptionsResolver();
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             //Behavior for create paginator. Availabled values :
             //  - doctrine_paginator: Return DoctrineORMPaginator or DoctrineDBALPaginator object
             //  - identifier_by_sub_request: Primary keys are found by sub request. Return ArrayPaginator. Option "identifier" is required
@@ -164,14 +169,14 @@ static public function createDoctrinePaginator($queryBuilder, $page, $perPage, a
             //Manual value for the number of results
             'count_manual_value' => null,
             //Count options. See countQueryBuilder. Used only if count_manual_value = null
-            'count_options' => array(),
+            'count_options' => [],
             //Identifier used when behavior=identifier_by_sub_request
             'identifier' => null,
             //Used only when ORM and behavior=doctrine_paginator
             'simplified_request' => true,
             'fetch_join_collection' => false,
-        ));
-        $resolver->setAllowedValues('behavior', array('doctrine_paginator', 'identifier_by_sub_request'));
+        ]);
+        $resolver->setAllowedValues('behavior', ['doctrine_paginator', 'identifier_by_sub_request']);
         $options = $resolver->resolve($options);
 
         if ('identifier_by_sub_request' === $options['behavior']) {
@@ -198,7 +203,7 @@ static public function createDoctrinePaginator($queryBuilder, $page, $perPage, a
 
             return $paginator;
         } elseif ('identifier_by_sub_request' === $options['behavior']) {
-            $result = array();
+            $result = [];
 
             if (null === $options['count_manual_value']) {
                 $countResults = self::countQueryBuilder($queryBuilder, $options['count_options']);
@@ -208,7 +213,7 @@ static public function createDoctrinePaginator($queryBuilder, $page, $perPage, a
 
             if ($countResults) {
                 $idsQueryBuilder = clone $queryBuilder;
-                $idsQueryBuilder->select(\sprintf('DISTINCT %s as pk', $options['identifier']));
+                $idsQueryBuilder->select(sprintf('DISTINCT %s as pk', $options['identifier']));
 
                 if ($useORM) {
                     $tmpPaginator = new DoctrineORMPaginator($perPage);
@@ -222,7 +227,7 @@ static public function createDoctrinePaginator($queryBuilder, $page, $perPage, a
                 $tmpPaginator->setManualCountResults($countResults);
                 $tmpPaginator->init();
 
-                $ids = array();
+                $ids = [];
                 foreach ($tmpPaginator->getResults() as $line) {
                     $ids[] = $line['pk'];
                 }
@@ -230,12 +235,12 @@ static public function createDoctrinePaginator($queryBuilder, $page, $perPage, a
                 $finalQueryBuilder = clone $queryBuilder;
                 if ($useORM) {
                     $finalQueryBuilder->resetDQLPart('where');
-                    $finalQueryBuilder->setParameters(array());
+                    $finalQueryBuilder->setParameters([]);
                     QueryBuilderFilter::addMultiFilter($finalQueryBuilder, QueryBuilderFilter::SELECT_IN, $ids, $options['identifier'], 'paginate_pks');
                     $result = $finalQueryBuilder->getQuery()->getResult();
                 } else {
                     $finalQueryBuilder->resetQueryPart('where');
-                    $finalQueryBuilder->setParameters(array());
+                    $finalQueryBuilder->setParameters([]);
                     QueryBuilderFilter::addMultiFilter($finalQueryBuilder, QueryBuilderFilter::SELECT_IN, $ids, $options['identifier'], 'paginate_pks');
                     $result = $finalQueryBuilder->execute()->fetchAll();
                 }
diff --git a/src/DoctrineExtension/QueryBuilderFilter.php b/src/DoctrineExtension/QueryBuilderFilter.php
index 003c8d6..02bb53a 100644
--- a/src/DoctrineExtension/QueryBuilderFilter.php
+++ b/src/DoctrineExtension/QueryBuilderFilter.php
@@ -1,6 +1,9 @@
 <?php
-/**
- * This file is part of the QueryBuilderFilterTrait package.
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
  *
@@ -12,33 +15,35 @@
 
 class QueryBuilderFilter
 {
-    const SELECT_IN = 'IN'; //WHERE IN
-    const SELECT_NOT_IN = 'NIN'; //WHERE NOT IN
-    const SELECT_ALL = 'ALL'; //No Filter (all values) 
-    const SELECT_AUTO = 'AUT'; //WHERE IN. If filter values are empty, no filter (all values)
-    const SELECT_NO = 'NO'; //Must return no result
+    public const SELECT_IN = 'IN'; //WHERE IN
+    public const SELECT_NOT_IN = 'NIN'; //WHERE NOT IN
+    public const SELECT_ALL = 'ALL'; //No Filter (all values)
+    public const SELECT_AUTO = 'AUT'; //WHERE IN. If filter values are empty, no filter (all values)
+    public const SELECT_NO = 'NO'; //Must return no result
 
     /**
-     * Add SQL WHERE IN or WHERE NOT IN filter
+     * Add SQL WHERE IN or WHERE NOT IN filter.
+     *
      * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string $filterSign  ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
-     * @param array $filterValues  Values
-     * @param string $sqlField  SQL field name
-     * @param string $paramName SQL parameter name
+     * @param string                                                       $filterSign   ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
+     * @param array                                                        $filterValues Values
+     * @param string                                                       $sqlField     SQL field name
+     * @param string                                                       $paramName    SQL parameter name
+     *
      * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
      */
     public static function addMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName)
     {
-        if (self::SELECT_NO == $filterSign)  {
+        if (self::SELECT_NO == $filterSign) {
             //Must return no result
             $queryBuilder->andWhere('0 = 1');
 
             return $queryBuilder;
         }
-        if ($filterSign != self::SELECT_IN && $filterSign != self::SELECT_NOT_IN && $filterSign != self::SELECT_AUTO) {
+        if (self::SELECT_IN != $filterSign && self::SELECT_NOT_IN != $filterSign && self::SELECT_AUTO != $filterSign) {
             return $queryBuilder;
         }
-        if (null === $filterValues || 0 === count($filterValues)) {
+        if (null === $filterValues || 0 === \count($filterValues)) {
             if (self::SELECT_NOT_IN == $filterSign || self::SELECT_AUTO == $filterSign) {
                 return $queryBuilder;
             }
@@ -49,7 +54,7 @@ public static function addMultiFilter($queryBuilder, $filterSign, $filterValues,
             return $queryBuilder;
         }
 
-        if (count($filterValues) > 1000) {
+        if (\count($filterValues) > 1000) {
             return self::addGroupMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName);
         }
 
@@ -57,43 +62,47 @@ public static function addMultiFilter($queryBuilder, $filterSign, $filterValues,
     }
 
     /**
-     * Add SQL WHERE IN or WHERE NOT IN filter without group
+     * Add SQL WHERE IN or WHERE NOT IN filter without group.
+     *
      * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string $filterSign  ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
-     * @param array $filterValues  Values
-     * @param string $sqlField  SQL field name
-     * @param string $paramName  SQL parameter name
+     * @param string                                                       $filterSign   ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
+     * @param array                                                        $filterValues Values
+     * @param string                                                       $sqlField     SQL field name
+     * @param string                                                       $paramName    SQL parameter name
+     *
      * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
      */
     protected static function addSimpleMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName)
     {
-        $clauseSql = ($filterSign == self::SELECT_IN || $filterSign == self::SELECT_AUTO)? 'IN' : 'NOT IN';
+        $clauseSql = (self::SELECT_IN == $filterSign || self::SELECT_AUTO == $filterSign) ? 'IN' : 'NOT IN';
 
-        $queryBuilder->andWhere(\sprintf('%s %s (:%s)', $sqlField, $clauseSql, $paramName));
+        $queryBuilder->andWhere(sprintf('%s %s (:%s)', $sqlField, $clauseSql, $paramName));
         $queryBuilder->setParameter($paramName, $filterValues, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
 
         return $queryBuilder;
     }
 
     /**
-     * Add SQL WHERE IN or WHERE NOT IN filter with group
+     * Add SQL WHERE IN or WHERE NOT IN filter with group.
+     *
      * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string $filterSign  ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
-     * @param array $filterValues  Values
-     * @param string $sqlField  SQL field name
-     * @param string $paramName  SQL parameter name
+     * @param string                                                       $filterSign   ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
+     * @param array                                                        $filterValues Values
+     * @param string                                                       $sqlField     SQL field name
+     * @param string                                                       $paramName    SQL parameter name
+     *
      * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
      */
     protected static function addGroupMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName)
     {
-        $clauseSql = ($filterSign == self::SELECT_IN || $filterSign == self::SELECT_AUTO)? 'IN' : 'NOT IN';
-        $separatorClauseSql = ($filterSign == self::SELECT_IN || $filterSign == self::SELECT_AUTO)? 'OR' : 'AND';
+        $clauseSql = (self::SELECT_IN == $filterSign || self::SELECT_AUTO == $filterSign) ? 'IN' : 'NOT IN';
+        $separatorClauseSql = (self::SELECT_IN == $filterSign || self::SELECT_AUTO == $filterSign) ? 'OR' : 'AND';
 
         $groupNumber = 0;
-        $groups = array();
-        foreach (\array_chunk($filterValues, 1000) as $filterValuesGroup) {
-            $groupNumber++;
-            $groups[] = \sprintf('%s %s (:%s%s)', $sqlField, $clauseSql, $paramName, $groupNumber);
+        $groups = [];
+        foreach (array_chunk($filterValues, 1000) as $filterValuesGroup) {
+            ++$groupNumber;
+            $groups[] = sprintf('%s %s (:%s%s)', $sqlField, $clauseSql, $paramName, $groupNumber);
             $queryBuilder->setParameter($paramName.$groupNumber, $filterValuesGroup, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
         }
 
@@ -103,44 +112,46 @@ protected static function addGroupMultiFilter($queryBuilder, $filterSign, $filte
     }
 
     /**
-     * Add SQL WHERE IN or WHERE NOT IN filter. And result MUST BE in the whitelist (if $restrictSign=IN) or MUST NOT BE in the blacklist (if $restrictSign=NIN)
+     * Add SQL WHERE IN or WHERE NOT IN filter. And result MUST BE in the whitelist (if $restrictSign=IN) or MUST NOT BE in the blacklist (if $restrictSign=NIN).
+     *
      * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string $filterSign  ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
-     * @param array $filterValues  Values
-     * @param string $sqlField  SQL field name
-     * @param string $paramName  SQL parameter name
-     * @param string $restrictSign IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $restrictValues is not empty. No filter else), NO (no result)
-     * @param array $restrictValues Whitelist (if $restrictSign=IN or AUT) or blacklist (if $restrictSign=NIN)
+     * @param string                                                       $filterSign     ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
+     * @param array                                                        $filterValues   Values
+     * @param string                                                       $sqlField       SQL field name
+     * @param string                                                       $paramName      SQL parameter name
+     * @param string                                                       $restrictSign   IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $restrictValues is not empty. No filter else), NO (no result)
+     * @param array                                                        $restrictValues Whitelist (if $restrictSign=IN or AUT) or blacklist (if $restrictSign=NIN)
+     *
      * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
      */
     public static function addMultiFilterWithRestrictValues($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName, $restrictSign, $restrictValues)
     {
-        if (self::SELECT_NO == $filterSign || self::SELECT_NO == $restrictSign)  {
+        if (self::SELECT_NO == $filterSign || self::SELECT_NO == $restrictSign) {
             //Must return no result
             $queryBuilder->andWhere('0 = 1');
 
             return $queryBuilder;
         }
 
-        if (in_array($restrictSign, array(self::SELECT_IN, self::SELECT_AUTO)) && in_array($filterSign, array(self::SELECT_IN, self::SELECT_AUTO)) && count($filterValues) > 0 && count($restrictValues) > 0) {
+        if (\in_array($restrictSign, [self::SELECT_IN, self::SELECT_AUTO]) && \in_array($filterSign, [self::SELECT_IN, self::SELECT_AUTO]) && \count($filterValues) > 0 && \count($restrictValues) > 0) {
             //We can simplify the query
 
             //Data cleaning
-            $cleanValues = array();
+            $cleanValues = [];
             foreach ($filterValues as $value) {
-                if (in_array($value, $restrictValues)) {
+                if (\in_array($value, $restrictValues)) {
                     $cleanValues[] = $value;
                 }
             }
 
             $queryBuilder = self::addMultiFilter($queryBuilder, self::SELECT_IN, $cleanValues, $sqlField, $paramName);
-        } elseif (self::SELECT_NOT_IN === $restrictSign && self::SELECT_NOT_IN === $filterSign && count($filterValues) > 0 && count($restrictValues) > 0) {
+        } elseif (self::SELECT_NOT_IN === $restrictSign && self::SELECT_NOT_IN === $filterSign && \count($filterValues) > 0 && \count($restrictValues) > 0) {
             //We can simplify the query
 
             //Data fusion
             $cleanValues = $restrictValues;
             foreach ($filterValues as $value) {
-                if (!in_array($value, $restrictValues)) {
+                if (!\in_array($value, $restrictValues)) {
                     $cleanValues[] = $value;
                 }
             }
@@ -156,12 +167,14 @@ public static function addMultiFilterWithRestrictValues($queryBuilder, $filterSi
     }
 
     /**
-     * Add SQL "equal" or "not equal" filter
+     * Add SQL "equal" or "not equal" filter.
+     *
      * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param bool $equal Equal or not
-     * @param string $filterValue  Value
-     * @param string $sqlField  SQL field name
-     * @param string $paramName  SQL parameter name
+     * @param bool                                                         $equal        Equal or not
+     * @param string                                                       $filterValue  Value
+     * @param string                                                       $sqlField     SQL field name
+     * @param string                                                       $paramName    SQL parameter name
+     *
      * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
      */
     public static function addEqualFilter($queryBuilder, $equal, $filterValue, $sqlField, $paramName)
@@ -181,12 +194,14 @@ public static function addEqualFilter($queryBuilder, $equal, $filterValue, $sqlF
     }
 
     /**
-     * Add SQL comparator filter
+     * Add SQL comparator filter.
+     *
      * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string $sign Comparator sign (< > <= >=)
-     * @param string $filterValue  Value
-     * @param string $sqlField  SQL field name
-     * @param string $paramName  SQL parameter name
+     * @param string                                                       $sign         Comparator sign (< > <= >=)
+     * @param string                                                       $filterValue  Value
+     * @param string                                                       $sqlField     SQL field name
+     * @param string                                                       $paramName    SQL parameter name
+     *
      * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
      */
     public static function addComparatorFilter($queryBuilder, $sign, $filterValue, $sqlField, $paramName)
@@ -195,19 +210,21 @@ public static function addComparatorFilter($queryBuilder, $sign, $filterValue, $
             return $queryBuilder;
         }
 
-        $queryBuilder->andWhere(\sprintf('%s %s :%s', $sqlField, $sign, $paramName));
+        $queryBuilder->andWhere(sprintf('%s %s :%s', $sqlField, $sign, $paramName));
         $queryBuilder->setParameter($paramName, $filterValue);
 
         return $queryBuilder;
     }
 
     /**
-     * Add SQL "LIKE" or "NOT LIKE" filter
+     * Add SQL "LIKE" or "NOT LIKE" filter.
+     *
      * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param bool $contain  Contain or not
-     * @param string $filterValue  Value
-     * @param string $sqlField  SQL field name
-     * @param string $paramName  SQL parameter name
+     * @param bool                                                         $contain      Contain or not
+     * @param string                                                       $filterValue  Value
+     * @param string                                                       $sqlField     SQL field name
+     * @param string                                                       $paramName    SQL parameter name
+     *
      * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
      */
     public static function addContainFilter($queryBuilder, $contain, $filterValue, $sqlField, $paramName)
@@ -218,9 +235,9 @@ public static function addContainFilter($queryBuilder, $contain, $filterValue, $
 
         $filterValue = addcslashes($filterValue, '%_');
         if ($contain) {
-            $queryBuilder->andWhere($queryBuilder->expr()->like($sqlField, ':' . $paramName));
+            $queryBuilder->andWhere($queryBuilder->expr()->like($sqlField, ':'.$paramName));
         } else {
-            $queryBuilder->andWhere($queryBuilder->expr()->notLike($sqlField, ':' . $paramName));
+            $queryBuilder->andWhere($queryBuilder->expr()->notLike($sqlField, ':'.$paramName));
         }
         $queryBuilder->setParameter($paramName, '%'.$filterValue.'%');
 
diff --git a/src/EcommitCrudBundle.php b/src/EcommitCrudBundle.php
index a030e57..3ed6eda 100644
--- a/src/EcommitCrudBundle.php
+++ b/src/EcommitCrudBundle.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
diff --git a/src/Entity/UserCrudInterface.php b/src/Entity/UserCrudInterface.php
index a24e2c1..dac594d 100644
--- a/src/Entity/UserCrudInterface.php
+++ b/src/Entity/UserCrudInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index 436f94d..8edb7ff 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -15,7 +17,7 @@
 use Ecommit\CrudBundle\Crud\CrudSession;
 
 /**
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="user_crud_settings")
  */
 class UserCrudSettings
@@ -40,7 +42,7 @@ class UserCrudSettings
     /**
      * @ORM\Column(type="array", name="displayed_columns")
      */
-    protected $displayedColumns = array();
+    protected $displayedColumns = [];
 
     /**
      * @ORM\Column(type="string", length=30)
@@ -53,22 +55,23 @@ class UserCrudSettings
     protected $sense;
 
     /**
-     * Set crudName
+     * Set crudName.
      *
      * @param string $crudName
+     *
      * @return UserCrudSettings
      */
     public function setCrudName($crudName)
     {
         $this->crudName = $crudName;
-    
+
         return $this;
     }
 
     /**
-     * Get crudName
+     * Get crudName.
      *
-     * @return string 
+     * @return string
      */
     public function getCrudName()
     {
@@ -76,22 +79,23 @@ public function getCrudName()
     }
 
     /**
-     * Set resultsDisplayed
+     * Set resultsDisplayed.
+     *
+     * @param int $resultsDisplayed
      *
-     * @param integer $resultsDisplayed
      * @return UserCrudSettings
      */
     public function setResultsDisplayed($resultsDisplayed)
     {
         $this->resultsDisplayed = $resultsDisplayed;
-    
+
         return $this;
     }
 
     /**
-     * Get resultsDisplayed
+     * Get resultsDisplayed.
      *
-     * @return integer 
+     * @return int
      */
     public function getResultsDisplayed()
     {
@@ -99,22 +103,23 @@ public function getResultsDisplayed()
     }
 
     /**
-     * Set displayedColumns
+     * Set displayedColumns.
      *
      * @param array $displayedColumns
+     *
      * @return UserCrudSettings
      */
     public function setDisplayedColumns($displayedColumns)
     {
         $this->displayedColumns = $displayedColumns;
-    
+
         return $this;
     }
 
     /**
-     * Get displayedColumns
+     * Get displayedColumns.
      *
-     * @return array 
+     * @return array
      */
     public function getDisplayedColumns()
     {
@@ -122,22 +127,23 @@ public function getDisplayedColumns()
     }
 
     /**
-     * Set sort
+     * Set sort.
      *
      * @param string $sort
+     *
      * @return UserCrudSettings
      */
     public function setSort($sort)
     {
         $this->sort = $sort;
-    
+
         return $this;
     }
 
     /**
-     * Get sort
+     * Get sort.
      *
-     * @return string 
+     * @return string
      */
     public function getSort()
     {
@@ -145,22 +151,23 @@ public function getSort()
     }
 
     /**
-     * Set sense
+     * Set sense.
      *
      * @param string $sense
+     *
      * @return UserCrudSettings
      */
     public function setSense($sense)
     {
         $this->sense = $sense;
-    
+
         return $this;
     }
 
     /**
-     * Get sense
+     * Get sense.
      *
-     * @return string 
+     * @return string
      */
     public function getSense()
     {
@@ -168,32 +175,30 @@ public function getSense()
     }
 
     /**
-     * Set user
+     * Set user.
      *
-     * @param \Ecommit\CrudBundle\Entity\UserCrudInterface $user
      * @return UserCrudSettings
      */
     public function setUser(\Ecommit\CrudBundle\Entity\UserCrudInterface $user)
     {
         $this->user = $user;
-    
+
         return $this;
     }
 
     /**
-     * Get user
+     * Get user.
      *
-     * @return \Ecommit\CrudBundle\Entity\UserCrudInterface 
+     * @return \Ecommit\CrudBundle\Entity\UserCrudInterface
      */
     public function getUser()
     {
         return $this->user;
     }
-    
+
     /**
-     * Create CrudSession from this object
-     * 
-     * @param \Ecommit\CrudBundle\Crud\CrudSession $crudSessionManager
+     * Create CrudSession from this object.
+     *
      * @return \Ecommit\CrudBundle\Crud\CrudSession
      */
     public function transformToCrudSession(CrudSession $crudSessionManager)
@@ -202,16 +207,14 @@ public function transformToCrudSession(CrudSession $crudSessionManager)
         $crudSessionManager->resultsPerPage = $this->resultsDisplayed;
         $crudSessionManager->sense = $this->sense;
         $crudSessionManager->sort = $this->sort;
-        
+
         return $crudSessionManager;
     }
-    
+
     /**
-     * Update this object from CrudSession
-     * 
-     * @param \Ecommit\CrudBundle\Crud\CrudSession $crudSessionManager
+     * Update this object from CrudSession.
      */
-    public function updateFromSessionManager(CrudSession $crudSessionManager)
+    public function updateFromSessionManager(CrudSession $crudSessionManager): void
     {
         $this->displayedColumns = $crudSessionManager->displayedColumns;
         $this->resultsDisplayed = $crudSessionManager->resultsPerPage;
diff --git a/src/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
index 742f3f0..cfafe2e 100644
--- a/src/EventListener/MappingEntities.php
+++ b/src/EventListener/MappingEntities.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -17,7 +20,7 @@ class MappingEntities
 {
     protected $isLoad = false;
 
-    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
+    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
         $metadata = $eventArgs->getClassMetadata();
 
@@ -36,22 +39,22 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
         }
     }
 
-    protected function mappUserCrudSettings(ClassMetadataInfo $userCrudSettingsMetadata, ClassMetadataInfo $userMetadata)
+    protected function mappUserCrudSettings(ClassMetadataInfo $userCrudSettingsMetadata, ClassMetadataInfo $userMetadata): void
     {
         $this->isLoad = true;
 
         $userCrudSettingsMetadata->setAssociationOverride(
             'user',
-            array(
+            [
                 'targetEntity' => $userMetadata->getName(),
                 'fieldName' => 'user',
                 'id' => true,
-                'joinColumns' => array(array(
+                'joinColumns' => [[
                     'name' => 'user_id',
                     'referencedColumnName' => $userMetadata->getSingleIdentifierColumnName(),
                     'onDelete' => 'CASCADE',
-                ))
-            )
+                ]],
+            ]
         );
     }
-} 
+}
diff --git a/src/Form/Filter/AbstractFieldFilter.php b/src/Form/Filter/AbstractFieldFilter.php
index d6481ce..f3c886a 100644
--- a/src/Form/Filter/AbstractFieldFilter.php
+++ b/src/Form/Filter/AbstractFieldFilter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -25,12 +27,12 @@ abstract class AbstractFieldFilter
     protected $isInitiated = false;
 
     /**
-     * @param string $columnId Column id
-     * @param string $property Field Name (search form)
-     * @param array $options Options
-     * @param array $typeOptions Type options
+     * @param string $columnId    Column id
+     * @param string $property    Field Name (search form)
+     * @param array  $options     Options
+     * @param array  $typeOptions Type options
      */
-    public function __construct($columnId, $property, $options = array(), $typeOptions = array())
+    public function __construct($columnId, $property, $options = [], $typeOptions = [])
     {
         $this->columnId = $columnId;
         $this->property = $property;
@@ -42,7 +44,7 @@ public function __construct($columnId, $property, $options = array(), $typeOptio
         $this->typeOptions = $typeOptions;
     }
 
-    public function init()
+    public function init(): void
     {
         if ($this->isInitiated) {
             return;
@@ -60,27 +62,22 @@ public function init()
         $this->isInitiated = true;
     }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
-    protected function configureCommonOptions(OptionsResolver $resolver)
+    protected function configureCommonOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
-            array(
+            [
                 'validate' => true,
-            )
+            ]
         );
     }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
     }
 
     /**
      * @param array $typeOptions
+     *
      * @return array
      */
     protected function configureTypeOptions($typeOptions)
@@ -89,33 +86,34 @@ protected function configureTypeOptions($typeOptions)
     }
 
     /**
-     * Adds the field into the form
-     * @param FormBuilder $formBuilder
+     * Adds the field into the form.
+     *
      * @return FormBuilder
      */
     abstract public function addField(FormBuilder $formBuilder);
 
     /**
-     * Changes the query
+     * Changes the query.
+     *
      * @param QueryBuilder $queryBuilder
-     * @param AbstractFormSearcher $formData
-     * @param string $aliasSearch
+     * @param string       $aliasSearch
+     *
      * @return QueryBuilder
      */
     abstract public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch);
 
     /**
-     * Add auto validation
+     * Add auto validation.
+     *
      * @param $value
-     * @param ExecutionContextInterface $context
      */
-    public function autoValidate(AbstractFormSearcher $value, ExecutionContextInterface $context)
+    public function autoValidate(AbstractFormSearcher $value, ExecutionContextInterface $context): void
     {
         if (!$this->options['validate']) {
             return;
         }
         $autoConstraints = $this->getAutoConstraints();
-        if (count($autoConstraints) == 0) {
+        if (0 == \count($autoConstraints)) {
             return;
         }
         $context->getValidator()
@@ -125,16 +123,17 @@ public function autoValidate(AbstractFormSearcher $value, ExecutionContextInterf
     }
 
     /**
-     * Gets auto constraints list
+     * Gets auto constraints list.
+     *
      * @return array
      */
     protected function getAutoConstraints()
     {
-        return array();
+        return [];
     }
 
     /**
-     * Returns the column id associated at this object
+     * Returns the column id associated at this object.
      *
      * @return string
      */
@@ -144,7 +143,7 @@ public function getColumnId()
     }
 
     /**
-     * Returns the property associated at this object
+     * Returns the property associated at this object.
      *
      * @return string
      */
@@ -155,9 +154,9 @@ public function getProperty()
 
     /**
      * @param string $label
-     * @param bool $displayLabelInErrors
+     * @param bool   $displayLabelInErrors
      */
-    public function setLabel($label, $displayLabelInErrors = false)
+    public function setLabel($label, $displayLabelInErrors = false): void
     {
         if (!empty($label) && !isset($this->typeOptions['label'])) {
             $this->typeOptions['label'] = $label;
diff --git a/src/Form/Filter/FieldFilterBoolean.php b/src/Form/Filter/FieldFilterBoolean.php
index 949bbd3..6c85175 100644
--- a/src/Form/Filter/FieldFilterBoolean.php
+++ b/src/Form/Filter/FieldFilterBoolean.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -19,22 +21,22 @@
 class FieldFilterBoolean extends AbstractFieldFilter
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
-            array(
+            [
                 'value_true' => 1,
                 'value_false' => 0,
                 'not_null_is_true' => false,
                 'null_is_false' => true,
-            )
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function configureTypeOptions($typeOptions)
     {
@@ -48,7 +50,7 @@ protected function configureTypeOptions($typeOptions)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
@@ -58,7 +60,7 @@ public function addField(FormBuilder $formBuilder)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
     {
@@ -67,10 +69,10 @@ public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $alia
             return $queryBuilder;
         }
 
-        if ($value == 'T') {
-            $parameterName = 'value_true' . str_replace(' ', '', $this->property);
+        if ('T' == $value) {
+            $parameterName = 'value_true'.str_replace(' ', '', $this->property);
             if ($this->options['not_null_is_true']) {
-                $parameterNameFalse = 'value_false' . str_replace(' ', '', $this->property);
+                $parameterNameFalse = 'value_false'.str_replace(' ', '', $this->property);
                 $queryBuilder->andWhere(
                     sprintf(
                         '(%s = :%s OR (%s IS NOT NULL AND %s != :%s))',
@@ -84,14 +86,14 @@ public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $alia
                     ->setParameter($parameterName, $this->options['value_true'])
                     ->setParameter($parameterNameFalse, $this->options['value_false']);
             } else {
-                $queryBuilder->andWhere(sprintf('%s = :%s',$aliasSearch, $parameterName))
+                $queryBuilder->andWhere(sprintf('%s = :%s', $aliasSearch, $parameterName))
                     ->setParameter($parameterName, $this->options['value_true']);
             }
 
             return $queryBuilder;
-        } elseif ($value == 'F') {
-            $parameterName = 'value_false' . str_replace(' ', '', $this->property);
-            if (is_null($this->options['value_false'])) {
+        } elseif ('F' == $value) {
+            $parameterName = 'value_false'.str_replace(' ', '', $this->property);
+            if (null === $this->options['value_false']) {
                 $queryBuilder->andWhere(sprintf('%s IS NULL', $aliasSearch));
             } elseif ($this->options['null_is_false']) {
                 $queryBuilder->andWhere(
@@ -108,17 +110,17 @@ public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $alia
                     ->setParameter($parameterName, $this->options['value_false']);
             }
 
-            return $queryBuilder;
-        } else {
             return $queryBuilder;
         }
+
+        return $queryBuilder;
     }
 
     public static function getChoices()
     {
-        return array(
+        return [
             'filter.true' => 'T',
             'filter.false' => 'F',
-        );
+        ];
     }
 }
diff --git a/src/Form/Filter/FieldFilterChoice.php b/src/Form/Filter/FieldFilterChoice.php
index 3a89b0e..8e55f48 100644
--- a/src/Form/Filter/FieldFilterChoice.php
+++ b/src/Form/Filter/FieldFilterChoice.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -22,35 +24,35 @@
 class FieldFilterChoice extends AbstractFieldFilter
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureCommonOptions(OptionsResolver $resolver)
+    protected function configureCommonOptions(OptionsResolver $resolver): void
     {
         parent::configureCommonOptions($resolver);
 
         $resolver->setDefaults(
-            array(
+            [
                 'multiple' => false,
                 'min' => null,
                 'max' => 99,
-            )
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
-            array(
+            [
                 'choices' => null,
-            )
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function configureTypeOptions($typeOptions)
     {
@@ -63,9 +65,8 @@ protected function configureTypeOptions($typeOptions)
         return $typeOptions;
     }
 
-
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
@@ -75,44 +76,44 @@ public function addField(FormBuilder $formBuilder)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function getAutoConstraints()
     {
         if ($this->options['multiple']) {
-            return array(
+            return [
                 new Assert\Count(
-                    array(
+                    [
                         'min' => $this->options['min'],
                         'max' => $this->options['max'],
-                    )
+                    ]
                 ),
-            );
-        } else {
-            return array();
+            ];
         }
+
+        return [];
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
     {
         $value = $formData->get($this->property);
-        $parameterName = 'value_choice' . str_replace(' ', '', $this->property);
-        if (null === $value || '' === $value || array() === $value) {
+        $parameterName = 'value_choice'.str_replace(' ', '', $this->property);
+        if (null === $value || '' === $value || [] === $value) {
             return $queryBuilder;
         }
 
         if ($this->options['multiple']) {
-            if (!is_array($value)) {
-                $value = array($value);
+            if (!\is_array($value)) {
+                $value = [$value];
             }
             $value = Util::filterScalarValues($value);
-            if (count($value) > $this->options['max'] || 0 === count($value)) {
+            if (\count($value) > $this->options['max'] || 0 === \count($value)) {
                 return $queryBuilder;
             }
-            if ($this->options['min'] && count($value) < $this->options['min']) {
+            if ($this->options['min'] && \count($value) < $this->options['min']) {
                 return $queryBuilder;
             }
             QueryBuilderFilter::addMultiFilter($queryBuilder, QueryBuilderFilter::SELECT_IN, $value, $aliasSearch, $parameterName);
diff --git a/src/Form/Filter/FieldFilterDate.php b/src/Form/Filter/FieldFilterDate.php
index 2afe167..c307e1a 100644
--- a/src/Form/Filter/FieldFilterDate.php
+++ b/src/Form/Filter/FieldFilterDate.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -22,19 +24,19 @@
 
 class FieldFilterDate extends AbstractFieldFilter
 {
-    const GREATER_THAN = '>';
-    const GREATER_EQUAL = '>=';
-    const SMALLER_THAN = '<';
-    const SMALLER_EQUAL = '<=';
-    const EQUAL = '=';
+    public const GREATER_THAN = '>';
+    public const GREATER_EQUAL = '>=';
+    public const SMALLER_THAN = '<';
+    public const SMALLER_EQUAL = '<=';
+    public const EQUAL = '=';
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
-            array(
+            [
                 'type' => JqueryDatePickerType::class,
                 'with_time' => function (Options $options) {
                     if (DateTimeType::class === $options['type']) {
@@ -43,33 +45,33 @@ protected function configureOptions(OptionsResolver $resolver)
 
                     return false;
                 },
-            )
+            ]
         );
 
         $resolver->setRequired(
-            array(
+            [
                 'comparator',
-            )
+            ]
         );
 
         $resolver->setAllowedValues(
             'comparator',
-            array(
+            [
                 self::EQUAL,
                 self::GREATER_EQUAL,
                 self::GREATER_THAN,
                 self::SMALLER_EQUAL,
                 self::SMALLER_THAN,
-            )
+            ]
         );
 
         $resolver->setAllowedValues(
             'type',
-            array(
+            [
                 DateType::class,
                 DateTimeType::class,
                 JqueryDatePickerType::class,
-            )
+            ]
         );
     }
 
@@ -85,7 +87,7 @@ protected function configureTypeOptions($typeOptions)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
@@ -95,59 +97,59 @@ public function addField(FormBuilder $formBuilder)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function getAutoConstraints()
     {
-        return array(
+        return [
             new Assert\Date(),
-        );
+        ];
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
     {
         $value = $formData->get($this->property);
         if (!empty($value) && $value instanceof \DateTime) {
-            $parameterName = 'value_date_' . str_replace(' ', '', $this->property);
+            $parameterName = 'value_date_'.str_replace(' ', '', $this->property);
 
             switch ($this->options['comparator']):
-                case FieldFilterDate::SMALLER_THAN:
-                case FieldFilterDate::GREATER_EQUAL:
+                case self::SMALLER_THAN:
+                case self::GREATER_EQUAL:
                     if (!$this->options['with_time']) {
                         $value->setTime(0, 0, 0);
                     }
-                    $value = $value->format('Y-m-d H:i:s');
-                    $queryBuilder->andWhere(
+            $value = $value->format('Y-m-d H:i:s');
+            $queryBuilder->andWhere(
                         sprintf('%s %s :%s', $aliasSearch, $this->options['comparator'], $parameterName)
                     )
                         ->setParameter($parameterName, $value);
-                    break;
-                case FieldFilterDate::SMALLER_EQUAL:
-                case FieldFilterDate::GREATER_THAN:
+            break;
+            case self::SMALLER_EQUAL:
+                case self::GREATER_THAN:
                     if (!$this->options['with_time']) {
                         $value->setTime(23, 59, 59);
                     }
-                    $value = $value->format('Y-m-d H:i:s');
-                    $queryBuilder->andWhere(
+            $value = $value->format('Y-m-d H:i:s');
+            $queryBuilder->andWhere(
                         sprintf('%s %s :%s', $aliasSearch, $this->options['comparator'], $parameterName)
                     )
                         ->setParameter($parameterName, $value);
-                    break;
-                default:
+            break;
+            default:
                     $valueDateInf = clone $value;
-                    $valueDateSup = clone $value;
-                    if (!$this->options['with_time']) {
-                        $valueDateInf->setTime(0, 0, 0);
-                        $valueDateSup->setTime(23, 59, 59);
-                    }
-                    $valueDateInf = $valueDateInf->format('Y-m-d H:i:s');
-                    $valueDateSup = $valueDateSup->format('Y-m-d H:i:s');
-                    $parameterNameInf = 'value_date_inf_' . str_replace(' ', '', $this->property);
-                    $parameterNameSup = 'value_date_sup_' . str_replace(' ', '', $this->property);
-                    $queryBuilder->andWhere(
+            $valueDateSup = clone $value;
+            if (!$this->options['with_time']) {
+                $valueDateInf->setTime(0, 0, 0);
+                $valueDateSup->setTime(23, 59, 59);
+            }
+            $valueDateInf = $valueDateInf->format('Y-m-d H:i:s');
+            $valueDateSup = $valueDateSup->format('Y-m-d H:i:s');
+            $parameterNameInf = 'value_date_inf_'.str_replace(' ', '', $this->property);
+            $parameterNameSup = 'value_date_sup_'.str_replace(' ', '', $this->property);
+            $queryBuilder->andWhere(
                         sprintf(
                             '%s >= :%s AND %s <= :%s',
                             $aliasSearch,
@@ -158,7 +160,7 @@ public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $alia
                     )
                         ->setParameter($parameterNameInf, $valueDateInf)
                         ->setParameter($parameterNameSup, $valueDateSup);
-                    break;
+            break;
             endswitch;
         }
 
diff --git a/src/Form/Filter/FieldFilterDoctrineInterface.php b/src/Form/Filter/FieldFilterDoctrineInterface.php
index d2cb9a7..f1d8bc0 100644
--- a/src/Form/Filter/FieldFilterDoctrineInterface.php
+++ b/src/Form/Filter/FieldFilterDoctrineInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -16,5 +18,6 @@
 interface FieldFilterDoctrineInterface
 {
     public function getRegistry();
+
     public function setRegistry(ManagerRegistry $registry);
 }
diff --git a/src/Form/Filter/FieldFilterEmpty.php b/src/Form/Filter/FieldFilterEmpty.php
index 0b88551..bcf72fb 100644
--- a/src/Form/Filter/FieldFilterEmpty.php
+++ b/src/Form/Filter/FieldFilterEmpty.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -18,7 +20,7 @@
 class FieldFilterEmpty extends AbstractFieldFilter
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function configureTypeOptions($typeOptions)
     {
@@ -28,7 +30,7 @@ protected function configureTypeOptions($typeOptions)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
@@ -38,7 +40,7 @@ public function addField(FormBuilder $formBuilder)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
     {
@@ -47,7 +49,7 @@ public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $alia
             return $queryBuilder;
         }
 
-        if ($value == 1) {
+        if (1 == $value) {
             $queryBuilder->andWhere(
                 sprintf('(%s IS NULL OR %s = \'\')', $aliasSearch, $aliasSearch)
             );
diff --git a/src/Form/Filter/FieldFilterEntity.php b/src/Form/Filter/FieldFilterEntity.php
index d7e34e5..36addfd 100644
--- a/src/Form/Filter/FieldFilterEntity.php
+++ b/src/Form/Filter/FieldFilterEntity.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -27,25 +29,25 @@ class FieldFilterEntity extends FieldFilterChoice implements FieldFilterDoctrine
     protected $registry;
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
         parent::configureOptions($resolver);
 
         $resolver->setDefaults(
-            array(
+            [
                 'choice_label' => null,
                 'em' => null,
                 'query_builder' => null,
                 'identifier' => null,
-            )
+            ]
         );
 
         $resolver->setRequired(
-            array(
+            [
                 'class',
-            )
+            ]
         );
 
         $resolver->setNormalizer('em', $this->getEmNormalizer($this->registry));
@@ -60,7 +62,7 @@ protected function configureTypeOptions($typeOptions)
         $queryBuilderLoader = new ORMQueryBuilderLoader($this->options['query_builder']);
 
         $accessor = PropertyAccess::createPropertyAccessor();
-        $choices = array();
+        $choices = [];
         foreach ($queryBuilderLoader->getEntities() as $entity) {
             $id = $accessor->getValue($entity, $this->options['identifier']);
             $choices[$this->extractLabel($entity)] = $id;
@@ -75,8 +77,10 @@ protected function configureTypeOptions($typeOptions)
     }
 
     /**
-     * Extract property that should be used for displaying the entities as text in the HTML element
+     * Extract property that should be used for displaying the entities as text in the HTML element.
+     *
      * @param object $object
+     *
      * @throws \Exception
      */
     protected function extractLabel($object)
@@ -86,10 +90,9 @@ protected function extractLabel($object)
 
             return $accessor->getValue($object, $this->options['choice_label']);
         } elseif (method_exists($object, '__toString')) {
-            return (string)$object;
-        } else {
-            throw new \Exception('"choice_label" option or "__toString" method must be defined"');
+            return (string) $object;
         }
+        throw new \Exception('"choice_label" option or "__toString" method must be defined"');
     }
 
     public function getRegistry()
@@ -97,7 +100,7 @@ public function getRegistry()
         return $this->registry;
     }
 
-    public function setRegistry(ManagerRegistry $registry)
+    public function setRegistry(ManagerRegistry $registry): void
     {
         $this->registry = $registry;
     }
diff --git a/src/Form/Filter/FieldFilterInteger.php b/src/Form/Filter/FieldFilterInteger.php
index 49cdb14..2c7e091 100644
--- a/src/Form/Filter/FieldFilterInteger.php
+++ b/src/Form/Filter/FieldFilterInteger.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -18,37 +20,37 @@
 
 class FieldFilterInteger extends AbstractFieldFilter
 {
-    const GREATER_THAN = '>';
-    const GREATER_EQUAL = '>=';
-    const SMALLER_THAN = '<';
-    const SMALLER_EQUAL = '<=';
-    const EQUAL = '=';
+    public const GREATER_THAN = '>';
+    public const GREATER_EQUAL = '>=';
+    public const SMALLER_THAN = '<';
+    public const SMALLER_EQUAL = '<=';
+    public const EQUAL = '=';
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setRequired(
-            array(
+            [
                 'comparator',
-            )
+            ]
         );
 
         $resolver->setAllowedValues(
             'comparator',
-            array(
+            [
                 self::EQUAL,
                 self::GREATER_EQUAL,
                 self::GREATER_THAN,
                 self::SMALLER_EQUAL,
                 self::SMALLER_THAN,
-            )
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
@@ -58,13 +60,13 @@ public function addField(FormBuilder $formBuilder)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
     {
         $value = $formData->get($this->property);
-        if (!is_null($value) && is_numeric($value)) { //Important: Is_null but not is_empty
-            $parameterName = 'value_integer_' . str_replace(' ', '', $this->property);
+        if (null !== $value && is_numeric($value)) { //Important: Is_null but not is_empty
+            $parameterName = 'value_integer_'.str_replace(' ', '', $this->property);
             $queryBuilder->andWhere(
                 sprintf('%s %s :%s', $aliasSearch, $this->options['comparator'], $parameterName)
             )
diff --git a/src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php b/src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
index 144b5aa..8486ced 100644
--- a/src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
+++ b/src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -19,12 +22,12 @@
 class FieldFilterJqueryAutocompleteEntityAjax extends AbstractFieldFilter
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
-            array(
+            [
                 'em' => null,
                 'query_builder' => null,
                 'choice_label' => null,
@@ -33,23 +36,23 @@ protected function configureOptions(OptionsResolver $resolver)
                 'route_name' => null,
                 'route_params' => null,
                 'max_length' => 255,
-            )
+            ]
         );
 
         $resolver->setRequired(
-            array(
+            [
                 'class',
-            )
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function configureTypeOptions($typeOptions)
     {
         foreach ($this->options as $optionName => $optionValue) {
-            if (!empty($optionValue) && !in_array($optionName, array('validate', 'max_length'))) {
+            if (!empty($optionValue) && !\in_array($optionName, ['validate', 'max_length'])) {
                 $typeOptions[$optionName] = $optionValue;
             }
         }
@@ -59,7 +62,7 @@ protected function configureTypeOptions($typeOptions)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
@@ -69,26 +72,26 @@ public function addField(FormBuilder $formBuilder)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function getAutoConstraints()
     {
-        return array(
+        return [
             new Assert\Length(
-                array(
+                [
                     'max' => $this->options['max_length'],
-                )
+                ]
             ),
-        );
+        ];
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
     {
         $value = $formData->get($this->property);
-        $parameterName = 'value_jquery_auto' . str_replace(' ', '', $this->property);
+        $parameterName = 'value_jquery_auto'.str_replace(' ', '', $this->property);
         if (null === $value || '' === $value || !is_scalar($value)) {
             return $queryBuilder;
         }
diff --git a/src/Form/Filter/FieldFilterNumber.php b/src/Form/Filter/FieldFilterNumber.php
index 5de370a..2c96ea7 100644
--- a/src/Form/Filter/FieldFilterNumber.php
+++ b/src/Form/Filter/FieldFilterNumber.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -17,7 +19,7 @@
 class FieldFilterNumber extends FieldFilterInteger
 {
     /**
-     * {@inheritDoc} 
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
diff --git a/src/Form/Filter/FieldFilterSelect2Choice.php b/src/Form/Filter/FieldFilterSelect2Choice.php
index af909b9..125f0df 100644
--- a/src/Form/Filter/FieldFilterSelect2Choice.php
+++ b/src/Form/Filter/FieldFilterSelect2Choice.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -16,11 +19,11 @@
 class FieldFilterSelect2Choice extends FieldFilterChoice
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
-        $formBuilder->add($this->property, Select2ChoiceType::class , $this->typeOptions);
+        $formBuilder->add($this->property, Select2ChoiceType::class, $this->typeOptions);
 
         return $formBuilder;
     }
diff --git a/src/Form/Filter/FieldFilterSelect2Country.php b/src/Form/Filter/FieldFilterSelect2Country.php
index b57932a..f2b91e0 100644
--- a/src/Form/Filter/FieldFilterSelect2Country.php
+++ b/src/Form/Filter/FieldFilterSelect2Country.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -16,11 +19,11 @@
 class FieldFilterSelect2Country extends FieldFilterChoice
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
-        $formBuilder->add($this->property, Select2CountryType::class , $this->typeOptions);
+        $formBuilder->add($this->property, Select2CountryType::class, $this->typeOptions);
 
         return $formBuilder;
     }
diff --git a/src/Form/Filter/FieldFilterSelect2Entity.php b/src/Form/Filter/FieldFilterSelect2Entity.php
index 05ef219..a219774 100644
--- a/src/Form/Filter/FieldFilterSelect2Entity.php
+++ b/src/Form/Filter/FieldFilterSelect2Entity.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -16,7 +19,7 @@
 class FieldFilterSelect2Entity extends FieldFilterEntity
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
diff --git a/src/Form/Filter/FieldFilterSelect2EntityAjax.php b/src/Form/Filter/FieldFilterSelect2EntityAjax.php
index 06c0b5e..8a493a9 100644
--- a/src/Form/Filter/FieldFilterSelect2EntityAjax.php
+++ b/src/Form/Filter/FieldFilterSelect2EntityAjax.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -17,12 +20,12 @@
 class FieldFilterSelect2EntityAjax extends FieldFilterChoice
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
-            array(
+            [
                 'em' => null,
                 'query_builder' => null,
                 'choice_label' => null,
@@ -30,23 +33,23 @@ protected function configureOptions(OptionsResolver $resolver)
                 'url' => null, //Required in FormType if route_name is empty
                 'route_name' => null,
                 'route_params' => null,
-            )
+            ]
         );
 
         $resolver->setRequired(
-            array(
+            [
                 'class',
-            )
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function configureTypeOptions($typeOptions)
     {
         foreach ($this->options as $optionName => $optionValue) {
-            if (!empty($optionValue) && !in_array($optionName, array('validate', 'min'))) {
+            if (!empty($optionValue) && !\in_array($optionName, ['validate', 'min'])) {
                 $typeOptions[$optionName] = $optionValue;
             }
         }
@@ -56,7 +59,7 @@ protected function configureTypeOptions($typeOptions)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
diff --git a/src/Form/Filter/FieldFilterText.php b/src/Form/Filter/FieldFilterText.php
index 8dfd7b3..18bc8cb 100644
--- a/src/Form/Filter/FieldFilterText.php
+++ b/src/Form/Filter/FieldFilterText.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -20,22 +22,22 @@
 class FieldFilterText extends AbstractFieldFilter
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
-            array(
+            [
                 'must_begin' => false,
                 'must_end' => false,
                 'min_length' => null,
                 'max_length' => 255,
-            )
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
@@ -45,27 +47,27 @@ public function addField(FormBuilder $formBuilder)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function getAutoConstraints()
     {
-        return array(
+        return [
             new Assert\Length(
-                array(
+                [
                     'min' => $this->options['min_length'],
                     'max' => $this->options['max_length'],
-                )
+                ]
             ),
-        );
+        ];
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
     {
         $value = $formData->get($this->property);
-        $parameterName = 'value_text_' . str_replace(' ', '', $this->property);
+        $parameterName = 'value_text_'.str_replace(' ', '', $this->property);
         if (null === $value || '' === $value || !is_scalar($value)) {
             return $queryBuilder;
         }
@@ -77,9 +79,9 @@ public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $alia
             $after = ($this->options['must_begin']) ? '' : '%';
             $before = ($this->options['must_end']) ? '' : '%';
             $value = addcslashes($value, '%_');
-            $like = $after . $value . $before;
+            $like = $after.$value.$before;
             $queryBuilder->andWhere(
-                $queryBuilder->expr()->like($aliasSearch, ':' . $parameterName)
+                $queryBuilder->expr()->like($aliasSearch, ':'.$parameterName)
             )
                 ->setParameter($parameterName, $like);
         }
diff --git a/src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php b/src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
index 7364b18..b17447b 100644
--- a/src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
+++ b/src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -20,12 +23,12 @@
 class FieldFilterTokenInputEntitiesAjax extends AbstractFieldFilter
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    protected function configureOptions(OptionsResolver $resolver)
+    protected function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
-            array(
+            [
                 'em' => null,
                 'query_builder' => null,
                 'choice_label' => null,
@@ -35,23 +38,23 @@ protected function configureOptions(OptionsResolver $resolver)
                 'route_params' => null,
                 'min' => null,
                 'max' => 99,
-            )
+            ]
         );
 
         $resolver->setRequired(
-            array(
+            [
                 'class',
-            )
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function configureTypeOptions($typeOptions)
     {
         foreach ($this->options as $optionName => $optionValue) {
-            if (!empty($optionValue) && !in_array($optionName, array('validate', 'min'))) {
+            if (!empty($optionValue) && !\in_array($optionName, ['validate', 'min'])) {
                 $typeOptions[$optionName] = $optionValue;
             }
         }
@@ -61,7 +64,7 @@ protected function configureTypeOptions($typeOptions)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function addField(FormBuilder $formBuilder)
     {
@@ -71,42 +74,43 @@ public function addField(FormBuilder $formBuilder)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function getAutoConstraints()
     {
-        return array(
+        return [
             new Assert\Count(
-                array(
+                [
                     'min' => $this->options['min'],
                     'max' => $this->options['max'],
-                )
+                ]
             ),
-        );
+        ];
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
     {
         $value = $formData->get($this->property);
-        $parameterName = 'value_choice' . str_replace(' ', '', $this->property);
-        if (null === $value || '' === $value || !is_array($value)) {
+        $parameterName = 'value_choice'.str_replace(' ', '', $this->property);
+        if (null === $value || '' === $value || !\is_array($value)) {
             return $queryBuilder;
         }
         $value = Util::filterScalarValues($value);
-        if (0 === count($value)) {
+        if (0 === \count($value)) {
             return $queryBuilder;
         }
 
-        if (count($value) > $this->options['max']) {
+        if (\count($value) > $this->options['max']) {
             return $queryBuilder;
         }
-        if ($this->options['min'] && count($value) < $this->options['min']) {
+        if ($this->options['min'] && \count($value) < $this->options['min']) {
             return $queryBuilder;
         }
-        return $queryBuilder->andWhere($queryBuilder->expr()->in($aliasSearch, ':' . $parameterName))
+
+        return $queryBuilder->andWhere($queryBuilder->expr()->in($aliasSearch, ':'.$parameterName))
             ->setParameter($parameterName, $value);
     }
 }
diff --git a/src/Form/Searcher/AbstractFormSearcher.php b/src/Form/Searcher/AbstractFormSearcher.php
index fc22029..419e24e 100644
--- a/src/Form/Searcher/AbstractFormSearcher.php
+++ b/src/Form/Searcher/AbstractFormSearcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -28,24 +30,25 @@ abstract class AbstractFormSearcher
      */
     protected $accessor;
 
-    protected $commonOptions = array();
+    protected $commonOptions = [];
 
     public $isSubmitted = false;
 
     /**
-     * Declares fields
+     * Declares fields.
      *
      * @return array
      */
     public function configureFieldsFilter()
     {
-        return array();
+        return [];
     }
 
     /**
-     * Gets field value
+     * Gets field value.
      *
      * @param string $field Field Name
+     *
      * @return mixed
      */
     public function get($field)
@@ -63,9 +66,9 @@ public function get($field)
      * Clears this objet
      * Used before storing this object in session
      * By default, If one property is not public and it doesn't begin
-     * by "field", it will be deleted
+     * by "field", it will be deleted.
      */
-    public function clear()
+    public function clear(): void
     {
         unset($this->fieldFilters);
         unset($this->accessor);
@@ -76,27 +79,27 @@ public function clear()
      * Sub method of "clear" method
      * Remove properties if they are not fields
      * If one property is not public and it doesn't begin
-     * by "field", it will be deleted
+     * by "field", it will be deleted.
      */
-    protected function clearExceptFields()
+    protected function clearExceptFields(): void
     {
         foreach ($this as $key => $value) {
             $variable = new \ReflectionProperty($this, $key);
-            if (!$variable->isPublic() && !\preg_match('/^field/', $key)) {
+            if (!$variable->isPublic() && !preg_match('/^field/', $key)) {
                 unset($this->$key);
             }
         }
     }
 
     /**
-     * Returns fields
+     * Returns fields.
      *
      * @return array
      */
     public function getFieldsFilter($registry = null)
     {
         if (!$this->fieldFilters) {
-            $this->fieldFilters = array();
+            $this->fieldFilters = [];
             foreach ($this->configureFieldsFilter() as $field) {
                 $this->fieldFilters[] = $field;
                 if (!empty($registry) && $field instanceof \Ecommit\CrudBundle\Form\Filter\FieldFilterDoctrineInterface) {
@@ -110,19 +113,16 @@ public function getFieldsFilter($registry = null)
     }
 
     /**
-     * Sets fields
-     *
-     * @param array $filters
+     * Sets fields.
      */
-    public function setFieldsFilter(array $filters)
+    public function setFieldsFilter(array $filters): void
     {
         $this->fieldFilters = $filters;
     }
 
     /**
-     * Changes the form (global change)
+     * Changes the form (global change).
      *
-     * @param \Symfony\Component\Form\FormBuilderInterface $formBuilder
      * @return \Symfony\Component\Form\FormBuilderInterface
      */
     public function globalBuildForm(FormBuilderInterface $formBuilder)
@@ -131,9 +131,10 @@ public function globalBuildForm(FormBuilderInterface $formBuilder)
     }
 
     /**
-     * Changes the query (global change)
+     * Changes the query (global change).
      *
      * @param QueryBuilder $queryBuilder
+     *
      * @return QueryBuilder
      */
     public function globalChangeQuery($queryBuilder)
@@ -142,7 +143,8 @@ public function globalChangeQuery($queryBuilder)
     }
 
     /**
-     * Returns true if auto validation is enabled
+     * Returns true if auto validation is enabled.
+     *
      * @return bool
      */
     public function automaticValidationIsEnabled()
@@ -151,7 +153,8 @@ public function automaticValidationIsEnabled()
     }
 
     /**
-     * Returns true if labels are displayed in errors messages
+     * Returns true if labels are displayed in errors messages.
+     *
      * @return bool
      */
     public function displayLabelInErrors()
@@ -159,12 +162,12 @@ public function displayLabelInErrors()
         return false;
     }
 
-    public static function loadValidatorMetadata(ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata): void
     {
         $metadata->addConstraint(new Callback('validateFormSearcher'));
     }
 
-    public static function validateFormSearcher($value, ExecutionContextInterface $context)
+    public static function validateFormSearcher($value, ExecutionContextInterface $context): void
     {
         if ($value->automaticValidationIsEnabled()) {
             foreach ($value->getFieldsFilter() as $field) {
@@ -181,6 +184,7 @@ protected function getAccessor()
         if (!isset($this->accessor) || !$this->accessor) {
             $this->accessor = PropertyAccess::createPropertyAccessor();
         }
+
         return $this->accessor;
     }
 
@@ -195,7 +199,7 @@ public function getCommonOptions()
     /**
      * @param array $commonOptions
      */
-    public function setCommonOptions($commonOptions)
+    public function setCommonOptions($commonOptions): void
     {
         $this->commonOptions = $commonOptions;
     }
diff --git a/src/Form/Type/DisplaySettingsType.php b/src/Form/Type/DisplaySettingsType.php
index ce314d1..4ba8a70 100644
--- a/src/Form/Type/DisplaySettingsType.php
+++ b/src/Form/Type/DisplaySettingsType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -19,55 +21,55 @@
 class DisplaySettingsType extends AbstractType
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         //Field "resultsPerPage"
         $builder->add(
             'resultsPerPage',
             ChoiceType::class,
-            array(
+            [
                 'choices' => array_flip($options['resultsPerPageChoices']),
                 'label' => 'Number of results per page',
                 'choice_translation_domain' => false,
-            )
+            ]
         );
 
         //Field "displayedColumns"
         $builder->add(
             'displayedColumns',
             ChoiceType::class,
-            array(
+            [
                 'choices' => array_flip($options['columnsChoices']),
                 'multiple' => true,
                 'expanded' => true,
-                'label' => 'Columns to be shown'
-            )
+                'label' => 'Columns to be shown',
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
-            array(
+            [
                 'csrf_protection' => false,
-            )
+            ]
         );
 
         $resolver->setRequired(
-            array(
+            [
                 'resultsPerPageChoices',
                 'columnsChoices',
-            )
+            ]
         );
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getBlockPrefix()
     {
diff --git a/src/Form/Type/FormSearchType.php b/src/Form/Type/FormSearchType.php
index 8b8a3cf..23ad991 100644
--- a/src/Form/Type/FormSearchType.php
+++ b/src/Form/Type/FormSearchType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -18,25 +20,25 @@
 class FormSearchType extends AbstractType
 {
     /**
-     * {@inheritDoc} 
+     * {@inheritdoc}
      */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {  
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
     }
-    
+
     /**
-     * {@inheritDoc} 
+     * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => 'Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher',
             'csrf_protection' => false,
-        ));
+        ]);
     }
-    
+
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getBlockPrefix()
     {
diff --git a/src/Helper/CrudHelper.php b/src/Helper/CrudHelper.php
index 6caa0f2..520d1ed 100644
--- a/src/Helper/CrudHelper.php
+++ b/src/Helper/CrudHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -74,15 +76,13 @@ class CrudHelper
     /**
      * @var array
      */
-    protected $lastValues = array();
+    protected $lastValues = [];
 
     /**
-     * Constructor
+     * Constructor.
      *
-     * @param UtilHelper $util
      * @param Manager $javascriptManager
-     * @param FormFactoryInterface $formFactory
-     * @param bool $useBootstrap
+     * @param bool    $useBootstrap
      */
     public function __construct(
         UtilHelper $util,
@@ -122,29 +122,29 @@ public function getOverlayService()
     }
 
     /**
-     * Returns links paginator
+     * Returns links paginator.
+     *
+     * @param string $routeName   Route name
+     * @param array  $routeParams Route parameters
+     * @param array  $options     Options:
+     *                            * ajax_options: Ajax Options. If null, Ajax is not used. Default: null
+     *                            * attribute_page: Attribute inside url. Default: page
+     *                            * type: Type of links paginator: elastic (all links) or sliding. Default: sliding
+     *                            * max_pages_before: Max links before current page (only if sliding type is used). Default: 3
+     *                            * max_pages_after: Max links after current page (only if sliding type is used). Default: 3
+     *                            * buttons: Type of buttons: text or image. Default: text
+     *                            * image_first:  Url image "<<" (only if image buttons is used)
+     *                            * image_previous:  Url image "<" (only if image buttons is used)
+     *                            * image_next:  Url image ">" (only if image buttons is used)
+     *                            * image_last:  Url image ">>" (only if image buttons is used)
+     *                            * text_first:  Text "<<" (only if text buttons is used)
+     *                            * text_previous:  Text "<" (only if text buttons is used)
+     *                            * text_next:  Text ">" (only if text buttons is used)
+     *                            * text_last:  Text ">>" (only if text buttons is used)
+     *                            * use_bootstrap: Use or not bootstap
+     *                            * bootstrap_size: Bootstrap nav size (lg sm or null)
+     *                            * template: Template used. If null, default template is used
      *
-     * @param AbstractPaginator $paginator
-     * @param string $routeName Route name
-     * @param array $routeParams Route parameters
-     * @param array $options Options:
-     *        * ajax_options: Ajax Options. If null, Ajax is not used. Default: null
-     *        * attribute_page: Attribute inside url. Default: page
-     *        * type: Type of links paginator: elastic (all links) or sliding. Default: sliding
-     *        * max_pages_before: Max links before current page (only if sliding type is used). Default: 3
-     *        * max_pages_after: Max links after current page (only if sliding type is used). Default: 3
-     *        * buttons: Type of buttons: text or image. Default: text
-     *        * image_first:  Url image "<<" (only if image buttons is used)
-     *        * image_previous:  Url image "<" (only if image buttons is used)
-     *        * image_next:  Url image ">" (only if image buttons is used)
-     *        * image_last:  Url image ">>" (only if image buttons is used)
-     *        * text_first:  Text "<<" (only if text buttons is used)
-     *        * text_previous:  Text "<" (only if text buttons is used)
-     *        * text_next:  Text ">" (only if text buttons is used)
-     *        * text_last:  Text ">>" (only if text buttons is used)
-     *        * use_bootstrap: Use or not bootstap
-     *        * bootstrap_size: Bootstrap nav size (lg sm or null)
-     *        * template: Template used. If null, default template is used
      * @return string
      */
     public function paginatorLinks(AbstractPaginator $paginator, $routeName, $routeParams, $options)
@@ -154,7 +154,7 @@ public function paginatorLinks(AbstractPaginator $paginator, $routeName, $routeP
         }
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
-            array(
+            [
                 'ajax_options' => null,
                 'attribute_page' => 'page',
                 'type' => 'sliding',
@@ -172,39 +172,39 @@ public function paginatorLinks(AbstractPaginator $paginator, $routeName, $routeP
                 'use_bootstrap' => $this->useBootstrap,
                 'bootstrap_size' => null,
                 'template' => null,
-            )
+            ]
         );
-        $resolver->setAllowedTypes('ajax_options', array('null', 'array'));
+        $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
         $resolver->setAllowedTypes('max_pages_before', 'int');
         $resolver->setAllowedTypes('max_pages_after', 'int');
-        $resolver->setAllowedValues('type', array('sliding', 'elastic'));
-        $resolver->setAllowedValues('buttons', array('text', 'image'));
+        $resolver->setAllowedValues('type', ['sliding', 'elastic']);
+        $resolver->setAllowedValues('buttons', ['text', 'image']);
         $resolver->setAllowedTypes('use_bootstrap', 'bool');
-        $resolver->setAllowedValues('bootstrap_size', array('lg', 'sm', null));
+        $resolver->setAllowedValues('bootstrap_size', ['lg', 'sm', null]);
         $options = $resolver->resolve($options);
 
         if ($options['template']) {
             return $this->templating->render(
                 $options['template'],
-                array(
+                [
                     'paginator' => $paginator,
                     'routeName' => $routeName,
                     'routeParams' => $routeParams,
                     'options' => $options,
-                )
+                ]
             );
         }
 
         $navigation = '';
         if ($paginator->haveToPaginate()) {
-            $navigationClass = $options['use_bootstrap']? 'pagination': 'pagination_nobootstrap';
+            $navigationClass = $options['use_bootstrap'] ? 'pagination' : 'pagination_nobootstrap';
             if ($options['use_bootstrap'] && $options['bootstrap_size']) {
                 $navigationClass .= ' pagination-'.$options['bootstrap_size'];
             }
-            $navigation .= \sprintf('<nav><ul class="%s">', $navigationClass);
+            $navigation .= sprintf('<nav><ul class="%s">', $navigationClass);
 
             //First page / Previous page
-            if ($paginator->getPage() != 1) {
+            if (1 != $paginator->getPage()) {
                 $navigation .= $this->elementPaginatorLinks(1, $options, 'first', $routeName, $routeParams);
                 $navigation .= $this->elementPaginatorLinks(
                     $paginator->getPreviousPage(),
@@ -216,9 +216,9 @@ public function paginatorLinks(AbstractPaginator $paginator, $routeName, $routeP
             }
 
             //Pages before the current page
-            $limit = ($options['type'] == 'sliding') ? $paginator->getPage() - $options['max_pages_before'] : 1;
+            $limit = ('sliding' == $options['type']) ? $paginator->getPage() - $options['max_pages_before'] : 1;
             $currentPage = $paginator->getPage();
-            for ($page = $limit; $page < $currentPage; $page++) {
+            for ($page = $limit; $page < $currentPage; ++$page) {
                 if ($page <= $paginator->getLastPage() && $page >= $paginator->getFirstPage()) {
                     //The page exists, displays it
                     $navigation .= $this->elementPaginatorLinks($page, $options, 'page', $routeName, $routeParams);
@@ -236,9 +236,9 @@ public function paginatorLinks(AbstractPaginator $paginator, $routeName, $routeP
             );
 
             //Pages after the current page
-            $limit = ($options['type'] == 'sliding') ? $paginator->getPage(
+            $limit = ('sliding' == $options['type']) ? $paginator->getPage(
                 ) + $options['max_pages_after'] : $paginator->getLastPage();
-            for ($page = $paginator->getPage() + 1; $page <= $limit; $page++) {
+            for ($page = $paginator->getPage() + 1; $page <= $limit; ++$page) {
                 if ($page <= $paginator->getLastPage() && $page >= $paginator->getFirstPage()) {
                     //The page exists, displays it
                     $navigation .= $this->elementPaginatorLinks($page, $options, 'page', $routeName, $routeParams);
@@ -270,14 +270,14 @@ public function paginatorLinks(AbstractPaginator $paginator, $routeName, $routeP
     }
 
     /**
-     * Paginator links: Display one element
+     * Paginator links: Display one element.
      *
-     * @param int $page Page number
-     * @param array $options Options
+     * @param int    $page        Page number
+     * @param array  $options     Options
      * @param string $elementName first, previous, page, next or last
      * @param string $routeName
-     * @param array $routeParams
-     * @param bool $current If element is the current page
+     * @param array  $routeParams
+     * @param bool   $current     If element is the current page
      */
     protected function elementPaginatorLinks(
         $page,
@@ -289,41 +289,41 @@ protected function elementPaginatorLinks(
     ) {
         $url = $this->router->generate(
             $routeName,
-            \array_merge($routeParams, array($options['attribute_page'] => $page))
+            array_merge($routeParams, [$options['attribute_page'] => $page])
         );
-        if ($elementName == 'page') {
+        if ('page' == $elementName) {
             if ($current) {
-                $class = ($options['use_bootstrap'])? 'active': 'pagination_current';
+                $class = ($options['use_bootstrap']) ? 'active' : 'pagination_current';
                 if ($options['use_bootstrap']) {
-                    $content = $this->listePrivateLink($page, '', array('onclick' => 'return false;')); //bootstrap expects link
+                    $content = $this->listePrivateLink($page, '', ['onclick' => 'return false;']); //bootstrap expects link
                 } else {
                     $content = $page;
                 }
             } else {
-                $class = ($options['use_bootstrap'])? '': 'pagination_no_current';
-                $content = $this->listePrivateLink($page, $url, array(), $options['ajax_options']);
+                $class = ($options['use_bootstrap']) ? '' : 'pagination_no_current';
+                $content = $this->listePrivateLink($page, $url, [], $options['ajax_options']);
             }
         } else {
-            $class = $options['buttons'] . ' ' . $elementName;
-            $buttonName = $options['buttons'] . '_' . $elementName;
+            $class = $options['buttons'].' '.$elementName;
+            $buttonName = $options['buttons'].'_'.$elementName;
             $button = $options[$buttonName];
-            if ($options['buttons'] == 'text' || $options['use_bootstrap']) {
-                $content = $this->listePrivateLink($button, $url, array(), $options['ajax_options']);
+            if ('text' == $options['buttons'] || $options['use_bootstrap']) {
+                $content = $this->listePrivateLink($button, $url, [], $options['ajax_options']);
             } else {
-                $image = $this->util->tag('img', array('src' => $button, 'alt' => $elementName));
-                $content = $this->listePrivateLink($image, $url, array(), $options['ajax_options']);
+                $image = $this->util->tag('img', ['src' => $button, 'alt' => $elementName]);
+                $content = $this->listePrivateLink($image, $url, [], $options['ajax_options']);
             }
         }
 
-        return \sprintf('<li class="%s">%s</li>', $class, $content);
+        return sprintf('<li class="%s">%s</li>', $class, $content);
     }
 
     /**
-     * Returns CRUD links paginator
+     * Returns CRUD links paginator.
      *
-     * @param Crud $crud
-     * @param array $options Options. See CrudHelper::paginatorLinks (ajax_options is ignored)
+     * @param array $options     Options. See CrudHelper::paginatorLinks (ajax_options is ignored)
      * @param array $ajaxOptions Ajax Options
+     *
      * @return string
      */
     public function crudPaginatorLinks(Crud $crud, $options, $ajaxOptions)
@@ -338,17 +338,17 @@ public function crudPaginatorLinks(Crud $crud, $options, $ajaxOptions)
     }
 
     /**
-     * Returns one colunm, inside "header" CRUD
+     * Returns one colunm, inside "header" CRUD.
+     *
+     * @param string $column_id   Column id
+     * @param array  $options     Options :
+     *                            * label: Label. If null, default label is displayed
+     *                            * image_up: Url image "^"
+     *                            * image_down: Url image "V"
+     *                            * template: Template used. If null, default template is used
+     * @param array  $thOptions   Html options
+     * @param array  $ajaxOptions Ajax Options
      *
-     * @param string $column_id Column id
-     * @param Crud $crud
-     * @param array $options Options :
-     *        * label: Label. If null, default label is displayed
-     *        * image_up: Url image "^"
-     *        * image_down: Url image "V"
-     *        * template: Template used. If null, default template is used
-     * @param array $thOptions Html options
-     * @param array $ajaxOptions Ajax Options
      * @return string
      */
     public function th($column_id, Crud $crud, $options, $thOptions, $ajaxOptions)
@@ -356,24 +356,24 @@ public function th($column_id, Crud $crud, $options, $thOptions, $ajaxOptions)
         $options = array_merge($crud->getTemplateConfiguration('crud_th'), $options);
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
-            array(
+            [
                 'label' => null,
                 'image_up' => $this->parameters['images']['th_image_up'],
                 'image_down' => $this->parameters['images']['th_image_down'],
                 'template' => null,
-            )
+            ]
         );
         $options = $resolver->resolve($options);
 
         if ($options['template']) {
             return $this->templating->render(
                 $options['template'],
-                array(
+                [
                     'column_id' => $column_id,
                     'crud' => $crud,
                     'th_options' => $thOptions,
                     'ajax_options' => $ajaxOptions,
-                )
+                ]
             );
         }
 
@@ -392,13 +392,13 @@ public function th($column_id, Crud $crud, $options, $thOptions, $ajaxOptions)
         //If the label was not defined, we take default label
         $column = $crud->getColumn($column_id);
         $label = $options['label'];
-        if (\is_null($label)) {
+        if (null === $label) {
             $label = $column->label;
         }
         //I18N label
         $label = $this->translator->trans($label);
         //XSS protection
-        $label = \htmlentities($label, ENT_QUOTES, 'UTF-8');
+        $label = htmlentities($label, ENT_QUOTES, 'UTF-8');
 
         //Case n°1: We cannot sort this column, we just show the label
         if (!$column->sortable) {
@@ -409,8 +409,8 @@ public function th($column_id, Crud $crud, $options, $thOptions, $ajaxOptions)
         if ($session_values->sort != $column_id) {
             $content = $this->listePrivateLink(
                 $label,
-                $crud->getUrl(array('sort' => $column_id)),
-                array(),
+                $crud->getUrl(['sort' => $column_id]),
+                [],
                 $ajaxOptions
             );
 
@@ -418,25 +418,25 @@ public function th($column_id, Crud $crud, $options, $thOptions, $ajaxOptions)
         }
 
         //Case n°3: We can sort on this column, and the sorting is active on her at present
-        $image_src = ($session_values->sense == Crud::ASC) ? $image_up : $image_down;
-        $image_alt = ($session_values->sense == Crud::ASC) ? '^' : 'V';
-        $new_sense = ($session_values->sense == Crud::ASC) ? Crud::DESC : Crud::ASC;
-        $image = $this->util->tag('img', array('src' => $image_src, 'alt' => $image_alt));
-        $link = $this->listePrivateLink($label, $crud->getUrl(array('sense' => $new_sense)), array(), $ajaxOptions);
+        $image_src = (Crud::ASC == $session_values->sense) ? $image_up : $image_down;
+        $image_alt = (Crud::ASC == $session_values->sense) ? '^' : 'V';
+        $new_sense = (Crud::ASC == $session_values->sense) ? Crud::DESC : Crud::ASC;
+        $image = $this->util->tag('img', ['src' => $image_src, 'alt' => $image_alt]);
+        $link = $this->listePrivateLink($label, $crud->getUrl(['sense' => $new_sense]), [], $ajaxOptions);
 
-        return $this->util->tag('th', $thOptions, $link . $image);
+        return $this->util->tag('th', $thOptions, $link.$image);
     }
 
     /**
-     * Returns one colunm, inside "body" CRUD
+     * Returns one colunm, inside "body" CRUD.
      *
      * @param string $column_id Column id
-     * @param Crud $crud
-     * @param string $value Value
-     * @param array $options Options :
-     *        * escape: Escape (or not) the value
-     *        * template: Template used. If null, default template is used
-     * @param array $tdOptions Html options
+     * @param string $value     Value
+     * @param array  $options   Options :
+     *                          * escape: Escape (or not) the value
+     *                          * template: Template used. If null, default template is used
+     * @param array  $tdOptions Html options
+     *
      * @return string
      */
     public function td($column_id, Crud $crud, $value, $options, $tdOptions)
@@ -444,25 +444,25 @@ public function td($column_id, Crud $crud, $value, $options, $tdOptions)
         $options = array_merge($crud->getTemplateConfiguration('crud_td'), $options);
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
-            array(
+            [
                 'escape' => true,
                 'template' => null,
                 'repeated_values_string' => null,
                 'repeated_values_add_title' => true,
-            )
+            ]
         );
         $options = $resolver->resolve($options);
 
         if ($options['template']) {
             return $this->templating->render(
                 $options['template'],
-                array(
+                [
                     'column_id' => $column_id,
                     'crud' => $crud,
                     'value' => $value,
                     'options' => $options,
                     'td_options' => $tdOptions,
-                )
+                ]
             );
         }
 
@@ -495,60 +495,59 @@ public function td($column_id, Crud $crud, $value, $options, $tdOptions)
 
         //XSS protection
         if ($options['escape']) {
-            $value = \htmlentities($value, ENT_QUOTES, 'UTF-8');
+            $value = htmlentities($value, ENT_QUOTES, 'UTF-8');
         }
 
         return $this->util->tag('td', $tdOptions, $value);
     }
 
     /**
-     * Returns "Display Settings" form
+     * Returns "Display Settings" form.
      *
-     * @param Crud $crud
      * @return FormView
      */
     public function getFormDisplaySettings(Crud $crud)
     {
         $form_name = sprintf('crud_display_settings_%s', $crud->getSessionName());
-        $resultsPerPageChoices = array();
+        $resultsPerPageChoices = [];
         foreach ($crud->getAvailableResultsPerPage() as $number) {
             $resultsPerPageChoices[$number] = $number;
         }
-        $columnsChoices = array();
+        $columnsChoices = [];
         foreach ($crud->getColumns() as $column) {
             $columnsChoices[$column->id] = $column->label;
         }
-        $data = array(
+        $data = [
             'resultsPerPage' => $crud->getSessionValues()->resultsPerPage,
             'displayedColumns' => $crud->getSessionValues()->displayedColumns,
-        );
+        ];
 
         $form = $this->formFactory->createNamed(
             $form_name,
             DisplaySettingsType::class,
             $data,
-            array(
+            [
                 'resultsPerPageChoices' => $resultsPerPageChoices,
                 'columnsChoices' => $columnsChoices,
                 'action' => $crud->getUrl(),
-            )
+            ]
         );
 
         return $form->createView();
     }
 
     /**
-     * Returns search form tag
+     * Returns search form tag.
      *
-     * @param Crud $crud
      * @param array $ajaxOptions Ajax Options
-     * @param type $htmlOptions Html options
+     * @param type  $htmlOptions Html options
+     *
      * @return string
      */
     public function searchFormTag(Crud $crud, $ajaxOptions, $htmlOptions)
     {
         if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = 'js_holder_for_multi_update_' . $crud->getSessionName();
+            $ajaxOptions['update'] = 'js_holder_for_multi_update_'.$crud->getSessionName();
         }
 
         if (!isset($htmlOptions['novalidate'])) {
@@ -559,14 +558,14 @@ public function searchFormTag(Crud $crud, $ajaxOptions, $htmlOptions)
     }
 
     /**
-     * Returns search reset button
+     * Returns search reset button.
      *
-     * @param Crud $crud
-     * @param array $options Options :
-     *        * label: Label. Défault: Reset
-     *        * template: Template used. If null, default template is used
+     * @param array $options     Options :
+     *                           * label: Label. Défault: Reset
+     *                           * template: Template used. If null, default template is used
      * @param array $ajaxOptions Ajax options
      * @param array $htmlOptions Html options
+     *
      * @return string
      */
     public function searchResetButton(Crud $crud, $options, $ajaxOptions, $htmlOptions)
@@ -574,63 +573,65 @@ public function searchResetButton(Crud $crud, $options, $ajaxOptions, $htmlOptio
         $options = array_merge($crud->getTemplateConfiguration('crud_search_reset'), $options);
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
-            array(
+            [
                 'label' => 'Reset',
                 'template' => null,
-            )
+            ]
         );
         $options = $resolver->resolve($options);
 
         if ($options['template']) {
             return $this->templating->render(
                 $options['template'],
-                array(
+                [
                     'crud' => $crud,
                     'options' => $options,
                     'ajax_options' => $ajaxOptions,
                     'html_options' => $htmlOptions,
-                )
+                ]
             );
         }
 
         if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = 'js_holder_for_multi_update_' . $crud->getSessionName();
+            $ajaxOptions['update'] = 'js_holder_for_multi_update_'.$crud->getSessionName();
         }
         if (!isset($htmlOptions['class'])) {
             $htmlOptions['class'] = ($this->useBootstrap) ? 'raz-bootstrap btn btn-default btn-sm' : 'raz';
         }
         $label = $this->translator->trans($options['label']);
         if ($this->useBootstrap) {
-            $label = '<span class="glyphicon glyphicon-fire"></span> ' . $label;
+            $label = '<span class="glyphicon glyphicon-fire"></span> '.$label;
         }
 
         return $this->javascriptManager->jQueryButtonToRemote(
             $label,
-            $crud->getSearchUrl(array('raz' => 1)),
+            $crud->getSearchUrl(['raz' => 1]),
             $ajaxOptions,
             $htmlOptions
         );
     }
 
     /**
-     * Returns declaration of modal
+     * Returns declaration of modal.
      *
      * @param string $modalId Modal id
-     * @param array $options
+     * @param array  $options
+     *
      * @return string
      */
-    public function declareModal($modalId, $options = array())
+    public function declareModal($modalId, $options = [])
     {
         return $this->overlay->declareHtmlModal($modalId, $options);
     }
 
     /**
-     * Returns JS code to open modal window
+     * Returns JS code to open modal window.
+     *
+     * @param string $modalId     Modal id
+     * @param string $url         Url
+     * @param array  $options     Array options
+     * @param array  $ajaxOptions Ajax options
      *
-     * @param string $modalId Modal id
-     * @param string $url Url
-     * @param array $options Array options
-     * @param array $ajaxOptions Ajax options
      * @return string
      */
     public function remoteModal($modalId, $url, $options, $ajaxOptions)
@@ -642,21 +643,21 @@ public function remoteModal($modalId, $url, $options, $ajaxOptions)
 
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
-            array(
+            [
                 'js_on_close' => null,
                 'close_div_class' => 'overlay-close',
-            )
+            ]
         );
         $options = $resolver->resolve($options);
 
         //Create Callback (Opening window)
         $jsModal = "$('#$modalId .contentWrap').html(data); ";
-        $jsModal .= $this->overlay->declareJavascriptModal($modalId, array('js_on_close' => $options['js_on_close'], 'close_div_class' => $options['close_div_class']));
+        $jsModal .= $this->overlay->declareJavascriptModal($modalId, ['js_on_close' => $options['js_on_close'], 'close_div_class' => $options['close_div_class']]);
         $jsModal .= $this->overlay->openModal($modalId);
 
         //Add callback
         if (isset($ajaxOptions['success'])) {
-            $ajaxOptions['success'] = $jsModal . ' ' . $ajaxOptions['success'];
+            $ajaxOptions['success'] = $jsModal.' '.$ajaxOptions['success'];
         } else {
             $ajaxOptions['success'] = $jsModal;
         }
@@ -670,43 +671,44 @@ public function remoteModal($modalId, $url, $options, $ajaxOptions)
     }
 
     /**
-     * Returns modal form tag
+     * Returns modal form tag.
+     *
+     * @param string          $modalId     Modal id
+     * @param FormView|string $form        the form or the url
+     * @param array           $ajaxOptions Ajax options
+     * @param array           $htmlOptions Html options
      *
-     * @param string $modalId Modal id
-     * @param FormView|string $form The form or the url.
-     * @param array $ajaxOptions Ajax options
-     * @param array $htmlOptions Html options
      * @return string
      */
     public function formModal($modalId, $form, $ajaxOptions, $htmlOptions)
     {
         $modalId = str_replace(' ', '', $modalId);
         if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = $modalId . ' .contentWrap';
+            $ajaxOptions['update'] = $modalId.' .contentWrap';
         }
 
         return $this->javascriptManager->jQueryFormToRemote($form, $ajaxOptions, $htmlOptions);
     }
 
     /**
-     * Creates a link
+     * Creates a link.
+     *
+     * @param string $name          Name link
+     * @param string $url           Url link
+     * @param array  $linkToOptions Html options
+     * @param array  $ajaxOptions   Ajax options (if null, Ajax is disabled)
      *
-     * @param string $name Name link
-     * @param string $url Url link
-     * @param array $linkToOptions Html options
-     * @param array $ajaxOptions Ajax options (if null, Ajax is disabled)
      * @return string
      */
-    protected function listePrivateLink($name, $url, $linkToOptions = array(), $ajaxOptions = null)
+    protected function listePrivateLink($name, $url, $linkToOptions = [], $ajaxOptions = null)
     {
-        if (is_null($ajaxOptions)) {
+        if (null === $ajaxOptions) {
             //No Ajax, Simple link
             $linkToOptions['href'] = $url;
 
             return $this->util->tag('a', $linkToOptions, $name);
-        } else {
-            //Ajax Request
-            return $this->javascriptManager->jQueryLinkToRemote($name, $url, $ajaxOptions, $linkToOptions);
         }
+        //Ajax Request
+        return $this->javascriptManager->jQueryLinkToRemote($name, $url, $ajaxOptions, $linkToOptions);
     }
 }
diff --git a/src/Paginator/AbstractDoctrinePaginator.php b/src/Paginator/AbstractDoctrinePaginator.php
index 5e770d4..93c0be2 100644
--- a/src/Paginator/AbstractDoctrinePaginator.php
+++ b/src/Paginator/AbstractDoctrinePaginator.php
@@ -1,5 +1,8 @@
 <?php
-/**
+
+declare(strict_types=1);
+
+/*
  * This file is part of the EcommitCrudBundle package.
  *
  * (c) E-commit <contact@e-commit.fr>
@@ -14,7 +17,7 @@ abstract class AbstractDoctrinePaginator extends AbstractPaginator
 {
     protected $query = null;
     protected $manualCountResults = null;
-    protected $countOptions = array();
+    protected $countOptions = [];
 
     /**
      * @return string
@@ -23,9 +26,9 @@ abstract protected function getQueryBuilderClass();
 
     abstract protected function initPaginator();
 
-    public function init()
+    public function init(): void
     {
-        if (is_null($this->query)) {
+        if (null === $this->query) {
             throw new \Exception('QueryBuilder must be defined.');
         }
 
@@ -43,7 +46,7 @@ public function init()
     }
 
     /**
-     * Returns QueryBuilder
+     * Returns QueryBuilder.
      *
      * @return mixed
      */
@@ -53,9 +56,10 @@ public function getQueryBuilder()
     }
 
     /**
-     * Sets the QueryBuilder
+     * Sets the QueryBuilder.
      *
      * @param mixed $query
+     *
      * @return AbstractDoctrinePaginator
      */
     public function setQueryBuilder($query)
@@ -70,9 +74,9 @@ public function setQueryBuilder($query)
     }
 
     /**
-     * Returns manual total results
+     * Returns manual total results.
      *
-     * @return Int
+     * @return int
      */
     public function getManualCountResults()
     {
@@ -80,9 +84,10 @@ public function getManualCountResults()
     }
 
     /**
-     * Sets manual total results
+     * Sets manual total results.
+     *
+     * @param int $manualCountResults
      *
-     * @param Int $manualCountResults
      * @return AbstractDoctrinePaginator
      */
     public function setManualCountResults($manualCountResults)
@@ -93,7 +98,7 @@ public function setManualCountResults($manualCountResults)
     }
 
     /**
-     * Returns count options
+     * Returns count options.
      *
      * @return array
      */
@@ -103,9 +108,8 @@ public function getCountOptions()
     }
 
     /**
-     * Sets count options
+     * Sets count options.
      *
-     * @param array $countOptions
      * @return AbstractDoctrinePaginator
      */
     public function setCountOptions(array $countOptions)
diff --git a/src/Paginator/AbstractPaginator.php b/src/Paginator/AbstractPaginator.php
index 07624b9..4fcc17d 100644
--- a/src/Paginator/AbstractPaginator.php
+++ b/src/Paginator/AbstractPaginator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -13,7 +15,6 @@
 
 abstract class AbstractPaginator implements \IteratorAggregate, \Countable
 {
-
     protected $page = 1;
     protected $maxPerPage = 1;
     protected $lastPage = 1;
@@ -23,8 +24,9 @@ abstract class AbstractPaginator implements \IteratorAggregate, \Countable
     /**
      * Constructor.
      *
-     * @param string $class The model class
-     * @param integer $maxPerPage Number of records to display per page
+     * @param string $class      The model class
+     * @param int    $maxPerPage Number of records to display per page
+     *
      * @return AbstractPaginator
      */
     public function __construct($maxPerPage = 10)
@@ -49,7 +51,7 @@ abstract public function getResults();
     /**
      * Returns true if the current query requires pagination.
      *
-     * @return boolean
+     * @return bool
      */
     public function haveToPaginate()
     {
@@ -59,11 +61,11 @@ public function haveToPaginate()
     /**
      * Returns the first index on the current page.
      *
-     * @return integer
+     * @return int
      */
     public function getFirstIndice()
     {
-        if ($this->getCountResults() == 0) {
+        if (0 == $this->getCountResults()) {
             return 0;
         }
 
@@ -73,21 +75,21 @@ public function getFirstIndice()
     /**
      * Returns the last index on the current page.
      *
-     * @return integer
+     * @return int
      */
     public function getLastIndice()
     {
         if ($this->page * $this->maxPerPage >= $this->countResults) {
             return $this->countResults;
-        } else {
-            return $this->page * $this->maxPerPage;
         }
+
+        return $this->page * $this->maxPerPage;
     }
 
     /**
      * Returns the number of results.
      *
-     * @return integer
+     * @return int
      */
     public function getCountResults()
     {
@@ -97,9 +99,9 @@ public function getCountResults()
     /**
      * Sets the number of results.
      *
-     * @param integer $nb
+     * @param int $nb
      */
-    protected function setCountResults($nb)
+    protected function setCountResults($nb): void
     {
         $this->countResults = $nb;
     }
@@ -107,7 +109,7 @@ protected function setCountResults($nb)
     /**
      * Returns the first page number.
      *
-     * @return integer
+     * @return int
      */
     public function getFirstPage()
     {
@@ -117,7 +119,7 @@ public function getFirstPage()
     /**
      * Returns the last page number.
      *
-     * @return integer
+     * @return int
      */
     public function getLastPage()
     {
@@ -126,12 +128,11 @@ public function getLastPage()
 
     /**
      * Init the last page number.
-     *
      */
-    protected function initLastPage()
+    protected function initLastPage(): void
     {
         if ($this->getCountResults() > 0) {
-            $lastPage = (int) \ceil($this->getCountResults() / $this->getMaxPerPage());
+            $lastPage = (int) ceil($this->getCountResults() / $this->getMaxPerPage());
         } else {
             $lastPage = 1;
         }
@@ -145,7 +146,7 @@ protected function initLastPage()
     /**
      * Returns the current page.
      *
-     * @return integer
+     * @return int
      */
     public function getPage()
     {
@@ -155,7 +156,7 @@ public function getPage()
     /**
      * Returns the next page.
      *
-     * @return integer
+     * @return int
      */
     public function getNextPage()
     {
@@ -165,7 +166,7 @@ public function getNextPage()
     /**
      * Returns the previous page.
      *
-     * @return integer
+     * @return int
      */
     public function getPreviousPage()
     {
@@ -175,12 +176,13 @@ public function getPreviousPage()
     /**
      * Sets the current page.
      *
-     * @param integer $page
+     * @param int $page
+     *
      * @return AbstractPaginator
      */
     public function setPage($page)
     {
-        $this->page = intval($page);
+        $this->page = (int) $page;
 
         if ($this->page <= 0) {
             $this->page = 1;
@@ -192,7 +194,7 @@ public function setPage($page)
     /**
      * Returns the maximum number of results per page.
      *
-     * @return integer
+     * @return int
      */
     public function getMaxPerPage()
     {
@@ -202,12 +204,13 @@ public function getMaxPerPage()
     /**
      * Sets the maximum number of results per page.
      *
-     * @param integer $max
+     * @param int $max
+     *
      * @return AbstractPaginator
      */
     public function setMaxPerPage($max)
     {
-        $max = intval($max);
+        $max = (int) $max;
 
         if ($max <= 0) {
             throw new \Exception('Max results value must be positive');
@@ -220,7 +223,7 @@ public function setMaxPerPage($max)
     /**
      * Returns true if on the first page.
      *
-     * @return boolean
+     * @return bool
      */
     public function isFirstPage()
     {
@@ -230,7 +233,7 @@ public function isFirstPage()
     /**
      * Returns true if on the last page.
      *
-     * @return boolean
+     * @return bool
      */
     public function isLastPage()
     {
@@ -240,7 +243,7 @@ public function isLastPage()
     /**
      * Returns true if the properties used for iteration have been initialized.
      *
-     * @return boolean
+     * @return bool
      */
     protected function isIteratorInitialized()
     {
diff --git a/src/Paginator/ArrayPaginator.php b/src/Paginator/ArrayPaginator.php
index 00fa575..2ad72c4 100644
--- a/src/Paginator/ArrayPaginator.php
+++ b/src/Paginator/ArrayPaginator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -13,20 +15,19 @@
 
 class ArrayPaginator extends AbstractPaginator
 {
-
     protected $initialObjects = null;
     protected $manualCountResults = null;
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function init()
+    public function init(): void
     {
-        if ($this->initialObjects === null) {
+        if (null === $this->initialObjects) {
             throw new \Exception('Results are required');
         }
 
-        if (is_null($this->manualCountResults)) {
+        if (null === $this->manualCountResults) {
             $this->setCountResults(\count($this->initialObjects));
             $this->initLastPage();
 
@@ -48,16 +49,17 @@ public function init()
     }
 
     /**
-     * Set an array of results
+     * Set an array of results.
      *
      * @param array|ArrayIterator $results
+     *
      * @return ArrayPaginator
      */
     public function setData($results)
     {
         if ($results instanceof \ArrayIterator) {
             $this->initialObjects = $results->getArrayCopy();
-        } elseif (is_array($results)) {
+        } elseif (\is_array($results)) {
             $this->initialObjects = $results;
         } else {
             throw new \Exception('Results must be an array');
@@ -67,10 +69,10 @@ public function setData($results)
     }
 
     /**
-     * Set an array of results without slice
+     * Set an array of results without slice.
      *
      * @param array|ArrayIterator $results
-     * @param Int $manualCountResults
+     * @param int                 $manualCountResults
      */
     public function setDataWithoutSlice($results, $manualCountResults)
     {
@@ -81,7 +83,7 @@ public function setDataWithoutSlice($results, $manualCountResults)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getResults()
     {
diff --git a/src/Paginator/DoctrineDBALPaginator.php b/src/Paginator/DoctrineDBALPaginator.php
index 698e287..c8e30db 100644
--- a/src/Paginator/DoctrineDBALPaginator.php
+++ b/src/Paginator/DoctrineDBALPaginator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -16,7 +18,7 @@
 class DoctrineDBALPaginator extends AbstractDoctrinePaginator
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function getQueryBuilderClass()
     {
@@ -24,12 +26,12 @@ protected function getQueryBuilderClass()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function initPaginator()
+    public function initPaginator(): void
     {
         //Calculation of the number of lines
-        if (is_null($this->manualCountResults)) {
+        if (null === $this->manualCountResults) {
             $count = Paginate::countQueryBuilder($this->query, $this->countOptions);
             $this->setCountResults($count);
         } else {
@@ -38,11 +40,11 @@ public function initPaginator()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getResults()
     {
-        if (is_null($this->results)) {
+        if (null === $this->results) {
             $results = $this->query->execute()->fetchAll();
             $this->results = new \ArrayIterator($results);
         }
diff --git a/src/Paginator/DoctrineORMPaginator.php b/src/Paginator/DoctrineORMPaginator.php
index 07fef2b..312da9f 100644
--- a/src/Paginator/DoctrineORMPaginator.php
+++ b/src/Paginator/DoctrineORMPaginator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -20,7 +22,7 @@ class DoctrineORMPaginator extends AbstractDoctrinePaginator
     protected $fetchJoinCollection = false;
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected function getQueryBuilderClass()
     {
@@ -28,12 +30,12 @@ protected function getQueryBuilderClass()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function initPaginator()
+    public function initPaginator(): void
     {
         //Calculation of the number of lines
-        if (is_null($this->manualCountResults)) {
+        if (null === $this->manualCountResults) {
             $countOptions = $this->countOptions;
             if (!isset($countOptions['behavior'])) {
                 $countOptions['behavior'] = Paginate::getDefaultCountBehavior($this->query);
@@ -50,7 +52,7 @@ public function initPaginator()
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isSimplifiedRequest()
     {
@@ -58,8 +60,10 @@ public function isSimplifiedRequest()
     }
 
     /**
-     * Use simplified request (not subrequest and not order by) or not when count results
-     * @param boolean $simplifiedRequest
+     * Use simplified request (not subrequest and not order by) or not when count results.
+     *
+     * @param bool $simplifiedRequest
+     *
      * @return DoctrineORMPaginator
      */
     public function setSimplifiedRequest($simplifiedRequest)
@@ -70,7 +74,7 @@ public function setSimplifiedRequest($simplifiedRequest)
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isFetchJoinCollection()
     {
@@ -79,8 +83,10 @@ public function isFetchJoinCollection()
 
     /**
      * Set to true when fetch join a to-many collection
-     * In that case 3 instead of the 2 queries described are executed
-     * @param boolean $fetchJoinCollection
+     * In that case 3 instead of the 2 queries described are executed.
+     *
+     * @param bool $fetchJoinCollection
+     *
      * @return DoctrineORMPaginator
      */
     public function setFetchJoinCollection($fetchJoinCollection)
@@ -91,11 +97,11 @@ public function setFetchJoinCollection($fetchJoinCollection)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getResults()
     {
-        if (is_null($this->results)) {
+        if (null === $this->results) {
             $query = $this->query->getQuery();
             $paginator = new Paginator($query, $this->fetchJoinCollection);
             $paginator->setUseOutputWalkers(!$this->simplifiedRequest);
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 49ac925..0a09db6 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -31,11 +33,8 @@ class CrudExtension extends Twig_Extension
      */
     protected $templating;
 
-
     /**
-     * Constructor
-     *
-     * @param CrudHelper $crudHelper
+     * Constructor.
      */
     public function __construct(CrudHelper $crudHelper, Twig_Environment $templating)
     {
@@ -60,129 +59,129 @@ public function getName()
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new Twig_SimpleFunction(
                 'paginator_links',
-                array($this, 'paginatorLinks'),
-                array('is_safe' => array('all'))
+                [$this, 'paginatorLinks'],
+                ['is_safe' => ['all']]
             ),
             new Twig_SimpleFunction(
                 'crud_paginator_links',
-                array($this, 'crudPaginatorLinks'),
-                array('is_safe' => array('all'))
+                [$this, 'crudPaginatorLinks'],
+                ['is_safe' => ['all']]
             ),
             new Twig_SimpleFunction(
                 'crud_th',
-                array($this, 'th'),
-                array('is_safe' => array('all'))
+                [$this, 'th'],
+                ['is_safe' => ['all']]
             ),
             new Twig_SimpleFunction(
                 'crud_td',
-                array($this, 'td'),
-                array('is_safe' => array('all'))
+                [$this, 'td'],
+                ['is_safe' => ['all']]
             ),
             new Twig_SimpleFunction(
                 'crud_display_settings',
-                array($this, 'displaySettings'),
-                array('is_safe' => array('all'))
+                [$this, 'displaySettings'],
+                ['is_safe' => ['all']]
             ),
             new Twig_SimpleFunction(
                 'crud_search_form',
-                array($this, 'searchForm'),
-                array('is_safe' => array('all'))
+                [$this, 'searchForm'],
+                ['is_safe' => ['all']]
             ),
             new Twig_SimpleFunction(
                 'crud_search_reset',
-                array($this, 'searchReset'),
-                array('is_safe' => array('all'))
+                [$this, 'searchReset'],
+                ['is_safe' => ['all']]
             ),
             new Twig_SimpleFunction(
                 'crud_declare_modal',
-                array($this, 'declareModal'),
-                array('is_safe' => array('all'))
+                [$this, 'declareModal'],
+                ['is_safe' => ['all']]
             ),
             new Twig_SimpleFunction(
                 'crud_remote_modal',
-                array($this, 'remoteModal'),
-                array('is_safe' => array('all'))
+                [$this, 'remoteModal'],
+                ['is_safe' => ['all']]
             ),
             new Twig_SimpleFunction(
                 'crud_form_modal',
-                array($this, 'formModal'),
-                array('is_safe' => array('all'))
+                [$this, 'formModal'],
+                ['is_safe' => ['all']]
             ),
-        );
+        ];
     }
 
     /**
-     * Twig function: "paginator_links"
+     * Twig function: "paginator_links".
      *
      * @see CrudHelper:paginatorLinks
      */
     public function paginatorLinks(
         AbstractPaginator $paginator,
         $routeName,
-        $routeParams = array(),
-        $options = array()
+        $routeParams = [],
+        $options = []
     ) {
         return $this->crudHelper->paginatorLinks($paginator, $routeName, $routeParams, $options);
     }
 
     /**
-     * Twig function: "crud_paginator_links"
+     * Twig function: "crud_paginator_links".
      *
      * @see CrudHelper:crudPaginatorLinks
      */
-    public function crudPaginatorLinks(Crud $crud, $options = array(), $ajaxOptions = array())
+    public function crudPaginatorLinks(Crud $crud, $options = [], $ajaxOptions = [])
     {
         return $this->crudHelper->crudPaginatorLinks($crud, $options, $ajaxOptions);
     }
 
     /**
-     * Twig function: "crud_th"
+     * Twig function: "crud_th".
      *
      * @see CrudHelper:th
      */
-    public function th($columnId, Crud $crud, $options = array(), $thOptions = array(), $ajaxOptions = array())
+    public function th($columnId, Crud $crud, $options = [], $thOptions = [], $ajaxOptions = [])
     {
         return $this->crudHelper->th($columnId, $crud, $options, $thOptions, $ajaxOptions);
     }
 
     /**
-     * Twig function: "crud_td"
+     * Twig function: "crud_td".
      *
      * @see CrudHelper:td
      */
-    public function td($columnId, Crud $crud, $value, $options = array(), $tdOptions = array())
+    public function td($columnId, Crud $crud, $value, $options = [], $tdOptions = [])
     {
         return $this->crudHelper->td($columnId, $crud, $value, $options, $tdOptions);
     }
 
     /**
-     * Twig function: "crud_display_config"
+     * Twig function: "crud_display_config".
      *
-     * @param Crud $crud
-     * @param array $options Options :
-     *        * modal:  Include (or not) inside a modal. Default: true
-     *        * image_url: Url image (button)
-     *        * use_bootstrap: Use Bootstrap or not
-     *        * modal_close_div_class: Close Div CSS Class
-     *        * template: Template used. If null, default template is used
+     * @param array $options     Options :
+     *                           * modal:  Include (or not) inside a modal. Default: true
+     *                           * image_url: Url image (button)
+     *                           * use_bootstrap: Use Bootstrap or not
+     *                           * modal_close_div_class: Close Div CSS Class
+     *                           * template: Template used. If null, default template is used
      * @param array $ajaxOptions Ajax options
+     *
      * @return string
      */
-    public function displaySettings(Crud $crud, $options = array(), $ajaxOptions = array())
+    public function displaySettings(Crud $crud, $options = [], $ajaxOptions = [])
     {
         $options = array_merge($crud->getTemplateConfiguration('crud_display_settings'), $options);
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
-            array(
+            [
                 'modal' => true,
                 'image_url' => '/bundles/ecommitcrud/images/i16/list.png',
                 'use_bootstrap' => $this->crudHelper->useBootstrap(),
                 'modal_close_div_class' => 'overlay-close',
                 'template' => null,
-            )
+            ]
         );
         $resolver->setAllowedTypes('modal', 'bool');
         $resolver->setAllowedTypes('use_bootstrap', 'bool');
@@ -212,10 +211,10 @@ public function displaySettings(Crud $crud, $options = array(), $ajaxOptions = a
 
         return $this->templating->render(
             $templateName,
-            array(
+            [
                 'form' => $form,
                 'url' => $crud->getUrl(),
-                'reset_settings_url' => $crud->getUrl(array('razsettings' => 1)),
+                'reset_settings_url' => $crud->getUrl(['razsettings' => 1]),
                 'ajax_options' => $ajaxOptions,
                 'image_url' => $options['image_url'],
                 'suffix' => $crud->getSessionName(),
@@ -224,56 +223,56 @@ public function displaySettings(Crud $crud, $options = array(), $ajaxOptions = a
                 'overlay_service' => $this->crudHelper->getOverlayService(),
                 'display_button' => $crud->getDisplayResults(),
                 'div_id_list' => $crud->getDivIdList(),
-            )
+            ]
         );
     }
 
     /**
-     * Twig function: "crud_search_form"
+     * Twig function: "crud_search_form".
      *
      * @see CrudHelper:searchFormTag
      */
-    public function searchForm(Crud $crud, $ajaxOptions = array(), $htmlOptions = array())
+    public function searchForm(Crud $crud, $ajaxOptions = [], $htmlOptions = [])
     {
         return $this->crudHelper->searchFormTag($crud, $ajaxOptions, $htmlOptions);
     }
 
     /**
-     * Twig function: "crud_search_reset"
+     * Twig function: "crud_search_reset".
      *
      * @see CrudHelper:searchResetButton
      */
-    public function searchReset(Crud $crud, $options = array(), $ajaxOptions = array(), $htmlOptions = array())
+    public function searchReset(Crud $crud, $options = [], $ajaxOptions = [], $htmlOptions = [])
     {
         return $this->crudHelper->searchResetButton($crud, $options, $ajaxOptions, $htmlOptions);
     }
 
     /**
-     * Twig function: "crud_declare_modal"
+     * Twig function: "crud_declare_modal".
      *
      * @see CrudHelper:declareModal
      */
-    public function declareModal($modalId, $options = array())
+    public function declareModal($modalId, $options = [])
     {
         return $this->crudHelper->declareModal($modalId, $options);
     }
 
     /**
-     * Twig function: "crud_remote_modal"
+     * Twig function: "crud_remote_modal".
      *
      * @see CrudHelper:remoteModal
      */
-    public function remoteModal($modalId, $url, $options = array(), $ajaxOptions = array())
+    public function remoteModal($modalId, $url, $options = [], $ajaxOptions = [])
     {
         return $this->crudHelper->remoteModal($modalId, $url, $options, $ajaxOptions);
     }
 
     /**
-     * Twig function: "crud_form_modal"
+     * Twig function: "crud_form_modal".
      *
      * @see CrudHelper:formModal
      */
-    public function formModal($modalId, $form, $ajaxOptions = array(), $htmlOptions = array())
+    public function formModal($modalId, $form, $ajaxOptions = [], $htmlOptions = [])
     {
         return $this->crudHelper->formModal($modalId, $form, $ajaxOptions, $htmlOptions);
     }
diff --git a/tests/App/Controller/UserController.php b/tests/App/Controller/UserController.php
index 62096ac..245197d 100644
--- a/tests/App/Controller/UserController.php
+++ b/tests/App/Controller/UserController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
diff --git a/tests/App/DataFixtures/TestUserFixtures.php b/tests/App/DataFixtures/TestUserFixtures.php
index c5f9e08..617a9c5 100644
--- a/tests/App/DataFixtures/TestUserFixtures.php
+++ b/tests/App/DataFixtures/TestUserFixtures.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -17,7 +19,7 @@
 
 class TestUserFixtures extends Fixture
 {
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $dataSet = [
             ['Eve', 'Reste'],
diff --git a/tests/App/Entity/TestUser.php b/tests/App/Entity/TestUser.php
index 9770a7f..5bb4b2b 100644
--- a/tests/App/Entity/TestUser.php
+++ b/tests/App/Entity/TestUser.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
diff --git a/tests/App/Form/Searcher/UserSearcher.php b/tests/App/Form/Searcher/UserSearcher.php
index 03c2cfe..4d45f9f 100644
--- a/tests/App/Form/Searcher/UserSearcher.php
+++ b/tests/App/Form/Searcher/UserSearcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
diff --git a/tests/App/Kernel.php b/tests/App/Kernel.php
index 2f8a99e..8ff1d86 100644
--- a/tests/App/Kernel.php
+++ b/tests/App/Kernel.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -21,11 +23,12 @@
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\RouteCollectionBuilder;
 
-class Kernel extends BaseKernel
+class Kernel extends BaseKernel implements CompilerPassInterface
 {
     use MicroKernelTrait;
 
@@ -37,6 +40,14 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $loader->load($this->getProjectDir().'/config/services.yaml');
     }
 
+    public function process(ContainerBuilder $container): void
+    {
+        //Bug with tests and symfony/stopwatch
+        $container->removeDefinition('debug.event_dispatcher');
+        $container->removeDefinition('debug.controller_resolver');
+        $container->removeDefinition('debug.argument_resolver');
+    }
+
     public function registerBundles()
     {
         return [
diff --git a/tests/App/config/bootstrap.php b/tests/App/config/bootstrap.php
index 442c378..b9addd5 100644
--- a/tests/App/config/bootstrap.php
+++ b/tests/App/config/bootstrap.php
@@ -1,6 +1,15 @@
 <?php
 
-use Symfony\Component\Dotenv\Dotenv;
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 require dirname(__DIR__).'/../../vendor/autoload.php';
 
diff --git a/tests/App/public/index.php b/tests/App/public/index.php
index bad74f1..5aaf737 100644
--- a/tests/App/public/index.php
+++ b/tests/App/public/index.php
@@ -1,5 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Ecommit\CrudBundle\Tests\App\Kernel;
 use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 16d28d1..d0a54e2 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the EcommitCrudBundle package.
  *
@@ -16,7 +18,7 @@
 use Symfony\Component\Panther\DomCrawler\Crawler;
 use Symfony\Component\Panther\PantherTestCase;
 
-class CrudControllerTest extends PantherTestCase
+class TestCrudControllerTest extends PantherTestCase
 {
     public static function setUpBeforeClass(): void
     {
@@ -285,7 +287,7 @@ protected function getPagination(Crawler $crawler): array
     protected function getSort(Crawler $crawler): array
     {
         $imageSort = $crawler->filterXPath('//table[@class="result"]/thead/tr/th/img');
-        if (0 === count($imageSort)) {
+        if (0 === \count($imageSort)) {
             return [];
         }
         $imageSort = $imageSort->first();
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a5029b4..da77888 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require __DIR__.'/App/config/bootstrap.php';
 
 function bootstrap(): void

From 640b2d9d1a074eb0202d7f862652ddbfa27863ff Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 5 May 2020 16:59:41 +0200
Subject: [PATCH 008/264] Fix CS

---
 src/Crud/Crud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 9825778..ab4296d 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -150,7 +150,7 @@ public function __construct(
      */
     public function addColumn($id, $alias, $label, $options = [])
     {
-        if (\mb_strlen($id) > 30) {
+        if (mb_strlen($id) > 30) {
             throw new \Exception('Column id is too long');
         }
 

From dc81cdd25d171245618186c978606e713aa6a9da Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 5 May 2020 17:04:47 +0200
Subject: [PATCH 009/264] Add ext-mbstring dependency

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index e7a45d9..bf19cb8 100644
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,7 @@
     ],
     "require": {
         "php": "^7.2",
+        "ext-mbstring": "*",
         "doctrine/common": "*",
         "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
         "doctrine/orm": "^2.6.3",

From 23f447227fa6be92ad07757b5801c0ca189ef191 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 5 May 2020 17:22:04 +0200
Subject: [PATCH 010/264] Use new Twig classes

---
 src/Twig/CrudExtension.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 0a09db6..5df6578 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -17,11 +17,11 @@
 use Ecommit\CrudBundle\Helper\CrudHelper;
 use Ecommit\CrudBundle\Paginator\AbstractPaginator;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Twig_Environment;
-use Twig_Extension;
-use Twig_SimpleFunction;
+use Twig\Environment;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
-class CrudExtension extends Twig_Extension
+class CrudExtension extends AbstractExtension
 {
     /**
      * @var CrudHelper
@@ -29,14 +29,14 @@ class CrudExtension extends Twig_Extension
     protected $crudHelper;
 
     /**
-     * @var Twig_Environment
+     * @var Environment
      */
     protected $templating;
 
     /**
      * Constructor.
      */
-    public function __construct(CrudHelper $crudHelper, Twig_Environment $templating)
+    public function __construct(CrudHelper $crudHelper, Environment $templating)
     {
         $this->crudHelper = $crudHelper;
         $this->templating = $templating;
@@ -60,52 +60,52 @@ public function getName()
     public function getFunctions()
     {
         return [
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'paginator_links',
                 [$this, 'paginatorLinks'],
                 ['is_safe' => ['all']]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'crud_paginator_links',
                 [$this, 'crudPaginatorLinks'],
                 ['is_safe' => ['all']]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'crud_th',
                 [$this, 'th'],
                 ['is_safe' => ['all']]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'crud_td',
                 [$this, 'td'],
                 ['is_safe' => ['all']]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'crud_display_settings',
                 [$this, 'displaySettings'],
                 ['is_safe' => ['all']]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'crud_search_form',
                 [$this, 'searchForm'],
                 ['is_safe' => ['all']]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'crud_search_reset',
                 [$this, 'searchReset'],
                 ['is_safe' => ['all']]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'crud_declare_modal',
                 [$this, 'declareModal'],
                 ['is_safe' => ['all']]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'crud_remote_modal',
                 [$this, 'remoteModal'],
                 ['is_safe' => ['all']]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'crud_form_modal',
                 [$this, 'formModal'],
                 ['is_safe' => ['all']]

From f2e355ba67b3baf041d5d4a82440db3c52a57ed0 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 1 May 2020 13:42:19 +0200
Subject: [PATCH 011/264] Replace ecommit_javascript_jquery_ajax_form and
 ecommit_javascript_jquery_ajax_button by JS modules

---
 .eslintrc.js                                  |  26 +
 .gitignore                                    |   4 +
 .travis.yml                                   |  15 +
 composer.json                                 |   4 +-
 karma.conf.js                                 |  47 ++
 package.json                                  |  25 +
 src/DependencyInjection/Configuration.php     |   1 +
 .../EcommitCrudExtension.php                  |   1 +
 src/Resources/config/services.xml             |   2 +
 src/Resources/public/js/ajax.js               | 193 ++++++
 src/Resources/public/js/callback.js           |  91 +++
 src/Resources/public/js/crud.js               |  10 +
 .../public/js/modal/engine/bootstrap3.js      |  34 +
 .../public/js/modal/modal-manager.js          | 129 ++++
 src/Resources/public/js/options-resolver.js   |  39 ++
 .../views/Crud/form_settings_modal.html.twig  |  10 +-
 .../form_settings_modal_bootstrap.html.twig   |  10 +-
 .../Crud/form_settings_nomodal.html.twig      |   8 +-
 .../form_settings_nomodal_bootstrap.html.twig |   8 +-
 src/Resources/views/Theme/base.html.twig      |   6 +
 src/Twig/CrudExtension.php                    | 119 +++-
 tests/App/Kernel.php                          |   4 +
 tests/App/assets/js/app.js                    |   5 +
 tests/App/config/ecommit_crud.yaml            |   2 +
 tests/App/config/webpack_encore.yaml          |   2 +
 tests/App/templates/layout.html.twig          |   4 +-
 .../Controller/TestCrudControllerTest.php     |   2 +-
 tests/Resources/public/js/ajax.spec.js        | 591 ++++++++++++++++++
 tests/Resources/public/js/callback.spec.js    | 129 ++++
 tests/Resources/public/js/main.js             |  11 +
 .../Resources/public/js/modal/engine/test.js  |  24 +
 .../public/js/modal/modal-manager.spec.js     | 322 ++++++++++
 .../public/js/options-resolver.spec.js        | 123 ++++
 tests/Twig/CrudExtensionTest.php              | 168 +++++
 webpack-encore-config.js                      |  26 +
 webpack.config.js                             |   3 +
 36 files changed, 2179 insertions(+), 19 deletions(-)
 create mode 100644 .eslintrc.js
 create mode 100644 karma.conf.js
 create mode 100644 package.json
 create mode 100644 src/Resources/public/js/ajax.js
 create mode 100644 src/Resources/public/js/callback.js
 create mode 100644 src/Resources/public/js/crud.js
 create mode 100644 src/Resources/public/js/modal/engine/bootstrap3.js
 create mode 100644 src/Resources/public/js/modal/modal-manager.js
 create mode 100644 src/Resources/public/js/options-resolver.js
 create mode 100644 src/Resources/views/Theme/base.html.twig
 create mode 100644 tests/App/assets/js/app.js
 create mode 100644 tests/App/config/ecommit_crud.yaml
 create mode 100644 tests/App/config/webpack_encore.yaml
 create mode 100644 tests/Resources/public/js/ajax.spec.js
 create mode 100644 tests/Resources/public/js/callback.spec.js
 create mode 100644 tests/Resources/public/js/main.js
 create mode 100644 tests/Resources/public/js/modal/engine/test.js
 create mode 100644 tests/Resources/public/js/modal/modal-manager.spec.js
 create mode 100644 tests/Resources/public/js/options-resolver.spec.js
 create mode 100644 tests/Twig/CrudExtensionTest.php
 create mode 100644 webpack-encore-config.js
 create mode 100644 webpack.config.js

diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..2eb458a
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,26 @@
+module.exports = {
+    env: {
+        'browser': true,
+        'es6': true,
+        'jasmine': true,
+        'node': true
+    },
+    extends: [
+        'standard'
+    ],
+    globals: {
+        Atomics: 'readonly',
+        SharedArrayBuffer: 'readonly'
+    },
+    ignorePatterns: ['/src/Resources/public/js/scrollToFirstMessage.js'],
+    parserOptions: {
+        ecmaVersion: 2018,
+        sourceType: 'module'
+    },
+    rules: {
+        'indent': ['error', 4],
+        'linebreak-style': ['error', 'unix'],
+        'no-eval': 'off',
+        'semi': 'off'
+    }
+}
diff --git a/.gitignore b/.gitignore
index aedc937..61b25bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,9 @@
 .php_cs.cache
 .phpunit.result.cache
 composer.lock
+/node_modules/
+/tests/App/public/build/
 /tests/App/var/
 /vendor/
+yarn-error.log
+yarn.lock
diff --git a/.travis.yml b/.travis.yml
index d43d51d..3baca8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,27 @@ env:
     - DEPENDENCIES="high"
     - DEPENDENCIES="low"
 
+cache:
+    yarn: true
+
 addons:
     firefox: latest
 
+services:
+    - xvfb
+
+before_install:
+    - sudo rm -rf ~/.nvm && curl -sL "https://deb.nodesource.com/setup_13.x" | sudo -E bash -
+    - sudo apt-get install -y nodejs
+    - sudo npm install -g yarn
+
 install:
     - if [ "$DEPENDENCIES" = "low" ]; then composer update --prefer-lowest --prefer-stable; else composer install; fi;
+    - yarn install
+    - yarn encore dev
 
 script:
     - php vendor/phpunit/phpunit/phpunit
+    - ./node_modules/.bin/karma start --single-run
     - php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
+    - ./node_modules/.bin/eslint src/Resources/public/js/* tests/Resources/public/js/*
diff --git a/composer.json b/composer.json
index bf19cb8..60a80f0 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,9 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^2.16.1",
         "phpunit/phpunit": "^8.4",
-        "symfony/panther": "^0.7.1"
+        "symfony/dom-crawler": "^4.4|^5.0",
+        "symfony/panther": "^0.7.1",
+        "symfony/webpack-encore-bundle": "^1.7.3"
     },
     "autoload": {
         "psr-4": { "Ecommit\\CrudBundle\\": "src/" }
diff --git a/karma.conf.js b/karma.conf.js
new file mode 100644
index 0000000..064e609
--- /dev/null
+++ b/karma.conf.js
@@ -0,0 +1,47 @@
+const Encore = require('@symfony/webpack-encore');
+
+Encore.configureRuntimeEnvironment('dev');
+
+const encoreConfig = require('./webpack-encore-config');
+const webpackConfig = encoreConfig('tests/App/var/karma/build').getWebpackConfig();
+
+delete webpackConfig.entry;
+delete webpackConfig.optimization.runtimeChunk;
+delete webpackConfig.optimization.splitChunks;
+
+// Replace the mini-css-extract-plugin's loader by the style-loader
+const styleExtensions = ['/\\.css$/', '/\\.s[ac]ss$/', '/\\.less$/', '/\\.styl$/'];
+for (const rule of webpackConfig.module.rules) {
+    if (rule.test && rule.oneOf && styleExtensions.includes(rule.test.toString())) {
+        rule.oneOf.forEach((oneOf) => {
+            oneOf.use[0] = 'style-loader';
+        })
+    }
+}
+
+// Karma options
+module.exports = function(config) {
+    config.set({
+        frameworks: ['jasmine-ajax', 'jasmine'],
+        browserConsoleLogOptions: {
+            level: 'log',
+            terminal: false //Remove console.* logs
+        },
+        files: [
+            'tests/Resources/public/js/main.js'
+        ],
+        preprocessors: {
+            'tests/Resources/public/js/main.js': ['webpack']
+        },
+        webpackMiddleware: {
+            stats: 'errors-only',
+            noInfo: true,
+        },
+        browsers: ['Firefox'],
+        reporters: ['spec'],
+        specReporter: {
+            suppressPassed: true,
+        },
+        webpack: webpackConfig
+    });
+};
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..05c4e3c
--- /dev/null
+++ b/package.json
@@ -0,0 +1,25 @@
+{
+  "dependencies": {
+    "jquery": "^3"
+  },
+  "devDependencies": {
+    "@symfony/webpack-encore": "^0.29.1",
+    "core-js": "^3.0.0",
+    "eslint": "^6.8.0",
+    "eslint-config-standard": "^14.1.1",
+    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
+    "install": "^0.13.0",
+    "jasmine": "^3.0",
+    "karma": "^4.0",
+    "karma-firefox-launcher": "^1.3",
+    "karma-jasmine": "^3.0",
+    "karma-jasmine-ajax": "^0.1.13",
+    "karma-spec-reporter": "^0.0.32",
+    "karma-webpack": "^4.0",
+    "webpack-notifier": "^1.6.0"
+  },
+  "private": true
+}
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 8f7aa19..25309d4 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -34,6 +34,7 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->children()
+                ->scalarNode('theme')->isRequired()->end()
                 ->arrayNode('template_configuration')
                     ->treatNullLike([])
                     ->prototype('variable')
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index e07a6a6..851cd0a 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -36,6 +36,7 @@ public function load(array $config, ContainerBuilder $container): void
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
 
+        $container->setParameter('ecommit_crud.theme', $config['theme']);
         $container->setParameter('ecommit_crud.template_configuration', $config['template_configuration']);
         $container->setParameter('ecommit_crud.images', ['th_image_up' => $config['images']['th_image_up'], 'th_image_down' => $config['images']['th_image_down']]);
     }
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 5f17468..3949b38 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -32,6 +32,8 @@
         <service id="Ecommit\CrudBundle\Twig\CrudExtension" class="Ecommit\CrudBundle\Twig\CrudExtension">
             <argument type="service" id="Ecommit\CrudBundle\Helper\CrudHelper"/>
             <argument type="service" id="Twig\Environment"/>
+            <argument type="service" id="twig.form.renderer" />
+            <argument>%ecommit_crud.theme%</argument>
             <tag name="twig.extension"/>
         </service>
 
diff --git a/src/Resources/public/js/ajax.js b/src/Resources/public/js/ajax.js
new file mode 100644
index 0000000..ed21923
--- /dev/null
+++ b/src/Resources/public/js/ajax.js
@@ -0,0 +1,193 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import $ from 'jquery';
+import * as optionsResolver from './options-resolver';
+import runCallback from './callback';
+
+$(function () {
+    $(document).on('click', '.ec-crud-ajax-click-auto', function (event) {
+        event.preventDefault();
+        const eventBefore = $.Event('ec-crud-ajax-click-auto-before');
+        $(this).trigger(eventBefore);
+        if (eventBefore.isDefaultPrevented()) {
+            return;
+        }
+
+        click(this);
+    });
+
+    $(document).on('click', 'a.ec-crud-ajax-link-auto', function (event) {
+        event.preventDefault();
+        const eventBefore = $.Event('ec-crud-ajax-link-auto-before');
+        $(this).trigger(eventBefore);
+        if (eventBefore.isDefaultPrevented()) {
+            return;
+        }
+
+        link(this);
+    });
+
+    $(document).on('submit', 'form.ec-crud-ajax-form-auto', function (event) {
+        event.preventDefault();
+        const eventBefore = $.Event('ec-crud-ajax-form-auto-before');
+        $(this).trigger(eventBefore);
+        if (eventBefore.isDefaultPrevented()) {
+            return;
+        }
+
+        sendForm(this);
+    });
+});
+
+export function sendRequest (options) {
+    options = optionsResolver.resolve(
+        {
+            url: null,
+            update: null,
+            updateMode: 'update',
+            onBeforeSend: null,
+            onSuccess: null,
+            onError: null,
+            onComplete: null,
+            dataType: 'html',
+            method: 'POST',
+            data: null,
+            cache: false,
+            options: {}
+        },
+        options
+    );
+
+    options = $.extend({}, options, options.options)
+
+    if (optionsResolver.isNotBlank(options.url) === false) {
+        console.error('Value required: url');
+
+        return;
+    }
+
+    if (optionsResolver.isNotBlank(options.onBeforeSend)) {
+        runCallback(options.onBeforeSend, options);
+    }
+    if (options.stop !== undefined && options.stop === true) {
+        return;
+    }
+
+    const callbacksSuccess = [];
+    if (optionsResolver.isNotBlank(options.update)) {
+        callbacksSuccess.push({
+            priority: 10,
+            callback: function (args) {
+                updateDomWithResponse(options.update, options.updateMode, args.data);
+            }
+        })
+    }
+    if (optionsResolver.isNotBlank(options.onSuccess)) {
+        callbacksSuccess.push(options.onSuccess);
+    }
+
+    $.ajax({
+        url: options.url,
+        type: options.method,
+        dataType: options.dataType,
+        cache: options.cache,
+        data: options.data,
+        success: function (data, textStatus, jqXHR) {
+            runCallback(callbacksSuccess, {
+                data: data,
+                textStatus: textStatus,
+                jqXHR: jqXHR
+            });
+        },
+        error: function (jqXHR, textStatus, errorThrown) {
+            runCallback(options.onError, {
+                jqXHR: jqXHR,
+                textStatus: textStatus,
+                errorThrown: errorThrown
+            });
+        },
+        complete: function (jqXHR, textStatus) {
+            runCallback(options.onComplete, {
+                jqXHR: jqXHR,
+                textStatus: textStatus
+            });
+        }
+    });
+}
+
+export function click (element, options) {
+    // Options in data-* override options argument
+    options = optionsResolver.resolve(
+        options,
+        optionsResolver.getDataAttributes(element, 'ecCrudAjax')
+    );
+
+    sendRequest(options);
+}
+
+export function link (link, options) {
+    // Options in data-* override options argument
+    // Option argument override href
+    options = optionsResolver.resolve(
+        {
+            url: $(link).attr('href')
+        },
+        optionsResolver.resolve(
+            options,
+            optionsResolver.getDataAttributes(link, 'ecCrudAjax')
+        )
+    );
+
+    sendRequest(options);
+}
+
+export function sendForm (form, options) {
+    // Options in data-* override options argument
+    // Option argument override action, method and data form
+    options = optionsResolver.resolve(
+        {
+            url: $(form).attr('action'),
+            method: $(form).attr('method'),
+            data: $(form).serialize()
+        },
+        optionsResolver.resolve(
+            options,
+            optionsResolver.getDataAttributes(form, 'ecCrudAjax')
+        )
+    );
+
+    sendRequest(options);
+}
+
+function updateDomWithResponse (update, updateMode, data) {
+    if (updateMode === 'update') {
+        $(update).html(data);
+
+        return;
+    } else if (updateMode === 'before') {
+        $(update).before(data);
+
+        return;
+    } else if (updateMode === 'after') {
+        $(update).after(data);
+
+        return;
+    } else if (updateMode === 'prepend') {
+        $(update).prepend(data);
+
+        return;
+    } else if (updateMode === 'append') {
+        $(update).append(data);
+
+        return;
+    }
+
+    console.error('Bad updateMode: ' + updateMode);
+}
diff --git a/src/Resources/public/js/callback.js b/src/Resources/public/js/callback.js
new file mode 100644
index 0000000..b1b7f0e
--- /dev/null
+++ b/src/Resources/public/js/callback.js
@@ -0,0 +1,91 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import $ from 'jquery';
+
+export default function (callbacks, arg) {
+    if (undefined === callbacks || callbacks === null) {
+        return;
+    }
+
+    if (typeof callbacks === 'string' || callbacks instanceof String || callbacks instanceof Function) {
+        callbacks = [callbacks];
+    }
+
+    if (Array !== callbacks.constructor) {
+        return;
+    }
+
+    const newCallbacks = [];
+    $.each(callbacks, function (key, value) {
+        addCallbacksToStack(value, newCallbacks);
+    });
+
+    newCallbacks.sort(function (a, b) {
+        if (parseInt(a.priority, 10) >= parseInt(b.priority, 10)) {
+            return -1;
+        }
+
+        return 1;
+    });
+
+    $.each(newCallbacks, function (key, value) {
+        processCallback(value.callback, arg);
+    });
+}
+
+function addCallbacksToStack (value, stack) {
+    if (typeof value === 'string' || value instanceof String || value instanceof Function) {
+        stack.push({
+            callback: value,
+            priority: 0
+        });
+    } else if (Array === value.constructor) {
+        $.each(value, function (key, subValue) {
+            addCallbacksToStack(subValue, stack);
+        });
+    } else if (undefined !== value.callback) {
+        stack.push({
+            callback: value.callback,
+            priority: (value.priority !== undefined) ? value.priority : 0
+        });
+    }
+}
+
+function processCallback (callback, arg) {
+    if (callback instanceof Function) {
+        callback(arg);
+
+        return;
+    }
+
+    if (typeof callback !== 'string' && !(callback instanceof String)) {
+        return;
+    }
+
+    const patternFunction = /^function\s*\(/i;
+    if (patternFunction.test(callback)) {
+        callback = eval('(' + callback + ')');
+        callback(arg);
+
+        return;
+    }
+
+    const patternFunctionContent = /^\/(.+)\/(.+)$/i;
+    const groups = callback.match(patternFunctionContent);
+    if (groups !== null && groups.length > 0) {
+        console.debug(groups);
+        callback = eval('(function(' + groups[1] + ') {' + groups[2] + '})');
+        callback(arg);
+
+        return;
+    }
+
+    eval(callback);
+}
diff --git a/src/Resources/public/js/crud.js b/src/Resources/public/js/crud.js
new file mode 100644
index 0000000..e74a215
--- /dev/null
+++ b/src/Resources/public/js/crud.js
@@ -0,0 +1,10 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import './ajax';
diff --git a/src/Resources/public/js/modal/engine/bootstrap3.js b/src/Resources/public/js/modal/engine/bootstrap3.js
new file mode 100644
index 0000000..37cf4e3
--- /dev/null
+++ b/src/Resources/public/js/modal/engine/bootstrap3.js
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import $ from 'jquery';
+import runCallback from '../../callback';
+
+export function openModal (options) {
+    // Suppression des événements
+    $(options.element).off('shown.bs.modal');
+    $(options.element).off('hide.bs.modal');
+
+    $(options.element).on('shown.bs.modal', function (e) {
+        runCallback(options.onOpen, $(options.element));
+    });
+
+    $(options.element).on('hide.bs.modal', function (e) {
+        runCallback(options.onClose, $(options.element));
+    });
+
+    $(options.element).modal({
+        show: true,
+        focus: true
+    });
+}
+
+export function closeModal (element) {
+    $(element).modal('hide');
+}
diff --git a/src/Resources/public/js/modal/modal-manager.js b/src/Resources/public/js/modal/modal-manager.js
new file mode 100644
index 0000000..01ccd83
--- /dev/null
+++ b/src/Resources/public/js/modal/modal-manager.js
@@ -0,0 +1,129 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import * as optionsResolver from '../options-resolver';
+import $ from 'jquery';
+import * as ajax from '../ajax';
+
+const ENGINE_KEY = Symbol.for('ecommit.crudbundle.modalengine');
+const globalSymbols = Object.getOwnPropertySymbols(global);
+if (globalSymbols.indexOf(ENGINE_KEY) === -1) {
+    global[ENGINE_KEY] = null;
+}
+
+$(function () {
+    $(document).on('click', '.ec-crud-modal-auto', function (event) {
+        event.preventDefault();
+        const eventBefore = $.Event('ec-crud-modal-auto-before');
+        $(this).trigger(eventBefore);
+        if (eventBefore.isDefaultPrevented()) {
+            return;
+        }
+
+        openModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'));
+    });
+
+    $(document).on('click', '.ec-crud-remote-modal-auto', function (event) {
+        event.preventDefault();
+        const eventBefore = $.Event('ec-crud-remote-modal-auto-before');
+        $(this).trigger(eventBefore);
+        if (eventBefore.isDefaultPrevented()) {
+            return;
+        }
+
+        openRemoteModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'));
+    });
+});
+
+export function defineEngine (newEngine) {
+    global[ENGINE_KEY] = newEngine;
+}
+
+export function getEngine () {
+    if (global[ENGINE_KEY] === null) {
+        console.error('Engine not defined');
+
+        return;
+    }
+
+    return global[ENGINE_KEY];
+}
+
+export function openModal (options) {
+    options = optionsResolver.resolve(
+        {
+            element: null,
+            onOpen: null,
+            onClose: null
+        },
+        options
+    );
+
+    if (optionsResolver.isNotBlank(options.element) === false) {
+        console.error('Value required: element');
+
+        return;
+    }
+
+    getEngine().openModal(options);
+}
+
+export function openRemoteModal (options) {
+    options = optionsResolver.resolve(
+        {
+            url: null,
+            element: null,
+            elementContent: null,
+            onOpen: null,
+            onClose: null,
+            method: 'POST',
+            ajaxOptions: {}
+        },
+        options
+    );
+
+    let hasError = false;
+    $.each(['url', 'element', 'elementContent', 'method'], function (index, value) {
+        if (optionsResolver.isNotBlank(options[value]) === false) {
+            console.error('Value required: ' + value);
+            hasError = true;
+        }
+    });
+    if (hasError === true) {
+        return;
+    }
+
+    const ajaxOptions = optionsResolver.resolve(
+        {
+            url: options.url,
+            method: options.method,
+            update: options.elementContent
+        },
+        options.ajaxOptions
+    );
+
+    const callbacksSuccess = [
+        {
+            priority: 1,
+            callback: function (args) {
+                openModal(options);
+            }
+        }
+    ];
+    if (optionsResolver.isNotBlank(ajaxOptions.onSuccess)) {
+        callbacksSuccess.push(ajaxOptions.onSuccess);
+    }
+    ajaxOptions.onSuccess = callbacksSuccess;
+
+    ajax.sendRequest(ajaxOptions);
+}
+
+export function closeModal (element) {
+    getEngine().closeModal(element);
+}
diff --git a/src/Resources/public/js/options-resolver.js b/src/Resources/public/js/options-resolver.js
new file mode 100644
index 0000000..f0013e5
--- /dev/null
+++ b/src/Resources/public/js/options-resolver.js
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import $ from 'jquery';
+
+export function resolve (defaultOptions, options) {
+    Object.keys(options).forEach(key => options[key] === undefined ? delete options[key] : {});
+
+    return $.extend({}, defaultOptions, options);
+}
+
+export function getDataAttributes (element, prefix) {
+    const prefixLength = prefix.length;
+    const attributes = {};
+
+    $.each($(element).data(), function (index, value) {
+        if (index.length > prefixLength && index.substr(0, prefixLength) === prefix) {
+            let newIndex = index.substr(prefixLength);
+            newIndex = newIndex.charAt(0).toLowerCase() + newIndex.slice(1);
+            attributes[newIndex] = value;
+        }
+    });
+
+    return attributes;
+}
+
+export function isNotBlank (value) {
+    if (undefined === value || value === null || value.length === 0) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/src/Resources/views/Crud/form_settings_modal.html.twig b/src/Resources/views/Crud/form_settings_modal.html.twig
index a872172..7a16c56 100644
--- a/src/Resources/views/Crud/form_settings_modal.html.twig
+++ b/src/Resources/views/Crud/form_settings_modal.html.twig
@@ -1,10 +1,10 @@
-{% set ajax_options = ajax_options|merge({ 'before': 'if(processCrudDisplaySettings_'~suffix~'() == false) { return false;}' }) %}
-{% set reset_ajax_options = ajax_options|merge({ 'before': 'resetDisplaySettings'~suffix~'();' }) %}
+{% set ajax_options = ajax_options|merge({ 'on_before_send': '/arg/if(processCrudDisplaySettings_'~suffix~'() == false) { arg.stop = true; }' }) %}
+{% set reset_ajax_options = ajax_options|merge({ 'on_before_send': 'resetDisplaySettings'~suffix~'();' }) %}
 {% set modalId = 'display_settings_' ~suffix %}
 
 {% macro contentDisplaySettings(vars) %}
     <h4 class="titre">{% trans %}Display Settings{% endtrans %}</h4>
-    {{ ecommit_javascript_jquery_ajax_form(vars.form, vars.ajax_options)  }}
+    {{ form_start_ajax(vars.form, {'ajax_options': vars.ajax_options}) }}
         <b>{{ form_label(vars.form.resultsPerPage) }} :</b><br />
         {{ form_widget(vars.form.resultsPerPage) }}<br /><br />
 
@@ -22,7 +22,9 @@
 
         <div style="text-align: center;">
             <button type="submit" class="save">{% trans %}Save{% endtrans %}</button>
-            {{ ecommit_javascript_jquery_ajax_button('reset_display_settings'|trans, vars.reset_settings_url, vars.reset_ajax_options, {'class': 'raz'}) }}
+            <button class="ec-crud-ajax-click-auto raz"{{ ajax_attributes({url: vars.reset_settings_url}|merge(vars.reset_ajax_options)) }}>
+                {% trans %}reset_display_settings{% endtrans %}
+            </button>
         </div>
     </form>
 {% endmacro %}
diff --git a/src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig b/src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig
index fe5eb0a..8397703 100644
--- a/src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig
+++ b/src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig
@@ -1,5 +1,5 @@
-{% set ajax_options = ajax_options|merge({ 'before': 'if(processCrudDisplaySettings_'~suffix~'() == false) { return false;}' }) %}
-{% set reset_ajax_options = ajax_options|merge({ 'before': 'resetDisplaySettings'~suffix~'();' }) %}
+{% set ajax_options = ajax_options|merge({ 'on_before_send': '/arg/if(processCrudDisplaySettings_'~suffix~'() == false) { arg.stop = true;}' }) %}
+{% set reset_ajax_options = ajax_options|merge({ 'on_before_send': 'resetDisplaySettings'~suffix~'();' }) %}
 {% set modalId = 'display_settings_' ~suffix %}
 
 {% macro contentDisplaySettings(vars) %}
@@ -9,7 +9,7 @@
         <h4 class="modal-title">{% trans %}Display Settings{% endtrans %}</h4>
     </div>
 
-    {{ ecommit_javascript_jquery_ajax_form(vars.form, vars.ajax_options)  }}
+    {{ form_start_ajax(vars.form, {'ajax_options': vars.ajax_options}) }}
     <div class="modal-body">
         {{ form_row(vars.form.resultsPerPage) }}
         {{ form_row(vars.form.displayedColumns) }}
@@ -24,7 +24,9 @@
     </div>
 
     <div class="modal-footer">
-        {{ ecommit_javascript_jquery_ajax_button('<span class="glyphicon glyphicon-fire"></span>' ~ 'reset_display_settings'|trans, vars.reset_settings_url, vars.reset_ajax_options, {'class': 'raz-bootstrap btn btn-default btn-sm'}) }}
+        <button class="ec-crud-ajax-click-auto raz-bootstrap btn btn-default btn-sm"{{ ajax_attributes({url: vars.reset_settings_url}|merge(vars.reset_ajax_options)) }}>
+            <span class="glyphicon glyphicon-fire"></span> {% trans %}reset_display_settings{% endtrans %}
+        </button>
         <button type="submit" class="save-bootstrap btn btn-success btn-sm">
             <span class="glyphicon glyphicon-floppy-disk"></span> {% trans %}Save{% endtrans %}
         </button>
diff --git a/src/Resources/views/Crud/form_settings_nomodal.html.twig b/src/Resources/views/Crud/form_settings_nomodal.html.twig
index 21a0253..aae9543 100644
--- a/src/Resources/views/Crud/form_settings_nomodal.html.twig
+++ b/src/Resources/views/Crud/form_settings_nomodal.html.twig
@@ -1,9 +1,9 @@
 {% set reset_ajax_options = ajax_options %}
-{% set ajax_options = ajax_options|merge({ 'before': 'if(processCrudDisplaySettings'~suffix~'() == false) { return false;}' }) %}
+{% set ajax_options = ajax_options|merge({ 'on_before_send': '/arg/if(processCrudDisplaySettings'~suffix~'() == false) { arg.stop = true;}' }) %}
 
 <div id="display_settings_{{ suffix }}" class="display_settings_nomodal" style="display: none;">
     <div class="title">{% trans %}Display Settings{% endtrans %}</div>
-    {{ ecommit_javascript_jquery_ajax_form(form, ajax_options)  }}
+    {{ form_start_ajax(form, {'ajax_options': ajax_options}) }}
         <b>{{ form_label(form.resultsPerPage) }} :</b><br />
         {{ form_widget(form.resultsPerPage) }}<br /><br />
         
@@ -21,7 +21,9 @@
 
         <div style="text-align: center;">
             <button type="submit" class="save">{% trans %}Save{% endtrans %}</button>
-            {{ ecommit_javascript_jquery_ajax_button('reset_display_settings'|trans, reset_settings_url, reset_ajax_options, {'class': 'raz'}) }}
+            <button class="ec-crud-ajax-click-auto raz"{{ ajax_attributes({url: reset_settings_url}|merge(reset_ajax_options)) }}>
+                {% trans %}reset_display_settings{% endtrans %}
+            </button>
         </div>
     </form>
 </div>
diff --git a/src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig b/src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig
index a93841a..76aeba3 100644
--- a/src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig
+++ b/src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig
@@ -1,12 +1,12 @@
 {% set reset_ajax_options = ajax_options %}
-{% set ajax_options = ajax_options|merge({ 'before': 'if(processCrudDisplaySettings'~suffix~'() == false) { return false;}' }) %}
+{% set ajax_options = ajax_options|merge({ 'on_before_send': '/arg/if(processCrudDisplaySettings'~suffix~'() == false) { arg.stop = true;}' }) %}
 {% form_theme form 'bootstrap_3_layout.html.twig' %}
 
 <div id="display_settings_{{ suffix }}" class="display_settings_nomodal_bootstrap" style="display: none;">
     <h4>{% trans %}Display Settings{% endtrans %}</h4>
 
 
-    {{ ecommit_javascript_jquery_ajax_form(form, ajax_options)  }}
+    {{ form_start_ajax(form, {'ajax_options': ajax_options}) }}
         {{ form_row(form.resultsPerPage) }}
         {{ form_row(form.displayedColumns) }}
         <button type="button" class="btn btn-default btn-xs" onclick="selectAllColumnsCrudDisplaySettings_{{ suffix }}(true)">
@@ -22,7 +22,9 @@
             <button type="submit" class="save-bootstrap btn btn-success btn-sm">
                 <span class="glyphicon glyphicon-floppy-disk"></span> {% trans %}Save{% endtrans %}
             </button>
-            {{ ecommit_javascript_jquery_ajax_button('<span class="glyphicon glyphicon-fire"></span>' ~ 'reset_display_settings'|trans, reset_settings_url, reset_ajax_options, {'class': 'raz-bootstrap btn btn-default btn-sm'}) }}
+            <button class="ec-crud-ajax-click-auto raz-bootstrap btn btn-default btn-sm"{{ ajax_attributes({url: reset_settings_url}|merge(reset_ajax_options)) }}>
+                <span class="glyphicon glyphicon-fire"></span> {% trans %}reset_display_settings{% endtrans %}
+            </button>
         </div>
     </form>
 </div>
diff --git a/src/Resources/views/Theme/base.html.twig b/src/Resources/views/Theme/base.html.twig
new file mode 100644
index 0000000..dbe808c
--- /dev/null
+++ b/src/Resources/views/Theme/base.html.twig
@@ -0,0 +1,6 @@
+{% block attributes %}
+    {%- for attrName, attrValue in attr -%}
+        {{- " " -}}
+        {{- attrName }}="{{ attrValue }}"
+    {%- endfor -%}
+{% endblock %}
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 5df6578..bef281d 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -16,6 +16,8 @@
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Helper\CrudHelper;
 use Ecommit\CrudBundle\Paginator\AbstractPaginator;
+use Symfony\Component\Form\FormRendererInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
@@ -33,13 +35,22 @@ class CrudExtension extends AbstractExtension
      */
     protected $templating;
 
+    /**
+     * @var FormRendererInterface
+     */
+    protected $formRenderer;
+
+    protected $theme;
+
     /**
      * Constructor.
      */
-    public function __construct(CrudHelper $crudHelper, Environment $templating)
+    public function __construct(CrudHelper $crudHelper, Environment $templating, FormRendererInterface $formRenderer, string $theme)
     {
         $this->crudHelper = $crudHelper;
         $this->templating = $templating;
+        $this->formRenderer = $formRenderer;
+        $this->theme = $theme;
     }
 
     /**
@@ -110,6 +121,19 @@ public function getFunctions()
                 [$this, 'formModal'],
                 ['is_safe' => ['all']]
             ),
+            new TwigFunction(
+                'form_start_ajax',
+                [$this, 'formStartAjax'],
+                ['is_safe' => ['html']]
+            ),
+            new TwigFunction(
+                'ajax_attributes',
+                [$this, 'ajaxAttributes'],
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['html'],
+                ]
+            ),
         ];
     }
 
@@ -188,7 +212,7 @@ public function displaySettings(Crud $crud, $options = [], $ajaxOptions = [])
         $options = $resolver->resolve($options);
 
         if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = $crud->getDivIdList();
+            $ajaxOptions['update'] = '#'.$crud->getDivIdList();
         }
 
         $form = $this->crudHelper->getFormDisplaySettings($crud);
@@ -276,4 +300,95 @@ public function formModal($modalId, $form, $ajaxOptions = [], $htmlOptions = [])
     {
         return $this->crudHelper->formModal($modalId, $form, $ajaxOptions, $htmlOptions);
     }
+
+    public function formStartAjax(FormView $formView, array $options = []): string
+    {
+        $autoClass = 'ec-crud-ajax-form-auto';
+        if (isset($options['auto_class']) && null !== isset($options['auto_class'])) {
+            $autoClass = $options['auto_class'];
+            unset($options['auto_class']);
+        }
+        if (isset($options['attr']['class'])) {
+            $options['attr']['class'] = sprintf('%s %s', $autoClass, $options['attr']['class']);
+        } else {
+            $options['attr']['class'] = $autoClass;
+        }
+
+        if (isset($options['ajax_options'])) {
+            $this->validateAjaxOptions($options['ajax_options']);
+            $options['attr'] = array_merge(
+                $options['attr'],
+                $this->getAjaxAttributes($options['ajax_options'])
+            );
+            unset($options['ajax_options']);
+        }
+
+        return $this->formRenderer->renderBlock($formView, 'form_start', $options);
+    }
+
+    public function ajaxAttributes(Environment $environment, array $ajaxOptions): string
+    {
+        $this->validateAjaxOptions($ajaxOptions);
+        $attributes = $this->getAjaxAttributes($ajaxOptions);
+        if (0 === \count($attributes)) {
+            return '';
+        }
+
+        return $this->renderBlock($environment, $this->theme, 'attributes', [
+            'attr' => $attributes,
+        ]);
+    }
+
+    protected function validateAjaxOptions(array $options, array $requiredOptions = []): array
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'url' => null,
+            'update' => null,
+            'update_mode' => null,
+            'on_before_send' => null,
+            'on_success' => null,
+            'on_error' => null,
+            'on_complete' => null,
+            'data_type' => null,
+            'method' => null,
+            'data' => null,
+            'cache' => null,
+            'options' => null,
+        ]);
+        $resolver->setRequired($requiredOptions);
+
+        return $resolver->resolve($options);
+    }
+
+    protected function getAjaxAttributes(array $options): array
+    {
+        $attributes = [];
+        foreach ($options as $optionName => $optionValue) {
+            if (null === $optionValue) {
+                continue;
+            }
+
+            if (\is_bool($optionValue)) {
+                $optionValue = ($optionValue) ? 'true' : 'false';
+            } elseif (\is_array($optionValue)) {
+                $optionValue = json_encode($optionValue);
+            }
+
+            $optionName = str_replace('_', '-', $optionName);
+            $attributes['data-ec-crud-ajax-'.$optionName] = (string) $optionValue;
+        }
+
+        return $attributes;
+    }
+
+    protected function renderBlock(Environment $environment, string $templateName, string $blockName, array $parameters = []): ?string
+    {
+        $template = $environment->load($templateName);
+
+        ob_start();
+        $template->displayBlock($blockName, $parameters);
+
+        return ob_get_clean();
+    }
 }
diff --git a/tests/App/Kernel.php b/tests/App/Kernel.php
index 8ff1d86..7db3619 100644
--- a/tests/App/Kernel.php
+++ b/tests/App/Kernel.php
@@ -27,6 +27,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\RouteCollectionBuilder;
+use Symfony\WebpackEncoreBundle\WebpackEncoreBundle;
 
 class Kernel extends BaseKernel implements CompilerPassInterface
 {
@@ -37,6 +38,8 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $loader->load($this->getProjectDir().'/config/framework.yaml');
         $loader->load($this->getProjectDir().'/config/doctrine.yaml');
         $loader->load($this->getProjectDir().'/config/security.yaml');
+        $loader->load($this->getProjectDir().'/config/webpack_encore.yaml');
+        $loader->load($this->getProjectDir().'/config/ecommit_crud.yaml');
         $loader->load($this->getProjectDir().'/config/services.yaml');
     }
 
@@ -56,6 +59,7 @@ public function registerBundles()
             new DoctrineFixturesBundle(),
             new FrameworkBundle(),
             new SecurityBundle(),
+            new WebpackEncoreBundle(),
             new EcommitCrudBundle(),
             new EcommitJavascriptBundle(),
             new EcommitUtilBundle(),
diff --git a/tests/App/assets/js/app.js b/tests/App/assets/js/app.js
new file mode 100644
index 0000000..4c06896
--- /dev/null
+++ b/tests/App/assets/js/app.js
@@ -0,0 +1,5 @@
+import '../../../../src/Resources/public/js/crud';
+import * as modalManager from '../../../../src/Resources/public/js/modal/modal-manager';
+var modalEngine = require('../../../../src/Resources/public/js/modal/engine/bootstrap3');
+
+modalManager.defineEngine(modalEngine);
diff --git a/tests/App/config/ecommit_crud.yaml b/tests/App/config/ecommit_crud.yaml
new file mode 100644
index 0000000..f6eca0f
--- /dev/null
+++ b/tests/App/config/ecommit_crud.yaml
@@ -0,0 +1,2 @@
+ecommit_crud:
+    theme: '@EcommitCrud/Theme/base.html.twig'
diff --git a/tests/App/config/webpack_encore.yaml b/tests/App/config/webpack_encore.yaml
new file mode 100644
index 0000000..548e1eb
--- /dev/null
+++ b/tests/App/config/webpack_encore.yaml
@@ -0,0 +1,2 @@
+webpack_encore:
+    output_path: '%kernel.project_dir%/public/build'
diff --git a/tests/App/templates/layout.html.twig b/tests/App/templates/layout.html.twig
index 439fd1a..2364ecd 100644
--- a/tests/App/templates/layout.html.twig
+++ b/tests/App/templates/layout.html.twig
@@ -2,10 +2,12 @@
     <head>
         <title>{% block title %}{% endblock %}</title>
         <script src="https://code.jquery.com/jquery-3.5.0.min.js"></script>
+        {{ encore_entry_link_tags('app') }}
         {% block stylesheets %}{% endblock %}
-        {% block javascripts %}{% endblock %}
     </head>
     <body>
         {% block content %}{% endblock %}
+        {{ encore_entry_script_tags('app') }}
+        {% block javascripts %}{% endblock %}
     </body>
 </html>
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index d0a54e2..cc93922 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -235,7 +235,7 @@ public function testResetSettings(Client $client): Client
         $button = $client->getCrawler()->filterXPath('//button[contains(., "Display Settings")]');
         $button->first()->click();
 
-        $button = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::button[contains(text(), "Reset display settings")]');
+        $button = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::button[contains(., "Reset display settings")]');
         $button->first()->click();
         $this->waitForAjax($client);
 
diff --git a/tests/Resources/public/js/ajax.spec.js b/tests/Resources/public/js/ajax.spec.js
new file mode 100644
index 0000000..d1e8b99
--- /dev/null
+++ b/tests/Resources/public/js/ajax.spec.js
@@ -0,0 +1,591 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import * as ajax from '../../../../src/Resources/public/js/ajax';
+import $ from 'jquery';
+
+describe('Test Ajax.sendRequest', function () {
+    beforeEach(function () {
+        jasmine.Ajax.install();
+
+        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+            status: 200,
+            responseText: 'OK'
+        });
+
+        jasmine.Ajax.stubRequest('/resultJS').andReturn({
+            status: 200,
+            responseText: '<div id="subcontent">BEFORE</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script>'
+        });
+
+        jasmine.Ajax.stubRequest('/error404').andReturn({
+            status: 404,
+            responseText: 'Page not found !'
+        });
+    });
+
+    afterEach(function () {
+        jasmine.Ajax.uninstall();
+        $('.html-test').remove();
+    });
+
+    it('Send request', function () {
+        const callbackSuccess = jasmine.createSpy('success');
+        const callbackError = jasmine.createSpy('error');
+        const callbackComplete = jasmine.createSpy('complete');
+
+        ajax.sendRequest({
+            url: '/goodRequest',
+            onComplete: function (args) {
+                callbackComplete();
+            },
+            onSuccess: function (args) {
+                callbackSuccess(args.data);
+            },
+            onError: function (args) {
+                callbackError(args.jqXHR.responseText);
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+        expect(callbackSuccess).toHaveBeenCalledWith('OK');
+        expect(callbackError).not.toHaveBeenCalled();
+        expect(callbackComplete).toHaveBeenCalled();
+    });
+
+    it('Send bad request', function () {
+        const callbackSuccess = jasmine.createSpy('success');
+        const callbackError = jasmine.createSpy('error');
+        const callbackComplete = jasmine.createSpy('complete');
+
+        ajax.sendRequest({
+            url: '/error404',
+            onComplete: function (args) {
+                callbackComplete();
+            },
+            onSuccess: function (args) {
+                callbackSuccess(args.data);
+            },
+            onError: function (args) {
+                callbackError(args.jqXHR.responseText);
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/error404');
+        expect(callbackSuccess).not.toHaveBeenCalled();
+        expect(callbackError).toHaveBeenCalledWith('Page not found !');
+        expect(callbackComplete).toHaveBeenCalled();
+    });
+
+    it('Send request with callback priorities', function () {
+        const callbackSuccess1 = jasmine.createSpy('success1');
+        const callbackSuccess2 = jasmine.createSpy('success2');
+
+        ajax.sendRequest({
+            url: '/goodRequest',
+            onSuccess: [
+                function (args) {
+                    callbackSuccess1();
+                },
+                {
+                    priority: 99,
+                    callback: function (args) {
+                        callbackSuccess2();
+                    }
+                }
+            ]
+        });
+
+        expect(callbackSuccess1).toHaveBeenCalled();
+        expect(callbackSuccess2).toHaveBeenCalledBefore(callbackSuccess1);
+    });
+
+    it('Send request without URL', function () {
+        spyOn(window.console, 'error');
+        ajax.sendRequest({});
+        expect(window.console.error).toHaveBeenCalledWith('Value required: url');
+    });
+
+    it('Send request and update DOM with default mode', function () {
+        $('body').append('<div id="ajax-result" class="html-test"><div class="content"></div></div>');
+        const callbackSuccess = jasmine.createSpy('success');
+
+        ajax.sendRequest({
+            url: '/goodRequest',
+            onSuccess: {
+                callback: function (args) {
+                    callbackSuccess($('#ajax-result').html());
+                },
+                priority: -99
+            },
+            update: '#ajax-result .content'
+        });
+
+        expect(callbackSuccess).toHaveBeenCalledWith('<div class="content">OK</div>');
+    });
+
+    it('Send request and update DOM with "update" mode', function () {
+        testUpdate('update', '<div class="content">OK</div>');
+    });
+
+    it('Send request and update DOM with "before" mode', function () {
+        testUpdate('before', 'OK<div class="content">X</div>');
+    });
+
+    it('Send request and update DOM with "after" mode', function () {
+        testUpdate('after', '<div class="content">X</div>OK');
+    });
+
+    it('Send request and update DOM with "prepend" mode', function () {
+        testUpdate('prepend', '<div class="content">OKX</div>');
+    });
+
+    it('Send request and update DOM with "append" mode', function () {
+        testUpdate('append', '<div class="content">XOK</div>');
+    });
+
+    it('Send request and update DOM with bad mode', function () {
+        spyOn(window.console, 'error');
+        testUpdate('badMode', '<div class="content">X</div>');
+        expect(window.console.error).toHaveBeenCalledWith('Bad updateMode: badMode');
+    });
+
+    it('Send request with method option', function () {
+        ajax.sendRequest({
+            url: '/goodRequest',
+            method: 'GET'
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().method).toEqual('GET');
+    });
+
+    it('Send request with onBeforeSend option', function () {
+        const callbackSuccess = jasmine.createSpy('success');
+        const callbackBeforeSend = jasmine.createSpy('beforeSend');
+
+        ajax.sendRequest({
+            url: '/goodRequest',
+            onBeforeSend: function (args) {
+                callbackBeforeSend();
+            },
+            onSuccess: function (args) {
+                callbackSuccess();
+            }
+        });
+
+        expect(callbackSuccess).toHaveBeenCalled();
+        expect(callbackBeforeSend).toHaveBeenCalledBefore(callbackSuccess);
+    });
+
+    it('Send request canceled by onBeforeSend option', function () {
+        const callbackSuccess = jasmine.createSpy('success');
+        const callbackBeforeSend = jasmine.createSpy('beforeSend');
+
+        ajax.sendRequest({
+            url: '/goodRequest',
+            onBeforeSend: function (args) {
+                callbackBeforeSend();
+                args.stop = true;
+            },
+            onSuccess: function (args) {
+                callbackSuccess();
+            }
+        });
+
+        expect(callbackSuccess).not.toHaveBeenCalled();
+        expect(callbackBeforeSend).toHaveBeenCalled();
+    });
+
+    it('Send request with data option', function () {
+        ajax.sendRequest({
+            url: '/goodRequest',
+            data: {
+                var1: 'value1',
+                var2: 'value2'
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+            var1: ['value1'], var2: ['value2']
+        });
+    });
+
+    it('Send request with JS in response', function () {
+        $('body').append('<div id="ajax-result" class="html-test"><div class="content">X</div></div>');
+        const callbackSuccess = jasmine.createSpy('success');
+
+        ajax.sendRequest({
+            url: '/resultJS',
+            onSuccess: {
+                callback: function (args) {
+                    callbackSuccess($('#ajax-result').html());
+                },
+                priority: -99
+            },
+            update: '#ajax-result .content'
+        });
+
+        expect(callbackSuccess).toHaveBeenCalledWith('<div class="content"><div id="subcontent">AFTER</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script></div>');
+    });
+
+    function testUpdate (updateMode, expectedContent) {
+        $('body').append('<div id="ajax-result" class="html-test"><div class="content">X</div></div>');
+        const callbackSuccess = jasmine.createSpy('success');
+
+        ajax.sendRequest({
+            url: '/goodRequest',
+            onSuccess: {
+                callback: function (args) {
+                    callbackSuccess($('#ajax-result').html());
+                },
+                priority: -99
+            },
+            update: '#ajax-result .content',
+            updateMode: updateMode
+        });
+
+        expect(callbackSuccess).toHaveBeenCalledWith(expectedContent);
+    }
+});
+
+describe('Test Ajax.click', function () {
+    beforeEach(function () {
+        jasmine.Ajax.install();
+
+        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+            status: 200,
+            responseText: 'OK'
+        });
+    });
+
+    afterEach(function () {
+        jasmine.Ajax.uninstall();
+        $('.html-test').remove();
+    });
+
+    it('Send request with button', function () {
+        $('body').append('<button class="html-test" id="buttonToTest">Go !</button>');
+
+        const callbackSuccess = jasmine.createSpy('success');
+
+        ajax.click($('#buttonToTest'), {
+            url: '/goodRequest',
+            onSuccess: function (args) {
+                callbackSuccess();
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(callbackSuccess).toHaveBeenCalled();
+    });
+
+    it('Send request with button and data-*', function () {
+        $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-success="callbackSuccess()">Go !</button>');
+
+        global.callbackSuccess = jasmine.createSpy('success');
+
+        ajax.click($('#buttonToTest'));
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(global.callbackSuccess).toHaveBeenCalled();
+    });
+
+    it('Send request with button and data-* and options', function () {
+        $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-on-success="callbackSuccess1()" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
+
+        global.callbackSuccess1 = jasmine.createSpy('success1');
+        const callbackSuccess2 = jasmine.createSpy('success2');
+        const callbackComplete = jasmine.createSpy('complete');
+
+        ajax.click($('#buttonToTest'), {
+            url: '/badRequest', // overridden by data-ec-crud-ajax-url
+            method: 'GET', // overridden by data-ec-crud-ajax-method
+            onSuccess: function (args) { // overridden by data-ec-crud-ajax-on-success
+                callbackSuccess2();
+            },
+            onComplete: function (args) {
+                callbackComplete();
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
+        expect(global.callbackSuccess1).toHaveBeenCalled();
+        expect(callbackSuccess2).not.toHaveBeenCalled();
+        expect(callbackComplete).toHaveBeenCalled();
+    });
+
+    it('Send auto-request with button', function () {
+        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="buttonToTest" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
+
+        $('#buttonToTest').click();
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+    });
+
+    it('Send auto-request with button canceled', function () {
+        $(document).on('ec-crud-ajax-click-auto-before', '#clickToTest', function (event) {
+            event.preventDefault();
+        });
+        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest">Go !</button>');
+
+        $('#clickToTest').click();
+
+        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+
+        $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest');
+    });
+
+    it('Send auto-request canceled by onBeforeSend option (function)', function () {
+        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="function (args) { args.stop = true; }">Go !</button>');
+
+        $('#clickToTest').click();
+
+        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+
+        $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest');
+    });
+
+    it('Send auto-request canceled by onBeforeSend option (function content)', function () {
+        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="/args/args.stop = true">Go !</button>');
+
+        $('#clickToTest').click();
+
+        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+
+        $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest');
+    });
+});
+
+describe('Test Ajax.link', function () {
+    beforeEach(function () {
+        jasmine.Ajax.install();
+
+        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+            status: 200,
+            responseText: 'OK'
+        });
+    });
+
+    afterEach(function () {
+        jasmine.Ajax.uninstall();
+        $('.html-test').remove();
+    });
+
+    it('Send request with link', function () {
+        $('body').append('<a href="/goodRequest" class="html-test" id="linkToTest">Go !</a>');
+
+        const callbackSuccess = jasmine.createSpy('success');
+
+        ajax.link($('#linkToTest'), {
+            onSuccess: function (args) {
+                callbackSuccess();
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(callbackSuccess).toHaveBeenCalled();
+    });
+
+    it('Send request with link and data-*', function () {
+        $('body').append('<a href="/goodRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="callbackSuccess()">Go !</a>');
+
+        global.callbackSuccess = jasmine.createSpy('success');
+
+        ajax.link($('#linkToTest'));
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(global.callbackSuccess).toHaveBeenCalled();
+    });
+
+    it('Send request with link and data-* and options', function () {
+        $('body').append('<a href="/badRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="callbackSuccess1()" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
+        // href is overridden by url option
+
+        global.callbackSuccess1 = jasmine.createSpy('success1');
+        const callbackSuccess2 = jasmine.createSpy('success2');
+        const callbackComplete = jasmine.createSpy('complete');
+
+        ajax.link($('#linkToTest'), {
+            url: '/badRequest', // overridden by data-ec-crud-ajax-url
+            method: 'GET', // overridden by data-ec-crud-ajax-method
+            onSuccess: function (args) { // overridden by data-ec-crud-ajax-on-success
+                callbackSuccess2();
+            },
+            onComplete: function (args) {
+                callbackComplete();
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
+        expect(global.callbackSuccess1).toHaveBeenCalled();
+        expect(callbackSuccess2).not.toHaveBeenCalled();
+        expect(callbackComplete).toHaveBeenCalled();
+    });
+
+    it('Send auto-request with link', function () {
+        $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>');
+
+        $('#linkToTest').click();
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+    });
+
+    it('Send auto-request with link canceled', function () {
+        $(document).on('ec-crud-ajax-link-auto-before', '#linkToTest', function (event) {
+            event.preventDefault();
+        });
+        $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>');
+
+        $('#linkToTest').click();
+
+        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+
+        $(document).off('ec-crud-ajax-link-auto-before', '#linkToTest');
+    });
+});
+
+describe('Test Ajax.form', function () {
+    beforeEach(function () {
+        jasmine.Ajax.install();
+
+        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+            status: 200,
+            responseText: 'OK'
+        });
+    });
+
+    afterEach(function () {
+        jasmine.Ajax.uninstall();
+        $('.html-test').remove();
+    });
+
+    it('Send request with form', function () {
+        $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
+        $('#formToTest input[name=var1]').val('My value 1');
+        $('#formToTest input[name=var2]').val('My value 2');
+
+        const callbackSuccess = jasmine.createSpy('success');
+
+        ajax.sendForm($('#formToTest'), {
+            onSuccess: function (args) {
+                callbackSuccess();
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+            var1: ['My value 1'], var2: ['My value 2']
+        });
+        expect(callbackSuccess).toHaveBeenCalled();
+    });
+
+    it('Send request with PUT form', function () {
+        $('body').append('<form action="/goodRequest" method="PUT" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
+        $('#formToTest input[name=var1]').val('My value 1');
+        $('#formToTest input[name=var2]').val('My value 2');
+
+        const callbackSuccess = jasmine.createSpy('success');
+
+        ajax.sendForm($('#formToTest'), {
+            onSuccess: function (args) {
+                callbackSuccess();
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
+        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+            var1: ['My value 1'], var2: ['My value 2']
+        });
+        expect(callbackSuccess).toHaveBeenCalled();
+    });
+
+    it('Send request with form and data-*', function () {
+        $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="callbackSuccess()"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
+        $('#formToTest input[name=var1]').val('My value 1');
+        $('#formToTest input[name=var2]').val('My value 2');
+
+        global.callbackSuccess = jasmine.createSpy('success');
+
+        ajax.sendForm($('#formToTest'));
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+            var1: ['My value 1'], var2: ['My value 2']
+        });
+        expect(global.callbackSuccess).toHaveBeenCalled();
+    });
+
+    it('Send request with form and data-* and options', function () {
+        $('body').append('<form action="/badRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="callbackSuccess1()" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
+        // action is overridden by url option
+        $('#formToTest input[name=var1]').val('My value 1');
+        $('#formToTest input[name=var2]').val('My value 2');
+
+        global.callbackSuccess1 = jasmine.createSpy('success1');
+        const callbackSuccess2 = jasmine.createSpy('success2');
+        const callbackComplete = jasmine.createSpy('complete');
+
+        ajax.sendForm($('#formToTest'), {
+            url: '/badRequest', // overridden by data-ec-crud-ajax-url
+            method: 'GET', // overridden by data-ec-crud-ajax-method
+            onSuccess: function (args) { // overridden by data-ec-crud-ajax-on-success
+                callbackSuccess2();
+            },
+            onComplete: function (args) {
+                callbackComplete();
+            }
+        });
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
+        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+            var1: ['My value 1'],
+            var2: ['My value 2']
+        });
+        expect(global.callbackSuccess1).toHaveBeenCalled();
+        expect(callbackSuccess2).not.toHaveBeenCalled();
+        expect(callbackComplete).toHaveBeenCalled();
+    });
+
+    it('Send auto-request with form', function () {
+        $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
+        $('#formToTest input[name=var1]').val('My value 1');
+        $('#formToTest input[name=var2]').val('My value 2');
+
+        $('#formToTest').submit();
+
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+            var1: ['My value 1'],
+            var2: ['My value 2']
+        });
+    });
+
+    it('Send auto-request with form canceled', function () {
+        $(document).on('ec-crud-ajax-form-auto-before', '#formToTest', function (event) {
+            event.preventDefault();
+        });
+        $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
+        $('#formToTest input[name=var1]').val('My value 1');
+        $('#formToTest input[name=var2]').val('My value 2');
+
+        $('#formToTest').submit();
+
+        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+
+        $(document).off('ec-crud-ajax-form-auto-before', '#formToTest');
+    });
+});
diff --git a/tests/Resources/public/js/callback.spec.js b/tests/Resources/public/js/callback.spec.js
new file mode 100644
index 0000000..78e3e03
--- /dev/null
+++ b/tests/Resources/public/js/callback.spec.js
@@ -0,0 +1,129 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import runCallback from '../../../../src/Resources/public/js/callback';
+
+describe('Test callback', function () {
+    it('Test callback with function', function () {
+        const callback = jasmine.createSpy('callback');
+
+        runCallback(function (arg) {
+            callback(arg);
+        }, 2);
+
+        expect(callback).toHaveBeenCalledWith(2);
+    });
+
+    it('Test callback with string', function () {
+        global.myCallback = jasmine.createSpy('callback');
+
+        runCallback('function (arg) { myCallback(arg); }', 3);
+
+        expect(global.myCallback).toHaveBeenCalledWith(3);
+    });
+
+    it('Test callback with function content with argument', function () {
+        global.myCallback = jasmine.createSpy('callback');
+
+        runCallback('/arg/myCallback(arg)', 5);
+
+        expect(global.myCallback).toHaveBeenCalledWith(5);
+    });
+
+    it('Test callback with function content without argument', function () {
+        global.myCallback = jasmine.createSpy('callback');
+
+        runCallback('myCallback(5)', 4);
+
+        expect(global.myCallback).toHaveBeenCalledWith(5);
+    });
+
+    it('Test callback with sub array', function () {
+        const callback1 = jasmine.createSpy('callback1');
+        const callback2 = jasmine.createSpy('callback2');
+        const callback3 = jasmine.createSpy('callback3');
+        const callback4 = jasmine.createSpy('callback4');
+        const callback5 = jasmine.createSpy('callback5');
+
+        runCallback([
+            function () {
+                callback1();
+            },
+            [
+                [
+                    function () {
+                        callback2();
+                    },
+                    function () {
+                        callback3();
+                    }
+                ],
+                function () {
+                    callback4();
+                }
+            ],
+            function () {
+                callback5();
+            }
+        ]);
+
+        expect(callback1).toHaveBeenCalledTimes(1);
+        expect(callback2).toHaveBeenCalledTimes(1);
+        expect(callback3).toHaveBeenCalledTimes(1);
+        expect(callback4).toHaveBeenCalledTimes(1);
+        expect(callback5).toHaveBeenCalledTimes(1);
+    });
+
+    it('Test callback with priorities', function () {
+        const callback1 = jasmine.createSpy('callback1');
+        const callback2 = jasmine.createSpy('callback2');
+        global.callback3 = jasmine.createSpy('callback3');
+        global.callback4 = jasmine.createSpy('callback4');
+        global.callback5 = jasmine.createSpy('callback5');
+
+        runCallback([
+            // Called third
+            function (arg) {
+                callback1(arg);
+            },
+            // Called first
+            {
+                priority: '99',
+                callback: function (arg) {
+                    callback2(arg);
+                }
+            },
+            // Called second
+            {
+                priority: 10,
+                callback: 'callback3()'
+            },
+            // Called fourth
+            {
+                callback: 'callback4()'
+            },
+            // Called in fifth
+            'callback5()'
+        ], 'myValue');
+
+        expect(callback1).toHaveBeenCalledTimes(1);
+        expect(callback2).toHaveBeenCalledTimes(1);
+        expect(global.callback3).toHaveBeenCalledTimes(1);
+        expect(global.callback4).toHaveBeenCalledTimes(1);
+        expect(global.callback5).toHaveBeenCalledTimes(1);
+
+        expect(callback1).toHaveBeenCalledWith('myValue');
+        expect(callback2).toHaveBeenCalledWith('myValue');
+
+        expect(callback2).toHaveBeenCalledBefore(global.callback3);
+        expect(global.callback3).toHaveBeenCalledBefore(callback1);
+        expect(callback1).toHaveBeenCalledBefore(global.callback4);
+        expect(global.callback4).toHaveBeenCalledBefore(global.callback5);
+    });
+});
diff --git a/tests/Resources/public/js/main.js b/tests/Resources/public/js/main.js
new file mode 100644
index 0000000..ec28c07
--- /dev/null
+++ b/tests/Resources/public/js/main.js
@@ -0,0 +1,11 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+const testsContext = require.context('.', true, /\.spec\.js$/);
+testsContext.keys().forEach(testsContext);
diff --git a/tests/Resources/public/js/modal/engine/test.js b/tests/Resources/public/js/modal/engine/test.js
new file mode 100644
index 0000000..c2660f3
--- /dev/null
+++ b/tests/Resources/public/js/modal/engine/test.js
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import runCallback from '../../../../../../src/Resources/public/js/callback';
+import $ from 'jquery';
+
+export function openModal (options) {
+    runCallback(options.onOpen, $(options.element));
+
+    $(document).on('DOMNodeRemoved', options.element + ' .content', function (event) {
+        runCallback(options.onClose, $(options.element));
+    });
+}
+
+export function closeModal (element) {
+    $(element + ' .content').remove();
+    $(document).off('remove', element + ' .content');
+}
diff --git a/tests/Resources/public/js/modal/modal-manager.spec.js b/tests/Resources/public/js/modal/modal-manager.spec.js
new file mode 100644
index 0000000..8935791
--- /dev/null
+++ b/tests/Resources/public/js/modal/modal-manager.spec.js
@@ -0,0 +1,322 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import * as modalManager from '../../../../../src/Resources/public/js/modal/modal-manager';
+import $ from 'jquery';
+const testEngine = require('./engine/test');
+const bootstrap3Engine = require('../../../../../src/Resources/public/js/modal/engine/bootstrap3');
+
+it('Get engine when not defined', function () {
+    modalManager.defineEngine(null);
+
+    spyOn(window.console, 'error');
+
+    const engine = modalManager.getEngine();
+    expect(window.console.error).toHaveBeenCalledWith('Engine not defined');
+
+    expect(engine).toBeUndefined();
+});
+
+describe('Test Modal-manager with spy engine', function () {
+    beforeEach(function () {
+        this.spyEngine = {
+            openModal: function (options) {
+            },
+            closeModal: function (element) {
+            }
+        }
+        spyOn(this.spyEngine, 'openModal');
+        spyOn(this.spyEngine, 'closeModal');
+
+        modalManager.defineEngine(this.spyEngine);
+
+        jasmine.Ajax.install();
+        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+            status: 200,
+            responseText: 'OK'
+        });
+    });
+
+    afterEach(function () {
+        $('.html-test').remove();
+        jasmine.Ajax.uninstall();
+    });
+
+    it('Test openModal', function () {
+        modalManager.openModal({
+            element: '#myId'
+        });
+
+        expect(this.spyEngine.openModal).toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+    });
+
+    it('Test openModal without element option', function () {
+        spyOn(window.console, 'error');
+        modalManager.openModal({});
+        expect(window.console.error).toHaveBeenCalledWith('Value required: element');
+    });
+
+    it('Test closeModal', function () {
+        modalManager.closeModal('#myId');
+
+        expect(this.spyEngine.openModal).not.toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).toHaveBeenCalled();
+    });
+
+    it('Test auto openModal', function () {
+        $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId">Go !</a>');
+
+        $('#linkToTest').click();
+
+        expect(this.spyEngine.openModal).toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+    });
+
+    it('Test auto openModal canceled', function () {
+        $(document).on('ec-crud-modal-auto-before', '#linkToTest', function (event) {
+            event.preventDefault();
+        });
+        $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId">Go !</a>');
+
+        $('#linkToTest').click();
+
+        expect(this.spyEngine.openModal).not.toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+
+        $(document).off('ec-crud-modal-auto-before', '#linkToTest');
+    });
+
+    it('Test auto openRemoteModal', function () {
+        $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>');
+
+        $('#linkToTest').click();
+
+        expect(this.spyEngine.openModal).toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+    });
+
+    it('Test auto openRemoteModal canceled', function () {
+        $(document).on('ec-crud-remote-modal-auto-before', '#linkToTest', function (event) {
+            event.preventDefault();
+        });
+        $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>');
+
+        $('#linkToTest').click();
+
+        expect(this.spyEngine.openModal).not.toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+
+        $(document).off('ec-crud-remote-modal-auto-before', '#linkToTest');
+    });
+});
+
+describe('Test Modal-manager with test engine', function () {
+    beforeEach(function () {
+        modalManager.defineEngine(testEngine);
+        $('body').append('<div id="test-modal"><div class="content"></div></div>');
+
+        jasmine.Ajax.install();
+        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+            status: 200,
+            responseText: 'OK'
+        });
+        jasmine.Ajax.stubRequest('/error404').andReturn({
+            status: 404,
+            responseText: 'Page not found !'
+        });
+    });
+
+    afterEach(function () {
+        $('#test-modal').remove();
+        jasmine.Ajax.uninstall();
+    });
+
+    describe('Test Modal-manager.defineEngine/getEngine', function () {
+        it('getEngine is testEngine', function () {
+            expect(modalManager.getEngine()).toEqual(testEngine);
+        });
+
+        it('Define bootstrap3 engine', function () {
+            modalManager.defineEngine(bootstrap3Engine);
+            expect(modalManager.getEngine()).toEqual(bootstrap3Engine);
+        });
+
+        it('Test openModal with onOpen and onClose options', function () {
+            const callbackOpen = jasmine.createSpy('open');
+            const callbackClose = jasmine.createSpy('close');
+
+            modalManager.openModal({
+                element: '#test-modal',
+                onOpen: function (element) {
+                    callbackOpen(element);
+                },
+                onClose: function (element) {
+                    callbackClose(element);
+                }
+            });
+
+            expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'));
+            expect(callbackClose).not.toHaveBeenCalled();
+
+            modalManager.closeModal('#test-modal');
+
+            expect(callbackOpen).toHaveBeenCalledTimes(1);
+            expect(callbackClose).toHaveBeenCalledWith($('#test-modal'));
+        });
+    });
+
+    describe('Test Modal-manager.openRemoteModal', function () {
+        it('Test openRemoteModal', function () {
+            const callbackOpen = jasmine.createSpy('open');
+            const callbackClose = jasmine.createSpy('close');
+
+            modalManager.openRemoteModal({
+                url: '/goodRequest',
+                element: '#test-modal',
+                elementContent: '#test-modal .content',
+                onOpen: function (element) {
+                    callbackOpen(element);
+                },
+                onClose: function (element) {
+                    callbackClose(element);
+                }
+            });
+
+            expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'));
+            expect(callbackClose).not.toHaveBeenCalled();
+            expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+            expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+            expect($('#test-modal .content').html()).toBe('OK');
+        });
+
+        it('Test openRemoteModal without option', function () {
+            spyOn(window.console, 'error');
+            modalManager.openRemoteModal({});
+            expect(window.console.error).toHaveBeenCalledWith('Value required: url');
+            expect(window.console.error).toHaveBeenCalledWith('Value required: element');
+            expect(window.console.error).toHaveBeenCalledWith('Value required: elementContent');
+        });
+
+        it('Test openRemoteModal without element option', function () {
+            spyOn(window.console, 'error');
+            const callbackOpen = jasmine.createSpy('open');
+            const callbackClose = jasmine.createSpy('close');
+
+            modalManager.openRemoteModal({
+                url: '/goodRequest',
+                elementContent: '#test-modal .content',
+                onOpen: function (element) {
+                    callbackOpen(element);
+                },
+                onClose: function (element) {
+                    callbackClose(element);
+                }
+            });
+
+            expect(window.console.error).toHaveBeenCalledWith('Value required: element');
+            expect(callbackOpen).not.toHaveBeenCalled();
+            expect(callbackClose).not.toHaveBeenCalled();
+            expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+        });
+
+        it('Test openRemoteModal with ajaxOptions.onSuccess', function () {
+            const callbackOpen = jasmine.createSpy('open');
+            const callbackClose = jasmine.createSpy('close');
+            const callbackSuccess1 = jasmine.createSpy('success1');
+            const callbackSuccess2 = jasmine.createSpy('success2');
+
+            modalManager.openRemoteModal({
+                url: '/goodRequest',
+                element: '#test-modal',
+                elementContent: '#test-modal .content',
+                onOpen: function (element) {
+                    callbackOpen(element);
+                },
+                onClose: function (element) {
+                    callbackClose(element);
+                },
+                ajaxOptions: {
+                    onSuccess: [
+                        {
+                            priority: 6,
+                            callback: function (args) {
+                                callbackSuccess1();
+                            }
+                        },
+                        {
+                            priority: -2,
+                            callback: function (args) {
+                                callbackSuccess2();
+                            }
+                        }
+                    ]
+                }
+            });
+
+            expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'));
+            expect(callbackSuccess1).toHaveBeenCalledBefore(callbackOpen);
+            expect(callbackOpen).toHaveBeenCalledBefore(callbackSuccess2);
+            expect(callbackClose).not.toHaveBeenCalled();
+            expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+            expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+            expect($('#test-modal .content').html()).toBe('OK');
+        });
+
+        it('Test openRemoteModal with method option', function () {
+            const callbackOpen = jasmine.createSpy('open');
+            const callbackClose = jasmine.createSpy('close');
+
+            modalManager.openRemoteModal({
+                url: '/goodRequest',
+                element: '#test-modal',
+                elementContent: '#test-modal .content',
+                onOpen: function (element) {
+                    callbackOpen(element);
+                },
+                onClose: function (element) {
+                    callbackClose(element);
+                },
+                method: 'PUT'
+            });
+
+            expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'));
+            expect(callbackClose).not.toHaveBeenCalled();
+            expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+            expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
+            expect($('#test-modal .content').html()).toBe('OK');
+        });
+
+        it('Test openRemoteModal with bad request', function () {
+            const callbackOpen = jasmine.createSpy('open');
+            const callbackClose = jasmine.createSpy('close');
+
+            modalManager.openRemoteModal({
+                url: '/error404',
+                element: '#test-modal',
+                elementContent: '#test-modal .content',
+                onOpen: function (element) {
+                    callbackOpen(element);
+                },
+                onClose: function (element) {
+                    callbackClose(element);
+                }
+            });
+
+            expect(callbackOpen).not.toHaveBeenCalled();
+            expect(callbackClose).not.toHaveBeenCalled();
+            expect(jasmine.Ajax.requests.mostRecent().url).toBe('/error404');
+            expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+            expect($('#test-modal .content').html()).toBe('');
+        });
+    });
+});
diff --git a/tests/Resources/public/js/options-resolver.spec.js b/tests/Resources/public/js/options-resolver.spec.js
new file mode 100644
index 0000000..5a38f2e
--- /dev/null
+++ b/tests/Resources/public/js/options-resolver.spec.js
@@ -0,0 +1,123 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import * as optionsRevolser from '../../../../src/Resources/public/js/options-resolver';
+import $ from 'jquery';
+
+describe('Test options-resolver.resolve', function () {
+    const defaultOptions = {
+        var1: 'hello',
+        var2: null,
+        var3: true,
+        var4: 1,
+        var5: 'world',
+        var6: null
+    };
+
+    it('Empty options', function () {
+        expect(optionsRevolser.resolve(defaultOptions, {})).toEqual(defaultOptions);
+    });
+
+    it('Options with values', function () {
+        const options = {
+            var3: null,
+            var5: 'world',
+            var6: 'hello',
+            var7: 'extra',
+            var8: null
+        };
+
+        const expected = {
+            var1: 'hello',
+            var2: null,
+            var3: null,
+            var4: 1,
+            var5: 'world',
+            var6: 'hello',
+            var7: 'extra',
+            var8: null
+        }
+
+        expect(optionsRevolser.resolve(defaultOptions, options)).toEqual(expected);
+    });
+});
+
+describe('Test options-resolver.getDataAttributes', function () {
+    afterEach(function () {
+        $('.html-test').remove();
+    });
+
+    it('Element doesn\'t exist', function () {
+        expect(optionsRevolser.getDataAttributes('#badId', 'myPrefix')).toEqual({});
+    });
+
+    it('Element exists', function () {
+        $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1" data-badprefix="1" data-my-prefix-var2="value2"></div>');
+
+        const expected = {
+            var1: 'value1',
+            var2: 'value2'
+        };
+
+        expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual(expected);
+    });
+
+    it('Element without attribute', function () {
+        $('body').append('<div id="myDiv" class="html-test"></div>');
+
+        expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual({});
+    });
+
+    it('Element with different data types', function () {
+        $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1" data-badprefix="1" data-my-prefix-var2="16" data-my-prefix-var3="false" data-my-prefix-var4="[8]" data-my-prefix-var5="{&quot;result&quot;:true, &quot;count&quot;:100}"></div>');
+
+        const expected = {
+            var1: 'value1',
+            var2: 16,
+            var3: false,
+            var4: [8],
+            var5: {
+                result: true,
+                count: 100
+            }
+        };
+
+        expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual(expected);
+    });
+});
+
+describe('Test options-resolver.isNotBlank', function () {
+    it('Undefined is blank', function () {
+        expect(optionsRevolser.isNotBlank(undefined)).toBe(false);
+    });
+
+    it('Null is blank', function () {
+        expect(optionsRevolser.isNotBlank(null)).toBe(false);
+    });
+
+    it('Empty string is blank', function () {
+        expect(optionsRevolser.isNotBlank('')).toBe(false);
+    });
+
+    it('String is not blank', function () {
+        expect(optionsRevolser.isNotBlank('string')).toBe(true);
+    });
+
+    it('Int is not blank', function () {
+        expect(optionsRevolser.isNotBlank(8)).toBe(true);
+    });
+
+    it('Empty array is blank', function () {
+        expect(optionsRevolser.isNotBlank([])).toBe(false);
+    });
+
+    it('Array is not blank', function () {
+        expect(optionsRevolser.isNotBlank(['val'])).toBe(true);
+    });
+});
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
new file mode 100644
index 0000000..afc1e61
--- /dev/null
+++ b/tests/Twig/CrudExtensionTest.php
@@ -0,0 +1,168 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Twig;
+
+use Ecommit\CrudBundle\Twig\CrudExtension;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
+use Twig\Environment;
+
+class CrudExtensionTest extends KernelTestCase
+{
+    /**
+     * @var CrudExtension
+     */
+    protected $crudExtension;
+
+    /**
+     * @var FormFactoryInterface
+     */
+    protected $formFactory;
+
+    /**
+     * @var Environment
+     */
+    protected $environment;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->crudExtension = self::$container->get(CrudExtension::class);
+        $this->formFactory = self::$container->get(FormFactoryInterface::class);
+        $this->environment = self::$container->get(Environment::class);
+    }
+
+    public function testFormStartAjax(): void
+    {
+        $html = $this->crudExtension->formStartAjax($this->createFormView());
+
+        $xpath = '//form[@method="post" and @action="/url" and contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")]';
+        $this->assertMatchesXpath($html, $xpath);
+    }
+
+    public function testFormStartAjaxWithCustomAutoClass(): void
+    {
+        $html = $this->crudExtension->formStartAjax($this->createFormView(), [
+            'auto_class' => 'custom-class',
+        ]);
+
+        $xpath = '//form[not(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and contains(concat(" ", normalize-space(@class), " "), " custom-class ")]';
+        $this->assertMatchesXpath($html, $xpath);
+    }
+
+    public function testFormStartAjaxWithClassAttr(): void
+    {
+        $html = $this->crudExtension->formStartAjax($this->createFormView(), [
+            'attr' => [
+                'class' => 'my-class',
+            ],
+        ]);
+
+        $xpath = '//form[(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and contains(concat(" ", normalize-space(@class), " "), " my-class ")]';
+        $this->assertMatchesXpath($html, $xpath);
+    }
+
+    public function testFormStartAjaxWithAjaxOptions(): void
+    {
+        $html = $this->crudExtension->formStartAjax($this->createFormView(), [
+            'ajax_options' => [
+                'on_success' => 'a=b',
+            ],
+        ]);
+
+        $xpath = '//form[(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and @data-ec-crud-ajax-on-success="a=b"]';
+        $this->assertMatchesXpath($html, $xpath);
+    }
+
+    public function testFormStartAjaxWithAttrAndAjaxOptions(): void
+    {
+        $html = $this->crudExtension->formStartAjax($this->createFormView(), [
+            'attr' => [
+                'data-custom' => 'custom',
+            ],
+            'ajax_options' => [
+                'on_success' => 'a=b',
+            ],
+        ]);
+
+        $xpath = '//form[(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and @data-ec-crud-ajax-on-success="a=b" and @data-custom="custom"]';
+        $this->assertMatchesXpath($html, $xpath);
+    }
+
+    public function testFormStartAjaxWithBadAjaxOptions(): void
+    {
+        $this->expectException(UndefinedOptionsException::class);
+        $this->crudExtension->formStartAjax($this->createFormView(), [
+            'ajax_options' => [
+                'badOption' => 'value',
+            ],
+        ]);
+    }
+
+    /**
+     * @dataProvider getTestAjaxAttributesProvider
+     */
+    public function testAjaxAttributes(array $ajaxOptions, string $expected): void
+    {
+        $result = $this->crudExtension->ajaxAttributes(
+            $this->environment,
+            $ajaxOptions
+        );
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function getTestAjaxAttributesProvider(): array
+    {
+        return [
+            [[], ''],
+            [['url' => '/url?id=a'], ' data-ec-crud-ajax-url="/url?id=a"'],
+            [['url' => '/url?id=a', 'method' => 'GET'], ' data-ec-crud-ajax-url="/url?id=a" data-ec-crud-ajax-method="GET"'],
+            [['data' => '<script>ValueToEscape</script>'], ' data-ec-crud-ajax-data="&lt;script&gt;ValueToEscape&lt;/script&gt;"'],
+            [['cache' => true], ' data-ec-crud-ajax-cache="true"'],
+            [['cache' => false], ' data-ec-crud-ajax-cache="false"'],
+            [['data' => ['var1' => 'value1']], ' data-ec-crud-ajax-data="{&quot;var1&quot;:&quot;value1&quot;}"'],
+        ];
+    }
+
+    public function testAjaxAttributesWithBadAjaxOptions(): void
+    {
+        $this->expectException(UndefinedOptionsException::class);
+        $this->crudExtension->ajaxAttributes(
+            $this->environment,
+            ['badOption' => 'value']
+        );
+    }
+
+    protected function createFormView(): FormView
+    {
+        $builder = $this->formFactory->createBuilder(FormType::class, null, [
+            'action' => '/url',
+            'method' => 'POST',
+        ]);
+
+        return $builder->getForm()->createView();
+    }
+
+    protected function assertMatchesXpath(?string $html, string $expression, int $count = 1): void
+    {
+        $crawler = new Crawler($html);
+        $this->assertCount($count, $crawler->filterXPath($expression));
+    }
+}
diff --git a/webpack-encore-config.js b/webpack-encore-config.js
new file mode 100644
index 0000000..9b1bf39
--- /dev/null
+++ b/webpack-encore-config.js
@@ -0,0 +1,26 @@
+module.exports = function (outputPath) {
+    var Encore = require('@symfony/webpack-encore');
+
+    if (!Encore.isRuntimeEnvironmentConfigured()) {
+        Encore.configureRuntimeEnvironment(process.env.NODE_ENV || 'dev');
+    }
+
+    Encore
+        .setOutputPath(outputPath)
+        .setPublicPath('/build')
+        .addEntry('app', './tests/App/assets/js/app.js')
+        .splitEntryChunks()
+        .enableSingleRuntimeChunk()
+        .cleanupOutputBeforeBuild()
+        .enableBuildNotifications()
+        .enableSourceMaps(!Encore.isProduction())
+        .enableVersioning(false)
+        .configureBabelPresetEnv((config) => {
+            config.useBuiltIns = 'usage';
+            config.corejs = 3;
+        })
+        .autoProvidejQuery()
+    ;
+
+    return Encore;
+}
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 0000000..33c0180
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,3 @@
+var encoreConfig = require('./webpack-encore-config');
+
+module.exports = encoreConfig('tests/App/public/build/').getWebpackConfig();

From 2ab5927c80746a184062a06328c982d8a20109b2 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 6 May 2020 17:49:38 +0200
Subject: [PATCH 012/264] [CrudExtension] Remove Twig\Environment dependency

---
 src/Resources/config/services.xml |  1 -
 src/Twig/CrudExtension.php        | 17 +++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 3949b38..b8a8685 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -31,7 +31,6 @@
 
         <service id="Ecommit\CrudBundle\Twig\CrudExtension" class="Ecommit\CrudBundle\Twig\CrudExtension">
             <argument type="service" id="Ecommit\CrudBundle\Helper\CrudHelper"/>
-            <argument type="service" id="Twig\Environment"/>
             <argument type="service" id="twig.form.renderer" />
             <argument>%ecommit_crud.theme%</argument>
             <tag name="twig.extension"/>
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index bef281d..b13042b 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -30,11 +30,6 @@ class CrudExtension extends AbstractExtension
      */
     protected $crudHelper;
 
-    /**
-     * @var Environment
-     */
-    protected $templating;
-
     /**
      * @var FormRendererInterface
      */
@@ -45,10 +40,9 @@ class CrudExtension extends AbstractExtension
     /**
      * Constructor.
      */
-    public function __construct(CrudHelper $crudHelper, Environment $templating, FormRendererInterface $formRenderer, string $theme)
+    public function __construct(CrudHelper $crudHelper, FormRendererInterface $formRenderer, string $theme)
     {
         $this->crudHelper = $crudHelper;
-        $this->templating = $templating;
         $this->formRenderer = $formRenderer;
         $this->theme = $theme;
     }
@@ -94,7 +88,10 @@ public function getFunctions()
             new TwigFunction(
                 'crud_display_settings',
                 [$this, 'displaySettings'],
-                ['is_safe' => ['all']]
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['all'],
+                ]
             ),
             new TwigFunction(
                 'crud_search_form',
@@ -194,7 +191,7 @@ public function td($columnId, Crud $crud, $value, $options = [], $tdOptions = []
      *
      * @return string
      */
-    public function displaySettings(Crud $crud, $options = [], $ajaxOptions = [])
+    public function displaySettings(Environment $environment, Crud $crud, $options = [], $ajaxOptions = [])
     {
         $options = array_merge($crud->getTemplateConfiguration('crud_display_settings'), $options);
         $resolver = new OptionsResolver();
@@ -233,7 +230,7 @@ public function displaySettings(Crud $crud, $options = [], $ajaxOptions = [])
             }
         }
 
-        return $this->templating->render(
+        return $environment->render(
             $templateName,
             [
                 'form' => $form,

From 6c9305872a029df0bc4ded77f307dd7b70fcdc74 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 6 May 2020 21:48:58 +0200
Subject: [PATCH 013/264] Remove template_configuration option

And associated methods:
Crud::configureTemplate
Crud::validateConfigureTemplateFunctionName
Crud::getTemplateConfiguration
---
 src/Crud/Crud.php                             | 65 +------------------
 src/Crud/CrudFactory.php                      | 10 +--
 src/DependencyInjection/Configuration.php     | 16 -----
 .../EcommitCrudExtension.php                  |  1 -
 src/Helper/CrudHelper.php                     | 10 ---
 src/Resources/config/services.xml             |  2 -
 src/Twig/CrudExtension.php                    |  1 -
 7 files changed, 2 insertions(+), 103 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index ab4296d..306f0e7 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -96,11 +96,6 @@ class Crud
      */
     protected $user;
 
-    /**
-     * @var array
-     */
-    protected $templateConfiguration;
-
     /**
      * Constructor.
      *
@@ -114,8 +109,7 @@ public function __construct(
         FormFactoryInterface $formFactory,
         Request $request,
         Registry $registry,
-        $user,
-        array $templateConfiguration = []
+        $user
     ) {
         if (!preg_match('/^[a-zA-Z0-9_]{1,50}$/', $sessionName)) {
             throw new \Exception('Variable sessionName is not given or is invalid');
@@ -127,9 +121,6 @@ public function __construct(
         $this->registry = $registry;
         $this->user = $user;
         $this->sessionValues = new CrudSession();
-        foreach ($templateConfiguration as $functionName => $value) {
-            $this->configureTemplate($functionName, $value);
-        }
 
         return $this;
     }
@@ -1152,58 +1143,4 @@ public function setDisplayResults($displayResults)
 
         return $this;
     }
-
-    /**
-     * @param string $functionName
-     * @param mixed  $value
-     */
-    public function configureTemplate($functionName, $value): void
-    {
-        if (!self::validateConfigureTemplateFunctionName($functionName)) {
-            throw new \Exception(sprintf('%s method is not allowed in configureTemplate', $functionName));
-        }
-
-        if (isset($this->templateConfiguration[$functionName])) {
-            $this->templateConfiguration[$functionName] = array_merge(
-                $this->templateConfiguration[$functionName],
-                $value
-            );
-        } else {
-            $this->templateConfiguration[$functionName] = $value;
-        }
-    }
-
-    /**
-     * @param string $functionName
-     *
-     * @return bool
-     */
-    public static function validateConfigureTemplateFunctionName($functionName)
-    {
-        $functionsAllowed = [
-            'paginator_links',
-            'crud_paginator_links',
-            'crud_th',
-            'crud_td',
-            'crud_search_reset',
-            'crud_remote_modal',
-            'crud_display_settings',
-        ];
-
-        return \in_array($functionName, $functionsAllowed);
-    }
-
-    /**
-     * @param string $functionName
-     *
-     * @return array
-     */
-    public function getTemplateConfiguration($functionName)
-    {
-        if (isset($this->templateConfiguration[$functionName])) {
-            return $this->templateConfiguration[$functionName];
-        }
-
-        return [];
-    }
 }
diff --git a/src/Crud/CrudFactory.php b/src/Crud/CrudFactory.php
index 1561f5d..1445f12 100644
--- a/src/Crud/CrudFactory.php
+++ b/src/Crud/CrudFactory.php
@@ -46,25 +46,18 @@ class CrudFactory
      */
     protected $tokenStorage;
 
-    /**
-     * @var array
-     */
-    protected $templateConfiguration;
-
     public function __construct(
         RouterInterface $router,
         FormFactoryInterface $formFactory,
         RequestStack $requestStack,
         ManagerRegistry $registry,
-        TokenStorageInterface $tokenStorage,
-        array $templateConfiguration
+        TokenStorageInterface $tokenStorage
     ) {
         $this->router = $router;
         $this->formFactory = $formFactory;
         $this->requestStack = $requestStack;
         $this->registry = $registry;
         $this->tokenStorage = $tokenStorage;
-        $this->templateConfiguration = $templateConfiguration;
     }
 
     /**
@@ -81,7 +74,6 @@ public function create($sessionName)
             $this->requestStack->getCurrentRequest(),
             $this->registry,
             $this->tokenStorage->getToken()->getUser(),
-            $this->templateConfiguration
         );
     }
 }
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 25309d4..b86a7df 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -13,7 +13,6 @@
 
 namespace Ecommit\CrudBundle\DependencyInjection;
 
-use Ecommit\CrudBundle\Crud\Crud;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -35,21 +34,6 @@ public function getConfigTreeBuilder()
         $rootNode
             ->children()
                 ->scalarNode('theme')->isRequired()->end()
-                ->arrayNode('template_configuration')
-                    ->treatNullLike([])
-                    ->prototype('variable')
-                    ->end()
-                    ->validate()
-                        ->ifTrue(function ($v) {
-                            foreach ($v as $functionName => $value) {
-                                if (!Crud::validateConfigureTemplateFunctionName($functionName)) {
-                                    return true;
-                                }
-                            }
-                        })
-                        ->thenInvalid('Function name in template_configuration is invalid.')
-                    ->end()
-                ->end()
                 ->arrayNode('images')
                     ->addDefaultsIfNotSet()
                     ->children()
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index 851cd0a..119a04c 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -37,7 +37,6 @@ public function load(array $config, ContainerBuilder $container): void
         $loader->load('services.xml');
 
         $container->setParameter('ecommit_crud.theme', $config['theme']);
-        $container->setParameter('ecommit_crud.template_configuration', $config['template_configuration']);
         $container->setParameter('ecommit_crud.images', ['th_image_up' => $config['images']['th_image_up'], 'th_image_down' => $config['images']['th_image_down']]);
     }
 }
diff --git a/src/Helper/CrudHelper.php b/src/Helper/CrudHelper.php
index 520d1ed..6ffee0a 100644
--- a/src/Helper/CrudHelper.php
+++ b/src/Helper/CrudHelper.php
@@ -149,9 +149,6 @@ public function getOverlayService()
      */
     public function paginatorLinks(AbstractPaginator $paginator, $routeName, $routeParams, $options)
     {
-        if (isset($this->parameters['template_configuration']['paginator_links'])) {
-            $options = array_merge($this->parameters['template_configuration']['paginator_links'], $options);
-        }
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
             [
@@ -328,7 +325,6 @@ protected function elementPaginatorLinks(
      */
     public function crudPaginatorLinks(Crud $crud, $options, $ajaxOptions)
     {
-        $options = array_merge($crud->getTemplateConfiguration('crud_paginator_links'), $options);
         if (!isset($ajaxOptions['update'])) {
             $ajaxOptions['update'] = $crud->getDivIdList();
         }
@@ -353,7 +349,6 @@ public function crudPaginatorLinks(Crud $crud, $options, $ajaxOptions)
      */
     public function th($column_id, Crud $crud, $options, $thOptions, $ajaxOptions)
     {
-        $options = array_merge($crud->getTemplateConfiguration('crud_th'), $options);
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
             [
@@ -441,7 +436,6 @@ public function th($column_id, Crud $crud, $options, $thOptions, $ajaxOptions)
      */
     public function td($column_id, Crud $crud, $value, $options, $tdOptions)
     {
-        $options = array_merge($crud->getTemplateConfiguration('crud_td'), $options);
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
             [
@@ -570,7 +564,6 @@ public function searchFormTag(Crud $crud, $ajaxOptions, $htmlOptions)
      */
     public function searchResetButton(Crud $crud, $options, $ajaxOptions, $htmlOptions)
     {
-        $options = array_merge($crud->getTemplateConfiguration('crud_search_reset'), $options);
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
             [
@@ -636,9 +629,6 @@ public function declareModal($modalId, $options = [])
      */
     public function remoteModal($modalId, $url, $options, $ajaxOptions)
     {
-        if (isset($this->parameters['template_configuration']['crud_remote_modal'])) {
-            $options = array_merge($this->parameters['template_configuration']['crud_remote_modal'], $options);
-        }
         $modalId = str_replace(' ', '', $modalId);
 
         $resolver = new OptionsResolver();
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index b8a8685..9c5070c 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -9,7 +9,6 @@
             <argument type="service" id="Symfony\Component\HttpFoundation\RequestStack"/>
             <argument type="service" id="Doctrine\Persistence\ManagerRegistry" />
             <argument type="service" id="Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface"/>
-            <argument>%ecommit_crud.template_configuration%</argument>
         </service>
         <service id="ecommit_crud.factory" alias="Ecommit\CrudBundle\Crud\CrudFactory" public="true" />
 
@@ -23,7 +22,6 @@
             <argument type="service" id="ecommit_javascript.overlay"/>
             <argument type="collection">
                 <argument key="use_bootstrap">%ecommit_javascript.use_bootstrap%</argument>
-                <argument key="template_configuration">%ecommit_crud.template_configuration%</argument>
                 <argument key="images">%ecommit_crud.images%</argument>
             </argument>
         </service>
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index b13042b..41ebd63 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -193,7 +193,6 @@ public function td($columnId, Crud $crud, $value, $options = [], $tdOptions = []
      */
     public function displaySettings(Environment $environment, Crud $crud, $options = [], $ajaxOptions = [])
     {
-        $options = array_merge($crud->getTemplateConfiguration('crud_display_settings'), $options);
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
             [

From 173bb174df30e074af1e845143043d65ce6e22b8 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 6 May 2020 22:02:38 +0200
Subject: [PATCH 014/264] Fix CrudFactory syntax

---
 src/Crud/CrudFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Crud/CrudFactory.php b/src/Crud/CrudFactory.php
index 1445f12..fadaedb 100644
--- a/src/Crud/CrudFactory.php
+++ b/src/Crud/CrudFactory.php
@@ -73,7 +73,7 @@ public function create($sessionName)
             $this->formFactory,
             $this->requestStack->getCurrentRequest(),
             $this->registry,
-            $this->tokenStorage->getToken()->getUser(),
+            $this->tokenStorage->getToken()->getUser()
         );
     }
 }

From 517d7765a4ce38e94fe49f9cd41e8a6b5c4e556a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 8 May 2020 17:42:19 +0200
Subject: [PATCH 015/264] [Tests] Replace
 "doctrine.orm.naming_strategy.underscore" by
 "doctrine.orm.naming_strategy.underscore_number_aware"

---
 tests/App/config/doctrine.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/App/config/doctrine.yaml b/tests/App/config/doctrine.yaml
index 89219bd..2bb3a07 100644
--- a/tests/App/config/doctrine.yaml
+++ b/tests/App/config/doctrine.yaml
@@ -17,6 +17,6 @@ doctrine:
                         type: annotation
                         dir: '%kernel.project_dir%/Entity'
                         prefix: 'Ecommit\CrudBundle\Tests\App\Entity'
-                naming_strategy: doctrine.orm.naming_strategy.underscore
+                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         resolve_target_entities:
             Ecommit\CrudBundle\Entity\UserCrudInterface: Ecommit\CrudBundle\Tests\App\Entity\TestUser

From 0d12ee9cc55b2607f4b9cd89c9fb25d90613bf45 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 8 May 2020 18:48:11 +0200
Subject: [PATCH 016/264] [Twig] New version of paginator_links and
 crud_paginator_links functions

* Remove options "buttons", "image_first", "image_previous", "image_next", "image_last", "text_first", "text_previous", "text_next", "text_last", "use_bootstrap" and "bootstrap_size"
* Rename the option "template" to "render"
* The 3rd option ($ajaxOptions) of crud_paginator_links is deleted. Use the option "ajax_options" instead
* New CSS classes
* Remove Ecommit\CrudBundle\Helper\CrudHelper::paginatorLinks
* Remove Ecommit\CrudBundle\Helper\CrudHelper::crudPaginatorLinks
* Removes assets : "images/i16/resultset_*"
---
 src/Helper/CrudHelper.php                     | 213 --------------
 .../public/images/i16/resultset_first.png     | Bin 522 -> 0 bytes
 .../public/images/i16/resultset_last.png      | Bin 524 -> 0 bytes
 .../public/images/i16/resultset_next.png      | Bin 395 -> 0 bytes
 .../public/images/i16/resultset_previous.png  | Bin 389 -> 0 bytes
 src/Resources/views/Theme/base.html.twig      |  86 ++++++
 .../views/Theme/bootstrap3.html.twig          |  14 +
 src/Twig/CrudExtension.php                    | 146 ++++++++--
 tests/App/templates/render.html.twig          |   1 +
 .../Controller/TestCrudControllerTest.php     |   2 +-
 tests/Twig/CrudExtensionTest.php              | 262 ++++++++++++++++++
 11 files changed, 481 insertions(+), 243 deletions(-)
 delete mode 100644 src/Resources/public/images/i16/resultset_first.png
 delete mode 100644 src/Resources/public/images/i16/resultset_last.png
 delete mode 100644 src/Resources/public/images/i16/resultset_next.png
 delete mode 100644 src/Resources/public/images/i16/resultset_previous.png
 create mode 100644 src/Resources/views/Theme/bootstrap3.html.twig
 create mode 100644 tests/App/templates/render.html.twig

diff --git a/src/Helper/CrudHelper.php b/src/Helper/CrudHelper.php
index 6ffee0a..d5a62a2 100644
--- a/src/Helper/CrudHelper.php
+++ b/src/Helper/CrudHelper.php
@@ -15,7 +15,6 @@
 
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Form\Type\DisplaySettingsType;
-use Ecommit\CrudBundle\Paginator\AbstractPaginator;
 use Ecommit\JavascriptBundle\Helper\JqueryHelper;
 use Ecommit\JavascriptBundle\Overlay\AbstractOverlay;
 use Ecommit\UtilBundle\Helper\UtilHelper;
@@ -121,218 +120,6 @@ public function getOverlayService()
         return $this->overlay;
     }
 
-    /**
-     * Returns links paginator.
-     *
-     * @param string $routeName   Route name
-     * @param array  $routeParams Route parameters
-     * @param array  $options     Options:
-     *                            * ajax_options: Ajax Options. If null, Ajax is not used. Default: null
-     *                            * attribute_page: Attribute inside url. Default: page
-     *                            * type: Type of links paginator: elastic (all links) or sliding. Default: sliding
-     *                            * max_pages_before: Max links before current page (only if sliding type is used). Default: 3
-     *                            * max_pages_after: Max links after current page (only if sliding type is used). Default: 3
-     *                            * buttons: Type of buttons: text or image. Default: text
-     *                            * image_first:  Url image "<<" (only if image buttons is used)
-     *                            * image_previous:  Url image "<" (only if image buttons is used)
-     *                            * image_next:  Url image ">" (only if image buttons is used)
-     *                            * image_last:  Url image ">>" (only if image buttons is used)
-     *                            * text_first:  Text "<<" (only if text buttons is used)
-     *                            * text_previous:  Text "<" (only if text buttons is used)
-     *                            * text_next:  Text ">" (only if text buttons is used)
-     *                            * text_last:  Text ">>" (only if text buttons is used)
-     *                            * use_bootstrap: Use or not bootstap
-     *                            * bootstrap_size: Bootstrap nav size (lg sm or null)
-     *                            * template: Template used. If null, default template is used
-     *
-     * @return string
-     */
-    public function paginatorLinks(AbstractPaginator $paginator, $routeName, $routeParams, $options)
-    {
-        $resolver = new OptionsResolver();
-        $resolver->setDefaults(
-            [
-                'ajax_options' => null,
-                'attribute_page' => 'page',
-                'type' => 'sliding',
-                'max_pages_before' => 3,
-                'max_pages_after' => 3,
-                'buttons' => 'text',
-                'image_first' => '/bundles/ecommitcrud/images/i16/resultset_first.png',
-                'image_previous' => '/bundles/ecommitcrud/images/i16/resultset_previous.png',
-                'image_next' => '/bundles/ecommitcrud/images/i16/resultset_next.png',
-                'image_last' => '/bundles/ecommitcrud/images/i16/resultset_last.png',
-                'text_first' => '&laquo;',
-                'text_previous' => '&lsaquo;',
-                'text_next' => '&rsaquo;',
-                'text_last' => '&raquo;',
-                'use_bootstrap' => $this->useBootstrap,
-                'bootstrap_size' => null,
-                'template' => null,
-            ]
-        );
-        $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
-        $resolver->setAllowedTypes('max_pages_before', 'int');
-        $resolver->setAllowedTypes('max_pages_after', 'int');
-        $resolver->setAllowedValues('type', ['sliding', 'elastic']);
-        $resolver->setAllowedValues('buttons', ['text', 'image']);
-        $resolver->setAllowedTypes('use_bootstrap', 'bool');
-        $resolver->setAllowedValues('bootstrap_size', ['lg', 'sm', null]);
-        $options = $resolver->resolve($options);
-
-        if ($options['template']) {
-            return $this->templating->render(
-                $options['template'],
-                [
-                    'paginator' => $paginator,
-                    'routeName' => $routeName,
-                    'routeParams' => $routeParams,
-                    'options' => $options,
-                ]
-            );
-        }
-
-        $navigation = '';
-        if ($paginator->haveToPaginate()) {
-            $navigationClass = $options['use_bootstrap'] ? 'pagination' : 'pagination_nobootstrap';
-            if ($options['use_bootstrap'] && $options['bootstrap_size']) {
-                $navigationClass .= ' pagination-'.$options['bootstrap_size'];
-            }
-            $navigation .= sprintf('<nav><ul class="%s">', $navigationClass);
-
-            //First page / Previous page
-            if (1 != $paginator->getPage()) {
-                $navigation .= $this->elementPaginatorLinks(1, $options, 'first', $routeName, $routeParams);
-                $navigation .= $this->elementPaginatorLinks(
-                    $paginator->getPreviousPage(),
-                    $options,
-                    'previous',
-                    $routeName,
-                    $routeParams
-                );
-            }
-
-            //Pages before the current page
-            $limit = ('sliding' == $options['type']) ? $paginator->getPage() - $options['max_pages_before'] : 1;
-            $currentPage = $paginator->getPage();
-            for ($page = $limit; $page < $currentPage; ++$page) {
-                if ($page <= $paginator->getLastPage() && $page >= $paginator->getFirstPage()) {
-                    //The page exists, displays it
-                    $navigation .= $this->elementPaginatorLinks($page, $options, 'page', $routeName, $routeParams);
-                }
-            }
-
-            //Current page
-            $navigation .= $this->elementPaginatorLinks(
-                $paginator->getPage(),
-                $options,
-                'page',
-                $routeName,
-                $routeParams,
-                true
-            );
-
-            //Pages after the current page
-            $limit = ('sliding' == $options['type']) ? $paginator->getPage(
-                ) + $options['max_pages_after'] : $paginator->getLastPage();
-            for ($page = $paginator->getPage() + 1; $page <= $limit; ++$page) {
-                if ($page <= $paginator->getLastPage() && $page >= $paginator->getFirstPage()) {
-                    //The page exists, displays it
-                    $navigation .= $this->elementPaginatorLinks($page, $options, 'page', $routeName, $routeParams);
-                }
-            }
-
-            //Next page / Last page
-            if ($paginator->getPage() != $paginator->getLastPage()) {
-                $navigation .= $this->elementPaginatorLinks(
-                    $paginator->getNextPage(),
-                    $options,
-                    'next',
-                    $routeName,
-                    $routeParams
-                );
-                $navigation .= $this->elementPaginatorLinks(
-                    $paginator->getLastPage(),
-                    $options,
-                    'last',
-                    $routeName,
-                    $routeParams
-                );
-            }
-
-            $navigation .= '</ul></nav>';
-        }
-
-        return $navigation;
-    }
-
-    /**
-     * Paginator links: Display one element.
-     *
-     * @param int    $page        Page number
-     * @param array  $options     Options
-     * @param string $elementName first, previous, page, next or last
-     * @param string $routeName
-     * @param array  $routeParams
-     * @param bool   $current     If element is the current page
-     */
-    protected function elementPaginatorLinks(
-        $page,
-        $options,
-        $elementName,
-        $routeName,
-        $routeParams,
-        $current = false
-    ) {
-        $url = $this->router->generate(
-            $routeName,
-            array_merge($routeParams, [$options['attribute_page'] => $page])
-        );
-        if ('page' == $elementName) {
-            if ($current) {
-                $class = ($options['use_bootstrap']) ? 'active' : 'pagination_current';
-                if ($options['use_bootstrap']) {
-                    $content = $this->listePrivateLink($page, '', ['onclick' => 'return false;']); //bootstrap expects link
-                } else {
-                    $content = $page;
-                }
-            } else {
-                $class = ($options['use_bootstrap']) ? '' : 'pagination_no_current';
-                $content = $this->listePrivateLink($page, $url, [], $options['ajax_options']);
-            }
-        } else {
-            $class = $options['buttons'].' '.$elementName;
-            $buttonName = $options['buttons'].'_'.$elementName;
-            $button = $options[$buttonName];
-            if ('text' == $options['buttons'] || $options['use_bootstrap']) {
-                $content = $this->listePrivateLink($button, $url, [], $options['ajax_options']);
-            } else {
-                $image = $this->util->tag('img', ['src' => $button, 'alt' => $elementName]);
-                $content = $this->listePrivateLink($image, $url, [], $options['ajax_options']);
-            }
-        }
-
-        return sprintf('<li class="%s">%s</li>', $class, $content);
-    }
-
-    /**
-     * Returns CRUD links paginator.
-     *
-     * @param array $options     Options. See CrudHelper::paginatorLinks (ajax_options is ignored)
-     * @param array $ajaxOptions Ajax Options
-     *
-     * @return string
-     */
-    public function crudPaginatorLinks(Crud $crud, $options, $ajaxOptions)
-    {
-        if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = $crud->getDivIdList();
-        }
-        $options['ajax_options'] = $ajaxOptions;
-
-        return $this->paginatorLinks($crud->getPaginator(), $crud->getRouteName(), $crud->getRouteParams(), $options);
-    }
-
     /**
      * Returns one colunm, inside "header" CRUD.
      *
diff --git a/src/Resources/public/images/i16/resultset_first.png b/src/Resources/public/images/i16/resultset_first.png
deleted file mode 100644
index b03eaf8b5416fa6878165d95116e73003f8445f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 522
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzoJmAMR5;7U
zQ#(jPQ5gPjnOErnVTBPAR5;WYF3}J<L=kO5wDf@1)@pSqqrtJ!rCOqhsA!9#tr~&~
zv8|y%M9Nq9o_FUQLNvNA4jnjf&j0^>ufs8f5Kzx*fI63}@)AAFXgQp7K#X5)&2^7g
z_9O9^7^ARqyc%qAP{1M7?|}io8xW>dotf=a%%ZSXBBI&Rf<-t`#(~H!2g~*8&15{#
zVXjXMwHZYVJ6lk!gb6?r$g;SuO>QI;y<Og=px*;b_6mqOhp1RF<r?4%VF*W`_X0k1
zX|TtHk0JqE*7HBWe=1O{NCJ3G19FIs4EME~J?%}9&J)O&DEL}jKrP~|K(S)QZZr6@
zXc1GUS#8X9KI+VWDX0P{Amv{`I!Bb(r<1$v(dFX@c-;mVpzH|{2s;C)gb|VKGAQX)
zyzYb|&#BzO&BG@&dm42<!e+G;Fdd+cS=sCR{^)G#F}r(vpVj&BS|O^0ZS@KgpmH#M
z9-i+UyWj-T1wp7YfMQLYy-A-^DytsMTu&|fLZ<}WuI0+Q@$bL!8}!lzjesmDrvLx|
M07*qoM6N<$f|&l~zyJUM

diff --git a/src/Resources/public/images/i16/resultset_last.png b/src/Resources/public/images/i16/resultset_last.png
deleted file mode 100644
index 8ec89478477aada6c95cac22920094dd12f399a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 524
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzo=HSOR5;7U
zlfP>eQ51#0H@Z6sk_ajqECPZEqLq!PMf5MQ5gS1i(Owi(ut_CY*w|Psf-Iy6=08Y`
zHnsuDs6h)+OwcBqopImX_v1c`5LkrSCWWWFUvW71z%eN$cB714YVYtd`}$X<%JbQ)
zM;;CHJDu;#-swg0iul07{S&4s!M><GxYzyhWEfhjoSGiv(&-6GNzE@<uberSo5Pds
zhqqpQd$z*|;t(HkUa72WHV_w3VESO2sr~J{m!Gb^1Sln8T|&H4N^I`nk59Ou^ljw$
zREtfU-#q{LLmLdW8>4O+`c|6_tW_i^y+I%|aPsIlEx5K=^ki~8LwqDy-)t}thx1D9
zB6|#ECQ%2a60OQQ<{6-)5|ok<pCCb=8{QUMtbFY+kT~>v)6E>1Xpv+@iIv@MJ8v15
zR{N~1_2z$e&R$WgNhIQelIl1rK}5XruIN#GDZA_4bJqcqID*^mXXFcgt1K5iK7HPL
zwLW*@#tu()#Cyd@CHc^75Ul6pYT4PCpSeBE)hh4bY><NT@A%ArU*lhrcKIamJ{)WS
O0000<MNUMnLSTaY5bkLJ

diff --git a/src/Resources/public/images/i16/resultset_next.png b/src/Resources/public/images/i16/resultset_next.png
deleted file mode 100644
index e252606d3e68c6da135a9b165996d9da968ef7fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz9Z5t%R5;6H
z`2YVu10|S&>IO8de(|Ml<%@O-40!dwX61{2C5s-llVw2V@@N0oo_PPieZ!0Y2~+R(
zk!(QTf=B;X9DnzJ@u9c>OP4(U@7{849!UlyO@H`*;lVfmCvAW6f9CF&{}ZR*{jXDW
zb_vl21ozzrYJBy-Vb$aRjjJF3@7nm}zjw#A|58cE9uZ}LbIY~=6ShA8U$XeY|MDdd
zfQCH!?_7WRzhvaG%|sbsT7Kz&`}!yUix%Do#>T_{_Ei`DO9UTSBkH=Hg(w4*^UnUS
zTk-IJ<+2C=ZObqG7Z2FGlB7VCN;>(!bn*TFHYMl(i+Sx`L~=ArL>~EXU3lidsO!!J
pWF;gqzXSh89JkLNxXeT<1_12n>%V}Y6R`jQ002ovPDHLkV1iLCz99er

diff --git a/src/Resources/public/images/i16/resultset_previous.png b/src/Resources/public/images/i16/resultset_previous.png
deleted file mode 100644
index 18f9cc10948f025fde708328fa704b520161e5f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 389
zcmV;00eb$4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz7fD1xR5;6H
z`2YVu10|S&E(T=Je%PKm^Whh=3`m`MzddRC!+((z?*1p)fP|@c`>K{b{Xc8(tN&i@
zH%T)fYQpV#rAr?FpSk<x|EW7){I{yPLc9UNy*HN>E_eXe+_wJd|K3f{{%aMTC(eL?
z&YO?2=RWv9b;pbUjjJF3FIss2fAiYM|D{t;5@&#8!?n%vQ}6um-u(1``H~0!(`ViJ
zU$yMvf616*#2KJfaGFIu@9Y|n)@%Q3RzCcnHskjH!iD$#iw7MbEf6JRj;ypTzwkeA
z{@wqXv+w*Db>B;RG>UocU1Xkp@_*9QTmMBIcK#<TAqiV<Szs7{<iD`x_WxujWkG`t
jvxSVe{2#c?gbxD%(2D2&kkL<{00000NkvXXu0mjfE_S?j

diff --git a/src/Resources/views/Theme/base.html.twig b/src/Resources/views/Theme/base.html.twig
index dbe808c..c2de2eb 100644
--- a/src/Resources/views/Theme/base.html.twig
+++ b/src/Resources/views/Theme/base.html.twig
@@ -1,3 +1,89 @@
+{# paginator_links / crud_paginator_links #}
+
+{% block paginator_links %}
+{% spaceless %}
+    {% if paginator.haveToPaginate %}
+        {% set ul_attr = ul_attr|merge({class: (ul_attr.class|default('') ~ ' ec-crud-pagination')|trim}) %}
+        <nav{% with { attr: nav_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
+        <ul{% with { attr: ul_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
+                {{ block('paginator_links_content', template_name) }}
+            </ul>
+        </nav>
+    {% endif %}
+{% endspaceless %}
+{% endblock %}
+
+{% block paginator_links_content %}
+    {% with { page: pages.first } %}{{ block('paginator_links_first_page', template_name) }}{% endwith %}
+    {% with { page: pages.previous } %}{{ block('paginator_links_previous_page', template_name) }}{% endwith %}
+    {% for page in pages.before_current %}
+        {{ block('paginator_links_other_page', template_name) }}
+    {% endfor %}
+    {% with { page: pages.current } %}{{ block('paginator_links_current_page', template_name) }}{% endwith %}
+    {% for page in pages.after_current %}
+        {{ block('paginator_links_other_page', template_name) }}
+    {% endfor %}
+    {% with { page: pages.next } %}{{ block('paginator_links_next_page', template_name) }}{% endwith %}
+    {% with { page: pages.last } %}{{ block('paginator_links_last_page', template_name) }}{% endwith %}
+{% endblock %}
+
+{% block paginator_links_first_page %}
+    {% set li_attr_child = li_attr.first_page|merge({class: (li_attr.first_page.class|default('') ~ ' first')|trim}) %}
+    {% set a_attr_child = a_attr.first_page %}
+    {% set page_label = '«' %}
+    {{ block('paginator_links_page', template_name) }}
+{% endblock %}
+
+{% block paginator_links_previous_page %}
+    {% set li_attr_child = li_attr.previous_page|merge({class: (li_attr.previous_page.class|default('') ~ ' previous')|trim}) %}
+    {% set a_attr_child = a_attr.previous_page %}
+    {% set page_label = '‹' %}
+    {{ block('paginator_links_page', template_name) }}
+{% endblock %}
+
+{% block paginator_links_current_page %}
+    {% set li_attr_child = li_attr.current_page|merge({class: (li_attr.current_page.class|default('') ~ ' current')|trim}) %}
+    {% set a_attr_child = a_attr.current_page %}
+    {% set page_label = page %}
+    {{ block('paginator_links_page', template_name) }}
+{% endblock %}
+
+{% block paginator_links_next_page %}
+    {% set li_attr_child = li_attr.next_page|merge({class: (li_attr.next_page.class|default('') ~ ' next')|trim}) %}
+    {% set a_attr_child = a_attr.next_page %}
+    {% set page_label = '›' %}
+    {{ block('paginator_links_page', template_name) }}
+{% endblock %}
+
+{% block paginator_links_last_page %}
+    {% set li_attr_child = li_attr.last_page|merge({class: (li_attr.last_page.class|default('') ~ ' last')|trim}) %}
+    {% set a_attr_child = a_attr.last_page %}
+    {% set page_label = '»' %}
+    {{ block('paginator_links_page', template_name) }}
+{% endblock %}
+
+{% block paginator_links_other_page %}
+    {% set li_attr_child = li_attr.other_page %}
+    {% set a_attr_child = a_attr.other_page %}
+    {% set page_label = page %}
+    {{ block('paginator_links_page', template_name) }}
+{% endblock %}
+
+{% block paginator_links_page %}
+    {% if page %}
+        {% set li_attr_child = li_attr_child|default([]) %}
+        {% set a_attr_child = a_attr_child|default([]) %}
+        {% if ajax_options is not null %}
+            {% set a_attr_child = a_attr_child|merge({class: (a_attr_child.class|default('') ~ ' ec-crud-ajax-link-auto')|trim}) %}
+        {% endif %}
+        <li{% with { attr: li_attr_child } %}{{ block('attributes', template_name) }}{% endwith %}>
+            <a href="{{ path(route_name, route_params|merge({(attribute_page): page})) }}"{% with { attr: a_attr_child } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>{{ page_label }}</a>
+        </li>
+    {% endif %}
+{% endblock %}
+
+{# Attributes #}
+
 {% block attributes %}
     {%- for attrName, attrValue in attr -%}
         {{- " " -}}
diff --git a/src/Resources/views/Theme/bootstrap3.html.twig b/src/Resources/views/Theme/bootstrap3.html.twig
new file mode 100644
index 0000000..236ae8a
--- /dev/null
+++ b/src/Resources/views/Theme/bootstrap3.html.twig
@@ -0,0 +1,14 @@
+{% use '@EcommitCrud/Theme/base.html.twig' %}
+
+{# paginator_links / crud_paginator_links #}
+
+{% block paginator_links %}
+    {% set ul_attr = ul_attr|merge({class: (ul_attr.class|default('') ~ ' pagination')|trim}) %}
+    {{ parent() }}
+{% endblock %}
+
+{% block paginator_links_current_page %}
+    {% set li_attr_child = li_attr.current_page|merge({class: (li_attr.current_page.class|default('') ~ ' active')|trim}) %}
+    {% set li_attr = li_attr|merge({current_page: li_attr_child}) %}
+    {{ parent() }}
+{% endblock %}
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 41ebd63..0b23df6 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -37,9 +37,6 @@ class CrudExtension extends AbstractExtension
 
     protected $theme;
 
-    /**
-     * Constructor.
-     */
     public function __construct(CrudHelper $crudHelper, FormRendererInterface $formRenderer, string $theme)
     {
         $this->crudHelper = $crudHelper;
@@ -47,33 +44,29 @@ public function __construct(CrudHelper $crudHelper, FormRendererInterface $formR
         $this->theme = $theme;
     }
 
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
     public function getName()
     {
         return 'ecommit_crud_crud_extension';
     }
 
-    /**
-     * Returns a list of global functions to add to the existing list.
-     *
-     * @return array An array of global functions
-     */
     public function getFunctions()
     {
         return [
             new TwigFunction(
                 'paginator_links',
                 [$this, 'paginatorLinks'],
-                ['is_safe' => ['all']]
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['html'],
+                ]
             ),
             new TwigFunction(
                 'crud_paginator_links',
                 [$this, 'crudPaginatorLinks'],
-                ['is_safe' => ['all']]
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['html'],
+                ]
             ),
             new TwigFunction(
                 'crud_th',
@@ -135,27 +128,122 @@ public function getFunctions()
     }
 
     /**
-     * Twig function: "paginator_links".
+     * Returns links paginator.
      *
-     * @see CrudHelper:paginatorLinks
+     * @param string $routeName   Route name
+     * @param array  $routeParams Route parameters
+     * @param array  $options     Options:
+     *                            * ajax_options: Ajax Options. If null, Ajax is not used. Default: null
+     *                            * attribute_page: Attribute inside url. Default: page
+     *                            * type: Type of links paginator: elastic (all links) or sliding. Default: sliding
+     *                            * max_pages_before: Max links before current page (only if sliding type is used). Default: 3
+     *                            * max_pages_after: Max links after current page (only if sliding type is used). Default: 3
+     *                            * nav_attr: "nav" CSS attributes
+     *                            * ul_attr: "ul" CSS attributes
+     *                            * li_attr: "li" CSS attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
+     *                            * a_attr: "a" CSS attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
+     *                            * render: Template used for generation. If null, default template is used
      */
-    public function paginatorLinks(
-        AbstractPaginator $paginator,
-        $routeName,
-        $routeParams = [],
-        $options = []
-    ) {
-        return $this->crudHelper->paginatorLinks($paginator, $routeName, $routeParams, $options);
+    public function paginatorLinks(Environment $environment, AbstractPaginator $paginator, string $routeName, array $routeParams = [], array $options = []): string
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'ajax_options' => null,
+            'attribute_page' => 'page',
+            'type' => 'sliding',
+            'max_pages_before' => 3,
+            'max_pages_after' => 3,
+            'nav_attr' => [],
+            'ul_attr' => [],
+            'li_attr' => function (OptionsResolver $liResolver): void {
+                $liResolver->setDefaults([
+                    'first_page' => [],
+                    'previous_page' => [],
+                    'current_page' => [],
+                    'next_page' => [],
+                    'last_page' => [],
+                    'other_page' => [],
+                ]);
+                foreach (['first_page', 'previous_page', 'current_page', 'next_page', 'last_page', 'other_page'] as $option) {
+                    $liResolver->setAllowedTypes($option, 'array');
+                }
+            },
+            'a_attr' => function (OptionsResolver $aResolver): void {
+                $aResolver->setDefaults([
+                    'first_page' => [],
+                    'previous_page' => [],
+                    'current_page' => [],
+                    'next_page' => [],
+                    'last_page' => [],
+                    'other_page' => [],
+                ]);
+                foreach (['first_page', 'previous_page', 'current_page', 'next_page', 'last_page', 'other_page'] as $option) {
+                    $aResolver->setAllowedTypes($option, 'array');
+                }
+            },
+            'render' => null,
+        ]);
+        $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
+        $resolver->setAllowedTypes('max_pages_before', 'int');
+        $resolver->setAllowedTypes('max_pages_after', 'int');
+        $resolver->setAllowedValues('type', ['sliding', 'elastic']);
+        $options = $resolver->resolve($options);
+
+        if ($options['render']) {
+            return $environment->render($options['render'], [
+                'paginator' => $paginator,
+                'routeName' => $routeName,
+                'routeParams' => $routeParams,
+                'options' => $options,
+            ]);
+        }
+
+        $pages = [
+            'first' => (1 !== $paginator->getPage()) ? 1 : null,
+            'previous' => (1 !== $paginator->getPage()) ? $paginator->getPreviousPage() : null,
+            'before_current' => [],
+            'current' => $paginator->getPage(),
+            'after_current' => [],
+            'next' => ($paginator->getPage() !== $paginator->getLastPage()) ? $paginator->getNextPage() : null,
+            'last' => ($paginator->getPage() !== $paginator->getLastPage()) ? $paginator->getLastPage() : null,
+        ];
+
+        //Pages before the current page
+        $limit = ('sliding' == $options['type']) ? $paginator->getPage() - $options['max_pages_before'] : 1;
+        for ($page = $limit; $page < $paginator->getPage(); ++$page) {
+            if ($page <= $paginator->getLastPage() && $page >= $paginator->getFirstPage()) {
+                $pages['before_current'][] = $page;
+            }
+        }
+
+        //Pages after the current page
+        $limit = ('sliding' == $options['type']) ? $paginator->getPage() + $options['max_pages_after'] : $paginator->getLastPage();
+        for ($page = $paginator->getPage() + 1; $page <= $limit; ++$page) {
+            if ($page <= $paginator->getLastPage() && $page >= $paginator->getFirstPage()) {
+                $pages['after_current'][] = $page;
+            }
+        }
+
+        return $this->renderBlock($environment, $this->theme, 'paginator_links', array_merge($options, [
+            'paginator' => $paginator,
+            'pages' => $pages,
+            'route_name' => $routeName,
+            'route_params' => $routeParams,
+        ]));
     }
 
     /**
-     * Twig function: "crud_paginator_links".
+     * Returns CRUD links paginator.
      *
-     * @see CrudHelper:crudPaginatorLinks
+     * @see CrudExtension::paginatorLinks()
      */
-    public function crudPaginatorLinks(Crud $crud, $options = [], $ajaxOptions = [])
+    public function crudPaginatorLinks(Environment $environment, Crud $crud, array $options = []): string
     {
-        return $this->crudHelper->crudPaginatorLinks($crud, $options, $ajaxOptions);
+        if (!isset($options['ajax_options']['update'])) {
+            $options['ajax_options']['update'] = '#'.$crud->getDivIdList();
+        }
+
+        return $this->paginatorLinks($environment, $crud->getPaginator(), $crud->getRouteName(), $crud->getRouteParams(), $options);
     }
 
     /**
@@ -383,7 +471,7 @@ protected function renderBlock(Environment $environment, string $templateName, s
         $template = $environment->load($templateName);
 
         ob_start();
-        $template->displayBlock($blockName, $parameters);
+        $template->displayBlock($blockName, array_merge(['template_name' => $templateName], $parameters));
 
         return ob_get_clean();
     }
diff --git a/tests/App/templates/render.html.twig b/tests/App/templates/render.html.twig
new file mode 100644
index 0000000..d86bac9
--- /dev/null
+++ b/tests/App/templates/render.html.twig
@@ -0,0 +1 @@
+OK
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index cc93922..d8922c8 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -135,7 +135,7 @@ public function testPersistentValuesAfterChangeSortAndSettings(Client $client):
      */
     public function testChangePage(Client $client): Client
     {
-        $page = $client->getCrawler()->filterXPath('//ul[@class="pagination"]/li/a[text()="2"]');
+        $page = $client->getCrawler()->filterXPath('//ul[@class="ec-crud-pagination"]/li/a[text()="2"]');
         $page->first()->click();
         $this->waitForAjax($client);
 
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index afc1e61..a57181a 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -13,6 +13,8 @@
 
 namespace Ecommit\CrudBundle\Tests\Twig;
 
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Paginator\ArrayPaginator;
 use Ecommit\CrudBundle\Twig\CrudExtension;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\DomCrawler\Crawler;
@@ -150,6 +152,266 @@ public function testAjaxAttributesWithBadAjaxOptions(): void
         );
     }
 
+    public function testPaginatorLinksWithNoResult(): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData([]);
+        $paginator->init();
+
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list');
+
+        $this->assertEmpty($result);
+    }
+
+    public function testPaginatorLinksWithOnePage(): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(['val']);
+        $paginator->init();
+
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list');
+
+        $this->assertEmpty($result);
+    }
+
+    /**
+     * @dataProvider getTestPaginatorWithDefaultOptionsProvider
+     */
+    public function testPaginatorWithDefaultOptions(int $page, string $expected): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage($page);
+        $paginator->init();
+
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list');
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function getTestPaginatorWithDefaultOptionsProvider(): array
+    {
+        return [
+            [1, '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1">1</a></li><li><a href="/user?page=2">2</a></li><li><a href="/user?page=3">3</a></li><li><a href="/user?page=4">4</a></li><li class="next"><a href="/user?page=2">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [2, '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=1">‹</a></li><li><a href="/user?page=1">1</a></li><li class="current"><a href="/user?page=2">2</a></li><li><a href="/user?page=3">3</a></li><li><a href="/user?page=4">4</a></li><li><a href="/user?page=5">5</a></li><li class="next"><a href="/user?page=3">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [10, '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=9">‹</a></li><li><a href="/user?page=7">7</a></li><li><a href="/user?page=8">8</a></li><li><a href="/user?page=9">9</a></li><li class="current"><a href="/user?page=10">10</a></li><li><a href="/user?page=11">11</a></li><li><a href="/user?page=12">12</a></li><li><a href="/user?page=13">13</a></li><li class="next"><a href="/user?page=11">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [19, '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=18">‹</a></li><li><a href="/user?page=16">16</a></li><li><a href="/user?page=17">17</a></li><li><a href="/user?page=18">18</a></li><li class="current"><a href="/user?page=19">19</a></li><li><a href="/user?page=20">20</a></li><li class="next"><a href="/user?page=20">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [20, '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=19">‹</a></li><li><a href="/user?page=17">17</a></li><li><a href="/user?page=18">18</a></li><li><a href="/user?page=19">19</a></li><li class="current"><a href="/user?page=20">20</a></li></ul></nav>'],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestPaginatorWithMaxPagesOptionsProvider
+     */
+    public function testPaginatorWithMaxPagesOptions(int $page, string $expected): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage($page);
+        $paginator->init();
+
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+            'max_pages_before' => 4,
+            'max_pages_after' => 2,
+        ]);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function getTestPaginatorWithMaxPagesOptionsProvider(): array
+    {
+        return [
+            [1, '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1">1</a></li><li><a href="/user?page=2">2</a></li><li><a href="/user?page=3">3</a></li><li class="next"><a href="/user?page=2">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [2, '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=1">‹</a></li><li><a href="/user?page=1">1</a></li><li class="current"><a href="/user?page=2">2</a></li><li><a href="/user?page=3">3</a></li><li><a href="/user?page=4">4</a></li><li class="next"><a href="/user?page=3">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [10, '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=9">‹</a></li><li><a href="/user?page=6">6</a></li><li><a href="/user?page=7">7</a></li><li><a href="/user?page=8">8</a></li><li><a href="/user?page=9">9</a></li><li class="current"><a href="/user?page=10">10</a></li><li><a href="/user?page=11">11</a></li><li><a href="/user?page=12">12</a></li><li class="next"><a href="/user?page=11">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [19, '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=18">‹</a></li><li><a href="/user?page=15">15</a></li><li><a href="/user?page=16">16</a></li><li><a href="/user?page=17">17</a></li><li><a href="/user?page=18">18</a></li><li class="current"><a href="/user?page=19">19</a></li><li><a href="/user?page=20">20</a></li><li class="next"><a href="/user?page=20">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [20, '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=19">‹</a></li><li><a href="/user?page=16">16</a></li><li><a href="/user?page=17">17</a></li><li><a href="/user?page=18">18</a></li><li><a href="/user?page=19">19</a></li><li class="current"><a href="/user?page=20">20</a></li></ul></nav>'],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestPaginatorWithTypeOptionProvider
+     */
+    public function testPaginatorWithTypeOption(int $page, string $type, string $expected): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage($page);
+        $paginator->init();
+
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+            'type' => $type,
+        ]);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function getTestPaginatorWithTypeOptionProvider(): array
+    {
+        $full = function (int $currentPage) {
+            $result = '';
+            for ($i = 1; $i <= 20; ++$i) {
+                $class = ($i === $currentPage) ? ' class="current"' : '';
+                $result .= sprintf('<li%s><a href="/user?page=%s">%s</a></li>', $class, $i, $i);
+            }
+
+            return $result;
+        };
+
+        return [
+            [1, 'sliding', '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1">1</a></li><li><a href="/user?page=2">2</a></li><li><a href="/user?page=3">3</a></li><li><a href="/user?page=4">4</a></li><li class="next"><a href="/user?page=2">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [2, 'sliding', '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=1">‹</a></li><li><a href="/user?page=1">1</a></li><li class="current"><a href="/user?page=2">2</a></li><li><a href="/user?page=3">3</a></li><li><a href="/user?page=4">4</a></li><li><a href="/user?page=5">5</a></li><li class="next"><a href="/user?page=3">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [10, 'sliding', '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=9">‹</a></li><li><a href="/user?page=7">7</a></li><li><a href="/user?page=8">8</a></li><li><a href="/user?page=9">9</a></li><li class="current"><a href="/user?page=10">10</a></li><li><a href="/user?page=11">11</a></li><li><a href="/user?page=12">12</a></li><li><a href="/user?page=13">13</a></li><li class="next"><a href="/user?page=11">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [19, 'sliding', '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=18">‹</a></li><li><a href="/user?page=16">16</a></li><li><a href="/user?page=17">17</a></li><li><a href="/user?page=18">18</a></li><li class="current"><a href="/user?page=19">19</a></li><li><a href="/user?page=20">20</a></li><li class="next"><a href="/user?page=20">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [20, 'sliding', '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=19">‹</a></li><li><a href="/user?page=17">17</a></li><li><a href="/user?page=18">18</a></li><li><a href="/user?page=19">19</a></li><li class="current"><a href="/user?page=20">20</a></li></ul></nav>'],
+
+            [1, 'elastic', '<nav><ul class="ec-crud-pagination">'.$full(1).'<li class="next"><a href="/user?page=2">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [2, 'elastic', '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=1">‹</a></li>'.$full(2).'<li class="next"><a href="/user?page=3">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [10, 'elastic', '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=9">‹</a></li>'.$full(10).'<li class="next"><a href="/user?page=11">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [19, 'elastic', '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=18">‹</a></li>'.$full(19).'<li class="next"><a href="/user?page=20">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
+            [20, 'elastic', '<nav><ul class="ec-crud-pagination"><li class="first"><a href="/user?page=1">«</a></li><li class="previous"><a href="/user?page=19">‹</a></li>'.$full(20).'</ul></nav>'],
+        ];
+    }
+
+    public function testPaginatorWithEmptyArrayAjaxOption(): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage(1);
+        $paginator->init();
+
+        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto">»</a></li></ul></nav>';
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+            'ajax_options' => [],
+            'max_pages_before' => 1,
+            'max_pages_after' => 1,
+        ]);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function testPaginatorWithAjaxOption(): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage(1);
+        $paginator->init();
+
+        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+            'ajax_options' => [
+                'update' => '#myId',
+            ],
+            'max_pages_before' => 1,
+            'max_pages_after' => 1,
+        ]);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function testPaginatorWithAttributePageOption(): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage(1);
+        $paginator->init();
+
+        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?p=1">1</a></li><li><a href="/user?p=2">2</a></li><li class="next"><a href="/user?p=2">›</a></li><li class="last"><a href="/user?p=20">»</a></li></ul></nav>';
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+            'attribute_page' => 'p',
+            'max_pages_before' => 1,
+            'max_pages_after' => 1,
+        ]);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function testPaginatorWithAttrOptions(): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage(10);
+        $paginator->init();
+
+        $expected = '<nav class="navattr" data-nav="val"><ul class="ulattr ec-crud-pagination" data-ul="val"><li class="lifirstpageattr first" data-li-first="val"><a href="/user?page=1" class="afirstpageattr" data-a-first="val">«</a></li><li class="lipreviouspageattr previous"><a href="/user?page=9" class="apreviouspageattr">‹</a></li><li class="liotherpageattr"><a href="/user?page=9" class="aotherpageattr">9</a></li><li class="liccurentpageattr current"><a href="/user?page=10" class="accurentpageattr">10</a></li><li class="liotherpageattr"><a href="/user?page=11" class="aotherpageattr">11</a></li><li class="linextpageattr next"><a href="/user?page=11" class="anextpageattr">›</a></li><li class="lilastpageattr last"><a href="/user?page=20" class="alastpageattr">»</a></li></ul></nav>';
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+            'nav_attr' => ['class' => 'navattr', 'data-nav' => 'val'],
+            'ul_attr' => ['class' => 'ulattr', 'data-ul' => 'val'],
+            'li_attr' => [
+                'first_page' => ['class' => 'lifirstpageattr', 'data-li-first' => 'val'],
+                'previous_page' => ['class' => 'lipreviouspageattr'],
+                'current_page' => ['class' => 'liccurentpageattr'],
+                'next_page' => ['class' => 'linextpageattr'],
+                'last_page' => ['class' => 'lilastpageattr'],
+                'other_page' => ['class' => 'liotherpageattr'],
+            ],
+            'a_attr' => [
+                'first_page' => ['class' => 'afirstpageattr', 'data-a-first' => 'val'],
+                'previous_page' => ['class' => 'apreviouspageattr'],
+                'current_page' => ['class' => 'accurentpageattr'],
+                'next_page' => ['class' => 'anextpageattr'],
+                'last_page' => ['class' => 'alastpageattr'],
+                'other_page' => ['class' => 'aotherpageattr'],
+            ],
+            'max_pages_before' => 1,
+            'max_pages_after' => 1,
+        ]);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function testPaginatorWithRenderOption(): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage(1);
+        $paginator->init();
+
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+            'render' => 'render.html.twig',
+        ]);
+
+        $this->assertRegExp('/OK/', $result);
+    }
+
+    public function testPaginatorWithBadOptions(): void
+    {
+        $this->expectException(UndefinedOptionsException::class);
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage(1);
+        $paginator->init();
+
+        $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+            'bad_option' => 'bad',
+        ]);
+    }
+
+    public function testCrudPaginatorLinks(): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage(1);
+        $paginator->init();
+
+        $crud = $this->getMockBuilder(Crud::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getDivIdList', 'getPaginator', 'getRouteName', 'getRouteParams'])
+            ->getMock();
+        $crud->expects($this->once())->method('getDivIdList')->willReturn('myId');
+        $crud->expects($this->once())->method('getPaginator')->willReturn($paginator);
+        $crud->expects($this->once())->method('getRouteName')->willReturn('user_list');
+        $crud->expects($this->once())->method('getRouteParams')->willReturn([]);
+
+        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
+        $result = $this->crudExtension->crudPaginatorLinks($this->environment, $crud, [
+            'max_pages_before' => 1,
+            'max_pages_after' => 1,
+        ]);
+
+        $this->assertSame($expected, $result);
+    }
+
     protected function createFormView(): FormView
     {
         $builder = $this->formFactory->createBuilder(FormType::class, null, [

From 7f143e44e4630c5b1c2a40e200eb532b1add3a82 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 8 May 2020 19:00:34 +0200
Subject: [PATCH 017/264] Fix Ecommit\CrudBundle\Helper\CrudHelper::td when the
 value is not a string

---
 src/Helper/CrudHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Helper/CrudHelper.php b/src/Helper/CrudHelper.php
index d5a62a2..6cb3ce4 100644
--- a/src/Helper/CrudHelper.php
+++ b/src/Helper/CrudHelper.php
@@ -276,7 +276,7 @@ public function td($column_id, Crud $crud, $value, $options, $tdOptions)
 
         //XSS protection
         if ($options['escape']) {
-            $value = htmlentities($value, ENT_QUOTES, 'UTF-8');
+            $value = htmlentities((string) $value, ENT_QUOTES, 'UTF-8');
         }
 
         return $this->util->tag('td', $tdOptions, $value);

From 70dddcf01a8d255a90eaee4a0e20c540690f2dd4 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 16 Dec 2020 17:15:23 +0100
Subject: [PATCH 018/264] Use nodejs 14

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3baca8b..f55dfcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ services:
     - xvfb
 
 before_install:
-    - sudo rm -rf ~/.nvm && curl -sL "https://deb.nodesource.com/setup_13.x" | sudo -E bash -
+    - sudo rm -rf ~/.nvm && curl -sL "https://deb.nodesource.com/setup_14.x" | sudo -E bash -
     - sudo apt-get install -y nodejs
     - sudo npm install -g yarn
 

From af4cfece9aae267f21018043913fc0fcf541dc52 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 16 Dec 2020 17:23:19 +0100
Subject: [PATCH 019/264] Fix CS

---
 .php_cs.dist                        |  1 +
 composer.json                       |  2 +-
 src/DoctrineExtension/Paginate.php  |  2 +-
 src/Form/Filter/FieldFilterDate.php | 42 ++++++++++++++---------------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index b07196c..c384015 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -37,6 +37,7 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'phpdoc_order' => true,
         'protected_to_private' => false,
+        'fully_qualified_strict_types' => false,
     ])
     ->setFinder($finder)
 ;
diff --git a/composer.json b/composer.json
index 60a80f0..262e65c 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "friendsofphp/php-cs-fixer": "^2.16.1",
+        "friendsofphp/php-cs-fixer": "^2.17.1",
         "phpunit/phpunit": "^8.4",
         "symfony/dom-crawler": "^4.4|^5.0",
         "symfony/panther": "^0.7.1",
diff --git a/src/DoctrineExtension/Paginate.php b/src/DoctrineExtension/Paginate.php
index 1c6c4a1..c8f53b4 100644
--- a/src/DoctrineExtension/Paginate.php
+++ b/src/DoctrineExtension/Paginate.php
@@ -82,7 +82,7 @@ public static function countQueryBuilder($queryBuilder, array $options = [])
                 $countQueryBuilder->select(sprintf('count(%s%s)', $distinct, $options['alias']));
                 $countQueryBuilder->resetDQLPart('orderBy');
 
-                return  (int) $countQueryBuilder->getQuery()->getSingleScalarResult();
+                return (int) $countQueryBuilder->getQuery()->getSingleScalarResult();
             } elseif ('count_by_sub_request' === $options['behavior']) {
                 /** @var \Doctrine\ORM\QueryBuilder $cloneQueryBuilder */
                 $cloneQueryBuilder = clone $queryBuilder;
diff --git a/src/Form/Filter/FieldFilterDate.php b/src/Form/Filter/FieldFilterDate.php
index c307e1a..f9cc809 100644
--- a/src/Form/Filter/FieldFilterDate.php
+++ b/src/Form/Filter/FieldFilterDate.php
@@ -115,41 +115,41 @@ public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $alia
         if (!empty($value) && $value instanceof \DateTime) {
             $parameterName = 'value_date_'.str_replace(' ', '', $this->property);
 
-            switch ($this->options['comparator']):
+            switch ($this->options['comparator']) {
                 case self::SMALLER_THAN:
                 case self::GREATER_EQUAL:
                     if (!$this->options['with_time']) {
                         $value->setTime(0, 0, 0);
                     }
-            $value = $value->format('Y-m-d H:i:s');
-            $queryBuilder->andWhere(
+                    $value = $value->format('Y-m-d H:i:s');
+                    $queryBuilder->andWhere(
                         sprintf('%s %s :%s', $aliasSearch, $this->options['comparator'], $parameterName)
                     )
                         ->setParameter($parameterName, $value);
-            break;
-            case self::SMALLER_EQUAL:
+                    break;
+                case self::SMALLER_EQUAL:
                 case self::GREATER_THAN:
                     if (!$this->options['with_time']) {
                         $value->setTime(23, 59, 59);
                     }
-            $value = $value->format('Y-m-d H:i:s');
-            $queryBuilder->andWhere(
+                    $value = $value->format('Y-m-d H:i:s');
+                    $queryBuilder->andWhere(
                         sprintf('%s %s :%s', $aliasSearch, $this->options['comparator'], $parameterName)
                     )
                         ->setParameter($parameterName, $value);
-            break;
-            default:
+                    break;
+                default:
                     $valueDateInf = clone $value;
-            $valueDateSup = clone $value;
-            if (!$this->options['with_time']) {
-                $valueDateInf->setTime(0, 0, 0);
-                $valueDateSup->setTime(23, 59, 59);
-            }
-            $valueDateInf = $valueDateInf->format('Y-m-d H:i:s');
-            $valueDateSup = $valueDateSup->format('Y-m-d H:i:s');
-            $parameterNameInf = 'value_date_inf_'.str_replace(' ', '', $this->property);
-            $parameterNameSup = 'value_date_sup_'.str_replace(' ', '', $this->property);
-            $queryBuilder->andWhere(
+                    $valueDateSup = clone $value;
+                    if (!$this->options['with_time']) {
+                        $valueDateInf->setTime(0, 0, 0);
+                        $valueDateSup->setTime(23, 59, 59);
+                    }
+                    $valueDateInf = $valueDateInf->format('Y-m-d H:i:s');
+                    $valueDateSup = $valueDateSup->format('Y-m-d H:i:s');
+                    $parameterNameInf = 'value_date_inf_'.str_replace(' ', '', $this->property);
+                    $parameterNameSup = 'value_date_sup_'.str_replace(' ', '', $this->property);
+                    $queryBuilder->andWhere(
                         sprintf(
                             '%s >= :%s AND %s <= :%s',
                             $aliasSearch,
@@ -160,8 +160,8 @@ public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $alia
                     )
                         ->setParameter($parameterNameInf, $valueDateInf)
                         ->setParameter($parameterNameSup, $valueDateSup);
-            break;
-            endswitch;
+                    break;
+            }
         }
 
         return $queryBuilder;

From 942e75ee671a8ce759d99a918742468c19ce6a45 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 16 Dec 2020 17:24:01 +0100
Subject: [PATCH 020/264] Migrate travis-ci.org to travis-ci.com

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 47ddce5..82a640f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # EcommitCrudBundle
 
 
-[![Build Status](https://travis-ci.org/e-commit/EcommitCrudBundle.svg?branch=master)](https://travis-ci.org/e-commit/EcommitCrudBundle)
+[![Build Status](https://travis-ci.com/e-commit/EcommitCrudBundle.svg?branch=master)](https://travis-ci.com/e-commit/EcommitCrudBundle)
 
 
 **WARNING: This branch is under development. Not use in production. You can use stable versions or 2.5 branch.**

From 8fa4ff6c26dfab27ee701989a04085ef24c117f6 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 16 Dec 2020 17:32:26 +0100
Subject: [PATCH 021/264] Fix CS with PHP 7.2

---
 .php_cs.dist | 62 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index c384015..02a057f 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -14,30 +14,46 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('tests/App/var')
 ;
 
+$rules = [];
+
+if (\PHP_VERSION_ID >= 70300) {
+    $rules = array_merge($rules, [
+        '@PHP73Migration' => true,
+    ]);
+}
+if (\PHP_VERSION_ID >= 70400) {
+    $rules = array_merge($rules, [
+        '@PHP74Migration' => true,
+        '@PHP74Migration:risky' => true,
+    ]);
+}
+
+$rules = [
+    '@Symfony' => true,
+    '@Symfony:risky' => true,
+    '@DoctrineAnnotation' => true,
+    '@PHP56Migration' =>  true,
+    '@PHP56Migration:risky' => true,
+    '@PHP71Migration' => true,
+    '@PHP71Migration:risky' => true,
+    'array_syntax' => ['syntax' => 'short'],
+    'fopen_flags' => true,
+    'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
+    'linebreak_after_opening_tag' => true,
+    'mb_str_functions' => true,
+    'no_php4_constructor' => true,
+    'no_unreachable_default_argument_value' => true,
+    'no_useless_else' => true,
+    'no_useless_return' => true,
+    'ordered_imports' => true,
+    'phpdoc_order' => true,
+    'protected_to_private' => false,
+    'fully_qualified_strict_types' => false,
+    'use_arrow_functions' => false,
+];
+
 return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
-    ->setRules([
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        '@DoctrineAnnotation' => true,
-        '@PHP56Migration' =>  true,
-        '@PHP56Migration:risky' => true,
-        '@PHP71Migration' => true,
-        '@PHP71Migration:risky' => true,
-        '@PHP73Migration' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'fopen_flags' => true,
-        'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
-        'linebreak_after_opening_tag' => true,
-        'mb_str_functions' => true,
-        'no_php4_constructor' => true,
-        'no_unreachable_default_argument_value' => true,
-        'no_useless_else' => true,
-        'no_useless_return' => true,
-        'ordered_imports' => true,
-        'phpdoc_order' => true,
-        'protected_to_private' => false,
-        'fully_qualified_strict_types' => false,
-    ])
+    ->setRules($rules)
     ->setFinder($finder)
 ;

From b2033a5f1e9706a8a52addab39d9718abfa697ee Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 16 Dec 2020 17:49:13 +0100
Subject: [PATCH 022/264] Fix CS rules

---
 .php_cs.dist | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 02a057f..e0111e6 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -14,7 +14,12 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('tests/App/var')
 ;
 
-$rules = [];
+$rules = [
+    '@PHP56Migration' =>  true,
+    '@PHP56Migration:risky' => true,
+    '@PHP71Migration' => true,
+    '@PHP71Migration:risky' => true,
+];
 
 if (\PHP_VERSION_ID >= 70300) {
     $rules = array_merge($rules, [
@@ -28,14 +33,10 @@ if (\PHP_VERSION_ID >= 70400) {
     ]);
 }
 
-$rules = [
+$rules = array_merge($rules, [
     '@Symfony' => true,
     '@Symfony:risky' => true,
     '@DoctrineAnnotation' => true,
-    '@PHP56Migration' =>  true,
-    '@PHP56Migration:risky' => true,
-    '@PHP71Migration' => true,
-    '@PHP71Migration:risky' => true,
     'array_syntax' => ['syntax' => 'short'],
     'fopen_flags' => true,
     'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
@@ -50,7 +51,7 @@ $rules = [
     'protected_to_private' => false,
     'fully_qualified_strict_types' => false,
     'use_arrow_functions' => false,
-];
+]);
 
 return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)

From f4aded5cd23af7b633de57361595105e24a6eaaa Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 16 Dec 2020 17:58:16 +0100
Subject: [PATCH 023/264] [PHP-CS-Fixer] Remove PHP73Migration and
 PHP74Migration

---
 .php_cs.dist | 62 +++++++++++++++++++---------------------------------
 1 file changed, 22 insertions(+), 40 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index e0111e6..48bca09 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -14,47 +14,29 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('tests/App/var')
 ;
 
-$rules = [
-    '@PHP56Migration' =>  true,
-    '@PHP56Migration:risky' => true,
-    '@PHP71Migration' => true,
-    '@PHP71Migration:risky' => true,
-];
-
-if (\PHP_VERSION_ID >= 70300) {
-    $rules = array_merge($rules, [
-        '@PHP73Migration' => true,
-    ]);
-}
-if (\PHP_VERSION_ID >= 70400) {
-    $rules = array_merge($rules, [
-        '@PHP74Migration' => true,
-        '@PHP74Migration:risky' => true,
-    ]);
-}
-
-$rules = array_merge($rules, [
-    '@Symfony' => true,
-    '@Symfony:risky' => true,
-    '@DoctrineAnnotation' => true,
-    'array_syntax' => ['syntax' => 'short'],
-    'fopen_flags' => true,
-    'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
-    'linebreak_after_opening_tag' => true,
-    'mb_str_functions' => true,
-    'no_php4_constructor' => true,
-    'no_unreachable_default_argument_value' => true,
-    'no_useless_else' => true,
-    'no_useless_return' => true,
-    'ordered_imports' => true,
-    'phpdoc_order' => true,
-    'protected_to_private' => false,
-    'fully_qualified_strict_types' => false,
-    'use_arrow_functions' => false,
-]);
-
 return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
-    ->setRules($rules)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        '@DoctrineAnnotation' => true,
+        '@PHP56Migration' =>  true,
+        '@PHP56Migration:risky' => true,
+        '@PHP71Migration' => true,
+        '@PHP71Migration:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'fopen_flags' => true,
+        'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
+        'linebreak_after_opening_tag' => true,
+        'mb_str_functions' => true,
+        'no_php4_constructor' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_imports' => true,
+        'phpdoc_order' => true,
+        'protected_to_private' => false,
+        'fully_qualified_strict_types' => false,
+    ])
     ->setFinder($finder)
 ;

From 2664f65512c8e43b4e1bc963a895ed3f3394aa4c Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 18 Dec 2020 11:48:57 +0100
Subject: [PATCH 024/264] Rename updateDomWithResponse to updateDom

---
 src/Resources/public/js/ajax.js        | 14 ++++-----
 tests/Resources/public/js/ajax.spec.js | 42 ++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/Resources/public/js/ajax.js b/src/Resources/public/js/ajax.js
index ed21923..f83f568 100644
--- a/src/Resources/public/js/ajax.js
+++ b/src/Resources/public/js/ajax.js
@@ -85,7 +85,7 @@ export function sendRequest (options) {
         callbacksSuccess.push({
             priority: 10,
             callback: function (args) {
-                updateDomWithResponse(options.update, options.updateMode, args.data);
+                updateDom(options.update, options.updateMode, args.data);
             }
         })
     }
@@ -166,25 +166,25 @@ export function sendForm (form, options) {
     sendRequest(options);
 }
 
-function updateDomWithResponse (update, updateMode, data) {
+export function updateDom (element, updateMode, data) {
     if (updateMode === 'update') {
-        $(update).html(data);
+        $(element).html(data);
 
         return;
     } else if (updateMode === 'before') {
-        $(update).before(data);
+        $(element).before(data);
 
         return;
     } else if (updateMode === 'after') {
-        $(update).after(data);
+        $(element).after(data);
 
         return;
     } else if (updateMode === 'prepend') {
-        $(update).prepend(data);
+        $(element).prepend(data);
 
         return;
     } else if (updateMode === 'append') {
-        $(update).append(data);
+        $(element).append(data);
 
         return;
     }
diff --git a/tests/Resources/public/js/ajax.spec.js b/tests/Resources/public/js/ajax.spec.js
index d1e8b99..f49fb26 100644
--- a/tests/Resources/public/js/ajax.spec.js
+++ b/tests/Resources/public/js/ajax.spec.js
@@ -589,3 +589,45 @@ describe('Test Ajax.form', function () {
         $(document).off('ec-crud-ajax-form-auto-before', '#formToTest');
     });
 });
+
+describe('Test Ajax.updateDom', function () {
+    beforeEach(function () {
+        $('body').append('<div id="container" class="html-test"><div class="content">X</div></div>');
+    });
+
+    afterEach(function () {
+        $('.html-test').remove();
+    });
+
+    it('Update with "update" mode', function () {
+        testUpdateDom('update', '<div class="content">OK</div>');
+    });
+
+    it('Update with "before" mode', function () {
+        testUpdateDom('before', 'OK<div class="content">X</div>');
+    });
+
+    it('Update with "after" mode', function () {
+        testUpdateDom('after', '<div class="content">X</div>OK');
+    });
+
+    it('Update with "prepend" mode', function () {
+        testUpdateDom('prepend', '<div class="content">OKX</div>');
+    });
+
+    it('Update with "append" mode', function () {
+        testUpdateDom('append', '<div class="content">XOK</div>');
+    });
+
+    function testUpdateDom (updateMode, expected) {
+        ajax.updateDom('#container .content', updateMode, 'OK');
+        expect($('#container').html()).toEqual(expected);
+    }
+
+    it('Update with bad mode', function () {
+        spyOn(window.console, 'error');
+        ajax.updateDom('#container .content', 'badMode', 'OK');
+        expect(window.console.error).toHaveBeenCalledWith('Bad updateMode: badMode');
+        expect($('#container').html()).toEqual('<div class="content">X</div>');
+    });
+});

From a6076ce8cd61514213bf9b3d5ab92dfd82038001 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 18 Dec 2020 11:56:15 +0100
Subject: [PATCH 025/264] Remove doctrine/common dependency

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index 262e65c..c83d965 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,6 @@
     "require": {
         "php": "^7.2",
         "ext-mbstring": "*",
-        "doctrine/common": "*",
         "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
         "doctrine/orm": "^2.6.3",
         "doctrine/persistence": "^1.3",

From d7cc5f5d6f37e13ef4719947fc2af659f6f162d9 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 18 Dec 2020 11:58:30 +0100
Subject: [PATCH 026/264] Add doctrine/persistence 2 support

---
 composer.json                                    | 2 +-
 src/Form/Filter/FieldFilterDoctrineInterface.php | 2 +-
 src/Form/Filter/FieldFilterEntity.php            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index c83d965..00f3bf5 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-mbstring": "*",
         "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
         "doctrine/orm": "^2.6.3",
-        "doctrine/persistence": "^1.3",
+        "doctrine/persistence": "^1.3|^2.0",
         "ecommit/javascript-bundle": "^2.5.1",
         "ecommit/util-bundle": "^2.5.1",
         "symfony/asset": "^4.4|^5.0",
diff --git a/src/Form/Filter/FieldFilterDoctrineInterface.php b/src/Form/Filter/FieldFilterDoctrineInterface.php
index f1d8bc0..52df090 100644
--- a/src/Form/Filter/FieldFilterDoctrineInterface.php
+++ b/src/Form/Filter/FieldFilterDoctrineInterface.php
@@ -13,7 +13,7 @@
 
 namespace Ecommit\CrudBundle\Form\Filter;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 
 interface FieldFilterDoctrineInterface
 {
diff --git a/src/Form/Filter/FieldFilterEntity.php b/src/Form/Filter/FieldFilterEntity.php
index 36addfd..069c582 100644
--- a/src/Form/Filter/FieldFilterEntity.php
+++ b/src/Form/Filter/FieldFilterEntity.php
@@ -13,7 +13,7 @@
 
 namespace Ecommit\CrudBundle\Form\Filter;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\JavascriptBundle\Form\Type\EntityNormalizerTrait;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
 use Symfony\Component\OptionsResolver\OptionsResolver;

From 365cedae87a4a8796105f30f03e1f3ac4eddd9d7 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 18 Dec 2020 12:29:42 +0100
Subject: [PATCH 027/264] Remove twig/extensions dependency

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 00f3bf5..9d2306a 100644
--- a/composer.json
+++ b/composer.json
@@ -30,9 +30,9 @@
         "symfony/routing": "^4.4|^5.0",
         "symfony/security-bundle": "^4.4|^5.0",
         "symfony/translation": "^4.4|^5.0",
+        "symfony/twig-bridge": "^4.4|^5.0",
         "symfony/twig-bundle": "^4.4|^5.0",
         "symfony/validator": "^4.4|^5.0",
-        "twig/extensions": "^1.0",
         "twig/twig": "^2.12.0|^3.0"
     },
     "require-dev": {

From cfdcaf6332bb512c7385f1790a330d96ff89890a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 18 Dec 2020 12:33:44 +0100
Subject: [PATCH 028/264] Add PHP 8 support

---
 .travis.yml   | 3 ++-
 composer.json | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f55dfcf..fea0948 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ php:
     - 7.2
     - 7.3
     - 7.4
+    - 8.0
 
 env:
     - DEPENDENCIES="high"
@@ -30,5 +31,5 @@ install:
 script:
     - php vendor/phpunit/phpunit/phpunit
     - ./node_modules/.bin/karma start --single-run
-    - php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
+    - export PHP_CS_FIXER_IGNORE_ENV=1 && php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
     - ./node_modules/.bin/eslint src/Resources/public/js/* tests/Resources/public/js/*
diff --git a/composer.json b/composer.json
index 9d2306a..304905f 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "ext-mbstring": "*",
         "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
         "doctrine/orm": "^2.6.3",
@@ -18,8 +18,8 @@
         "ecommit/javascript-bundle": "^2.5.1",
         "ecommit/util-bundle": "^2.5.1",
         "symfony/asset": "^4.4|^5.0",
-        "symfony/config": "^4.4|^5.0",
-        "symfony/dependency-injection": "^4.4|^5.0",
+        "symfony/config": "^4.4.12|^5.1.4",
+        "symfony/dependency-injection": "^4.4.12|^5.1.4",
         "symfony/doctrine-bridge": "^4.4|^5.0",
         "symfony/form": "^4.4|^5.0",
         "symfony/framework-bundle": "^4.4|^5.0",
@@ -40,6 +40,7 @@
         "friendsofphp/php-cs-fixer": "^2.17.1",
         "phpunit/phpunit": "^8.4",
         "symfony/dom-crawler": "^4.4|^5.0",
+        "symfony/http-client": "^4.4.11|^5.1.3",
         "symfony/panther": "^0.7.1",
         "symfony/webpack-encore-bundle": "^1.7.3"
     },

From fd306ccdf04e4d2d709ab8920cc8626260a5c5aa Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 18 Dec 2020 16:54:01 +0100
Subject: [PATCH 029/264] Use "@PHPUnit84Migration:risky" rule set

---
 .php_cs.dist | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 48bca09..15802a6 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -20,10 +20,9 @@ return PhpCsFixer\Config::create()
         '@Symfony' => true,
         '@Symfony:risky' => true,
         '@DoctrineAnnotation' => true,
-        '@PHP56Migration' =>  true,
-        '@PHP56Migration:risky' => true,
         '@PHP71Migration' => true,
         '@PHP71Migration:risky' => true,
+        '@PHPUnit84Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'fopen_flags' => true,
         'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],

From dac6b998db3c76c44ca19cb004bba61a6affd41e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 18 Jan 2021 11:51:36 +0100
Subject: [PATCH 030/264] Fix CS

---
 composer.json                  | 2 +-
 src/Helper/CrudHelper.php      | 4 ++--
 tests/App/config/bootstrap.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 304905f..63f7fe5 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "friendsofphp/php-cs-fixer": "^2.17.1",
+        "friendsofphp/php-cs-fixer": "^2.18.0",
         "phpunit/phpunit": "^8.4",
         "symfony/dom-crawler": "^4.4|^5.0",
         "symfony/http-client": "^4.4.11|^5.1.3",
diff --git a/src/Helper/CrudHelper.php b/src/Helper/CrudHelper.php
index 6cb3ce4..9158d04 100644
--- a/src/Helper/CrudHelper.php
+++ b/src/Helper/CrudHelper.php
@@ -180,7 +180,7 @@ public function th($column_id, Crud $crud, $options, $thOptions, $ajaxOptions)
         //I18N label
         $label = $this->translator->trans($label);
         //XSS protection
-        $label = htmlentities($label, ENT_QUOTES, 'UTF-8');
+        $label = htmlentities($label, \ENT_QUOTES, 'UTF-8');
 
         //Case n°1: We cannot sort this column, we just show the label
         if (!$column->sortable) {
@@ -276,7 +276,7 @@ public function td($column_id, Crud $crud, $value, $options, $tdOptions)
 
         //XSS protection
         if ($options['escape']) {
-            $value = htmlentities((string) $value, ENT_QUOTES, 'UTF-8');
+            $value = htmlentities((string) $value, \ENT_QUOTES, 'UTF-8');
         }
 
         return $this->util->tag('td', $tdOptions, $value);
diff --git a/tests/App/config/bootstrap.php b/tests/App/config/bootstrap.php
index b9addd5..029fe3d 100644
--- a/tests/App/config/bootstrap.php
+++ b/tests/App/config/bootstrap.php
@@ -16,4 +16,4 @@
 $_SERVER += $_ENV;
 $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
 $_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
-$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';
+$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], \FILTER_VALIDATE_BOOLEAN) ? '1' : '0';

From f9d4f1a088ace5d6ff08afc0a64c63fbaf75de95 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 18 Jan 2021 12:29:08 +0100
Subject: [PATCH 031/264] Migrate from Travis CI to GitHub Actions

---
 .github/workflows/tests.yml | 120 ++++++++++++++++++++++++++++++++++++
 .travis.yml                 |  35 -----------
 README.md                   |   2 +-
 3 files changed, 121 insertions(+), 36 deletions(-)
 create mode 100644 .github/workflows/tests.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..a5588bf
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,120 @@
+name: Tests
+
+on:
+    push:
+    pull_request:
+    schedule:
+        - cron: '30 7 * * 1'
+
+jobs:
+    tests:
+        if: (github.event_name == 'schedule' && github.repository == 'e-commit/EcommitCrudBundle') || (github.event_name != 'schedule')
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    -   php-version: '7.2'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with lowest'
+                    -   php-version: '7.2'
+                        symfony-version: '^4'
+                        description: 'with SF ^4'
+                    -   php-version: '7.2'
+                        symfony-version: '^5'
+                        description: 'with SF ^5'
+                    -   php-version: '7.3'
+                        symfony-version: '^4'
+                        description: 'with SF ^4'
+                    -   php-version: '7.3'
+                        symfony-version: '^5'
+                        description: 'with SF ^5'
+                    -   php-version: '7.4'
+                        symfony-version: '^4'
+                        description: 'with SF ^4'
+                    -   php-version: '7.4'
+                        symfony-version: '^5'
+                        description: 'with SF ^5'
+                    -   php-version: '8.0'
+                        symfony-version: '^4'
+                        description: 'with SF ^4'
+                    -   php-version: '8.0'
+                        symfony-version: '^5'
+                        description: 'with SF ^5'
+                    -   php-version: '8.0'
+                        description: 'with Coding Standards'
+                        coding-standards: true
+
+        name: PHP ${{ matrix.php-version }} ${{ matrix.description }}
+
+        runs-on: 'ubuntu-latest'
+
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v2
+
+            -   name: Install system dependencies
+                run: |
+                    sudo rm -rf ~/.nvm && curl -sL "https://deb.nodesource.com/setup_14.x" | sudo -E bash -
+                    sudo apt-get install -y nodejs
+                    sudo npm install -g yarn
+                    sudo apt-get install xvfb
+
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-version }}
+                    extensions: "pdo_sqlite"
+                    coverage: none
+                    tools: flex
+                env:
+                    update: true
+
+            -   name: Display versions
+                run: |
+                    php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;'
+                    php -i
+
+            -   name: Get Composer cache directory
+                id: composer-cache
+                run: echo "::set-output name=dir::$(composer config cache-dir)"
+
+            -   name: Get yarn cache directory
+                id: yarn-cache
+                run: echo "::set-output name=dir::$(yarn cache dir)"
+
+            -   name: Cache dependencies
+                uses: actions/cache@v2
+                with:
+                    path: |
+                        ${{ steps.composer-cache.outputs.dir }}
+                        ${{ steps.yarn-cache.outputs.dir }}
+                    key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}-${{ matrix.composer-flags }}-${{ hashFiles('**/yarn.lock') }}
+                    restore-keys: composer-${{ runner.os }}-${{ matrix.php-version }}-
+
+            -   name: Configure Symfony Flex
+                if: matrix.symfony-version
+                run: composer config extra.symfony.require ${{ matrix.symfony-version }}
+
+            -   name: Install dependencies
+                run: |
+                    composer update --no-interaction --no-progress ${{ matrix.composer-flags }}
+                    yarn install
+                    yarn encore dev
+
+            -   name: Run PHPUnit
+                if: matrix.coding-standards != true
+                run: php vendor/phpunit/phpunit/phpunit
+
+            -   name: Run Karma
+                if: matrix.coding-standards != true
+                run: xvfb-run ./node_modules/.bin/karma start --single-run
+
+            -   name: Run PHP CS Fixer
+                if: matrix.coding-standards
+                env:
+                    PHP_CS_FIXER_IGNORE_ENV: 1
+                run: php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
+
+            -   name: Run ESLint
+                if: matrix.coding-standards
+                run: ./node_modules/.bin/eslint src/Resources/public/js/* tests/Resources/public/js/*
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index fea0948..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-language: php
-php:
-    - 7.2
-    - 7.3
-    - 7.4
-    - 8.0
-
-env:
-    - DEPENDENCIES="high"
-    - DEPENDENCIES="low"
-
-cache:
-    yarn: true
-
-addons:
-    firefox: latest
-
-services:
-    - xvfb
-
-before_install:
-    - sudo rm -rf ~/.nvm && curl -sL "https://deb.nodesource.com/setup_14.x" | sudo -E bash -
-    - sudo apt-get install -y nodejs
-    - sudo npm install -g yarn
-
-install:
-    - if [ "$DEPENDENCIES" = "low" ]; then composer update --prefer-lowest --prefer-stable; else composer install; fi;
-    - yarn install
-    - yarn encore dev
-
-script:
-    - php vendor/phpunit/phpunit/phpunit
-    - ./node_modules/.bin/karma start --single-run
-    - export PHP_CS_FIXER_IGNORE_ENV=1 && php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
-    - ./node_modules/.bin/eslint src/Resources/public/js/* tests/Resources/public/js/*
diff --git a/README.md b/README.md
index 82a640f..32cf282 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # EcommitCrudBundle
 
 
-[![Build Status](https://travis-ci.com/e-commit/EcommitCrudBundle.svg?branch=master)](https://travis-ci.com/e-commit/EcommitCrudBundle)
+![Tests](https://github.com/e-commit/EcommitCrudBundle/workflows/Tests/badge.svg)
 
 
 **WARNING: This branch is under development. Not use in production. You can use stable versions or 2.5 branch.**

From bd86196f5519cbfa87f8e7cb5f925cabad084a22 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 18 Jan 2021 14:51:55 +0100
Subject: [PATCH 032/264] Add Ecommit\CrudBundle\Tests\Functional\App namespace

---
 .gitignore                                            |  4 ++--
 .php_cs.dist                                          |  2 +-
 karma.conf.js                                         |  2 +-
 phpunit.xml.dist                                      |  4 ++--
 tests/App/assets/js/app.js                            |  5 -----
 tests/App/config/routes.yaml                          | 11 -----------
 .../App/Controller/UserController.php                 |  6 +++---
 .../App/DataFixtures/TestUserFixtures.php             |  4 ++--
 tests/{ => Functional}/App/Entity/TestUser.php        |  2 +-
 .../App/Form/Searcher/UserSearcher.php                |  2 +-
 tests/{ => Functional}/App/Kernel.php                 |  2 +-
 tests/Functional/App/assets/js/app.js                 |  5 +++++
 tests/{ => Functional}/App/config/bootstrap.php       |  2 +-
 tests/{ => Functional}/App/config/doctrine.yaml       |  4 ++--
 tests/{ => Functional}/App/config/ecommit_crud.yaml   |  0
 tests/{ => Functional}/App/config/framework.yaml      |  0
 tests/Functional/App/config/routes.yaml               | 11 +++++++++++
 tests/{ => Functional}/App/config/security.yaml       |  0
 tests/{ => Functional}/App/config/services.yaml       |  4 ++--
 tests/{ => Functional}/App/config/webpack_encore.yaml |  0
 tests/{ => Functional}/App/public/index.php           |  2 +-
 tests/{ => Functional}/App/templates/layout.html.twig |  0
 tests/{ => Functional}/App/templates/render.html.twig |  0
 .../App/templates/user/index.html.twig                |  0
 .../App/templates/user/list.html.twig                 |  0
 .../App/templates/user/search.html.twig               |  0
 tests/bootstrap.php                                   |  4 ++--
 webpack-encore-config.js                              |  2 +-
 webpack.config.js                                     |  2 +-
 29 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 tests/App/assets/js/app.js
 delete mode 100644 tests/App/config/routes.yaml
 rename tests/{ => Functional}/App/Controller/UserController.php (89%)
 rename tests/{ => Functional}/App/DataFixtures/TestUserFixtures.php (90%)
 rename tests/{ => Functional}/App/Entity/TestUser.php (96%)
 rename tests/{ => Functional}/App/Form/Searcher/UserSearcher.php (92%)
 rename tests/{ => Functional}/App/Kernel.php (98%)
 create mode 100644 tests/Functional/App/assets/js/app.js
 rename tests/{ => Functional}/App/config/bootstrap.php (91%)
 rename tests/{ => Functional}/App/config/doctrine.yaml (84%)
 rename tests/{ => Functional}/App/config/ecommit_crud.yaml (100%)
 rename tests/{ => Functional}/App/config/framework.yaml (100%)
 create mode 100644 tests/Functional/App/config/routes.yaml
 rename tests/{ => Functional}/App/config/security.yaml (100%)
 rename tests/{ => Functional}/App/config/services.yaml (65%)
 rename tests/{ => Functional}/App/config/webpack_encore.yaml (100%)
 rename tests/{ => Functional}/App/public/index.php (95%)
 rename tests/{ => Functional}/App/templates/layout.html.twig (100%)
 rename tests/{ => Functional}/App/templates/render.html.twig (100%)
 rename tests/{ => Functional}/App/templates/user/index.html.twig (100%)
 rename tests/{ => Functional}/App/templates/user/list.html.twig (100%)
 rename tests/{ => Functional}/App/templates/user/search.html.twig (100%)

diff --git a/.gitignore b/.gitignore
index 61b25bf..8fc4408 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
 .phpunit.result.cache
 composer.lock
 /node_modules/
-/tests/App/public/build/
-/tests/App/var/
+/tests/Functional/App/public/build/
+/tests/Functional/App/var/
 /vendor/
 yarn-error.log
 yarn.lock
diff --git a/.php_cs.dist b/.php_cs.dist
index 15802a6..0fb6c04 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -11,7 +11,7 @@ COMMENT;
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
-    ->exclude('tests/App/var')
+    ->exclude('tests/Functional/App/var')
 ;
 
 return PhpCsFixer\Config::create()
diff --git a/karma.conf.js b/karma.conf.js
index 064e609..df4f15f 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -3,7 +3,7 @@ const Encore = require('@symfony/webpack-encore');
 Encore.configureRuntimeEnvironment('dev');
 
 const encoreConfig = require('./webpack-encore-config');
-const webpackConfig = encoreConfig('tests/App/var/karma/build').getWebpackConfig();
+const webpackConfig = encoreConfig('tests/Functional/App/var/karma/build').getWebpackConfig();
 
 delete webpackConfig.entry;
 delete webpackConfig.optimization.runtimeChunk;
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 513eb68..b02aeae 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,9 +9,9 @@
          bootstrap="tests/bootstrap.php"
 >
     <php>
-        <env name="KERNEL_CLASS" value="Ecommit\CrudBundle\Tests\App\Kernel" />
+        <env name="KERNEL_CLASS" value="Ecommit\CrudBundle\Tests\Functional\App\Kernel" />
         <env name="APP_ENV" value="test"/>
-        <server name="PANTHER_WEB_SERVER_DIR" value="./tests/App/public" />
+        <server name="PANTHER_WEB_SERVER_DIR" value="./tests/Functional/App/public" />
     </php>
 
     <extensions>
diff --git a/tests/App/assets/js/app.js b/tests/App/assets/js/app.js
deleted file mode 100644
index 4c06896..0000000
--- a/tests/App/assets/js/app.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import '../../../../src/Resources/public/js/crud';
-import * as modalManager from '../../../../src/Resources/public/js/modal/modal-manager';
-var modalEngine = require('../../../../src/Resources/public/js/modal/engine/bootstrap3');
-
-modalManager.defineEngine(modalEngine);
diff --git a/tests/App/config/routes.yaml b/tests/App/config/routes.yaml
deleted file mode 100644
index edea24d..0000000
--- a/tests/App/config/routes.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-user_list:
-    path: /user
-    controller: Ecommit\CrudBundle\Tests\App\Controller\UserController::listAction
-
-user_ajax_list:
-    path: /user/ajax-list
-    controller: Ecommit\CrudBundle\Tests\App\Controller\UserController::ajaxListAction
-
-user_ajax_search:
-    path: /user/ajax-search
-    controller: Ecommit\CrudBundle\Tests\App\Controller\UserController::ajaxSearchAction
diff --git a/tests/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
similarity index 89%
rename from tests/App/Controller/UserController.php
rename to tests/Functional/App/Controller/UserController.php
index 245197d..67c9f5f 100644
--- a/tests/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -11,12 +11,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Tests\App\Controller;
+namespace Ecommit\CrudBundle\Tests\Functional\App\Controller;
 
 use Ecommit\CrudBundle\Controller\AbstractCrudController;
 use Ecommit\CrudBundle\Crud\Crud;
-use Ecommit\CrudBundle\Tests\App\Entity\TestUser;
-use Ecommit\CrudBundle\Tests\App\Form\Searcher\UserSearcher;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
+use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\UserSearcher;
 
 class UserController extends AbstractCrudController
 {
diff --git a/tests/App/DataFixtures/TestUserFixtures.php b/tests/Functional/App/DataFixtures/TestUserFixtures.php
similarity index 90%
rename from tests/App/DataFixtures/TestUserFixtures.php
rename to tests/Functional/App/DataFixtures/TestUserFixtures.php
index 617a9c5..2ab9c8e 100644
--- a/tests/App/DataFixtures/TestUserFixtures.php
+++ b/tests/Functional/App/DataFixtures/TestUserFixtures.php
@@ -11,11 +11,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Tests\App\DataFixtures;
+namespace Ecommit\CrudBundle\Tests\Functional\App\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
-use Ecommit\CrudBundle\Tests\App\Entity\TestUser;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
 
 class TestUserFixtures extends Fixture
 {
diff --git a/tests/App/Entity/TestUser.php b/tests/Functional/App/Entity/TestUser.php
similarity index 96%
rename from tests/App/Entity/TestUser.php
rename to tests/Functional/App/Entity/TestUser.php
index 5bb4b2b..71f88f0 100644
--- a/tests/App/Entity/TestUser.php
+++ b/tests/Functional/App/Entity/TestUser.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Tests\App\Entity;
+namespace Ecommit\CrudBundle\Tests\Functional\App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Ecommit\CrudBundle\Entity\UserCrudInterface;
diff --git a/tests/App/Form/Searcher/UserSearcher.php b/tests/Functional/App/Form/Searcher/UserSearcher.php
similarity index 92%
rename from tests/App/Form/Searcher/UserSearcher.php
rename to tests/Functional/App/Form/Searcher/UserSearcher.php
index 4d45f9f..bb4a595 100644
--- a/tests/App/Form/Searcher/UserSearcher.php
+++ b/tests/Functional/App/Form/Searcher/UserSearcher.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Tests\App\Form\Searcher;
+namespace Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher;
 
 use Ecommit\CrudBundle\Form\Filter as Filter;
 use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
diff --git a/tests/App/Kernel.php b/tests/Functional/App/Kernel.php
similarity index 98%
rename from tests/App/Kernel.php
rename to tests/Functional/App/Kernel.php
index 7db3619..2dbe1bc 100644
--- a/tests/App/Kernel.php
+++ b/tests/Functional/App/Kernel.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Tests\App;
+namespace Ecommit\CrudBundle\Tests\Functional\App;
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
diff --git a/tests/Functional/App/assets/js/app.js b/tests/Functional/App/assets/js/app.js
new file mode 100644
index 0000000..e08caa4
--- /dev/null
+++ b/tests/Functional/App/assets/js/app.js
@@ -0,0 +1,5 @@
+import '../../../../../src/Resources/public/js/crud';
+import * as modalManager from '../../../../../src/Resources/public/js/modal/modal-manager';
+var modalEngine = require('../../../../../src/Resources/public/js/modal/engine/bootstrap3');
+
+modalManager.defineEngine(modalEngine);
diff --git a/tests/App/config/bootstrap.php b/tests/Functional/App/config/bootstrap.php
similarity index 91%
rename from tests/App/config/bootstrap.php
rename to tests/Functional/App/config/bootstrap.php
index 029fe3d..7f686f7 100644
--- a/tests/App/config/bootstrap.php
+++ b/tests/Functional/App/config/bootstrap.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-require dirname(__DIR__).'/../../vendor/autoload.php';
+require dirname(__DIR__).'/../../../vendor/autoload.php';
 
 $_SERVER += $_ENV;
 $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
diff --git a/tests/App/config/doctrine.yaml b/tests/Functional/App/config/doctrine.yaml
similarity index 84%
rename from tests/App/config/doctrine.yaml
rename to tests/Functional/App/config/doctrine.yaml
index 2bb3a07..b868db7 100644
--- a/tests/App/config/doctrine.yaml
+++ b/tests/Functional/App/config/doctrine.yaml
@@ -16,7 +16,7 @@ doctrine:
                         is_bundle: false
                         type: annotation
                         dir: '%kernel.project_dir%/Entity'
-                        prefix: 'Ecommit\CrudBundle\Tests\App\Entity'
+                        prefix: 'Ecommit\CrudBundle\Tests\Functional\App\Entity'
                 naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         resolve_target_entities:
-            Ecommit\CrudBundle\Entity\UserCrudInterface: Ecommit\CrudBundle\Tests\App\Entity\TestUser
+            Ecommit\CrudBundle\Entity\UserCrudInterface: Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser
diff --git a/tests/App/config/ecommit_crud.yaml b/tests/Functional/App/config/ecommit_crud.yaml
similarity index 100%
rename from tests/App/config/ecommit_crud.yaml
rename to tests/Functional/App/config/ecommit_crud.yaml
diff --git a/tests/App/config/framework.yaml b/tests/Functional/App/config/framework.yaml
similarity index 100%
rename from tests/App/config/framework.yaml
rename to tests/Functional/App/config/framework.yaml
diff --git a/tests/Functional/App/config/routes.yaml b/tests/Functional/App/config/routes.yaml
new file mode 100644
index 0000000..5d12674
--- /dev/null
+++ b/tests/Functional/App/config/routes.yaml
@@ -0,0 +1,11 @@
+user_list:
+    path: /user
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserController::listAction
+
+user_ajax_list:
+    path: /user/ajax-list
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserController::ajaxListAction
+
+user_ajax_search:
+    path: /user/ajax-search
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserController::ajaxSearchAction
diff --git a/tests/App/config/security.yaml b/tests/Functional/App/config/security.yaml
similarity index 100%
rename from tests/App/config/security.yaml
rename to tests/Functional/App/config/security.yaml
diff --git a/tests/App/config/services.yaml b/tests/Functional/App/config/services.yaml
similarity index 65%
rename from tests/App/config/services.yaml
rename to tests/Functional/App/config/services.yaml
index b0904a6..62c19f6 100644
--- a/tests/App/config/services.yaml
+++ b/tests/Functional/App/config/services.yaml
@@ -6,9 +6,9 @@ services:
         autowire: true
         autoconfigure: true
 
-    Ecommit\CrudBundle\Tests\App\DataFixtures\:
+    Ecommit\CrudBundle\Tests\Functional\App\DataFixtures\:
         resource: '../DataFixtures'
 
-    Ecommit\CrudBundle\Tests\App\Controller\:
+    Ecommit\CrudBundle\Tests\Functional\App\Controller\:
         resource: '../Controller'
         tags: ['controller.service_arguments']
diff --git a/tests/App/config/webpack_encore.yaml b/tests/Functional/App/config/webpack_encore.yaml
similarity index 100%
rename from tests/App/config/webpack_encore.yaml
rename to tests/Functional/App/config/webpack_encore.yaml
diff --git a/tests/App/public/index.php b/tests/Functional/App/public/index.php
similarity index 95%
rename from tests/App/public/index.php
rename to tests/Functional/App/public/index.php
index 5aaf737..77552c2 100644
--- a/tests/App/public/index.php
+++ b/tests/Functional/App/public/index.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-use Ecommit\CrudBundle\Tests\App\Kernel;
+use Ecommit\CrudBundle\Tests\Functional\App\Kernel;
 use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/App/templates/layout.html.twig b/tests/Functional/App/templates/layout.html.twig
similarity index 100%
rename from tests/App/templates/layout.html.twig
rename to tests/Functional/App/templates/layout.html.twig
diff --git a/tests/App/templates/render.html.twig b/tests/Functional/App/templates/render.html.twig
similarity index 100%
rename from tests/App/templates/render.html.twig
rename to tests/Functional/App/templates/render.html.twig
diff --git a/tests/App/templates/user/index.html.twig b/tests/Functional/App/templates/user/index.html.twig
similarity index 100%
rename from tests/App/templates/user/index.html.twig
rename to tests/Functional/App/templates/user/index.html.twig
diff --git a/tests/App/templates/user/list.html.twig b/tests/Functional/App/templates/user/list.html.twig
similarity index 100%
rename from tests/App/templates/user/list.html.twig
rename to tests/Functional/App/templates/user/list.html.twig
diff --git a/tests/App/templates/user/search.html.twig b/tests/Functional/App/templates/user/search.html.twig
similarity index 100%
rename from tests/App/templates/user/search.html.twig
rename to tests/Functional/App/templates/user/search.html.twig
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index da77888..8c06c92 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -11,11 +11,11 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/App/config/bootstrap.php';
+require __DIR__.'/Functional/App/config/bootstrap.php';
 
 function bootstrap(): void
 {
-    $kernel = new \Ecommit\CrudBundle\Tests\App\Kernel('test', true);
+    $kernel = new \Ecommit\CrudBundle\Tests\Functional\App\Kernel('test', true);
     $kernel->boot();
 
     $application = new \Symfony\Bundle\FrameworkBundle\Console\Application($kernel);
diff --git a/webpack-encore-config.js b/webpack-encore-config.js
index 9b1bf39..e9ee59d 100644
--- a/webpack-encore-config.js
+++ b/webpack-encore-config.js
@@ -8,7 +8,7 @@ module.exports = function (outputPath) {
     Encore
         .setOutputPath(outputPath)
         .setPublicPath('/build')
-        .addEntry('app', './tests/App/assets/js/app.js')
+        .addEntry('app', './tests/Functional/App/assets/js/app.js')
         .splitEntryChunks()
         .enableSingleRuntimeChunk()
         .cleanupOutputBeforeBuild()
diff --git a/webpack.config.js b/webpack.config.js
index 33c0180..2302a3a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,3 +1,3 @@
 var encoreConfig = require('./webpack-encore-config');
 
-module.exports = encoreConfig('tests/App/public/build/').getWebpackConfig();
+module.exports = encoreConfig('tests/Functional/App/public/build/').getWebpackConfig();

From 60385d8b518819f4f70a68bfb9ac04649128bf3f Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 31 Jan 2021 19:25:34 +0100
Subject: [PATCH 033/264] [CI] Fix vendors for Symfony Panther

---
 .github/workflows/tests.yml | 1 +
 .gitignore                  | 1 +
 composer.json               | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a5588bf..bf536ef 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -98,6 +98,7 @@ jobs:
             -   name: Install dependencies
                 run: |
                     composer update --no-interaction --no-progress ${{ matrix.composer-flags }}
+                    vendor/bin/bdi detect drivers
                     yarn install
                     yarn encore dev
 
diff --git a/.gitignore b/.gitignore
index 8fc4408..dd5f9e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .php_cs.cache
 .phpunit.result.cache
 composer.lock
+/drivers/
 /node_modules/
 /tests/Functional/App/public/build/
 /tests/Functional/App/var/
diff --git a/composer.json b/composer.json
index 63f7fe5..07eb3e3 100644
--- a/composer.json
+++ b/composer.json
@@ -36,12 +36,13 @@
         "twig/twig": "^2.12.0|^3.0"
     },
     "require-dev": {
+        "dbrekelmans/bdi": "^0.3.0",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^2.18.0",
         "phpunit/phpunit": "^8.4",
         "symfony/dom-crawler": "^4.4|^5.0",
         "symfony/http-client": "^4.4.11|^5.1.3",
-        "symfony/panther": "^0.7.1",
+        "symfony/panther": "^0.9.0",
         "symfony/webpack-encore-bundle": "^1.7.3"
     },
     "autoload": {

From 6b52872465236c4baedb7cf64fbaeae8173373d4 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 1 Feb 2021 16:55:16 +0100
Subject: [PATCH 034/264] Remove extra.branch-alias

---
 composer.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/composer.json b/composer.json
index 07eb3e3..b0d7382 100644
--- a/composer.json
+++ b/composer.json
@@ -53,10 +53,5 @@
     },
     "config": {
         "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.0.x-dev"
-        }
     }
 }

From 01492ca46f993defd01773755db6c27d1b016f2a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 1 Feb 2021 17:50:20 +0100
Subject: [PATCH 035/264] Add missing symfony/yaml dependency

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 47db5e3..8f0b88f 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,8 @@
         "symfony/dom-crawler": "^4.4|^5.0",
         "symfony/http-client": "^4.4.11|^5.1.3",
         "symfony/panther": "^0.9.0",
-        "symfony/webpack-encore-bundle": "^1.7.3"
+        "symfony/webpack-encore-bundle": "^1.7.3",
+        "symfony/yaml": "^4.4|^5.0"
     },
     "autoload": {
         "psr-4": { "Ecommit\\CrudBundle\\": "src/" }

From 6267a2266ab77e69aa82c2ca41a601102784d6d3 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 11 Feb 2021 11:51:35 +0100
Subject: [PATCH 036/264] Use symfony/panther stable version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5d291ca..cd9ee18 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "phpunit/phpunit": "^8.4",
         "symfony/dom-crawler": "^4.4|^5.0",
         "symfony/http-client": "^4.4.11|^5.1.3",
-        "symfony/panther": "^0.9.0",
+        "symfony/panther": "^1.0",
         "symfony/webpack-encore-bundle": "^1.7.3",
         "symfony/yaml": "^4.4|^5.0"
     },

From b5aa32912a179a6205da8fb1711c04b2e752cab3 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 14 Feb 2021 17:39:30 +0100
Subject: [PATCH 037/264] [Twig] New version of crud_th and crud_td functions

* th: Remove options "image_up", "image_down"
* td: Remove option "repeated_values_add_title"
* Rename the option "template" to "render"
* The 4rd option ($thOptions) of th is deleted. Use the option "th_attr" instead
* The 5rd option ($ajaxOptions) of th is deleted. Use the option "ajax_options" instead
* The 5rd option ($tdOptions) of th is deleted. Use the option "td_attr" instead
* New CSS classes
* Remove Ecommit\CrudBundle\Helper\CrudHelper::td
* Remove Ecommit\CrudBundle\Helper\CrudHelper::th
* Removes assets : "images/i16/sort_*"
---
 src/DependencyInjection/Configuration.php     |   1 +
 .../EcommitCrudExtension.php                  |   1 +
 src/Helper/CrudHelper.php                     | 168 ----------
 src/Resources/config/services.xml             |   1 +
 .../public/images/i16/sort_decrease.png       | Bin 2985 -> 0 bytes
 src/Resources/public/images/i16/sort_incr.png | Bin 2981 -> 0 bytes
 src/Resources/views/IconTheme/base.html.twig  |  11 +
 .../views/IconTheme/fontawesome4.html.twig    |  13 +
 src/Resources/views/Theme/base.html.twig      |  75 +++++
 src/Twig/CrudExtension.php                    | 169 +++++++++-
 tests/Functional/App/config/ecommit_crud.yaml |   1 +
 .../Controller/TestCrudControllerTest.php     |  17 +-
 tests/Twig/CrudExtensionTest.php              | 293 ++++++++++++++++++
 13 files changed, 560 insertions(+), 190 deletions(-)
 delete mode 100644 src/Resources/public/images/i16/sort_decrease.png
 delete mode 100644 src/Resources/public/images/i16/sort_incr.png
 create mode 100644 src/Resources/views/IconTheme/base.html.twig
 create mode 100644 src/Resources/views/IconTheme/fontawesome4.html.twig

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index b86a7df..e664b86 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -34,6 +34,7 @@ public function getConfigTreeBuilder()
         $rootNode
             ->children()
                 ->scalarNode('theme')->isRequired()->end()
+                ->scalarNode('icon_theme')->isRequired()->end()
                 ->arrayNode('images')
                     ->addDefaultsIfNotSet()
                     ->children()
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index 119a04c..088e1db 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -37,6 +37,7 @@ public function load(array $config, ContainerBuilder $container): void
         $loader->load('services.xml');
 
         $container->setParameter('ecommit_crud.theme', $config['theme']);
+        $container->setParameter('ecommit_crud.icon_theme', $config['icon_theme']);
         $container->setParameter('ecommit_crud.images', ['th_image_up' => $config['images']['th_image_up'], 'th_image_down' => $config['images']['th_image_down']]);
     }
 }
diff --git a/src/Helper/CrudHelper.php b/src/Helper/CrudHelper.php
index 9158d04..4723620 100644
--- a/src/Helper/CrudHelper.php
+++ b/src/Helper/CrudHelper.php
@@ -22,7 +22,6 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Twig\Markup;
 use Twig_Environment;
 
 class CrudHelper
@@ -72,11 +71,6 @@ class CrudHelper
      */
     protected $parameters;
 
-    /**
-     * @var array
-     */
-    protected $lastValues = [];
-
     /**
      * Constructor.
      *
@@ -120,168 +114,6 @@ public function getOverlayService()
         return $this->overlay;
     }
 
-    /**
-     * Returns one colunm, inside "header" CRUD.
-     *
-     * @param string $column_id   Column id
-     * @param array  $options     Options :
-     *                            * label: Label. If null, default label is displayed
-     *                            * image_up: Url image "^"
-     *                            * image_down: Url image "V"
-     *                            * template: Template used. If null, default template is used
-     * @param array  $thOptions   Html options
-     * @param array  $ajaxOptions Ajax Options
-     *
-     * @return string
-     */
-    public function th($column_id, Crud $crud, $options, $thOptions, $ajaxOptions)
-    {
-        $resolver = new OptionsResolver();
-        $resolver->setDefaults(
-            [
-                'label' => null,
-                'image_up' => $this->parameters['images']['th_image_up'],
-                'image_down' => $this->parameters['images']['th_image_down'],
-                'template' => null,
-            ]
-        );
-        $options = $resolver->resolve($options);
-
-        if ($options['template']) {
-            return $this->templating->render(
-                $options['template'],
-                [
-                    'column_id' => $column_id,
-                    'crud' => $crud,
-                    'th_options' => $thOptions,
-                    'ajax_options' => $ajaxOptions,
-                ]
-            );
-        }
-
-        if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = $crud->getDivIdList();
-        }
-        $image_up = $options['image_up'];
-        $image_down = $options['image_down'];
-
-        //If the column is not to be shown, returns empty
-        $session_values = $crud->getSessionValues();
-        if (!\in_array($column_id, $session_values->displayedColumns)) {
-            return '';
-        }
-
-        //If the label was not defined, we take default label
-        $column = $crud->getColumn($column_id);
-        $label = $options['label'];
-        if (null === $label) {
-            $label = $column->label;
-        }
-        //I18N label
-        $label = $this->translator->trans($label);
-        //XSS protection
-        $label = htmlentities($label, \ENT_QUOTES, 'UTF-8');
-
-        //Case n°1: We cannot sort this column, we just show the label
-        if (!$column->sortable) {
-            return $this->util->tag('th', $thOptions, $label);
-        }
-
-        //Case n°2: We can sort on this column, but the sorting is not active on her at present
-        if ($session_values->sort != $column_id) {
-            $content = $this->listePrivateLink(
-                $label,
-                $crud->getUrl(['sort' => $column_id]),
-                [],
-                $ajaxOptions
-            );
-
-            return $this->util->tag('th', $thOptions, $content);
-        }
-
-        //Case n°3: We can sort on this column, and the sorting is active on her at present
-        $image_src = (Crud::ASC == $session_values->sense) ? $image_up : $image_down;
-        $image_alt = (Crud::ASC == $session_values->sense) ? '^' : 'V';
-        $new_sense = (Crud::ASC == $session_values->sense) ? Crud::DESC : Crud::ASC;
-        $image = $this->util->tag('img', ['src' => $image_src, 'alt' => $image_alt]);
-        $link = $this->listePrivateLink($label, $crud->getUrl(['sense' => $new_sense]), [], $ajaxOptions);
-
-        return $this->util->tag('th', $thOptions, $link.$image);
-    }
-
-    /**
-     * Returns one colunm, inside "body" CRUD.
-     *
-     * @param string $column_id Column id
-     * @param string $value     Value
-     * @param array  $options   Options :
-     *                          * escape: Escape (or not) the value
-     *                          * template: Template used. If null, default template is used
-     * @param array  $tdOptions Html options
-     *
-     * @return string
-     */
-    public function td($column_id, Crud $crud, $value, $options, $tdOptions)
-    {
-        $resolver = new OptionsResolver();
-        $resolver->setDefaults(
-            [
-                'escape' => true,
-                'template' => null,
-                'repeated_values_string' => null,
-                'repeated_values_add_title' => true,
-            ]
-        );
-        $options = $resolver->resolve($options);
-
-        if ($options['template']) {
-            return $this->templating->render(
-                $options['template'],
-                [
-                    'column_id' => $column_id,
-                    'crud' => $crud,
-                    'value' => $value,
-                    'options' => $options,
-                    'td_options' => $tdOptions,
-                ]
-            );
-        }
-
-        //If the column is not to be shown, returns empty
-        $session_values = $crud->getSessionValues();
-        if (!\in_array($column_id, $session_values->displayedColumns)) {
-            return '';
-        }
-
-        //Repeated values
-        if (null !== $options['repeated_values_string']) {
-            if ($value instanceof Markup) {
-                $value = $value->__toString();
-            }
-            if (null === $value) {
-                $value = '';
-            }
-
-            if (isset($this->lastValues[$column_id]) && $this->lastValues[$column_id] === $value) {
-                if ('' !== $value) {
-                    if ($options['repeated_values_add_title']) {
-                        $tdOptions['title'] = $value;
-                    }
-                    $value = $options['repeated_values_string'];
-                }
-            } else {
-                $this->lastValues[$column_id] = $value;
-            }
-        }
-
-        //XSS protection
-        if ($options['escape']) {
-            $value = htmlentities((string) $value, \ENT_QUOTES, 'UTF-8');
-        }
-
-        return $this->util->tag('td', $tdOptions, $value);
-    }
-
     /**
      * Returns "Display Settings" form.
      *
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 9c5070c..99b4ad7 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -31,6 +31,7 @@
             <argument type="service" id="Ecommit\CrudBundle\Helper\CrudHelper"/>
             <argument type="service" id="twig.form.renderer" />
             <argument>%ecommit_crud.theme%</argument>
+            <argument>%ecommit_crud.icon_theme%</argument>
             <tag name="twig.extension"/>
         </service>
 
diff --git a/src/Resources/public/images/i16/sort_decrease.png b/src/Resources/public/images/i16/sort_decrease.png
deleted file mode 100644
index 3d58baf4ebd97e3dfce9ad3e372c0b0900884ec8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2985
zcmV;a3s&@rP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uz7PiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C`
z008P>0026e000+nl3&F}0002QNkl<Zc-o{>!3~2j5VH{r&@tHPCMg>+7M%dng2WH^
z(WXs8fTCJDMRz%$e2xN1kOTo*g})2p+B8wUKnRJS$iU1r^gYZ>zE(zL4^p`y%d+6^
z92C?jDel@Jo0*28f0KzzRiSNLmcNhzpzCfR0ZAZ<hjU(eU}9+4hKY4uNA<OW1B~Ms
z<#`i#FilgG7ij~DT@~{@$NlLmkT0LM29T5jwMCA6q+)l4vnbNt)AI;r{1v{t|2p9B
f71n>@B%T8RakZ>rUZ(s$00000NkvXXu0mjfStE%;

diff --git a/src/Resources/public/images/i16/sort_incr.png b/src/Resources/public/images/i16/sort_incr.png
deleted file mode 100644
index 1fbf09dce19c7e13f4101e1613e5fdd7059a46c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2981
zcmV;W3tIGvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uz7PiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C`
z008P>0026e000+nl3&F}0002MNkl<Zc-o|rOAdoD3`A!l4pD9cx8UgX1Vts3g}a|F
z`XLTUMb(j_$cg>@NrEJ#3y|`&be+f1-3R=rWnG=^03;-VBvb{&SO*+Yj7u5t&YJJJ
z=K1RECN(552krs$e=Sr2Y4(!+nZX<@Es*<?r5z+Lu|5MAPyzzDW&eQB-<OG0p1o~P
z-j%>~nHY`)13=gHFf-WQU}osMzED9Wc)Q-((#tPYg9|elhQaN=f`hL>QcBL7Z_Xtt
b^Lq>c=SY-;@dQGM00000NkvXXu0mjf_0ow>

diff --git a/src/Resources/views/IconTheme/base.html.twig b/src/Resources/views/IconTheme/base.html.twig
new file mode 100644
index 0000000..30c79eb
--- /dev/null
+++ b/src/Resources/views/IconTheme/base.html.twig
@@ -0,0 +1,11 @@
+{% block asc %}
+{% spaceless %}
+    <i>^</i>
+{% endspaceless %}
+{% endblock %}
+
+{% block desc %}
+{% spaceless %}
+    <i>v</i>
+{% endspaceless %}
+{% endblock %}
diff --git a/src/Resources/views/IconTheme/fontawesome4.html.twig b/src/Resources/views/IconTheme/fontawesome4.html.twig
new file mode 100644
index 0000000..119338e
--- /dev/null
+++ b/src/Resources/views/IconTheme/fontawesome4.html.twig
@@ -0,0 +1,13 @@
+{% use '@EcommitCrud/IconTheme/base.html.twig' %}
+
+{% block asc %}
+{% spaceless %}
+    <i class="fa fa-sort-alpha-asc"></i>
+{% endspaceless %}
+{% endblock %}
+
+{% block desc %}
+{% spaceless %}
+    <i class="fa fa-sort-alpha-desc"></i>
+{% endspaceless %}
+{% endblock %}
diff --git a/src/Resources/views/Theme/base.html.twig b/src/Resources/views/Theme/base.html.twig
index c2de2eb..5fa7116 100644
--- a/src/Resources/views/Theme/base.html.twig
+++ b/src/Resources/views/Theme/base.html.twig
@@ -82,6 +82,81 @@
     {% endif %}
 {% endblock %}
 
+{# th #}
+
+{% block th %}
+{% spaceless %}
+    {% if not column.sortable %}
+        {{ block('th_not_sortable', template_name) }}
+    {% elseif crud.sessionValues.sort != column.id %}
+        {{ block('th_sortable_not_active', template_name) }}
+    {% elseif crud.sessionValues.sense == constant('Ecommit\\CrudBundle\\Crud\\Crud::DESC') %}
+        {{ block('th_sortable_active_desc', template_name) }}
+    {% else %}
+        {{ block('th_sortable_active_asc', template_name) }}
+    {% endif %}
+{% endspaceless %}
+{% endblock %}
+
+{% block th_not_sortable %}
+    {% set th_attr = th_attr.not_sortable|merge({class: (th_attr.not_sortable.class|default('') ~ ' ec-crud-th ec-crud-th-not-sortable')|trim}) %}
+    <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>{{ label|trans }}</th>
+{% endblock %}
+
+{% block th_sortable_not_active %}
+    {% set th_attr = th_attr.sortable_not_active|merge({class: (th_attr.sortable_not_active.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-not-active')|trim}) %}
+    {% set a_attr = a_attr.sortable_not_active %}
+    {% if ajax_options is not null %}
+        {% set a_attr = a_attr|merge({class: (a_attr.class|default('') ~ ' ec-crud-ajax-link-auto')|trim}) %}
+    {% endif %}
+    <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
+        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>{{ label|trans }}</a>
+    </th>
+{% endblock %}
+
+{% block th_sortable_active_asc %}
+    {% set th_attr = th_attr.sortable_active_asc|merge({class: (th_attr.sortable_active_asc.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-active-asc')|trim}) %}
+    {% set a_attr = a_attr.sortable_active_asc %}
+    {% set newSense = constant('Ecommit\\CrudBundle\\Crud\\Crud::DESC') %}
+    {% set iconName = 'asc' %}
+    {{ block('th_sortable_active', template_name) }}
+{% endblock %}
+
+{% block th_sortable_active_desc %}
+    {% set th_attr = th_attr.sortable_active_desc|merge({class: (th_attr.sortable_active_desc.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-active-desc')|trim}) %}
+    {% set a_attr = a_attr.sortable_active_desc %}
+    {% set newSense = constant('Ecommit\\CrudBundle\\Crud\\Crud::ASC') %}
+    {% set iconName = 'desc' %}
+    {{ block('th_sortable_active', template_name) }}
+{% endblock %}
+
+{% block th_sortable_active %}
+    {% if ajax_options is not null %}
+        {% set a_attr = a_attr|merge({class: (a_attr.class|default('') ~ ' ec-crud-ajax-link-auto')|trim}) %}
+    {% endif %}
+    <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
+        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id, 'sense': newSense})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>
+            {{- label|trans }} {{ crud_icon(iconName) -}}
+        </a>
+    </th>
+{% endblock %}
+
+{# td #}
+
+{% block td %}
+{% spaceless %}
+    {% if repeatedValue %}
+        {% if td_attr.title is not defined %}
+            {% set td_attr = td_attr|merge({title: value}) %}
+        {% endif %}
+        {% set value = options.repeated_values_string %}
+    {% endif %}
+    <td{% with { attr: td_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
+        {{- (options.escape) ? value : value|raw -}}
+    </td>
+{% endspaceless %}
+{% endblock %}
+
 {# Attributes #}
 
 {% block attributes %}
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 0b23df6..2a03c8a 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -36,12 +36,16 @@ class CrudExtension extends AbstractExtension
     protected $formRenderer;
 
     protected $theme;
+    protected $iconTheme;
 
-    public function __construct(CrudHelper $crudHelper, FormRendererInterface $formRenderer, string $theme)
+    protected $lastTdValues = [];
+
+    public function __construct(CrudHelper $crudHelper, FormRendererInterface $formRenderer, string $theme, string $iconTheme)
     {
         $this->crudHelper = $crudHelper;
         $this->formRenderer = $formRenderer;
         $this->theme = $theme;
+        $this->iconTheme = $iconTheme;
     }
 
     public function getName()
@@ -71,12 +75,18 @@ public function getFunctions()
             new TwigFunction(
                 'crud_th',
                 [$this, 'th'],
-                ['is_safe' => ['all']]
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['html'],
+                ]
             ),
             new TwigFunction(
                 'crud_td',
                 [$this, 'td'],
-                ['is_safe' => ['all']]
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['html'],
+                ]
             ),
             new TwigFunction(
                 'crud_display_settings',
@@ -124,6 +134,14 @@ public function getFunctions()
                     'is_safe' => ['html'],
                 ]
             ),
+            new TwigFunction(
+                'crud_icon',
+                [$this, 'crudIcon'],
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['html'],
+                ]
+            ),
         ];
     }
 
@@ -138,9 +156,9 @@ public function getFunctions()
      *                            * type: Type of links paginator: elastic (all links) or sliding. Default: sliding
      *                            * max_pages_before: Max links before current page (only if sliding type is used). Default: 3
      *                            * max_pages_after: Max links after current page (only if sliding type is used). Default: 3
-     *                            * nav_attr: "nav" CSS attributes
-     *                            * ul_attr: "ul" CSS attributes
-     *                            * li_attr: "li" CSS attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
+     *                            * nav_attr: "nav" attributes
+     *                            * ul_attr: "ul" attributes
+     *                            * li_attr: "li" attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
      *                            * a_attr: "a" CSS attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
      *                            * render: Template used for generation. If null, default template is used
      */
@@ -247,23 +265,141 @@ public function crudPaginatorLinks(Environment $environment, Crud $crud, array $
     }
 
     /**
-     * Twig function: "crud_th".
+     * Returns CRUD th tag.
      *
-     * @see CrudHelper:th
+     * @param string $columnId Column to display
+     * @param array  $options  Options:
+     *                         * ajax_options: Ajax Options. If null, Ajax is not used. Default: null
+     *                         * label: Th label. If null, CRUD configuration is used
+     *                         * th_attr: "th" attributes
+     *                         * a_attr: "a" attributes
+     *                         * render: Template used for generation. If null, default template is used
      */
-    public function th($columnId, Crud $crud, $options = [], $thOptions = [], $ajaxOptions = [])
+    public function th(Environment $environment, string $columnId, Crud $crud, array $options = []): string
     {
-        return $this->crudHelper->th($columnId, $crud, $options, $thOptions, $ajaxOptions);
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'ajax_options' => null,
+            'label' => null,
+            'th_attr' => function (OptionsResolver $thResolver): void {
+                $thResolver->setDefaults([
+                    'not_sortable' => [],
+                    'sortable_active_asc' => [],
+                    'sortable_active_desc' => [],
+                    'sortable_not_active' => [],
+                ]);
+                foreach (['not_sortable', 'sortable_active_asc', 'sortable_active_desc', 'sortable_not_active'] as $option) {
+                    $thResolver->setAllowedTypes($option, 'array');
+                }
+            },
+            'a_attr' => function (OptionsResolver $aResolver): void {
+                $aResolver->setDefaults([
+                    'sortable_active_asc' => [],
+                    'sortable_active_desc' => [],
+                    'sortable_not_active' => [],
+                ]);
+                foreach (['sortable_active_asc', 'sortable_active_desc', 'sortable_not_active'] as $option) {
+                    $aResolver->setAllowedTypes($option, 'array');
+                }
+            },
+            'render' => null,
+        ]);
+        $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
+        $resolver->setAllowedTypes('label', ['null', 'string']);
+        $options = $resolver->resolve($options);
+
+        //If the column is not to be shown, returns empty
+        $sessionValues = $crud->getSessionValues();
+        if (!\in_array($columnId, $sessionValues->displayedColumns)) {
+            return '';
+        }
+        $column = $crud->getColumn($columnId);
+
+        if ($options['render']) {
+            return $environment->render($options['render'], [
+                'column' => $column,
+                'crud' => $crud,
+                'options' => $options,
+            ]);
+        }
+
+        if (!isset($options['ajax_options']['update'])) {
+            $options['ajax_options']['update'] = '#'.$crud->getDivIdList();
+        }
+
+        //If the label was not defined, we take default label
+        $label = $options['label'];
+        if (null === $label) {
+            $label = $column->label;
+        }
+
+        return $this->renderBlock($environment, $this->theme, 'th', array_merge($options, [
+            'column' => $column,
+            'crud' => $crud,
+            'options' => $options,
+            'label' => $label,
+        ]));
     }
 
     /**
-     * Twig function: "crud_td".
+     * Returns CRUD td tag.
      *
-     * @see CrudHelper:td
+     * @param string $columnId Column to display
+     * @param array  $options  Options:
+     *                         * escape: Escape or not value. Default: true
+     *                         * repeated_values_string: If not null, use this value if the original value is repeated. Default: null
+     *                         * td_attr: "td" attributes
+     *                         * render: Template used for generation. If null, default template is used
      */
-    public function td($columnId, Crud $crud, $value, $options = [], $tdOptions = [])
+    public function td(Environment $environment, string $columnId, Crud $crud, $value, $options = []): string
     {
-        return $this->crudHelper->td($columnId, $crud, $value, $options, $tdOptions);
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'escape' => true,
+            'repeated_values_string' => null,
+            'td_attr' => [],
+            'render' => null,
+        ]);
+        $resolver->setAllowedTypes('escape', 'bool');
+        $resolver->setAllowedTypes('repeated_values_string', ['null', 'string']);
+        $resolver->setAllowedTypes('td_attr', ['null', 'array']);
+        $options = $resolver->resolve($options);
+
+        //If the column is not to be shown, returns empty
+        $sessionValues = $crud->getSessionValues();
+        if (!\in_array($columnId, $sessionValues->displayedColumns)) {
+            return '';
+        }
+        $column = $crud->getColumn($columnId);
+
+        if ($options['render']) {
+            return $environment->render($options['render'], [
+                'column' => $column,
+                'crud' => $crud,
+                'value' => $value,
+                'options' => $options,
+            ]);
+        }
+
+        $repeatedValue = false;
+        if (null !== $options['repeated_values_string']) {
+            $value = (string) $value; //transform to string is important : eg: Twig Markup
+            if (isset($this->lastTdValues[$crud->getSessionName()][$columnId]) && $this->lastTdValues[$crud->getSessionName()][$columnId] === $value) {
+                if ('' !== $value) {
+                    $repeatedValue = true;
+                }
+            } else {
+                $this->lastTdValues[$crud->getSessionName()][$columnId] = $value;
+            }
+        }
+
+        return $this->renderBlock($environment, $this->theme, 'td', array_merge($options, [
+            'column' => $column,
+            'crud' => $crud,
+            'value' => $value,
+            'repeatedValue' => $repeatedValue,
+            'options' => $options,
+        ]));
     }
 
     /**
@@ -466,6 +602,11 @@ protected function getAjaxAttributes(array $options): array
         return $attributes;
     }
 
+    public function crudIcon(Environment $environment, string $iconName): string
+    {
+        return $this->renderBlock($environment, $this->iconTheme, $iconName);
+    }
+
     protected function renderBlock(Environment $environment, string $templateName, string $blockName, array $parameters = []): ?string
     {
         $template = $environment->load($templateName);
diff --git a/tests/Functional/App/config/ecommit_crud.yaml b/tests/Functional/App/config/ecommit_crud.yaml
index f6eca0f..c5aaa83 100644
--- a/tests/Functional/App/config/ecommit_crud.yaml
+++ b/tests/Functional/App/config/ecommit_crud.yaml
@@ -1,2 +1,3 @@
 ecommit_crud:
     theme: '@EcommitCrud/Theme/base.html.twig'
+    icon_theme: '@EcommitCrud/IconTheme/base.html.twig'
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index d8922c8..b8d8f37 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -45,7 +45,7 @@ public function testList(): Client
      */
     public function testChangeSortSense(Client $client): Client
     {
-        $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[text()="first_name"]');
+        $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[contains(text(), "first_name")]');
         $link->click();
         $this->waitForAjax($client);
 
@@ -286,26 +286,27 @@ protected function getPagination(Crawler $crawler): array
 
     protected function getSort(Crawler $crawler): array
     {
-        $imageSort = $crawler->filterXPath('//table[@class="result"]/thead/tr/th/img');
-        if (0 === \count($imageSort)) {
+        $iSort = $crawler->filterXPath('//table[@class="result"]/thead/tr/th/a/i');
+        if (0 === \count($iSort)) {
             return [];
         }
-        $imageSort = $imageSort->first();
+        $iSort = $iSort->first();
 
-        switch ($imageSort->getAttribute('alt')) {
+        switch ($iSort->text()) {
             case '^':
                 $sense = Crud::ASC;
                 break;
-            case 'V':
+            case 'v':
                 $sense = Crud::DESC;
                 break;
             default:
                 throw new \Exception('Bad sense');
         }
 
-        $column = $imageSort->filterXPath('ancestor::th')->last();
+        $column = $iSort->filterXPath('ancestor::th')->last()->text();
+        $column = str_replace(' '.$iSort->text(), '', $column);
 
-        return [$column->text(), $sense];
+        return [$column, $sense];
     }
 
     protected function getFirstUsername(Crawler $crawler): ?string
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index a57181a..6c67a87 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -14,6 +14,8 @@
 namespace Ecommit\CrudBundle\Tests\Twig;
 
 use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudColumn;
+use Ecommit\CrudBundle\Crud\CrudSession;
 use Ecommit\CrudBundle\Paginator\ArrayPaginator;
 use Ecommit\CrudBundle\Twig\CrudExtension;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -23,6 +25,7 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
 use Twig\Environment;
+use Twig\Markup;
 
 class CrudExtensionTest extends KernelTestCase
 {
@@ -412,6 +415,296 @@ public function testCrudPaginatorLinks(): void
         $this->assertSame($expected, $result);
     }
 
+    public function testThColumnNotDisplayed(): void
+    {
+        $html = $this->crudExtension->th($this->environment, 'column4', $this->createCrud());
+        $this->assertSame('', $html);
+    }
+
+    public function testThColumnNotSortable(): void
+    {
+        $html = $this->crudExtension->th($this->environment, 'column3', $this->createCrud());
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-not-sortable">label3</th>', $html);
+    }
+
+    public function testThColumnSortableNotActive(): void
+    {
+        $html = $this->crudExtension->th($this->environment, 'column2', $this->createCrud());
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-not-active"><a href="/user?sort=column2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label2</a></th>', $html);
+    }
+
+    public function testThColumnSortableActiveAsc(): void
+    {
+        $html = $this->crudExtension->th($this->environment, 'column1', $this->createCrud());
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-asc"><a href="/user?sort=column1&amp;sense=DESC" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>', $html);
+    }
+
+    public function testThColumnSortableActiveDesc(): void
+    {
+        $html = $this->crudExtension->th($this->environment, 'column1', $this->createCrud('column1', CRUD::DESC));
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-desc"><a href="/user?sort=column1&amp;sense=ASC" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>', $html);
+    }
+
+    public function testThWithAjaxOptions(): void
+    {
+        $html = $this->crudExtension->th($this->environment, 'column2', $this->createCrud(), [
+            'ajax_options' => [
+                'update' => '#div2',
+            ],
+        ]);
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-not-active"><a href="/user?sort=column2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#div2">label2</a></th>', $html);
+    }
+
+    public function testThWithLabel(): void
+    {
+        $html = $this->crudExtension->th($this->environment, 'column2', $this->createCrud(), [
+            'label' => 'My label',
+        ]);
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-not-active"><a href="/user?sort=column2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">My label</a></th>', $html);
+    }
+
+    /**
+     * @dataProvider getTestThWithAttrOptionsProvider
+     */
+    public function testThWithAttrOptions(string $columnId, string $sort, string $sense, string $expected): void
+    {
+        $html = $this->crudExtension->th($this->environment, $columnId, $this->createCrud($sort, $sense), [
+            'th_attr' => [
+                'not_sortable' => ['class' => 'a', 'data-a' => 'val'],
+                'sortable_active_asc' => ['class' => 'b', 'data-b' => 'val'],
+                'sortable_active_desc' => ['class' => 'c', 'data-c' => 'val'],
+                'sortable_not_active' => ['class' => 'd', 'data-d' => 'val'],
+            ],
+            'a_attr' => [
+                'sortable_active_asc' => ['class' => 'e', 'data-e' => 'val'],
+                'sortable_active_desc' => ['class' => 'f', 'data-f' => 'val'],
+                'sortable_not_active' => ['class' => 'g', 'data-g' => 'val'],
+            ],
+        ]);
+
+        $this->assertSame($expected, $html);
+    }
+
+    public function getTestThWithAttrOptionsProvider(): array
+    {
+        return [
+            ['column3', 'column1', Crud::ASC, '<th class="a ec-crud-th ec-crud-th-not-sortable" data-a="val">label3</th>'],
+            ['column1', 'column1', Crud::ASC, '<th class="b ec-crud-th ec-crud-th-sortable-active-asc" data-b="val"><a href="/user?sort=column1&amp;sense=DESC" class="e ec-crud-ajax-link-auto" data-e="val" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>'],
+            ['column1', 'column1', Crud::DESC, '<th class="c ec-crud-th ec-crud-th-sortable-active-desc" data-c="val"><a href="/user?sort=column1&amp;sense=ASC" class="f ec-crud-ajax-link-auto" data-f="val" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>'],
+            ['column2', 'column1', Crud::ASC, '<th class="d ec-crud-th ec-crud-th-sortable-not-active" data-d="val"><a href="/user?sort=column2" class="g ec-crud-ajax-link-auto" data-g="val" data-ec-crud-ajax-update="#myId">label2</a></th>'],
+        ];
+    }
+
+    public function testThWithRenderOption(): void
+    {
+        $html = $this->crudExtension->th($this->environment, 'column1', $this->createCrud(), [
+            'render' => 'render.html.twig',
+        ]);
+
+        $this->assertRegExp('/OK/', $html);
+    }
+
+    public function testThWithBadOptions(): void
+    {
+        $this->expectException(UndefinedOptionsException::class);
+        $this->crudExtension->th($this->environment, 'column1', $this->createCrud(), [
+            'bad_option' => 'bad',
+        ]);
+    }
+
+    public function testTdColumnNotDisplayed(): void
+    {
+        $html = $this->crudExtension->td($this->environment, 'column4', $this->createCrud(), 'value4');
+        $this->assertSame('', $html);
+    }
+
+    public function testTdWithEscape(): void
+    {
+        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1 é&');
+        $this->assertSame('<td>value1 é&amp;</td>', $html);
+    }
+
+    public function testTdWithoutEscape(): void
+    {
+        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1 é&', [
+            'escape' => false,
+        ]);
+        $this->assertSame('<td>value1 é&</td>', $html);
+    }
+
+    public function testRepeatedValuesStringFirst(): CrudExtension
+    {
+        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+            'repeated_values_string' => '"',
+        ]);
+        $this->assertSame('<td>value1</td>', $html);
+
+        return $this->crudExtension;
+    }
+
+    /**
+     * @depends testRepeatedValuesStringFirst
+     */
+    public function testRepeatedValuesStringRepeat(CrudExtension $crudExtension): CrudExtension
+    {
+        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+            'repeated_values_string' => 'Bis',
+        ]);
+        $this->assertSame('<td title="value1">Bis</td>', $html);
+
+        return $crudExtension;
+    }
+
+    /**
+     * @depends testRepeatedValuesStringRepeat
+     */
+    public function testRepeatedValuesStringOtherColumn(CrudExtension $crudExtension): CrudExtension
+    {
+        $html = $crudExtension->td($this->environment, 'column2', $this->createCrud(), 'value1', [
+            'repeated_values_string' => 'Bis',
+        ]);
+        $this->assertSame('<td>value1</td>', $html);
+
+        return $crudExtension;
+    }
+
+    /**
+     * @depends testRepeatedValuesStringOtherColumn
+     */
+    public function testRepeatedValuesStringOtherColumnRepeat(CrudExtension $crudExtension): CrudExtension
+    {
+        $html = $crudExtension->td($this->environment, 'column2', $this->createCrud(), 'value1', [
+            'repeated_values_string' => 'Bis',
+        ]);
+        $this->assertSame('<td title="value1">Bis</td>', $html);
+
+        return $crudExtension;
+    }
+
+    /**
+     * @depends testRepeatedValuesStringOtherColumnRepeat
+     */
+    public function testRepeatedValuesStringRepeatWithMarkup(CrudExtension $crudExtension): CrudExtension
+    {
+        $markup = new Markup('value1', 'UTF-8');
+        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), $markup, [
+            'repeated_values_string' => 'Bis',
+        ]);
+        $this->assertSame('<td title="value1">Bis</td>', $html);
+
+        return $crudExtension;
+    }
+
+    /**
+     * @depends testRepeatedValuesStringRepeatWithMarkup
+     */
+    public function testRepeatedValuesStringRepeatWithTitleAttr(CrudExtension $crudExtension): CrudExtension
+    {
+        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+            'repeated_values_string' => 'Bis',
+            'td_attr' => ['title' => 'Repeated'],
+        ]);
+        $this->assertSame('<td title="Repeated">Bis</td>', $html);
+
+        return $crudExtension;
+    }
+
+    /**
+     * @depends testRepeatedValuesStringRepeatWithMarkup
+     */
+    public function testRepeatedValuesStringNotRepeat(CrudExtension $crudExtension): CrudExtension
+    {
+        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value2', [
+            'repeated_values_string' => 'Bis',
+        ]);
+        $this->assertSame('<td>value2</td>', $html);
+
+        return $crudExtension;
+    }
+
+    /**
+     * @depends testRepeatedValuesStringNotRepeat
+     */
+    public function testRepeatedValuesWithEmptyValueFirst(CrudExtension $crudExtension): CrudExtension
+    {
+        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), '', [
+            'repeated_values_string' => 'Bis',
+        ]);
+        $this->assertSame('<td></td>', $html);
+
+        return $crudExtension;
+    }
+
+    /**
+     * @depends testRepeatedValuesWithEmptyValueFirst
+     */
+    public function testRepeatedValuesWithEmptyValueRepeat(CrudExtension $crudExtension): CrudExtension
+    {
+        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), '', [
+            'repeated_values_string' => 'Bis',
+        ]);
+        $this->assertSame('<td></td>', $html);
+
+        return $crudExtension;
+    }
+
+    public function testTdWithAttrOptions(): void
+    {
+        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+            'td_attr' => ['class' => 'a', 'data-a' => 'val'],
+        ]);
+        $this->assertSame('<td class="a" data-a="val">value1</td>', $html);
+    }
+
+    public function testTdWithRenderOption(): void
+    {
+        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+            'render' => 'render.html.twig',
+        ]);
+
+        $this->assertRegExp('/OK/', $html);
+    }
+
+    public function testTdWithBadOptions(): void
+    {
+        $this->expectException(UndefinedOptionsException::class);
+        $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+            'bad_option' => 'bad',
+        ]);
+    }
+
+    protected function createCrud(string $sort = 'column1', string $sense = Crud::ASC): Crud
+    {
+        $columns = [
+            'column1' => new CrudColumn('column1', 'alias1', 'label1', true, true, 'alias1', 'alias1'),
+            'column2' => new CrudColumn('column2', 'alias2', 'label2', true, false, 'alias2', 'alias2'),
+            'column3' => new CrudColumn('column3', 'alias3', 'label3', false, true, 'alias3', 'alias3'),
+            'column4' => new CrudColumn('column4', 'alias4', 'label4', true, true, 'alias4', 'alias4'),
+        ];
+        $crudSession = new CrudSession();
+        $crudSession->displayedColumns = [
+            'column1',
+            'column2',
+            'column3',
+        ];
+        $crudSession->sort = $sort;
+        $crudSession->sense = $sense;
+
+        $crud = $this->getMockBuilder(Crud::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getDivIdList', 'getRouteName', 'getRouteParams', 'getSessionValues', 'getColumn'])
+            ->getMock();
+        $crud->expects($this->any())->method('getDivIdList')->willReturn('myId');
+        $crud->expects($this->any())->method('getRouteName')->willReturn('user_list');
+        $crud->expects($this->any())->method('getRouteParams')->willReturn([]);
+        $crud->expects($this->any())->method('getSessionValues')->willReturn($crudSession);
+        $crud->expects($this->any())->method('getColumn')->willReturnCallback(function ($columnId) use ($columns) {
+            return $columns[$columnId];
+        });
+
+        return $crud;
+    }
+
     protected function createFormView(): FormView
     {
         $builder = $this->formFactory->createBuilder(FormType::class, null, [

From aeb1c87aadd7496dbce8928fbe18f7b06d692c82 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 15 Feb 2021 19:45:34 +0100
Subject: [PATCH 038/264] New version of CrudControllerTrait (used by
 AbstractCrudController)

* $cm protected property is removed
* getTemplateName method: New signature "protected function getTemplateName(string $action): string"
* createCrud method is now final
* autoListAction method is replaced by new getCrudResponse method
* autoAjaxListAction method is replaced by new getAjaxCrudResponse method
* autoAjaxSearchAction is removed
* prepareList method is removed
* configCrud method is replaced by new getCrud method
* addDataAfterBuildQuery method is removed
* beforeBuildQuery method: New signature "protected function beforeBuildQuery(Crud $crud, array $data): array"
* afterBuildQuery method: New signature "protected function afterBuildQuery(Crud $crud, array $data): array"
* processSearch method is removed
* renderCrudView method is removed
* renderCrud method is removed
* getCrudRequiredServices method : Remove twig and request_stack services
* Remove Crud::setSearchRoute method
---
 src/Controller/CrudControllerTrait.php        | 151 ++++--------------
 src/Crud/Crud.php                             |  25 +--
 src/Crud/CrudResponseGenerator.php            | 144 +++++++++++++++++
 src/Resources/config/services.xml             |   5 +
 .../App/Controller/UserController.php         |  20 +--
 .../Controller/UserWithoutTraitController.php | 109 +++++++++++++
 tests/Functional/App/config/routes.yaml       |  20 ++-
 .../App/templates/user/list.html.twig         |   2 +
 .../Controller/TestCrudControllerTest.php     |  53 ++++--
 .../TestCrudControllerWithoutTraitTest.php    |  20 +++
 ...CrudControllerWithoutTraitWithDataTest.php |  21 +++
 tests/Twig/CrudExtensionTest.php              |  26 +--
 12 files changed, 410 insertions(+), 186 deletions(-)
 create mode 100644 src/Crud/CrudResponseGenerator.php
 create mode 100644 tests/Functional/App/Controller/UserWithoutTraitController.php
 create mode 100644 tests/Functional/Controller/TestCrudControllerWithoutTraitTest.php
 create mode 100644 tests/Functional/Controller/TestCrudControllerWithoutTraitWithDataTest.php

diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index 05a5d86..6fa539c 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -15,148 +15,65 @@
 
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Crud\CrudFactory;
-use Symfony\Component\HttpFoundation\RequestStack;
+use Ecommit\CrudBundle\Crud\CrudResponseGenerator;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Twig\Environment;
 
 trait CrudControllerTrait
 {
-    protected $cm;
+    abstract protected function getCrud(): Crud;
 
-    /**
-     * @param $sessionName
-     *
-     * @return Crud
-     */
-    protected function createCrud($sessionName)
-    {
-        return $this->container->get('ecommit_crud.factory')->create($sessionName);
-    }
+    abstract protected function getTemplateName(string $action): string;
 
-    public function autoListAction()
+    final protected function createCrud($sessionName): Crud
     {
-        $data = $this->prepareList();
-
-        return $this->renderCrud($this->getTemplateName('index'), array_merge($data, ['crud' => $this->cm]));
+        return $this->container->get(CrudFactory::class)->create($sessionName);
     }
 
-    protected function prepareList()
+    public function getCrudResponse(): Response
     {
-        $this->cm = $this->configCrud();
-        $this->beforeBuildQuery();
-        $this->cm->buildQuery();
-        $this->afterBuildQuery();
-        $data = $this->addDataAfterBuildQuery();
-        $this->cm->clearTemplate();
-
-        return $data;
+        return $this->container->get(CrudResponseGenerator::class)->getResponse($this->getCrud(), [
+            'template_generator' => function (string $action) {
+                return $this->getTemplateName($action);
+            },
+            'before_build_query' => function (Crud $crud, $data) {
+                return $this->beforeBuildQuery($crud, $data);
+            },
+            'after_build_query' => function (Crud $crud, $data) {
+                return $this->afterBuildQuery($crud, $data);
+            },
+        ]);
     }
 
-    /**
-     * Configures and returns the CRUD.
-     *
-     * @return Crud
-     */
-    abstract protected function configCrud();
-
-    /**
-     * @return array
-     */
-    protected function addDataAfterBuildQuery()
+    public function getAjaxCrudResponse(): Response
     {
-        return [];
+        return $this->container->get(CrudResponseGenerator::class)->getAjaxResponse($this->getCrud(), [
+            'template_generator' => function (string $action) {
+                return $this->getTemplateName($action);
+            },
+            'before_build_query' => function (Crud $crud, $data) {
+                return $this->beforeBuildQuery($crud, $data);
+            },
+            'after_build_query' => function (Crud $crud, $data) {
+                return $this->afterBuildQuery($crud, $data);
+            },
+        ]);
     }
 
-    protected function beforeBuildQuery(): void
+    protected function beforeBuildQuery(Crud $crud, array $data): array
     {
-    }
-
-    protected function afterBuildQuery(): void
-    {
-    }
-
-    /**
-     * Returns template for action.
-     *
-     * @param string $action Action
-     *
-     * @return string
-     */
-    abstract protected function getTemplateName($action);
-
-    public function autoAjaxListAction()
-    {
-        $masterRequest = $this->get('request_stack')->getMasterRequest();
-        if (!$masterRequest->isXmlHttpRequest()) {
-            throw new NotFoundHttpException('Ajax is required');
-        }
-        $data = $this->prepareList();
-
-        return $this->renderCrud($this->getTemplateName('list'), array_merge($data, ['crud' => $this->cm]));
-    }
-
-    public function autoAjaxSearchAction()
-    {
-        $masterRequest = $this->get('request_stack')->getMasterRequest();
-        if (!$masterRequest->isXmlHttpRequest()) {
-            throw new NotFoundHttpException('Ajax is required');
-        }
-        $data = $this->processSearch();
-        $renderSearch = $this->renderCrudView(
-            $this->getTemplateName('search'),
-            array_merge($data, ['crud' => $this->cm])
-        );
-        $renderList = $this->renderCrudView($this->getTemplateName('list'), array_merge($data, ['crud' => $this->cm]));
-
-        return $this->renderCrud(
-            '@EcommitCrud/Crud/double_search.html.twig',
-            [
-                'id_search' => $this->cm->getDivIdSearch(),
-                'id_list' => $this->cm->getDivIdList(),
-                'render_search' => $renderSearch,
-                'render_list' => $renderList,
-            ]
-        );
-    }
-
-    protected function processSearch()
-    {
-        $this->cm = $this->configCrud();
-        $this->cm->processForm();
-        $this->beforeBuildQuery();
-        $this->cm->buildQuery();
-        $this->afterBuildQuery();
-        $data = $this->addDataAfterBuildQuery();
-        $this->cm->clearTemplate();
-
         return $data;
     }
 
-    protected function renderCrudView(string $view, array $parameters = []): string
+    protected function afterBuildQuery(Crud $crud, array $data): array
     {
-        return $this->container->get('twig')->render($view, $parameters);
-    }
-
-    protected function renderCrud(string $view, array $parameters = [], Response $response = null): Response
-    {
-        $content = $this->container->get('twig')->render($view, $parameters);
-
-        if (null === $response) {
-            $response = new Response();
-        }
-
-        $response->setContent($content);
-
-        return $response;
+        return $data;
     }
 
     protected static function getCrudRequiredServices()
     {
         return [
-            'ecommit_crud.factory' => CrudFactory::class,
-            'twig' => Environment::class,
-            'request_stack' => RequestStack::class,
+            CrudFactory::class,
+            CrudResponseGenerator::class,
         ];
     }
 }
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 306f0e7..7e3f91a 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -65,8 +65,6 @@ class Crud
      */
     protected $routeName = null;
     protected $routeParams = [];
-    protected $searchRouteName = null;
-    protected $searchRouteParams = [];
 
     protected $divIdSearch = 'crud_search';
     protected $divIdList = 'crud_list';
@@ -327,22 +325,6 @@ public function getUrl($parameters = [])
         return $this->router->generate($this->routeName, $parameters);
     }
 
-    /**
-     * Sets the search route.
-     *
-     * @param string $routeName
-     * @param array  $parameters
-     *
-     * @return Crud
-     */
-    public function setSearchRoute($routeName, $parameters = [])
-    {
-        $this->searchRouteName = $routeName;
-        $this->searchRouteParams = $parameters;
-
-        return $this;
-    }
-
     /**
      * Returns the search url.
      *
@@ -352,9 +334,9 @@ public function setSearchRoute($routeName, $parameters = [])
      */
     public function getSearchUrl($parameters = [])
     {
-        $parameters = array_merge($this->searchRouteParams, $parameters);
+        $parameters = array_merge($this->routeParams, ['search' => 1], $parameters);
 
-        return $this->router->generate($this->searchRouteName, $parameters);
+        return $this->router->generate($this->routeName, $parameters);
     }
 
     /**
@@ -559,9 +541,6 @@ public function init(): void
             'queryBuilder',
             'routeName',
         ];
-        if (!empty($this->defaultFormSearcherData)) {
-            $check_values[] = 'searchRouteName';
-        }
         foreach ($check_values as $value) {
             if (empty($this->$value)) {
                 throw new \Exception('Config Crud: Option '.$value.' is required');
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
new file mode 100644
index 0000000..e86510e
--- /dev/null
+++ b/src/Crud/CrudResponseGenerator.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud;
+
+use Psr\Container\ContainerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
+use Twig\Environment;
+
+class CrudResponseGenerator implements ServiceSubscriberInterface
+{
+    protected $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    public function getResponse(Crud $crud, array $options = []): Response
+    {
+        $options = $this->getOptions($options);
+        $data = $this->processCrud($crud, $options);
+
+        return $this->renderCrud($this->getTemplateName($options['template_generator'], 'index'), $data);
+    }
+
+    public function getAjaxResponse(Crud $crud, array $options = []): Response
+    {
+        $masterRequest = $this->container->get('request_stack')->getMasterRequest();
+        if (!$masterRequest->isXmlHttpRequest()) {
+            throw new NotFoundHttpException('Ajax is required');
+        }
+
+        $options = $this->getOptions($options);
+        $data = $this->processCrud($crud, $options);
+
+        $request = $this->container->get('request_stack')->getCurrentRequest();
+        if ($request->query->has('search')) {
+            $renderSearch = $this->renderCrudView($this->getTemplateName($options['template_generator'], 'search'), $data);
+            $renderList = $this->renderCrudView($this->getTemplateName($options['template_generator'], 'list'), $data);
+
+            return $this->renderCrud(
+                '@EcommitCrud/Crud/double_search.html.twig',
+                [
+                    'id_search' => $crud->getDivIdSearch(),
+                    'id_list' => $crud->getDivIdList(),
+                    'render_search' => $renderSearch,
+                    'render_list' => $renderList,
+                ]
+            );
+        }
+
+        return $this->renderCrud($this->getTemplateName($options['template_generator'], 'list'), $data);
+    }
+
+    protected function processCrud(Crud $crud, array $options): array
+    {
+        $data = [
+            'crud' => $crud,
+        ];
+
+        $request = $this->container->get('request_stack')->getCurrentRequest();
+
+        if ($request->query->has('search')) {
+            $crud->processForm();
+        }
+
+        if (null !== $options['before_build_query']) {
+            $data = $options['before_build_query']($crud, $data);
+        }
+
+        $crud->buildQuery();
+
+        if (null !== $options['after_build_query']) {
+            $data = $options['after_build_query']($crud, $data);
+        }
+
+        $crud->clearTemplate();
+
+        return $data;
+    }
+
+    protected function getOptions(array $options): array
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'before_build_query' => null,
+            'after_build_query' => null,
+        ]);
+        $resolver->setRequired([
+            'template_generator',
+        ]);
+        $resolver->setAllowedTypes('template_generator', 'callable');
+        $resolver->setAllowedTypes('before_build_query', ['null', 'callable']);
+        $resolver->setAllowedTypes('after_build_query', ['null', 'callable']);
+
+        return $resolver->resolve($options);
+    }
+
+    protected function getTemplateName(callable $templateGenerator, string $action): string
+    {
+        return $templateGenerator($action);
+    }
+
+    protected function renderCrudView(string $view, array $parameters = []): string
+    {
+        return $this->container->get('twig')->render($view, $parameters);
+    }
+
+    protected function renderCrud(string $view, array $parameters = [], Response $response = null): Response
+    {
+        $content = $this->container->get('twig')->render($view, $parameters);
+
+        if (null === $response) {
+            $response = new Response();
+        }
+
+        $response->setContent($content);
+
+        return $response;
+    }
+
+    public static function getSubscribedServices(): array
+    {
+        return [
+            'twig' => Environment::class,
+            'request_stack' => RequestStack::class,
+        ];
+    }
+}
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 99b4ad7..1fc8e73 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -12,6 +12,11 @@
         </service>
         <service id="ecommit_crud.factory" alias="Ecommit\CrudBundle\Crud\CrudFactory" public="true" />
 
+        <service id="Ecommit\CrudBundle\Crud\CrudResponseGenerator" class="Ecommit\CrudBundle\Crud\CrudResponseGenerator" public="true">
+            <tag name="container.service_subscriber" />
+        </service>
+        <service id="ecommit_crud.response_generatror" alias="Ecommit\CrudBundle\Crud\CrudResponseGenerator" public="true" />
+
         <service id="Ecommit\CrudBundle\Helper\CrudHelper" class="Ecommit\CrudBundle\Helper\CrudHelper" public="true">
             <argument type="service" id="Ecommit\UtilBundle\Helper\UtilHelper"/>
             <argument type="service" id="Ecommit\JavascriptBundle\Helper\JqueryHelper"/>
diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index 67c9f5f..8869537 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -20,7 +20,7 @@
 
 class UserController extends AbstractCrudController
 {
-    protected function configCrud()
+    protected function getCrud(): Crud
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -36,31 +36,25 @@ protected function configCrud()
             ->setAvailableResultsPerPage([5, 5, 10, 50], 5)
             ->setDefaultSort('firstName', Crud::ASC)
             ->createSearcherForm(new UserSearcher())
-            ->setRoute('user_ajax_list')
-            ->setSearchRoute('user_ajax_search')
+            ->setRoute('user_ajax_crud')
             ->setPersistentSettings(true)
             ->init();
 
         return $crud;
     }
 
-    protected function getTemplateName($action)
+    protected function getTemplateName(string $action): string
     {
         return sprintf('user/%s.html.twig', $action);
     }
 
-    public function listAction()
+    public function crudAction()
     {
-        return $this->autoListAction();
+        return $this->getCrudResponse();
     }
 
-    public function ajaxListAction()
+    public function ajaxCrudAction()
     {
-        return $this->autoAjaxListAction();
-    }
-
-    public function ajaxSearchAction()
-    {
-        return $this->autoAjaxSearchAction();
+        return $this->getAjaxCrudResponse();
     }
 }
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
new file mode 100644
index 0000000..b639cf4
--- /dev/null
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -0,0 +1,109 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\App\Controller;
+
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudFactory;
+use Ecommit\CrudBundle\Crud\CrudResponseGenerator;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
+use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\UserSearcher;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+
+class UserWithoutTraitController extends AbstractController
+{
+    protected function getCrud(string $sessionName, array $routeParams = []): Crud
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $queryBuilder = $em->getRepository(TestUser::class)
+            ->createQueryBuilder('u')
+            ->select('u');
+
+        $crud = $this->get(CrudFactory::class)->create($sessionName);
+        $crud->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
+            ->addColumn('firstName', 'u.firstName', 'first_name')
+            ->addColumn('lastName', 'u.lastName', 'last_name')
+            ->setQueryBuilder($queryBuilder)
+            ->setAvailableResultsPerPage([5, 5, 10, 50], 5)
+            ->setDefaultSort('firstName', Crud::ASC)
+            ->createSearcherForm(new UserSearcher())
+            ->setRoute('user_without_trait_ajax_crud', $routeParams)
+            ->setPersistentSettings(true)
+            ->init();
+
+        return $crud;
+    }
+
+    public function crudAction(Request $request, CrudResponseGenerator $crudResponseGenerator)
+    {
+        if ($request->query->has('test-before-and-after-build-query')) {
+            return $crudResponseGenerator->getResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
+                'template_generator' => function (string $action) {
+                    return sprintf('user/%s.html.twig', $action);
+                },
+                'before_build_query' => function (Crud $crud, array $data) {
+                    $data['test_before_after_build_query'] = 'BEFORE';
+
+                    return $data;
+                },
+                'after_build_query' => function (Crud $crud, array $data) {
+                    $data['test_before_after_build_query'] = $data['test_before_after_build_query'].' AFTER';
+
+                    return $data;
+                },
+            ]);
+        }
+
+        return $crudResponseGenerator->getResponse($this->getCrud('user_without_trait'), [
+            'template_generator' => function (string $action) {
+                return sprintf('user/%s.html.twig', $action);
+            },
+        ]);
+    }
+
+    public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResponseGenerator)
+    {
+        if ($request->query->has('test-before-and-after-build-query')) {
+            return $crudResponseGenerator->getAjaxResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
+                'template_generator' => function (string $action) {
+                    return sprintf('user/%s.html.twig', $action);
+                },
+                'before_build_query' => function (Crud $crud, array $data) {
+                    $data['test_before_after_build_query'] = 'BEFORE';
+
+                    return $data;
+                },
+                'after_build_query' => function (Crud $crud, array $data) {
+                    $data['test_before_after_build_query'] = $data['test_before_after_build_query'].' AFTER';
+
+                    return $data;
+                },
+            ]);
+        }
+
+        return $crudResponseGenerator->getAjaxResponse($this->getCrud('user_without_trait'), [
+            'template_generator' => function (string $action) {
+                return sprintf('user/%s.html.twig', $action);
+            },
+        ]);
+    }
+
+    public static function getSubscribedServices()
+    {
+        return array_merge(parent::getSubscribedServices(), [
+            CrudFactory::class,
+        ]);
+    }
+}
diff --git a/tests/Functional/App/config/routes.yaml b/tests/Functional/App/config/routes.yaml
index 5d12674..7a9b6ad 100644
--- a/tests/Functional/App/config/routes.yaml
+++ b/tests/Functional/App/config/routes.yaml
@@ -1,11 +1,15 @@
-user_list:
+user_crud:
     path: /user
-    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserController::listAction
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserController::crudAction
 
-user_ajax_list:
-    path: /user/ajax-list
-    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserController::ajaxListAction
+user_ajax_crud:
+    path: /user/ajax-crud
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserController::ajaxCrudAction
 
-user_ajax_search:
-    path: /user/ajax-search
-    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserController::ajaxSearchAction
+user_without_trait_crud:
+    path: /user-without-trait
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserWithoutTraitController::crudAction
+
+user_without_trait_ajax_crud:
+    path: /user-without-trait/ajax-crud
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserWithoutTraitController::ajaxCrudAction
diff --git a/tests/Functional/App/templates/user/list.html.twig b/tests/Functional/App/templates/user/list.html.twig
index bc94ab9..0a96682 100644
--- a/tests/Functional/App/templates/user/list.html.twig
+++ b/tests/Functional/App/templates/user/list.html.twig
@@ -19,6 +19,8 @@
     </table>
 </div>
 
+{% if test_before_after_build_query is defined %}<div>TEST BEFORE AFTER BUILD QUERY {{ test_before_after_build_query }}</div>{% endif %}
+
 <div class="info-pagination">
     {% trans with {'%first%': crud.paginator.firstIndice, '%last%' : crud.paginator.lastIndice} %}Results %first%-%last%{% endtrans %}  -
     {% trans with {'%page%': crud.paginator.page, '%lastPage%' : crud.paginator.lastPage} %}Page %page%/%lastPage%{% endtrans %}
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index b8d8f37..3d17e73 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -20,6 +20,10 @@
 
 class TestCrudControllerTest extends PantherTestCase
 {
+    public const URL = '/user/';
+    public const SESSION_NAME = 'user';
+    public const SEARCH_IN_LIST = null;
+
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
@@ -30,12 +34,13 @@ public static function setUpBeforeClass(): void
     public function testList(): Client
     {
         $client = static::createPantherClient();
-        $client->request('GET', '/user/');
+        $client->request('GET', static::URL);
 
         $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
         $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -53,6 +58,7 @@ public function testChangeSortSense(Client $client): Client
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['first_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('YvonEmbavé', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -70,6 +76,7 @@ public function testChangeSortColumn(Client $client): Client
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -82,14 +89,15 @@ public function testChangeDisplayedColumns(Client $client): Client
         $button = $client->getCrawler()->filterXPath('//button[contains(.,"Display Settings")]');
         $button->first()->click();
 
-        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::input[@value="username"]')->click();
-        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::button[@type="submit"]')->click();
+        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::input[@value="username"]')->click();
+        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[@type="submit"]')->click();
         $this->waitForAjax($client);
 
         $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -102,8 +110,8 @@ public function testChangePerPage(Client $client): Client
         $button = $client->getCrawler()->filterXPath('//button[contains(., "Display Settings")]');
         $button->first()->click();
 
-        $form = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::button[@type="submit"]')->form();
-        $form['crud_display_settings_user[resultsPerPage]'] = 10;
+        $form = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[@type="submit"]')->form();
+        $form['crud_display_settings_'.static::SESSION_NAME.'[resultsPerPage]'] = 10;
         $client->submit($form);
         $this->waitForAjax($client);
 
@@ -111,6 +119,7 @@ public function testChangePerPage(Client $client): Client
         $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -120,12 +129,13 @@ public function testChangePerPage(Client $client): Client
      */
     public function testPersistentValuesAfterChangeSortAndSettings(Client $client): Client
     {
-        $client->request('GET', '/user/');
+        $client->request('GET', static::URL);
 
         $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -143,6 +153,7 @@ public function testChangePage(Client $client): Client
         $this->assertSame([2, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('JudieCieux', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -152,12 +163,13 @@ public function testChangePage(Client $client): Client
      */
     public function testPersistentValuesAfterChangePage(Client $client): Client
     {
-        $client->request('GET', '/user/');
+        $client->request('GET', static::URL);
 
         $this->assertSame([1, 3], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame([2, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('JudieCieux', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -168,7 +180,7 @@ public function testPersistentValuesAfterChangePage(Client $client): Client
     public function testSearch(Client $client): Client
     {
         $form = $client->getCrawler()->filterXPath('//div[@id="crud_search"]/descendant::button[@type="submit" and contains(text(), "Search")]')->form();
-        $form['crud_search_user[firstName]'] = 'Henri';
+        $form['crud_search_'.static::SESSION_NAME.'[firstName]'] = 'Henri';
         $client->submit($form);
         $this->waitForAjax($client);
 
@@ -176,6 +188,7 @@ public function testSearch(Client $client): Client
         $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('HenriPoste', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -185,12 +198,13 @@ public function testSearch(Client $client): Client
      */
     public function testPersistentValuesAfterSearch(Client $client): Client
     {
-        $client->request('GET', '/user/');
+        $client->request('GET', static::URL);
 
         $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('HenriPoste', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -208,6 +222,7 @@ public function testResetSearch(Client $client): Client
         $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -217,12 +232,13 @@ public function testResetSearch(Client $client): Client
      */
     public function testPersistentValuesAfterResetSearch(Client $client): Client
     {
-        $client->request('GET', '/user/');
+        $client->request('GET', static::URL);
 
         $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -235,7 +251,7 @@ public function testResetSettings(Client $client): Client
         $button = $client->getCrawler()->filterXPath('//button[contains(., "Display Settings")]');
         $button->first()->click();
 
-        $button = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_user"]/descendant::button[contains(., "Reset display settings")]');
+        $button = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[contains(., "Reset display settings")]');
         $button->first()->click();
         $this->waitForAjax($client);
 
@@ -243,6 +259,7 @@ public function testResetSettings(Client $client): Client
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
         $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
@@ -252,16 +269,28 @@ public function testResetSettings(Client $client): Client
      */
     public function testPersistentValuesAfterResetSettings(Client $client): Client
     {
-        $client->request('GET', '/user/');
+        $client->request('GET', static::URL);
 
         $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
         $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
 
         return $client;
     }
 
+    protected function checkBeforeAndAfterBuildQuery(Crawler $crawler): void
+    {
+        if (null === static::SEARCH_IN_LIST) {
+            $this->assertCount(0, $crawler->filterXPath('//div[contains(text(), "TEST BEFORE AFTER BUILD QUERY")]'));
+
+            return;
+        }
+
+        $this->assertCount(1, $crawler->filterXPath('//div[contains(text(), "TEST BEFORE AFTER BUILD QUERY '.static::SEARCH_IN_LIST.'")]'));
+    }
+
     protected function countRowsAndColumns(Crawler $crawler): array
     {
         $rows = $crawler->filterXPath('//table[@class="result"]/tbody/tr');
diff --git a/tests/Functional/Controller/TestCrudControllerWithoutTraitTest.php b/tests/Functional/Controller/TestCrudControllerWithoutTraitTest.php
new file mode 100644
index 0000000..e02fc36
--- /dev/null
+++ b/tests/Functional/Controller/TestCrudControllerWithoutTraitTest.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\Controller;
+
+class TestCrudControllerWithoutTraitTest extends TestCrudControllerTest
+{
+    public const URL = '/user-without-trait/';
+    public const SESSION_NAME = 'user_without_trait';
+}
diff --git a/tests/Functional/Controller/TestCrudControllerWithoutTraitWithDataTest.php b/tests/Functional/Controller/TestCrudControllerWithoutTraitWithDataTest.php
new file mode 100644
index 0000000..336cde3
--- /dev/null
+++ b/tests/Functional/Controller/TestCrudControllerWithoutTraitWithDataTest.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\Controller;
+
+class TestCrudControllerWithoutTraitWithDataTest extends TestCrudControllerTest
+{
+    public const URL = '/user-without-trait?test-before-and-after-build-query=1';
+    public const SESSION_NAME = 'user_without_trait_with_data';
+    public const SEARCH_IN_LIST = 'BEFORE AFTER';
+}
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 6c67a87..a38bec2 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -161,7 +161,7 @@ public function testPaginatorLinksWithNoResult(): void
         $paginator->setData([]);
         $paginator->init();
 
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list');
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud');
 
         $this->assertEmpty($result);
     }
@@ -172,7 +172,7 @@ public function testPaginatorLinksWithOnePage(): void
         $paginator->setData(['val']);
         $paginator->init();
 
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list');
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud');
 
         $this->assertEmpty($result);
     }
@@ -187,7 +187,7 @@ public function testPaginatorWithDefaultOptions(int $page, string $expected): vo
         $paginator->setPage($page);
         $paginator->init();
 
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list');
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud');
 
         $this->assertSame($expected, $result);
     }
@@ -213,7 +213,7 @@ public function testPaginatorWithMaxPagesOptions(int $page, string $expected): v
         $paginator->setPage($page);
         $paginator->init();
 
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'max_pages_before' => 4,
             'max_pages_after' => 2,
         ]);
@@ -242,7 +242,7 @@ public function testPaginatorWithTypeOption(int $page, string $type, string $exp
         $paginator->setPage($page);
         $paginator->init();
 
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'type' => $type,
         ]);
 
@@ -284,7 +284,7 @@ public function testPaginatorWithEmptyArrayAjaxOption(): void
         $paginator->init();
 
         $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto">»</a></li></ul></nav>';
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'ajax_options' => [],
             'max_pages_before' => 1,
             'max_pages_after' => 1,
@@ -301,7 +301,7 @@ public function testPaginatorWithAjaxOption(): void
         $paginator->init();
 
         $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'ajax_options' => [
                 'update' => '#myId',
             ],
@@ -320,7 +320,7 @@ public function testPaginatorWithAttributePageOption(): void
         $paginator->init();
 
         $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?p=1">1</a></li><li><a href="/user?p=2">2</a></li><li class="next"><a href="/user?p=2">›</a></li><li class="last"><a href="/user?p=20">»</a></li></ul></nav>';
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'attribute_page' => 'p',
             'max_pages_before' => 1,
             'max_pages_after' => 1,
@@ -337,7 +337,7 @@ public function testPaginatorWithAttrOptions(): void
         $paginator->init();
 
         $expected = '<nav class="navattr" data-nav="val"><ul class="ulattr ec-crud-pagination" data-ul="val"><li class="lifirstpageattr first" data-li-first="val"><a href="/user?page=1" class="afirstpageattr" data-a-first="val">«</a></li><li class="lipreviouspageattr previous"><a href="/user?page=9" class="apreviouspageattr">‹</a></li><li class="liotherpageattr"><a href="/user?page=9" class="aotherpageattr">9</a></li><li class="liccurentpageattr current"><a href="/user?page=10" class="accurentpageattr">10</a></li><li class="liotherpageattr"><a href="/user?page=11" class="aotherpageattr">11</a></li><li class="linextpageattr next"><a href="/user?page=11" class="anextpageattr">›</a></li><li class="lilastpageattr last"><a href="/user?page=20" class="alastpageattr">»</a></li></ul></nav>';
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'nav_attr' => ['class' => 'navattr', 'data-nav' => 'val'],
             'ul_attr' => ['class' => 'ulattr', 'data-ul' => 'val'],
             'li_attr' => [
@@ -370,7 +370,7 @@ public function testPaginatorWithRenderOption(): void
         $paginator->setPage(1);
         $paginator->init();
 
-        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'render' => 'render.html.twig',
         ]);
 
@@ -385,7 +385,7 @@ public function testPaginatorWithBadOptions(): void
         $paginator->setPage(1);
         $paginator->init();
 
-        $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_list', [], [
+        $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'bad_option' => 'bad',
         ]);
     }
@@ -403,7 +403,7 @@ public function testCrudPaginatorLinks(): void
             ->getMock();
         $crud->expects($this->once())->method('getDivIdList')->willReturn('myId');
         $crud->expects($this->once())->method('getPaginator')->willReturn($paginator);
-        $crud->expects($this->once())->method('getRouteName')->willReturn('user_list');
+        $crud->expects($this->once())->method('getRouteName')->willReturn('user_crud');
         $crud->expects($this->once())->method('getRouteParams')->willReturn([]);
 
         $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
@@ -695,7 +695,7 @@ protected function createCrud(string $sort = 'column1', string $sense = Crud::AS
             ->onlyMethods(['getDivIdList', 'getRouteName', 'getRouteParams', 'getSessionValues', 'getColumn'])
             ->getMock();
         $crud->expects($this->any())->method('getDivIdList')->willReturn('myId');
-        $crud->expects($this->any())->method('getRouteName')->willReturn('user_list');
+        $crud->expects($this->any())->method('getRouteName')->willReturn('user_crud');
         $crud->expects($this->any())->method('getRouteParams')->willReturn([]);
         $crud->expects($this->any())->method('getSessionValues')->willReturn($crudSession);
         $crud->expects($this->any())->method('getColumn')->willReturnCallback(function ($columnId) use ($columns) {

From 3d416469b9d63c91cb69e84813a9989e25b67127 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 15 Feb 2021 21:02:34 +0100
Subject: [PATCH 039/264] Remove config.sample.yml

---
 src/Resources/doc/config.sample.yml | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 src/Resources/doc/config.sample.yml

diff --git a/src/Resources/doc/config.sample.yml b/src/Resources/doc/config.sample.yml
deleted file mode 100644
index c6801d5..0000000
--- a/src/Resources/doc/config.sample.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-ecommit_crud:
-  images:
-    #Images used in th method
-    th_image_up: "/bundles/ecommitcrud/images/i16/sort_incr.png"
-    th_image_down: "/bundles/ecommitcrud/images/i16/sort_decrease.png"

From 2f5da1d5ac92a48f0ec050e11fad24c8109dd8a9 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 16 Feb 2021 19:16:08 +0100
Subject: [PATCH 040/264] New version of forms

* Add Crud::createDisplaySettingsForm and Crud::getDisplaySettingsForm methods
* Remove EcommitCrud/Crud/double_search.html.twig template
* Remove EcommitCrud/Crud/form_settings_* templates
* DisplaySettingsType: Add validation
* DisplaySettingsType: Add reset and save fields
* DisplaySettingsType: New required options: results_per_page_choices, columns_choices and reset_settings_url
* Remove CrudHelper::getFormDisplaySettings, CrudHelper::searchFormTag and CrudHelper::searchResetButton methods
* Remove some "messages" translations
* crud_search_form twig function is replaced by crud_search_form_start
* crud_search_reset twig function is replaced by crud_search_form_reset
* New signature of crud_display_settings twig function
* Add new twig function crud_search_form_submit
---
 src/Crud/Crud.php                             |  58 ++++-
 src/Crud/CrudResponseGenerator.php            |  22 +-
 src/Form/Type/DisplaySettingsType.php         |  74 +++---
 src/Helper/CrudHelper.php                     | 119 ----------
 src/Resources/config/services.xml             |   1 -
 src/Resources/public/js/crud.js               | 118 +++++++++-
 .../translations/EcommitCrudBundle.en.yml     |  12 +
 .../translations/EcommitCrudBundle.fr.yml     |  12 +
 src/Resources/translations/messages.en.yml    |  10 -
 src/Resources/translations/messages.fr.yml    |  10 -
 .../views/Crud/double_search.html.twig        |   6 -
 .../views/Crud/form_settings_modal.html.twig  |  70 ------
 .../form_settings_modal_bootstrap.html.twig   |  77 -------
 .../Crud/form_settings_nomodal.html.twig      |  65 ------
 .../form_settings_nomodal_bootstrap.html.twig |  68 ------
 src/Resources/views/IconTheme/base.html.twig  |   6 +
 .../views/IconTheme/fontawesome4.html.twig    |  18 ++
 src/Resources/views/Theme/base.html.twig      |  99 ++++++++
 .../views/Theme/bootstrap3.html.twig          |  88 +++++++
 src/Twig/CrudExtension.php                    | 216 ++++++++++++------
 .../App/templates/user/list.html.twig         |  12 +-
 .../App/templates/user/search.html.twig       |   8 +-
 .../Controller/TestCrudControllerTest.php     |   2 +
 23 files changed, 613 insertions(+), 558 deletions(-)
 create mode 100644 src/Resources/translations/EcommitCrudBundle.en.yml
 create mode 100644 src/Resources/translations/EcommitCrudBundle.fr.yml
 delete mode 100644 src/Resources/views/Crud/double_search.html.twig
 delete mode 100644 src/Resources/views/Crud/form_settings_modal.html.twig
 delete mode 100644 src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig
 delete mode 100644 src/Resources/views/Crud/form_settings_nomodal.html.twig
 delete mode 100644 src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 7e3f91a..cb6aaac 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -17,6 +17,7 @@
 use Ecommit\CrudBundle\DoctrineExtension\Paginate;
 use Ecommit\CrudBundle\Entity\UserCrudSettings;
 use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
+use Ecommit\CrudBundle\Form\Type\DisplaySettingsType;
 use Ecommit\CrudBundle\Form\Type\FormSearchType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -43,6 +44,11 @@ class Crud
      */
     protected $formSearcher = null;
 
+    /**
+     * @var Form
+     */
+    protected $formDisplaySettings = null;
+
     protected $availableColumns = [];
     protected $availableVirtualColumns = [];
     protected $availableResultsPerPage = [];
@@ -562,6 +568,8 @@ public function init(): void
             $this->displayResults = $this->sessionValues->formSearcherData->isSubmitted;
         }
 
+        $this->createDisplaySettingsForm();
+
         //Process request (resultsPerPage, sort, sense, change_columns)
         $this->processRequest();
 
@@ -766,15 +774,12 @@ protected function processRequest(): void
 
             return;
         }
-        $displaySettingsFormName = sprintf('crud_display_settings_%s', $this->sessionName);
-        if ($this->request->request->has($displaySettingsFormName)) {
-            $displaySettings = $this->request->request->get($displaySettingsFormName);
-            if (\is_array($displaySettings) && isset($displaySettings['displayedColumns'])) {
-                $this->changeColumnsDisplayed($displaySettings['displayedColumns']);
-            }
-            if (\is_array($displaySettings) && isset($displaySettings['resultsPerPage'])) {
-                $this->changeNumberResultsDisplayed($displaySettings['resultsPerPage']);
-            }
+
+        $this->formDisplaySettings->handleRequest($this->request);
+        if ($this->formDisplaySettings->isSubmitted() && $this->formDisplaySettings->isValid()) {
+            $displaySettingsData = $this->formDisplaySettings->getData();
+            $this->changeColumnsDisplayed($displaySettingsData['displayedColumns']);
+            $this->changeNumberResultsDisplayed($displaySettingsData['resultsPerPage']);
         }
         if ($this->request->query->has('sort')) {
             $this->changeSort($this->request->query->get('sort'));
@@ -787,6 +792,30 @@ protected function processRequest(): void
         }
     }
 
+    public function createDisplaySettingsForm(): void
+    {
+        $resultsPerPageChoices = [];
+        foreach ($this->getAvailableResultsPerPage() as $number) {
+            $resultsPerPageChoices[$number] = $number;
+        }
+        $columnsChoices = [];
+        foreach ($this->getColumns() as $column) {
+            $columnsChoices[$column->id] = $column->label;
+        }
+        $data = [
+            'resultsPerPage' => $this->getSessionValues()->resultsPerPage,
+            'displayedColumns' => $this->getSessionValues()->displayedColumns,
+        ];
+        $formName = sprintf('crud_display_settings_%s', $this->getSessionName());
+
+        $this->formDisplaySettings = $this->formFactory->createNamed($formName, DisplaySettingsType::class, $data, [
+            'results_per_page_choices' => $resultsPerPageChoices,
+            'columns_choices' => $columnsChoices,
+            'action' => $this->getUrl(['display-settings' => 1]),
+            'reset_settings_url' => $this->getUrl(['razsettings' => 1]),
+        ]);
+    }
+
     /**
      * Reset display settings.
      */
@@ -957,6 +986,7 @@ public function clearTemplate(): void
         } else {
             $this->formSearcher = $this->formSearcher->createView();
         }
+        $this->formDisplaySettings = $this->formDisplaySettings->createView();
         $this->defaultFormSearcherData = null;
     }
 
@@ -1025,6 +1055,16 @@ public function getSearcherForm()
         return $this->formSearcher;
     }
 
+    /**
+     * Returns the search form.
+     *
+     * @return Form (before clearTemplate) or FormView (after clearTemplate)
+     */
+    public function getDisplaySettingsForm()
+    {
+        return $this->formDisplaySettings;
+    }
+
     /**
      * Returns the div id search.
      *
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index e86510e..aba1d7e 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -14,6 +14,7 @@
 namespace Ecommit\CrudBundle\Crud;
 
 use Psr\Container\ContainerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -50,18 +51,15 @@ public function getAjaxResponse(Crud $crud, array $options = []): Response
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('search')) {
-            $renderSearch = $this->renderCrudView($this->getTemplateName($options['template_generator'], 'search'), $data);
-            $renderList = $this->renderCrudView($this->getTemplateName($options['template_generator'], 'list'), $data);
-
-            return $this->renderCrud(
-                '@EcommitCrud/Crud/double_search.html.twig',
-                [
-                    'id_search' => $crud->getDivIdSearch(),
-                    'id_list' => $crud->getDivIdList(),
-                    'render_search' => $renderSearch,
-                    'render_list' => $renderList,
-                ]
-            );
+            return new JsonResponse([
+                'render_search' => $this->renderCrudView($this->getTemplateName($options['template_generator'], 'search'), $data),
+                'render_list' => $this->renderCrudView($this->getTemplateName($options['template_generator'], 'list'), $data),
+            ]);
+        } elseif ($request->query->has('display-settings')) {
+            return new JsonResponse([
+                'render_list' => $this->renderCrudView($this->getTemplateName($options['template_generator'], 'list'), $data),
+                'form_is_valid' => $crud->getDisplaySettingsForm()->vars['valid'],
+            ]);
         }
 
         return $this->renderCrud($this->getTemplateName($options['template_generator'], 'list'), $data);
diff --git a/src/Form/Type/DisplaySettingsType.php b/src/Form/Type/DisplaySettingsType.php
index 4ba8a70..d9a55a6 100644
--- a/src/Form/Type/DisplaySettingsType.php
+++ b/src/Form/Type/DisplaySettingsType.php
@@ -14,9 +14,13 @@
 namespace Ecommit\CrudBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ButtonType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Count;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 class DisplaySettingsType extends AbstractType
 {
@@ -25,28 +29,37 @@ class DisplaySettingsType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        //Field "resultsPerPage"
-        $builder->add(
-            'resultsPerPage',
-            ChoiceType::class,
-            [
-                'choices' => array_flip($options['resultsPerPageChoices']),
-                'label' => 'Number of results per page',
-                'choice_translation_domain' => false,
-            ]
-        );
+        $builder->add('resultsPerPage', ChoiceType::class, [
+            'choices' => array_flip($options['results_per_page_choices']),
+            'label' => 'display_settings.results_per_page',
+            'translation_domain' => 'EcommitCrudBundle',
+            'choice_translation_domain' => false,
+            'constraints' => new NotBlank(),
+        ]);
 
-        //Field "displayedColumns"
-        $builder->add(
-            'displayedColumns',
-            ChoiceType::class,
-            [
-                'choices' => array_flip($options['columnsChoices']),
-                'multiple' => true,
-                'expanded' => true,
-                'label' => 'Columns to be shown',
-            ]
-        );
+        $builder->add('displayedColumns', ChoiceType::class, [
+            'choices' => array_flip($options['columns_choices']),
+            'multiple' => true,
+            'expanded' => true,
+            'label' => 'display_settings.displayed_columns',
+            'translation_domain' => 'EcommitCrudBundle',
+            'choice_translation_domain' => 'messages',
+            'constraints' => [new NotBlank(), new Count(['min' => 1])],
+        ]);
+
+        $builder->add('reset', ButtonType::class, [
+            'label' => 'display_settings.reset_display_settings',
+            'translation_domain' => 'EcommitCrudBundle',
+            'attr' => [
+                'class' => 'ec-crud-display-settings-raz',
+                'data-reset-url' => $options['reset_settings_url'],
+            ],
+        ]);
+
+        $builder->add('save', SubmitType::class, [
+            'label' => 'display_settings.save',
+            'translation_domain' => 'EcommitCrudBundle',
+        ]);
     }
 
     /**
@@ -54,18 +67,15 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
      */
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(
-            [
-                'csrf_protection' => false,
-            ]
-        );
+        $resolver->setDefaults([
+            'csrf_protection' => false,
+        ]);
 
-        $resolver->setRequired(
-            [
-                'resultsPerPageChoices',
-                'columnsChoices',
-            ]
-        );
+        $resolver->setRequired([
+            'results_per_page_choices',
+            'columns_choices',
+            'reset_settings_url',
+        ]);
     }
 
     /**
diff --git a/src/Helper/CrudHelper.php b/src/Helper/CrudHelper.php
index 4723620..1e12c41 100644
--- a/src/Helper/CrudHelper.php
+++ b/src/Helper/CrudHelper.php
@@ -13,12 +13,9 @@
 
 namespace Ecommit\CrudBundle\Helper;
 
-use Ecommit\CrudBundle\Crud\Crud;
-use Ecommit\CrudBundle\Form\Type\DisplaySettingsType;
 use Ecommit\JavascriptBundle\Helper\JqueryHelper;
 use Ecommit\JavascriptBundle\Overlay\AbstractOverlay;
 use Ecommit\UtilBundle\Helper\UtilHelper;
-use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -36,11 +33,6 @@ class CrudHelper
      */
     protected $javascriptManager;
 
-    /**
-     * @var FormFactoryInterface
-     */
-    protected $formFactory;
-
     /**
      * @var RouterInterface
      */
@@ -80,7 +72,6 @@ class CrudHelper
     public function __construct(
         UtilHelper $util,
         JqueryHelper $javascriptManager,
-        FormFactoryInterface $formFactory,
         RouterInterface $router,
         TranslatorInterface $translator,
         Twig_Environment $templating,
@@ -89,7 +80,6 @@ public function __construct(
     ) {
         $this->util = $util;
         $this->javascriptManager = $javascriptManager;
-        $this->formFactory = $formFactory;
         $this->router = $router;
         $this->translator = $translator;
         $this->templating = $templating;
@@ -114,115 +104,6 @@ public function getOverlayService()
         return $this->overlay;
     }
 
-    /**
-     * Returns "Display Settings" form.
-     *
-     * @return FormView
-     */
-    public function getFormDisplaySettings(Crud $crud)
-    {
-        $form_name = sprintf('crud_display_settings_%s', $crud->getSessionName());
-        $resultsPerPageChoices = [];
-        foreach ($crud->getAvailableResultsPerPage() as $number) {
-            $resultsPerPageChoices[$number] = $number;
-        }
-        $columnsChoices = [];
-        foreach ($crud->getColumns() as $column) {
-            $columnsChoices[$column->id] = $column->label;
-        }
-        $data = [
-            'resultsPerPage' => $crud->getSessionValues()->resultsPerPage,
-            'displayedColumns' => $crud->getSessionValues()->displayedColumns,
-        ];
-
-        $form = $this->formFactory->createNamed(
-            $form_name,
-            DisplaySettingsType::class,
-            $data,
-            [
-                'resultsPerPageChoices' => $resultsPerPageChoices,
-                'columnsChoices' => $columnsChoices,
-                'action' => $crud->getUrl(),
-            ]
-        );
-
-        return $form->createView();
-    }
-
-    /**
-     * Returns search form tag.
-     *
-     * @param array $ajaxOptions Ajax Options
-     * @param type  $htmlOptions Html options
-     *
-     * @return string
-     */
-    public function searchFormTag(Crud $crud, $ajaxOptions, $htmlOptions)
-    {
-        if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = 'js_holder_for_multi_update_'.$crud->getSessionName();
-        }
-
-        if (!isset($htmlOptions['novalidate'])) {
-            $htmlOptions['novalidate'] = 'novalidate';
-        }
-
-        return $this->javascriptManager->jQueryFormToRemote($crud->getSearcherForm(), $ajaxOptions, $htmlOptions);
-    }
-
-    /**
-     * Returns search reset button.
-     *
-     * @param array $options     Options :
-     *                           * label: Label. Défault: Reset
-     *                           * template: Template used. If null, default template is used
-     * @param array $ajaxOptions Ajax options
-     * @param array $htmlOptions Html options
-     *
-     * @return string
-     */
-    public function searchResetButton(Crud $crud, $options, $ajaxOptions, $htmlOptions)
-    {
-        $resolver = new OptionsResolver();
-        $resolver->setDefaults(
-            [
-                'label' => 'Reset',
-                'template' => null,
-            ]
-        );
-        $options = $resolver->resolve($options);
-
-        if ($options['template']) {
-            return $this->templating->render(
-                $options['template'],
-                [
-                    'crud' => $crud,
-                    'options' => $options,
-                    'ajax_options' => $ajaxOptions,
-                    'html_options' => $htmlOptions,
-                ]
-            );
-        }
-
-        if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = 'js_holder_for_multi_update_'.$crud->getSessionName();
-        }
-        if (!isset($htmlOptions['class'])) {
-            $htmlOptions['class'] = ($this->useBootstrap) ? 'raz-bootstrap btn btn-default btn-sm' : 'raz';
-        }
-        $label = $this->translator->trans($options['label']);
-        if ($this->useBootstrap) {
-            $label = '<span class="glyphicon glyphicon-fire"></span> '.$label;
-        }
-
-        return $this->javascriptManager->jQueryButtonToRemote(
-            $label,
-            $crud->getSearchUrl(['raz' => 1]),
-            $ajaxOptions,
-            $htmlOptions
-        );
-    }
-
     /**
      * Returns declaration of modal.
      *
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 1fc8e73..9f30a53 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -20,7 +20,6 @@
         <service id="Ecommit\CrudBundle\Helper\CrudHelper" class="Ecommit\CrudBundle\Helper\CrudHelper" public="true">
             <argument type="service" id="Ecommit\UtilBundle\Helper\UtilHelper"/>
             <argument type="service" id="Ecommit\JavascriptBundle\Helper\JqueryHelper"/>
-            <argument type="service" id="Symfony\Component\Form\FormFactoryInterface"/>
             <argument type="service" id="Symfony\Component\Routing\RouterInterface"/>
             <argument type="service" id="Symfony\Contracts\Translation\TranslatorInterface"/>
             <argument type="service" id="Twig\Environment"/>
diff --git a/src/Resources/public/js/crud.js b/src/Resources/public/js/crud.js
index e74a215..aca584a 100644
--- a/src/Resources/public/js/crud.js
+++ b/src/Resources/public/js/crud.js
@@ -7,4 +7,120 @@
  * file that was distributed with this source code.
  */
 
-import './ajax';
+import $ from 'jquery';
+import { click, sendForm, sendRequest, updateDom } from './ajax';
+import { closeModal, openModal } from './modal/modal-manager';
+
+$(document).on('submit', 'form.ec-crud-search-form', function (event) {
+    event.preventDefault();
+
+    const searchId = $(this).attr('data-crud-search-id');
+    const listId = $(this).attr('data-crud-list-id');
+
+    sendForm(this, {
+        onSuccess: function (args) {
+            const json = $.parseJSON(args.data);
+
+            updateDom($('#' + searchId), 'update', json.render_search);
+            updateDom($('#' + listId), 'update', json.render_list);
+        }
+    });
+});
+
+$(document).on('click', 'button.ec-crud-search-reset', function (event) {
+    const searchId = $(this).attr('data-crud-search-id');
+    const listId = $(this).attr('data-crud-list-id');
+
+    click(this, {
+        onSuccess: function (args) {
+            const json = $.parseJSON(args.data);
+
+            updateDom($('#' + searchId), 'update', json.render_search);
+            updateDom($('#' + listId), 'update', json.render_list);
+        }
+    });
+});
+
+$(document).on('click', 'button.ec-crud-display-settings-button', function (event) {
+    const displaySettingsContainerId = $(this).attr('data-display-settings');
+    const isModal = $('#' + displaySettingsContainerId).attr('data-modal') === '1';
+
+    if (isModal) {
+        openDisplaySettings($('#' + displaySettingsContainerId));
+
+        return;
+    }
+
+    if ($('#' + displaySettingsContainerId).is(':visible')) {
+        closeDisplaySettings($('#' + displaySettingsContainerId));
+    } else {
+        openDisplaySettings($('#' + displaySettingsContainerId));
+    }
+});
+
+$(document).on('click', 'button.ec-crud-display-settings-check-all-columns', function (event) {
+    $(this).parents('div.ec-crud-display-settings').find('input[type=checkbox]').each(function () {
+        $(this).prop('checked', true);
+    });
+});
+
+$(document).on('click', 'button.ec-crud-display-settings-uncheck-all-columns', function (event) {
+    $(this).parents('div.ec-crud-display-settings').find('input[type=checkbox]').each(function () {
+        $(this).prop('checked', false);
+    });
+});
+
+$(document).on('click', 'button.ec-crud-display-settings-raz', function (event) {
+    const displaySettingsContainer = $(this).parents('div.ec-crud-display-settings');
+    const displaySettingsContainerId = $(displaySettingsContainer).attr('id');
+    const listId = $(displaySettingsContainer).attr('data-crud-list-id');
+
+    closeDisplaySettings($('#' + displaySettingsContainerId));
+
+    sendRequest({
+        url: $(this).attr('data-reset-url'),
+        update: $('#' + listId)
+    });
+});
+
+$(document).on('submit', '.ec-crud-display-settings form', function (event) {
+    event.preventDefault();
+
+    const displaySettingsContainer = $(this).parents('div.ec-crud-display-settings');
+    const displaySettingsContainerId = $(displaySettingsContainer).attr('id');
+    const listId = $(displaySettingsContainer).attr('data-crud-list-id');
+
+    closeDisplaySettings($('#' + displaySettingsContainerId));
+
+    sendForm(this, {
+        onSuccess: function (args) {
+            const json = $.parseJSON(args.data);
+
+            updateDom($('#' + listId), 'update', json.render_list);
+            if (!json.form_is_valid) {
+                openDisplaySettings($('#' + displaySettingsContainerId));
+            }
+        }
+    });
+});
+
+function openDisplaySettings (displaySettingsContainer) {
+    const isModal = $(displaySettingsContainer).attr('data-modal') === '1';
+    if (isModal) {
+        openModal({
+            element: displaySettingsContainer
+        });
+    } else {
+        $(displaySettingsContainer).show();
+    }
+}
+
+function closeDisplaySettings (displaySettingsContainer) {
+    const isModal = $(displaySettingsContainer).attr('data-modal') === '1';
+
+    if (isModal) {
+        closeModal(displaySettingsContainer);
+    } else {
+        $(displaySettingsContainer).hide();
+    }
+}
diff --git a/src/Resources/translations/EcommitCrudBundle.en.yml b/src/Resources/translations/EcommitCrudBundle.en.yml
new file mode 100644
index 0000000..e10b05f
--- /dev/null
+++ b/src/Resources/translations/EcommitCrudBundle.en.yml
@@ -0,0 +1,12 @@
+display_settings:
+    check_all: Check all
+    displayed_columns: Columns to be shown
+    reset_display_settings: Reset display settings
+    results_per_page: Number of results per page
+    save: Save
+    title: Display Settings
+    uncheck_all: Uncheck all
+
+search:
+    reset: Reset
+    submit: Search
diff --git a/src/Resources/translations/EcommitCrudBundle.fr.yml b/src/Resources/translations/EcommitCrudBundle.fr.yml
new file mode 100644
index 0000000..cb8f54b
--- /dev/null
+++ b/src/Resources/translations/EcommitCrudBundle.fr.yml
@@ -0,0 +1,12 @@
+display_settings:
+    check_all: Tout sélectionner
+    displayed_columns: Colonnes à afficher
+    reset_display_settings: Réinitialiser paramètres par défaut
+    results_per_page: Nombre de résultats par page
+    save: Enregistrer
+    title: Propriétés d'affichage
+    uncheck_all: Tout désélectionner
+
+search:
+    reset: R.A.Z
+    submit: Rechercher
diff --git a/src/Resources/translations/messages.en.yml b/src/Resources/translations/messages.en.yml
index eb3826a..1254d59 100644
--- a/src/Resources/translations/messages.en.yml
+++ b/src/Resources/translations/messages.en.yml
@@ -1,10 +1,3 @@
-Display Settings: Display Settings
-Number of results per page: Number of results per page
-Columns to be shown: Columns to be shown
-You need to select at least one column to display: You need to select at least one column to display
-Save: Save
-Search: Search
-Reset: Reset
 '{0} No results|{1} 1 result found|]1,Inf] %count% results found': '{0} No results|{1} 1 result found|]1,Inf] %count% results found'
 Page %firstPage%/%lastPage%: Page %page%/%lastPage%
 Results %first%-%last%: Results %first%-%last%
@@ -14,6 +7,3 @@ filter.false: No
 filter.choices.placeholder: All
 picker.add: Add
 picker.list: Select
-reset_display_settings: Reset display settings
-check_all: Check all
-uncheck_all: Uncheck all
diff --git a/src/Resources/translations/messages.fr.yml b/src/Resources/translations/messages.fr.yml
index 355a14d..c3bfdc1 100644
--- a/src/Resources/translations/messages.fr.yml
+++ b/src/Resources/translations/messages.fr.yml
@@ -1,10 +1,3 @@
-Display Settings: Propriétés d'affichage
-Number of results per page: Nombre de résultats par page
-Columns to be shown: Colonnes à afficher
-You need to select at least one column to display: Vous devez sélectionner au moins une colonne à afficher
-Save: Enregistrer
-Search: Rechercher
-Reset: R.A.Z
 '{0} No results|{1} 1 result found|]1,Inf] %count% results found': '{0} Pas de résultat|{1} 1 résultat trouvé|]1,Inf] %count% résultats trouvés'
 Page %firstPage%/%lastPage%: Page %page%/%lastPage%
 Results %first%-%last%: Résultats %first%-%last%
@@ -14,6 +7,3 @@ filter.false: Non
 filter.choices.placeholder: Tous
 picker.add: Ajouter
 picker.list: Sélectionner
-reset_display_settings: Réinitialiser paramètres par défaut
-check_all: Tout sélectionner
-uncheck_all: Tout désélectionner
diff --git a/src/Resources/views/Crud/double_search.html.twig b/src/Resources/views/Crud/double_search.html.twig
deleted file mode 100644
index 7d09819..0000000
--- a/src/Resources/views/Crud/double_search.html.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-{% autoescape 'js' %}
-<script type="text/javascript">
-    jQuery('#{{ id_search|default('crud_search') }}').html('{{ render_search }}');
-    jQuery('#{{ id_list|default('crud_list') }}').html('{{ render_list }}');
-</script>
-{% endautoescape %}
diff --git a/src/Resources/views/Crud/form_settings_modal.html.twig b/src/Resources/views/Crud/form_settings_modal.html.twig
deleted file mode 100644
index 7a16c56..0000000
--- a/src/Resources/views/Crud/form_settings_modal.html.twig
+++ /dev/null
@@ -1,70 +0,0 @@
-{% set ajax_options = ajax_options|merge({ 'on_before_send': '/arg/if(processCrudDisplaySettings_'~suffix~'() == false) { arg.stop = true; }' }) %}
-{% set reset_ajax_options = ajax_options|merge({ 'on_before_send': 'resetDisplaySettings'~suffix~'();' }) %}
-{% set modalId = 'display_settings_' ~suffix %}
-
-{% macro contentDisplaySettings(vars) %}
-    <h4 class="titre">{% trans %}Display Settings{% endtrans %}</h4>
-    {{ form_start_ajax(vars.form, {'ajax_options': vars.ajax_options}) }}
-        <b>{{ form_label(vars.form.resultsPerPage) }} :</b><br />
-        {{ form_widget(vars.form.resultsPerPage) }}<br /><br />
-
-        <b>{{ form_label(vars.form.displayedColumns) }} :</b><br />
-         {% for choice, child in vars.form.displayedColumns %}
-            {{ form_widget(child) }}  {{ form_label(child) }}<br />
-        {% endfor %}
-        <button type="button" class="btn-crud-select-columns btn-crud-select-columns-check" onclick="selectAllColumnsCrudDisplaySettings_{{ vars.suffix }}(true)">
-            {{ 'check_all'|trans }}
-        </button>
-        <button type="button" class="btn-crud-select-columns btn-crud-select-columns-uncheck" onclick="selectAllColumnsCrudDisplaySettings_{{ vars.suffix }}(false)">
-            {{ 'uncheck_all'|trans }}
-        </button>
-        {{ form_rest(vars.form) }}
-
-        <div style="text-align: center;">
-            <button type="submit" class="save">{% trans %}Save{% endtrans %}</button>
-            <button class="ec-crud-ajax-click-auto raz"{{ ajax_attributes({url: vars.reset_settings_url}|merge(vars.reset_ajax_options)) }}>
-                {% trans %}reset_display_settings{% endtrans %}
-            </button>
-        </div>
-    </form>
-{% endmacro %}
-
-{% import _self as macro %}
-
-<script type="text/javascript">
-    if ($('#{{ modalId }}').length == 0) {
-        $('#{{ div_id_list }}').append('{{ overlay_service.declareHtmlModal(modalId, {close_div_class: close_div_class})|raw }}');
-    }
-    $('#{{ modalId }} .contentWrap').html('{{ macro.contentDisplaySettings(_context)|replace({"\n":' ', "\r":' '})|e('js') }}');
-    {{ overlay_service.declareJavascriptModal(modalId, {close_div_class: close_div_class})|raw }}
-
-    function processCrudDisplaySettings_{{ suffix }}()
-    {
-       if($('#display_settings_{{ suffix }} input:checkbox:checked').length < 1)
-       {
-            alert('{% trans %}You need to select at least one column to display{% endtrans %}');
-            return false;
-       }
-        {{ overlay_service.closeModal(modalId)|raw }}
-    }
-    function selectAllColumnsCrudDisplaySettings_{{ suffix }}(checked)
-    {
-        $('#display_settings_{{ suffix }} input:checkbox').each(function() {
-            $(this).prop('checked', checked);
-        });
-    }
-    function changeDisplaySettings{{ suffix }}()
-    {
-        {{ overlay_service.openModal(modalId)|raw }}
-    }
-    function resetDisplaySettings{{ suffix }}()
-    {
-        {{ overlay_service.closeModal(modalId)|raw }}
-    }
-</script>
-
-{% if display_button %}
-<a href="#" onclick="changeDisplaySettings{{ suffix }}(); return false;"><img src="{{ asset(image_url) }}" alt="{% trans %}Display Settings{% endtrans %}" title="{% trans %}Display Settings{% endtrans %}" /></a>
-{% endif %}
-
-<div id="js_holder_for_multi_update_{{ suffix }}" style="display: none;"></div>
diff --git a/src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig b/src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig
deleted file mode 100644
index 8397703..0000000
--- a/src/Resources/views/Crud/form_settings_modal_bootstrap.html.twig
+++ /dev/null
@@ -1,77 +0,0 @@
-{% set ajax_options = ajax_options|merge({ 'on_before_send': '/arg/if(processCrudDisplaySettings_'~suffix~'() == false) { arg.stop = true;}' }) %}
-{% set reset_ajax_options = ajax_options|merge({ 'on_before_send': 'resetDisplaySettings'~suffix~'();' }) %}
-{% set modalId = 'display_settings_' ~suffix %}
-
-{% macro contentDisplaySettings(vars) %}
-    {% form_theme vars.form 'bootstrap_3_layout.html.twig' %}
-
-    <div class="modal-header">
-        <h4 class="modal-title">{% trans %}Display Settings{% endtrans %}</h4>
-    </div>
-
-    {{ form_start_ajax(vars.form, {'ajax_options': vars.ajax_options}) }}
-    <div class="modal-body">
-        {{ form_row(vars.form.resultsPerPage) }}
-        {{ form_row(vars.form.displayedColumns) }}
-        <button type="button" class="btn btn-default btn-xs" onclick="selectAllColumnsCrudDisplaySettings_{{ vars.suffix }}(true)">
-            {{ 'check_all'|trans }}
-        </button>
-        <button type="button" class="btn btn-default btn-xs" onclick="selectAllColumnsCrudDisplaySettings_{{ vars.suffix }}(false)">
-            {{ 'uncheck_all'|trans }}
-        </button>
-
-        {{ form_rest(vars.form) }}
-    </div>
-
-    <div class="modal-footer">
-        <button class="ec-crud-ajax-click-auto raz-bootstrap btn btn-default btn-sm"{{ ajax_attributes({url: vars.reset_settings_url}|merge(vars.reset_ajax_options)) }}>
-            <span class="glyphicon glyphicon-fire"></span> {% trans %}reset_display_settings{% endtrans %}
-        </button>
-        <button type="submit" class="save-bootstrap btn btn-success btn-sm">
-            <span class="glyphicon glyphicon-floppy-disk"></span> {% trans %}Save{% endtrans %}
-        </button>
-    </div>
-    </form>
-{% endmacro %}
-
-{% import _self as macro %}
-
-<script type="text/javascript">
-    if ($('#{{ modalId }}').length == 0) {
-        $('#{{ div_id_list }}').append('{{ overlay_service.declareHtmlModal(modalId, {close_div_class: close_div_class})|raw }}');
-    }
-    $('#{{ modalId }} .contentWrap').html('{{ macro.contentDisplaySettings(_context)|replace({"\n":' ', "\r":' '})|e('js') }}');
-    {{ overlay_service.declareJavascriptModal(modalId, {close_div_class: close_div_class})|raw }}
-
-    function processCrudDisplaySettings_{{ suffix }}()
-    {
-       if($('#display_settings_{{ suffix }} input:checkbox:checked').length < 1)
-       {
-            alert('{% trans %}You need to select at least one column to display{% endtrans %}');
-            return false;
-       }
-        {{ overlay_service.closeModal(modalId)|raw }}
-    }
-    function selectAllColumnsCrudDisplaySettings_{{ suffix }}(checked)
-    {
-        $('#display_settings_{{ suffix }} input:checkbox').each(function() {
-            $(this).prop('checked', checked);
-        });
-    }
-    function changeDisplaySettings{{ suffix }}()
-    {
-        {{ overlay_service.openModal(modalId)|raw }}
-    }
-    function resetDisplaySettings{{ suffix }}()
-    {
-        {{ overlay_service.closeModal(modalId)|raw }}
-    }
-</script>
-
-{% if display_button %}
-<button type="button" class="display_settings-bootstrap btn btn-default btn-sm" onclick="changeDisplaySettings{{ suffix }}(); return false;">
-    <span class="glyphicon glyphicon-cog"></span> {% trans %}Display Settings{% endtrans %}
-</button>
-{% endif %}
-
-<div id="js_holder_for_multi_update_{{ suffix }}" style="display: none;"></div>
diff --git a/src/Resources/views/Crud/form_settings_nomodal.html.twig b/src/Resources/views/Crud/form_settings_nomodal.html.twig
deleted file mode 100644
index aae9543..0000000
--- a/src/Resources/views/Crud/form_settings_nomodal.html.twig
+++ /dev/null
@@ -1,65 +0,0 @@
-{% set reset_ajax_options = ajax_options %}
-{% set ajax_options = ajax_options|merge({ 'on_before_send': '/arg/if(processCrudDisplaySettings'~suffix~'() == false) { arg.stop = true;}' }) %}
-
-<div id="display_settings_{{ suffix }}" class="display_settings_nomodal" style="display: none;">
-    <div class="title">{% trans %}Display Settings{% endtrans %}</div>
-    {{ form_start_ajax(form, {'ajax_options': ajax_options}) }}
-        <b>{{ form_label(form.resultsPerPage) }} :</b><br />
-        {{ form_widget(form.resultsPerPage) }}<br /><br />
-        
-        <b>{{ form_label(form.displayedColumns) }} :</b><br />
-         {% for choice, child in form.displayedColumns %}
-                {{ form_widget(child) }}  {{ form_label(child) }}<br />
-         {% endfor %}
-        <button type="button" class="btn-crud-select-columns btn-crud-select-columns-check" onclick="selectAllColumnsCrudDisplaySettings_{{ suffix }}(true)">
-            {{ 'check_all'|trans }}
-        </button>
-        <button type="button" class="btn-crud-select-columns btn-crud-select-columns-uncheck" onclick="selectAllColumnsCrudDisplaySettings_{{ suffix }}(false)">
-            {{ 'uncheck_all'|trans }}
-        </button>
-        {{ form_rest(form) }}
-
-        <div style="text-align: center;">
-            <button type="submit" class="save">{% trans %}Save{% endtrans %}</button>
-            <button class="ec-crud-ajax-click-auto raz"{{ ajax_attributes({url: reset_settings_url}|merge(reset_ajax_options)) }}>
-                {% trans %}reset_display_settings{% endtrans %}
-            </button>
-        </div>
-    </form>
-</div>
-
-<script type="text/javascript">
-    function processCrudDisplaySettings{{ suffix }}()
-    {
-       if($('#display_settings_{{ suffix }} input:checkbox:checked').length < 1)
-       {
-            alert('{% trans %}You need to select at least one column to display{% endtrans %}');
-            return false;
-       }
-       $("#display_settings_{{ suffix }}").hide("slow");
-    }
-    function selectAllColumnsCrudDisplaySettings_{{ suffix }}(checked)
-    {
-        $('#display_settings_{{ suffix }} input:checkbox').each(function() {
-            $(this).prop('checked', checked);
-        });
-    }
-    function clickChangeSettings{{ suffix }}()
-    {
-        if($("#display_settings_{{ suffix }}").is(":visible"))
-        {
-            $("#display_settings_{{ suffix }}").hide("slow");
-        }
-        else
-        {
-            $("#display_settings_{{ suffix }}").show("slow");
-        }
-    }
-</script>
-
-
-{% if display_button %}
-<a href="#" onclick="clickChangeSettings{{ suffix }}(); return false;"><img src="{{ asset(image_url) }}" alt="{% trans %}Display Settings{% endtrans %}" title="{% trans %}Display Settings{% endtrans %}" /></a>
-{% endif %}
-
-<div id="js_holder_for_multi_update_{{ suffix }}" style="display: none;"></div>
diff --git a/src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig b/src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig
deleted file mode 100644
index 76aeba3..0000000
--- a/src/Resources/views/Crud/form_settings_nomodal_bootstrap.html.twig
+++ /dev/null
@@ -1,68 +0,0 @@
-{% set reset_ajax_options = ajax_options %}
-{% set ajax_options = ajax_options|merge({ 'on_before_send': '/arg/if(processCrudDisplaySettings'~suffix~'() == false) { arg.stop = true;}' }) %}
-{% form_theme form 'bootstrap_3_layout.html.twig' %}
-
-<div id="display_settings_{{ suffix }}" class="display_settings_nomodal_bootstrap" style="display: none;">
-    <h4>{% trans %}Display Settings{% endtrans %}</h4>
-
-
-    {{ form_start_ajax(form, {'ajax_options': ajax_options}) }}
-        {{ form_row(form.resultsPerPage) }}
-        {{ form_row(form.displayedColumns) }}
-        <button type="button" class="btn btn-default btn-xs" onclick="selectAllColumnsCrudDisplaySettings_{{ suffix }}(true)">
-            {{ 'check_all'|trans }}
-        </button>
-        <button type="button" class="btn btn-default btn-xs" onclick="selectAllColumnsCrudDisplaySettings_{{ suffix }}(false)">
-            {{ 'uncheck_all'|trans }}
-        </button>
-
-        {{ form_rest(form) }}
-
-        <div style="text-align: center;">
-            <button type="submit" class="save-bootstrap btn btn-success btn-sm">
-                <span class="glyphicon glyphicon-floppy-disk"></span> {% trans %}Save{% endtrans %}
-            </button>
-            <button class="ec-crud-ajax-click-auto raz-bootstrap btn btn-default btn-sm"{{ ajax_attributes({url: reset_settings_url}|merge(reset_ajax_options)) }}>
-                <span class="glyphicon glyphicon-fire"></span> {% trans %}reset_display_settings{% endtrans %}
-            </button>
-        </div>
-    </form>
-</div>
-
-<script type="text/javascript">
-    function processCrudDisplaySettings{{ suffix }}()
-    {
-       if($('#display_settings_{{ suffix }} input:checkbox:checked').length < 1)
-       {
-            alert('{% trans %}You need to select at least one column to display{% endtrans %}');
-            return false;
-       }
-       $("#display_settings_{{ suffix }}").hide("slow");
-    }
-    function selectAllColumnsCrudDisplaySettings_{{ suffix }}(checked)
-    {
-        $('#display_settings_{{ suffix }} input:checkbox').each(function() {
-            $(this).prop('checked', checked);
-        });
-    }
-    function clickChangeSettings{{ suffix }}()
-    {
-        if($("#display_settings_{{ suffix }}").is(":visible"))
-        {
-            $("#display_settings_{{ suffix }}").hide("slow");
-        }
-        else
-        {
-            $("#display_settings_{{ suffix }}").show("slow");
-        }
-    }
-</script>
-
-
-{% if display_button %}
-<button type="button" class="display_settings-bootstrap btn btn-default btn-sm" onclick="clickChangeSettings{{ suffix }}(); return false;">
-    <span class="glyphicon glyphicon-cog"></span> {% trans %}Display Settings{% endtrans %}
-</button>
-{% endif %}
-
-<div id="js_holder_for_multi_update_{{ suffix }}" style="display: none;"></div>
diff --git a/src/Resources/views/IconTheme/base.html.twig b/src/Resources/views/IconTheme/base.html.twig
index 30c79eb..83f4187 100644
--- a/src/Resources/views/IconTheme/base.html.twig
+++ b/src/Resources/views/IconTheme/base.html.twig
@@ -9,3 +9,9 @@
     <i>v</i>
 {% endspaceless %}
 {% endblock %}
+
+{% block display_settings %}{% endblock %}
+
+{% block search %}{% endblock %}
+
+{% block reset %}{% endblock %}
diff --git a/src/Resources/views/IconTheme/fontawesome4.html.twig b/src/Resources/views/IconTheme/fontawesome4.html.twig
index 119338e..8ecc763 100644
--- a/src/Resources/views/IconTheme/fontawesome4.html.twig
+++ b/src/Resources/views/IconTheme/fontawesome4.html.twig
@@ -11,3 +11,21 @@
     <i class="fa fa-sort-alpha-desc"></i>
 {% endspaceless %}
 {% endblock %}
+
+{% block display_settings %}
+{% spaceless %}
+    <i class="fa fa-cog" aria-hidden="true"></i>
+{% endspaceless %}
+{% endblock %}
+
+{% block search %}
+{% spaceless %}
+    <i class="fa fa-search" aria-hidden="true"></i>
+{% endspaceless %}
+{% endblock %}
+
+{% block reset %}
+{% spaceless %}
+    <i class="fa fa-fire" aria-hidden="true"></i>
+{% endspaceless %}
+{% endblock %}
diff --git a/src/Resources/views/Theme/base.html.twig b/src/Resources/views/Theme/base.html.twig
index 5fa7116..648948b 100644
--- a/src/Resources/views/Theme/base.html.twig
+++ b/src/Resources/views/Theme/base.html.twig
@@ -157,6 +157,105 @@
 {% endspaceless %}
 {% endblock %}
 
+{# Display settings #}
+
+{% block display_settings %}
+{% spaceless %}
+    {% if crud.displayResults %}
+        {% set displaySettingsContainerAttributes = {'class': 'ec-crud-display-settings', 'id': 'ec-crud-display-settings-'~crud.sessionName, 'data-crud-list-id': crud.divIdList} %}
+        {% if modal %}
+            {{ block('display_settings_button_modal', template_name) }}
+            {{ block('display_settings_container_modal', template_name) }}
+        {% else %}
+            {{ block('display_settings_button_without_modal', template_name) }}
+            {{ block('display_settings_container_without_modal', template_name) }}
+        {% endif %}
+    {% endif %}
+{% endspaceless %}
+{% endblock %}
+
+{% block display_settings_button_modal %}
+    {# Modal not available in this theme #}
+    {{ block('display_settings_button_without_modal', template_name) }}
+{% endblock %}
+
+{% block display_settings_button_without_modal %}
+    {% set button_attr = {'data-modal': '0'} %}
+    {{ block('display_settings_button', template_name) }}
+{% endblock %}
+
+{% block display_settings_button %}
+    {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' ec-crud-display-settings-button')|trim, 'data-display-settings': 'ec-crud-display-settings-'~crud.sessionName}) %}
+    <button{% with { attr: button_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
+        {{ crud_icon('display_settings') }} {{ 'display_settings.title'|trans({}, 'EcommitCrudBundle') }}
+    </button>
+{% endblock %}
+
+{% block display_settings_container_modal %}
+    {# Modal not available in this theme #}
+    {{ block('display_settings_container_without_modal', template_name) }}
+{% endblock %}
+
+{% block display_settings_container_without_modal %}
+    {% set displaySettingsContainerAttributes = displaySettingsContainerAttributes|default({})|merge({'data-modal': '0', 'style': 'display: none;'}) %}
+    <div{% with { attr: displaySettingsContainerAttributes } %}{{ block('attributes', template_name) }}{% endwith %}>
+        {{ block('display_settings_content_without_modal', template_name) }}
+    </div>
+{% endblock %}
+
+{% block display_settings_content_modal %}
+    {# Modal not available in this theme #}
+    {{ block('display_settings_content_without_modal', template_name) }}
+{% endblock %}
+
+{% block display_settings_content_without_modal %}
+    <div>
+        <h4>{{ 'display_settings.title'|trans({}, 'EcommitCrudBundle') }}</h4>
+
+        {{ form_start(form) }}
+            {{ form_row(form.resultsPerPage) }}
+            {{ form_row(form.displayedColumns) }}
+            <div>
+                <button type="button" class="ec-crud-display-settings-check-all-columns">{{ 'display_settings.check_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                &nbsp;
+                <button type="button" class="ec-crud-display-settings-uncheck-all-columns">{{ 'display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle') }}</button>
+            </div>
+            <div style="text-align: center;">
+                {{ form_row(form.reset) }}
+                {{ form_row(form.save) }}
+            </div>
+        {{ form_end(form) }}
+    </div>
+{% endblock %}
+
+{# search_form_start #}
+
+{% block search_form_start %}
+{% spaceless %}
+    {{ form_start(crud.searcherForm, {'attr': form_attr}) }}
+{% endspaceless %}
+{% endblock %}
+
+{# search_form_submit #}
+
+{% block search_form_submit %}
+    {% spaceless %}
+        <button type="submit" {% with { attr: button_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
+            {{ crud_icon('search') }} {{ 'search.submit'|trans({}, 'EcommitCrudBundle') }}
+        </button>
+    {% endspaceless %}
+{% endblock %}
+
+{# search_form_reset #}
+
+{% block search_form_reset %}
+{% spaceless %}
+    <button type="button" {% with { attr: button_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
+        {{ crud_icon('reset') }} {{ 'search.reset'|trans({}, 'EcommitCrudBundle') }}
+    </button>
+{% endspaceless %}
+{% endblock %}
+
 {# Attributes #}
 
 {% block attributes %}
diff --git a/src/Resources/views/Theme/bootstrap3.html.twig b/src/Resources/views/Theme/bootstrap3.html.twig
index 236ae8a..de5cbc6 100644
--- a/src/Resources/views/Theme/bootstrap3.html.twig
+++ b/src/Resources/views/Theme/bootstrap3.html.twig
@@ -12,3 +12,91 @@
     {% set li_attr = li_attr|merge({current_page: li_attr_child}) %}
     {{ parent() }}
 {% endblock %}
+
+{# Display settings #}
+
+{% block display_settings_button %}
+    {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-default btn-sm')|trim}) %}
+    {{ parent() }}
+{% endblock %}
+
+{% block display_settings_button_modal %}
+    {% set button_attr = {'data-modal': '1'} %}
+    {{ block('display_settings_button', template_name) }}
+{% endblock %}
+
+{% block display_settings_container_modal %}
+    {% set displaySettingsContainerAttributes = displaySettingsContainerAttributes|default({})|merge({class: (displaySettingsContainerAttributes.class|default('') ~ ' modal fade')|trim, 'data-modal': '1', 'style': 'display: none;', 'role': 'dialog'}) %}
+    <div{% with { attr: displaySettingsContainerAttributes } %}{{ block('attributes', template_name) }}{% endwith %}>
+        {{ block('display_settings_content_modal', template_name) }}
+    </div>
+{% endblock %}
+
+{% block display_settings_content_modal %}
+    {% form_theme form 'bootstrap_3_layout.html.twig' %}
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4>{{ 'display_settings.title'|trans({}, 'EcommitCrudBundle') }}</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            {{ form_start(form) }}
+                <div class="modal-body">
+                    {{ form_row(form.resultsPerPage) }}
+                    {{ form_row(form.displayedColumns) }}
+                    <div>
+                        <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-check-all-columns">{{ 'display_settings.check_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                        &nbsp;
+                        <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-uncheck-all-columns">{{ 'display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    {{ form_widget(form.reset) }}
+                    {{ form_widget(form.save, {'attr': {'class': 'btn-success'}}) }}
+                </div>
+            {{ form_end(form) }}
+        </div>
+    </div>
+{% endblock %}
+
+{% block display_settings_content_without_modal %}
+    {% form_theme form 'bootstrap_3_layout.html.twig' %}
+    <div>
+        <h4>{{ 'display_settings.title'|trans({}, 'EcommitCrudBundle') }}</h4>
+
+        {{ form_start(form) }}
+            {{ form_row(form.resultsPerPage) }}
+            {{ form_row(form.displayedColumns) }}
+            <div>
+                <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-check-all-columns">{{ 'display_settings.check_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                &nbsp;
+                <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-uncheck-all-columns">{{ 'display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle') }}</button>
+            </div>
+
+            <div style="text-align: center;">
+                {{ form_row(form.reset) }}
+                {{ form_row(form.save, {'attr': {'class': 'btn-success'}}) }}
+            </div>
+        {{ form_end(form) }}
+    </div>
+{% endblock %}
+
+{# search_form_submit #}
+
+{% block search_form_submit %}
+{% spaceless %}
+    {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-default btn-sm')|trim}) %}
+    {{ parent() }}
+{% endspaceless %}
+{% endblock %}
+
+{# search_form_reset #}
+
+{% block search_form_reset %}
+{% spaceless %}
+    {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-default btn-sm')|trim}) %}
+    {{ parent() }}
+{% endspaceless %}
+{% endblock %}
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 2a03c8a..e149f23 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -97,14 +97,28 @@ public function getFunctions()
                 ]
             ),
             new TwigFunction(
-                'crud_search_form',
-                [$this, 'searchForm'],
-                ['is_safe' => ['all']]
+                'crud_search_form_start',
+                [$this, 'searchFormStart'],
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['all'],
+                ]
             ),
             new TwigFunction(
-                'crud_search_reset',
-                [$this, 'searchReset'],
-                ['is_safe' => ['all']]
+                'crud_search_form_submit',
+                [$this, 'searchFormSubmit'],
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['all'],
+                ]
+            ),
+            new TwigFunction(
+                'crud_search_form_reset',
+                [$this, 'searchFormReset'],
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['all'],
+                ]
             ),
             new TwigFunction(
                 'crud_declare_modal',
@@ -403,92 +417,158 @@ public function td(Environment $environment, string $columnId, Crud $crud, $valu
     }
 
     /**
-     * Twig function: "crud_display_config".
-     *
-     * @param array $options     Options :
-     *                           * modal:  Include (or not) inside a modal. Default: true
-     *                           * image_url: Url image (button)
-     *                           * use_bootstrap: Use Bootstrap or not
-     *                           * modal_close_div_class: Close Div CSS Class
-     *                           * template: Template used. If null, default template is used
-     * @param array $ajaxOptions Ajax options
+     * Returns CRUD td tag.
      *
-     * @return string
+     * @param array $options Options:
+     *                       * modal: Use modal or not. Default: true
+     *                       * render: Template used for generation. If null, default template is used
      */
-    public function displaySettings(Environment $environment, Crud $crud, $options = [], $ajaxOptions = [])
+    public function displaySettings(Environment $environment, Crud $crud, array $options = []): string
     {
         $resolver = new OptionsResolver();
-        $resolver->setDefaults(
-            [
-                'modal' => true,
-                'image_url' => '/bundles/ecommitcrud/images/i16/list.png',
-                'use_bootstrap' => $this->crudHelper->useBootstrap(),
-                'modal_close_div_class' => 'overlay-close',
-                'template' => null,
-            ]
-        );
+        $resolver->setDefaults([
+            'modal' => true,
+            'render' => null,
+        ]);
         $resolver->setAllowedTypes('modal', 'bool');
-        $resolver->setAllowedTypes('use_bootstrap', 'bool');
         $options = $resolver->resolve($options);
 
-        if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = '#'.$crud->getDivIdList();
+        $form = $crud->getDisplaySettingsForm();
+
+        if ($options['render']) {
+            return $environment->render($options['render'], [
+                'crud' => $crud,
+                'form' => $form,
+                'options' => $options,
+            ]);
         }
 
-        $form = $this->crudHelper->getFormDisplaySettings($crud);
+        return $this->renderBlock($environment, $this->theme, 'display_settings', array_merge($options, [
+            'crud' => $crud,
+            'form' => $form,
+        ]));
+    }
 
-        if (!empty($options['template'])) {
-            $templateName = $options['template'];
-        } elseif ($options['modal']) {
-            if ($options['use_bootstrap']) {
-                $templateName = '@EcommitCrud/Crud/form_settings_modal_bootstrap.html.twig';
-            } else {
-                $templateName = '@EcommitCrud/Crud/form_settings_modal.html.twig';
-            }
-        } else {
-            if ($options['use_bootstrap']) {
-                $templateName = '@EcommitCrud/Crud/form_settings_nomodal_bootstrap.html.twig';
-            } else {
-                $templateName = '@EcommitCrud/Crud/form_settings_nomodal.html.twig';
-            }
+    /**
+     * @param array $options Options:
+     *                       * ajax_options: Ajax options. Default: []
+     *                       * form_attr: "form" attributes
+     *                       * render: Template used for generation. If null, default template is used
+     */
+    public function searchFormStart(Environment $environment, Crud $crud, array $options = [])
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'ajax_options' => [],
+            'form_attr' => [],
+            'render' => null,
+        ]);
+        $resolver->setAllowedTypes('ajax_options', ['array']);
+        $resolver->setAllowedTypes('form_attr', ['array']);
+        $options = $resolver->resolve($options);
+
+        if ($options['render']) {
+            return $environment->render($options['render'], [
+                'crud' => $crud,
+                'options' => $options,
+            ]);
         }
 
-        return $environment->render(
-            $templateName,
+        $options['form_attr'] = array_merge(
             [
-                'form' => $form,
-                'url' => $crud->getUrl(),
-                'reset_settings_url' => $crud->getUrl(['razsettings' => 1]),
-                'ajax_options' => $ajaxOptions,
-                'image_url' => $options['image_url'],
-                'suffix' => $crud->getSessionName(),
-                'use_bootstrap' => $options['use_bootstrap'],
-                'close_div_class' => $options['modal_close_div_class'],
-                'overlay_service' => $this->crudHelper->getOverlayService(),
-                'display_button' => $crud->getDisplayResults(),
-                'div_id_list' => $crud->getDivIdList(),
-            ]
+                'data-crud-search-id' => $crud->getDivIdSearch(),
+                'data-crud-list-id' => $crud->getDivIdList(),
+            ],
+            $options['form_attr'],
+            $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options']))
         );
+        $class = 'ec-crud-search-form';
+        if (isset($options['form_attr']['class'])) {
+            $options['form_attr']['class'] = sprintf('%s %s', $class, $options['form_attr']['class']);
+        } else {
+            $options['form_attr']['class'] = $class;
+        }
+
+        if (!isset($options['form_attr']['novalidate'])) {
+            $options['form_attr']['novalidate'] = 'novalidate';
+        }
+
+        return $this->renderBlock($environment, $this->theme, 'search_form_start', array_merge($options, [
+            'crud' => $crud,
+        ]));
     }
 
     /**
-     * Twig function: "crud_search_form".
-     *
-     * @see CrudHelper:searchFormTag
+     * @param array $options Options:
+     *                       * button_attr: "button" attributes
+     *                       * render: Template used for generation. If null, default template is used
      */
-    public function searchForm(Crud $crud, $ajaxOptions = [], $htmlOptions = [])
+    public function searchFormSubmit(Environment $environment, Crud $crud, $options = [], $ajaxOptions = [], $htmlOptions = [])
     {
-        return $this->crudHelper->searchFormTag($crud, $ajaxOptions, $htmlOptions);
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'button_attr' => [],
+            'render' => null,
+        ]);
+        $resolver->setAllowedTypes('button_attr', ['array']);
+        $options = $resolver->resolve($options);
+
+        if ($options['render']) {
+            return $environment->render($options['render'], [
+                'crud' => $crud,
+                'options' => $options,
+            ]);
+        }
+
+        return $this->renderBlock($environment, $this->theme, 'search_form_submit', array_merge($options, [
+            'crud' => $crud,
+        ]));
     }
 
     /**
-     * Twig function: "crud_search_reset".
-     *
-     * @see CrudHelper:searchResetButton
+     * @param array $options Options:
+     *                       * ajax_options: Ajax options. Default: []
+     *                       * button_attr: "button" attributes
+     *                       * render: Template used for generation. If null, default template is used
      */
-    public function searchReset(Crud $crud, $options = [], $ajaxOptions = [], $htmlOptions = [])
+    public function searchFormReset(Environment $environment, Crud $crud, $options = [], $ajaxOptions = [], $htmlOptions = [])
     {
-        return $this->crudHelper->searchResetButton($crud, $options, $ajaxOptions, $htmlOptions);
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'ajax_options' => [],
+            'button_attr' => [],
+            'render' => null,
+        ]);
+        $resolver->setAllowedTypes('ajax_options', ['array']);
+        $resolver->setAllowedTypes('button_attr', ['array']);
+        $options = $resolver->resolve($options);
+
+        if ($options['render']) {
+            return $environment->render($options['render'], [
+                'crud' => $crud,
+                'options' => $options,
+            ]);
+        }
+
+        $options['button_attr'] = array_merge(
+            [
+                'data-crud-search-id' => $crud->getDivIdSearch(),
+                'data-crud-list-id' => $crud->getDivIdList(),
+                'data-ec-crud-ajax-url' => $crud->getSearchUrl(['raz' => 1]),
+            ],
+            $options['button_attr'],
+            $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options']))
+        );
+        $class = 'ec-crud-search-reset';
+        if (isset($options['button_attr']['class'])) {
+            $options['button_attr']['class'] = sprintf('%s %s', $class, $options['button_attr']['class']);
+        } else {
+            $options['button_attr']['class'] = $class;
+        }
+
+        return $this->renderBlock($environment, $this->theme, 'search_form_reset', array_merge($options, [
+            'crud' => $crud,
+        ]));
     }
 
     /**
diff --git a/tests/Functional/App/templates/user/list.html.twig b/tests/Functional/App/templates/user/list.html.twig
index 0a96682..d96426d 100644
--- a/tests/Functional/App/templates/user/list.html.twig
+++ b/tests/Functional/App/templates/user/list.html.twig
@@ -21,11 +21,13 @@
 
 {% if test_before_after_build_query is defined %}<div>TEST BEFORE AFTER BUILD QUERY {{ test_before_after_build_query }}</div>{% endif %}
 
-<div class="info-pagination">
-    {% trans with {'%first%': crud.paginator.firstIndice, '%last%' : crud.paginator.lastIndice} %}Results %first%-%last%{% endtrans %}  -
-    {% trans with {'%page%': crud.paginator.page, '%lastPage%' : crud.paginator.lastPage} %}Page %page%/%lastPage%{% endtrans %}
-</div>
+{% if crud.paginator %}
+    <div class="info-pagination">
+        {% trans with {'%first%': crud.paginator.firstIndice, '%last%' : crud.paginator.lastIndice} %}Results %first%-%last%{% endtrans %}  -
+        {% trans with {'%page%': crud.paginator.page, '%lastPage%' : crud.paginator.lastPage} %}Page %page%/%lastPage%{% endtrans %}
+    </div>
 
-{{ crud_paginator_links(crud) }}
+    {{ crud_paginator_links(crud) }}
+{% endif %}
 
 {{ crud_display_settings(crud, {modal: false}) }}
diff --git a/tests/Functional/App/templates/user/search.html.twig b/tests/Functional/App/templates/user/search.html.twig
index a706b8e..8191c04 100644
--- a/tests/Functional/App/templates/user/search.html.twig
+++ b/tests/Functional/App/templates/user/search.html.twig
@@ -1,12 +1,10 @@
-{{ crud_search_form(crud, {}, {'class': 'form-inline'}) }}
+{{ crud_search_form_start(crud, {}, {'class': 'form-inline'}) }}
     {{ form_row(crud.searcherform.username) }}
     {{ form_row(crud.searcherform.firstName) }}
     {{ form_row(crud.searcherform.lastName) }}
 
     <div>
-        <button type="submit">
-            {{ 'Search'|trans }}
-        </button>
-        {{ crud_search_reset(crud) }}
+        {{ crud_search_form_submit(crud) }}
+        {{ crud_search_form_reset(crud) }}
     </div>
 </form>
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 3d17e73..3c683b9 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -355,5 +355,7 @@ protected function waitForAjax(Client $client, int $timeout = 5): void
         $driver->wait($timeout, 500)->until(static function ($driver) {
             return !$driver->executeScript('return (typeof jQuery !== "undefined" && jQuery.active);');
         });
+
+        usleep(500000);
     }
 }

From 8df0d63771942dd360ab4934827b5fde102f28fe Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 17 Feb 2021 15:07:45 +0100
Subject: [PATCH 041/264] Add ec-crud-ajax-update-dom-before and
 ec-crud-ajax-update-dom-after events

---
 src/Resources/public/js/ajax.js        | 41 ++++++++++++-------
 tests/Resources/public/js/ajax.spec.js | 56 ++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/src/Resources/public/js/ajax.js b/src/Resources/public/js/ajax.js
index f83f568..f5c4d0b 100644
--- a/src/Resources/public/js/ajax.js
+++ b/src/Resources/public/js/ajax.js
@@ -166,28 +166,39 @@ export function sendForm (form, options) {
     sendRequest(options);
 }
 
-export function updateDom (element, updateMode, data) {
-    if (updateMode === 'update') {
-        $(element).html(data);
-
+export function updateDom (element, updateMode, content) {
+    const eventBefore = $.Event('ec-crud-ajax-update-dom-before', {
+        element: element,
+        updateMode: updateMode,
+        content: content
+    });
+    $(element).trigger(eventBefore);
+    if (eventBefore.isDefaultPrevented()) {
         return;
-    } else if (updateMode === 'before') {
-        $(element).before(data);
+    }
+    updateMode = eventBefore.updateMode;
+    content = eventBefore.content;
 
-        return;
+    if (updateMode === 'update') {
+        $(element).html(content);
+    } else if (updateMode === 'before') {
+        $(element).before(content);
     } else if (updateMode === 'after') {
-        $(element).after(data);
-
-        return;
+        $(element).after(content);
     } else if (updateMode === 'prepend') {
-        $(element).prepend(data);
-
-        return;
+        $(element).prepend(content);
     } else if (updateMode === 'append') {
-        $(element).append(data);
+        $(element).append(content);
+    } else {
+        console.error('Bad updateMode: ' + updateMode);
 
         return;
     }
 
-    console.error('Bad updateMode: ' + updateMode);
+    const eventAfter = $.Event('ec-crud-ajax-update-dom-after', {
+        element: element,
+        updateMode: updateMode,
+        content: content
+    });
+    $(element).trigger(eventAfter);
 }
diff --git a/tests/Resources/public/js/ajax.spec.js b/tests/Resources/public/js/ajax.spec.js
index f49fb26..1ccff75 100644
--- a/tests/Resources/public/js/ajax.spec.js
+++ b/tests/Resources/public/js/ajax.spec.js
@@ -597,6 +597,8 @@ describe('Test Ajax.updateDom', function () {
 
     afterEach(function () {
         $('.html-test').remove();
+        $(document).off('ec-crud-ajax-update-dom-before');
+        $(document).off('ec-crud-ajax-update-dom-after');
     });
 
     it('Update with "update" mode', function () {
@@ -619,6 +621,60 @@ describe('Test Ajax.updateDom', function () {
         testUpdateDom('append', '<div class="content">XOK</div>');
     });
 
+    it('Update with "update" mode and ec-crud-ajax-update-dom-before event - change updateMode', function () {
+        $(document).on('ec-crud-ajax-update-dom-before', function (event) {
+            event.updateMode = 'append';
+        });
+
+        testUpdateDom('update', '<div class="content">XOK</div>');
+    });
+
+    it('Update with "update" mode and ec-crud-ajax-update-dom-before event - change content', function () {
+        $(document).on('ec-crud-ajax-update-dom-before', function (event) {
+            event.content = 'NEW OK';
+        });
+
+        testUpdateDom('update', '<div class="content">NEW OK</div>');
+    });
+
+    it('Update with "update" mode and ec-crud-ajax-update-dom-before event - preventDefault', function () {
+        $(document).on('ec-crud-ajax-update-dom-before', function (event) {
+            event.preventDefault();
+        });
+
+        testUpdateDom('update', '<div class="content">X</div>');
+    });
+
+    it('Update with "update" mode and ec-crud-ajax-update-dom-after event', function () {
+        $(document).on('ec-crud-ajax-update-dom-after', function (event) {
+            $(event.element).find('.content').html('OK');
+        });
+
+        ajax.updateDom('#container .content', 'update', '<div><span class="content"></span></div>');
+        expect($('#container').html()).toEqual('<div class="content"><div><span class="content">OK</span></div></div>');
+    });
+
+    it('Update with "update" mode and ec-crud-ajax-update-dom-after event - with scopes', function () {
+        const callbackCalled1 = jasmine.createSpy('called1');
+        const callbackCalled2 = jasmine.createSpy('called2');
+        const callbackNotCalled = jasmine.createSpy('not-called');
+
+        $(document).on('ec-crud-ajax-update-dom-before', function (event) {
+            callbackCalled1();
+        });
+        $(document).on('ec-crud-ajax-update-dom-before', '#container', function (event) {
+            callbackCalled2();
+        });
+        $(document).on('ec-crud-ajax-update-dom-before', '#id-does-not-exit', function (event) {
+            callbackNotCalled();
+        });
+
+        testUpdateDom('update', '<div class="content">OK</div>');
+        expect(callbackCalled1).toHaveBeenCalled();
+        expect(callbackCalled2).toHaveBeenCalled();
+        expect(callbackNotCalled).not.toHaveBeenCalled();
+    });
+
     function testUpdateDom (updateMode, expected) {
         ajax.updateDom('#container .content', updateMode, 'OK');
         expect($('#container').html()).toEqual(expected);

From 2926690987081c2ef6fa6fe52b64e922276f4688 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 17 Feb 2021 16:10:40 +0100
Subject: [PATCH 042/264] [CI] Add PHP zip extension

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bf536ef..64a31a9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -63,7 +63,7 @@ jobs:
                 uses: shivammathur/setup-php@v2
                 with:
                     php-version: ${{ matrix.php-version }}
-                    extensions: "pdo_sqlite"
+                    extensions: "pdo_sqlite zip"
                     coverage: none
                     tools: flex
                 env:

From a431bae24f441c4a5cbdab211d9190dc0e03947b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 18 Feb 2021 10:16:48 +0100
Subject: [PATCH 043/264] Add ec-crud-remote-modal-auto event for links

---
 .../public/js/modal/modal-manager.js          | 21 +++++++-
 .../public/js/modal/modal-manager.spec.js     | 52 ++++++++++++++++++-
 2 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/src/Resources/public/js/modal/modal-manager.js b/src/Resources/public/js/modal/modal-manager.js
index 01ccd83..caa60c0 100644
--- a/src/Resources/public/js/modal/modal-manager.js
+++ b/src/Resources/public/js/modal/modal-manager.js
@@ -29,7 +29,7 @@ $(function () {
         openModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'));
     });
 
-    $(document).on('click', '.ec-crud-remote-modal-auto', function (event) {
+    $(document).on('click', 'button.ec-crud-remote-modal-auto', function (event) {
         event.preventDefault();
         const eventBefore = $.Event('ec-crud-remote-modal-auto-before');
         $(this).trigger(eventBefore);
@@ -39,6 +39,25 @@ $(function () {
 
         openRemoteModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'));
     });
+
+    $(document).on('click', 'a.ec-crud-remote-modal-auto', function (event) {
+        event.preventDefault();
+        const eventBefore = $.Event('ec-crud-remote-modal-auto-before');
+        $(this).trigger(eventBefore);
+        if (eventBefore.isDefaultPrevented()) {
+            return;
+        }
+
+        // Options in data-* override href
+        const options = optionsResolver.resolve(
+            {
+                url: $(this).attr('href')
+            },
+            optionsResolver.getDataAttributes(this, 'ecCrudModal')
+        );
+
+        openRemoteModal(options);
+    });
 });
 
 export function defineEngine (newEngine) {
diff --git a/tests/Resources/public/js/modal/modal-manager.spec.js b/tests/Resources/public/js/modal/modal-manager.spec.js
index 8935791..28af865 100644
--- a/tests/Resources/public/js/modal/modal-manager.spec.js
+++ b/tests/Resources/public/js/modal/modal-manager.spec.js
@@ -93,7 +93,7 @@ describe('Test Modal-manager with spy engine', function () {
         $(document).off('ec-crud-modal-auto-before', '#linkToTest');
     });
 
-    it('Test auto openRemoteModal', function () {
+    it('Test auto openRemoteModal - link', function () {
         $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>');
 
         $('#linkToTest').click();
@@ -104,7 +104,29 @@ describe('Test Modal-manager with spy engine', function () {
         expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
     });
 
-    it('Test auto openRemoteModal canceled', function () {
+    it('Test auto openRemoteModal - link with href', function () {
+        $('body').append('<a href="/goodRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content">Go !</a>');
+
+        $('#linkToTest').click();
+
+        expect(this.spyEngine.openModal).toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+    });
+
+    it('Test auto openRemoteModal - link - prioriry url attr', function () {
+        $('body').append('<a href="/badRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>');
+
+        $('#linkToTest').click();
+
+        expect(this.spyEngine.openModal).toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+    });
+
+    it('Test auto openRemoteModal - link - canceled', function () {
         $(document).on('ec-crud-remote-modal-auto-before', '#linkToTest', function (event) {
             event.preventDefault();
         });
@@ -118,6 +140,32 @@ describe('Test Modal-manager with spy engine', function () {
 
         $(document).off('ec-crud-remote-modal-auto-before', '#linkToTest');
     });
+
+    it('Test auto openRemoteModal - button', function () {
+        $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>');
+
+        $('#buttonToTest').click();
+
+        expect(this.spyEngine.openModal).toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
+        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
+    });
+
+    it('Test auto openRemoteModal - button - canceled', function () {
+        $(document).on('ec-crud-remote-modal-auto-before', '#buttonToTest', function (event) {
+            event.preventDefault();
+        });
+        $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>');
+
+        $('#buttonToTest').click();
+
+        expect(this.spyEngine.openModal).not.toHaveBeenCalled();
+        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+
+        $(document).off('ec-crud-remote-modal-auto-before', '#buttonToTest');
+    });
 });
 
 describe('Test Modal-manager with test engine', function () {

From 8dacd54e05b5b061fde9bf6e1c9d5c5c49a6baa4 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 18 Feb 2021 10:59:21 +0100
Subject: [PATCH 044/264] [CI] Fix PHP extensions

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 64a31a9..ae14648 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -63,7 +63,7 @@ jobs:
                 uses: shivammathur/setup-php@v2
                 with:
                     php-version: ${{ matrix.php-version }}
-                    extensions: "pdo_sqlite zip"
+                    extensions: "pdo_sqlite, zip"
                     coverage: none
                     tools: flex
                 env:

From 9b8ead0b4d5caef5773c5dba6e312661fa6641bd Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 22 Feb 2021 19:07:57 +0100
Subject: [PATCH 045/264] Add EntityAjaxType

---
 composer.json                                 |   2 +-
 .../Compiler/TwigFormPass.php                 |  30 ++
 src/EcommitCrudBundle.php                     |   8 +
 .../Entity/AbstractEntityTransformer.php      |  77 ++++
 .../Entity/EntitiesToChoicesTransformer.php   | 101 +++++
 .../Entity/EntitiesToIdsTransformer.php       |  40 ++
 .../Entity/EntityToChoiceTransformer.php      |  76 ++++
 .../Entity/EntityToIdTransformer.php          |  34 ++
 src/Form/Filter/FieldFilterEntityAjax.php     |  81 ++++
 src/Form/Type/EntityAjaxType.php              | 139 +++++++
 src/Resources/config/services.xml             |   6 +
 .../views/Form/entity_ajax.html.twig          |  20 +
 tests/DoctrineHelper.php                      |  80 ++++
 tests/Fixtures/EntityManyToOne.php            |  81 ++++
 tests/Fixtures/EntityToManyToOneSearcher.php  |  21 +
 tests/Fixtures/Tag.php                        |  68 ++++
 .../AbstractEntityTransformerTest.php         |  41 ++
 .../EntitiesToChoicesTransformerTest.php      | 216 ++++++++++
 .../EntitiesToIdsTransformerTest.php          |  55 +++
 .../EntityToChoiceTransformerTest.php         | 168 ++++++++
 .../EntityToIdTransformerTest.php             |  51 +++
 .../Form/Filter/FieldFilterEntityAjaxTest.php | 376 ++++++++++++++++++
 tests/Form/Type/EntityAjaxTypeTest.php        | 338 ++++++++++++++++
 23 files changed, 2108 insertions(+), 1 deletion(-)
 create mode 100644 src/DependencyInjection/Compiler/TwigFormPass.php
 create mode 100644 src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
 create mode 100644 src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
 create mode 100644 src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
 create mode 100644 src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
 create mode 100644 src/Form/DataTransformer/Entity/EntityToIdTransformer.php
 create mode 100644 src/Form/Filter/FieldFilterEntityAjax.php
 create mode 100644 src/Form/Type/EntityAjaxType.php
 create mode 100644 src/Resources/views/Form/entity_ajax.html.twig
 create mode 100644 tests/DoctrineHelper.php
 create mode 100644 tests/Fixtures/EntityManyToOne.php
 create mode 100644 tests/Fixtures/EntityToManyToOneSearcher.php
 create mode 100644 tests/Fixtures/Tag.php
 create mode 100644 tests/Form/DataTransformer/AbstractEntityTransformerTest.php
 create mode 100644 tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
 create mode 100644 tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
 create mode 100644 tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
 create mode 100644 tests/Form/DataTransformer/EntityToIdTransformerTest.php
 create mode 100644 tests/Form/Filter/FieldFilterEntityAjaxTest.php
 create mode 100644 tests/Form/Type/EntityAjaxTypeTest.php

diff --git a/composer.json b/composer.json
index cd9ee18..3612d34 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
         "dbrekelmans/bdi": "^0.3.0",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^2.18.0",
-        "phpunit/phpunit": "^8.4",
+        "phpunit/phpunit": "^8.4.1",
         "symfony/dom-crawler": "^4.4|^5.0",
         "symfony/http-client": "^4.4.11|^5.1.3",
         "symfony/panther": "^1.0",
diff --git a/src/DependencyInjection/Compiler/TwigFormPass.php b/src/DependencyInjection/Compiler/TwigFormPass.php
new file mode 100644
index 0000000..da2cceb
--- /dev/null
+++ b/src/DependencyInjection/Compiler/TwigFormPass.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class TwigFormPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        $container->setParameter('twig.form.resources', array_merge(
+            $container->getParameter('twig.form.resources'),
+            [
+                '@EcommitCrud/Form/entity_ajax.html.twig',
+            ]
+        ));
+    }
+}
diff --git a/src/EcommitCrudBundle.php b/src/EcommitCrudBundle.php
index 3ed6eda..1b97606 100644
--- a/src/EcommitCrudBundle.php
+++ b/src/EcommitCrudBundle.php
@@ -13,8 +13,16 @@
 
 namespace Ecommit\CrudBundle;
 
+use Ecommit\CrudBundle\DependencyInjection\Compiler\TwigFormPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class EcommitCrudBundle extends Bundle
 {
+    public function build(ContainerBuilder $container): void
+    {
+        parent::build($container);
+
+        $container->addCompilerPass(new TwigFormPass());
+    }
 }
diff --git a/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php b/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
new file mode 100644
index 0000000..d6fd82b
--- /dev/null
+++ b/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\DataTransformer\Entity;
+
+use Ecommit\ScalarValues\ScalarValues;
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\PropertyAccessor;
+
+abstract class AbstractEntityTransformer implements DataTransformerInterface
+{
+    protected $queryBuilder;
+    protected $identifier;
+    protected $choiceLabel;
+    protected $throwExceptionIfValueNotFoundInReverse;
+
+    /**
+     * @var PropertyAccessor
+     */
+    protected $accessor;
+
+    protected $cachedResults = [];
+
+    public function __construct($queryBuilder, $identifier, $choiceLabel, bool $throwExceptionIfValueNotFoundInReverse)
+    {
+        $this->queryBuilder = $queryBuilder;
+        $this->identifier = $identifier;
+        $this->choiceLabel = $choiceLabel;
+        $this->throwExceptionIfValueNotFoundInReverse = $throwExceptionIfValueNotFoundInReverse;
+        $this->accessor = PropertyAccess::createPropertyAccessor();
+    }
+
+    protected function getCacheHash($id): string
+    {
+        if (\is_array($id)) {
+            $id = ScalarValues::filterScalarValues($id);
+            $id = array_map(function ($child) {
+                return (string) $child; //Converts ids from integer to string => Parameters for transform and reverse functions must be identicals
+            }, $id);
+            sort($id);
+        } else {
+            $id = (string) $id;
+        }
+
+        return md5(json_encode([
+            spl_object_hash($this->queryBuilder),
+            $this->identifier,
+            $id,
+        ]));
+    }
+
+    protected function extractLabel($entity): string
+    {
+        if ($this->choiceLabel) {
+            if ($this->choiceLabel instanceof \Closure) {
+                return (string) $this->choiceLabel->__invoke($entity);
+            }
+
+            return (string) $this->accessor->getValue($entity, $this->choiceLabel);
+        } elseif (method_exists($entity, '__toString')) {
+            return (string) $entity;
+        }
+
+        throw new \Exception('"choice_label" option or "__toString" method must be defined"');
+    }
+}
diff --git a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
new file mode 100644
index 0000000..5297ae2
--- /dev/null
+++ b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\DataTransformer\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Ecommit\ScalarValues\ScalarValues;
+use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class EntitiesToChoicesTransformer extends AbstractEntityTransformer
+{
+    protected $maxResults;
+
+    public function __construct($queryBuilder, $identifier, $choiceLabel, bool $throwExceptionIfValueNotFoundInReverse, int $maxResults)
+    {
+        parent::__construct($queryBuilder, $identifier, $choiceLabel, $throwExceptionIfValueNotFoundInReverse);
+
+        $this->maxResults = $maxResults;
+    }
+
+    public function transform($collection)
+    {
+        if (null === $collection) {
+            return [];
+        }
+
+        if (!($collection instanceof Collection)) {
+            throw new UnexpectedTypeException($collection, Collection::class);
+        }
+
+        $results = [];
+        foreach ($collection as $entity) {
+            $identifier = (string) $this->accessor->getValue($entity, $this->identifier);
+            $label = $this->extractLabel($entity);
+
+            $results[$identifier] = $label;
+        }
+
+        return $results;
+    }
+
+    public function reverseTransform($identifiers)
+    {
+        $collection = new ArrayCollection();
+
+        if ('' === $identifiers || null === $identifiers) {
+            return $collection;
+        }
+
+        if (!\is_array($identifiers)) {
+            throw new TransformationFailedException('This collection must be an array');
+        }
+        $identifiers = ScalarValues::filterScalarValues($identifiers);
+
+        if (0 === \count($identifiers)) {
+            return $collection;
+        }
+        $identifiers = array_unique($identifiers);
+        if (\count($identifiers) > $this->maxResults) {
+            throw new TransformationFailedException(sprintf('This collection should contain %s elements or less.', $this->maxResults));
+        }
+
+        $hash = $this->getCacheHash($identifiers);
+        if (\array_key_exists($hash, $this->cachedResults)) {
+            $collection = $this->cachedResults[$hash];
+        } else {
+            //Result not in cache
+
+            try {
+                $queryBuilderLoader = new ORMQueryBuilderLoader($this->queryBuilder);
+
+                foreach ($queryBuilderLoader->getEntitiesByIds($this->identifier, $identifiers) as $entity) {
+                    $collection->add($entity);
+                }
+            } catch (\Exception $exception) {
+                throw new TransformationFailedException('Tranformation: Query Error');
+            }
+
+            if ($collection->count() !== \count($identifiers) && $this->throwExceptionIfValueNotFoundInReverse) {
+                throw new TransformationFailedException('Entities not found');
+            }
+
+            $this->cachedResults[$hash] = $collection; //Saves result in cache
+        }
+
+        return $collection;
+    }
+}
diff --git a/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
new file mode 100644
index 0000000..19433b2
--- /dev/null
+++ b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\DataTransformer\Entity;
+
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class EntitiesToIdsTransformer extends EntitiesToChoicesTransformer
+{
+    public function transform($collection)
+    {
+        if (null === $collection) {
+            return [];
+        }
+
+        if (!($collection instanceof Collection)) {
+            throw new UnexpectedTypeException($collection, Collection::class);
+        }
+
+        $results = [];
+        foreach ($collection as $entity) {
+            $identifier = (string) $this->accessor->getValue($entity, $this->identifier);
+
+            $results[] = $identifier;
+        }
+
+        return $results;
+    }
+}
diff --git a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
new file mode 100644
index 0000000..b06124e
--- /dev/null
+++ b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\DataTransformer\Entity;
+
+use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class EntityToChoiceTransformer extends AbstractEntityTransformer
+{
+    public function transform($entity)
+    {
+        if (null === $entity || '' === $entity) {
+            return null;
+        }
+
+        if (!\is_object($entity)) {
+            throw new UnexpectedTypeException($entity, 'object');
+        }
+
+        $identifier = (string) $this->accessor->getValue($entity, $this->identifier);
+        $label = $this->extractLabel($entity);
+
+        $results[$identifier] = $label;
+
+        return $results;
+    }
+
+    public function reverseTransform($identifier)
+    {
+        if ('' === $identifier || null === $identifier) {
+            return null;
+        }
+
+        if (!is_scalar($identifier)) {
+            throw new TransformationFailedException('Value is not scalar');
+        }
+
+        $hash = $this->getCacheHash($identifier);
+        if (\array_key_exists($hash, $this->cachedResults)) {
+            $entity = $this->cachedResults[$hash];
+        } else {
+            //Result not in cache
+
+            try {
+                $queryBuilderLoader = new ORMQueryBuilderLoader($this->queryBuilder);
+                $entities = $queryBuilderLoader->getEntitiesByIds($this->identifier, [$identifier]);
+            } catch (\Exception $exception) {
+                throw new TransformationFailedException('Tranformation: Query Error');
+            }
+            if (1 !== \count($entities)) {
+                if ($this->throwExceptionIfValueNotFoundInReverse) {
+                    throw new TransformationFailedException(sprintf('The entity with key "%s" could not be found or is not unique', $identifier));
+                }
+
+                return null;
+            }
+
+            $entity = $entities[0];
+            $this->cachedResults[$hash] = $entity; //Saves result in cache
+        }
+
+        return $entity;
+    }
+}
diff --git a/src/Form/DataTransformer/Entity/EntityToIdTransformer.php b/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
new file mode 100644
index 0000000..5bee247
--- /dev/null
+++ b/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\DataTransformer\Entity;
+
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class EntityToIdTransformer extends EntityToChoiceTransformer
+{
+    public function transform($entity)
+    {
+        if (null === $entity || '' === $entity) {
+            return null;
+        }
+
+        if (!\is_object($entity)) {
+            throw new UnexpectedTypeException($entity, 'object');
+        }
+
+        $identifier = (string) $this->accessor->getValue($entity, $this->identifier);
+
+        return $identifier;
+    }
+}
diff --git a/src/Form/Filter/FieldFilterEntityAjax.php b/src/Form/Filter/FieldFilterEntityAjax.php
new file mode 100644
index 0000000..d2dfe86
--- /dev/null
+++ b/src/Form/Filter/FieldFilterEntityAjax.php
@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToIdsTransformer;
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
+use Ecommit\CrudBundle\Form\Type\EntityAjaxType;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\ReversedTransformer;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class FieldFilterEntityAjax extends FieldFilterChoice
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'route_params' => [],
+        ]);
+
+        $resolver->setRequired([
+            'class',
+            'route_name',
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configureTypeOptions($typeOptions)
+    {
+        $options = ['class', 'route_name', 'route_params', 'multiple'];
+        foreach ($options as $option) {
+            if (!isset($typeOptions[$option])) {
+                $typeOptions[$option] = $this->options[$option];
+            }
+        }
+        if (!isset($typeOptions['max_elements'])) {
+            $typeOptions['max_elements'] = $this->options['max'];
+        }
+
+        return $typeOptions;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addField(FormBuilder $formBuilder)
+    {
+        $formBuilder->add($this->property, EntityAjaxType::class, $this->typeOptions);
+        $typeOptions = $formBuilder->get($this->property)->getOptions();
+        if ($this->options['multiple']) {
+            $formBuilder->get($this->property)->addModelTransformer(
+                new ReversedTransformer(
+                    new EntitiesToIdsTransformer($typeOptions['query_builder'], $typeOptions['identifier'], $typeOptions['choice_label'], false, $typeOptions['max_elements'])
+                )
+            );
+        } else {
+            $formBuilder->get($this->property)->addModelTransformer(
+                new ReversedTransformer(
+                    new EntityToIdTransformer($typeOptions['query_builder'], $typeOptions['identifier'], $typeOptions['choice_label'], false)
+                )
+            );
+        }
+
+        return $formBuilder;
+    }
+}
diff --git a/src/Form/Type/EntityAjaxType.php b/src/Form/Type/EntityAjaxType.php
new file mode 100644
index 0000000..a899d5d
--- /dev/null
+++ b/src/Form/Type/EntityAjaxType.php
@@ -0,0 +1,139 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Type;
+
+use Doctrine\Persistence\ManagerRegistry;
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToChoicesTransformer;
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToChoiceTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Exception\InvalidConfigurationException;
+use Symfony\Component\Form\Exception\RuntimeException;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Routing\RouterInterface;
+
+class EntityAjaxType extends AbstractType
+{
+    /**
+     * @var ManagerRegistry
+     */
+    protected $registry;
+
+    /**
+     * @var RouterInterface
+     */
+    protected $router;
+
+    public function __construct(ManagerRegistry $registry, RouterInterface $router)
+    {
+        $this->registry = $registry;
+        $this->router = $router;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        if ($options['multiple']) {
+            $builder->addViewTransformer(
+                new EntitiesToChoicesTransformer($options['query_builder'], $options['identifier'], $options['choice_label'], true, $options['max_elements'])
+            );
+        } else {
+            $builder->addViewTransformer(
+                new EntityToChoiceTransformer($options['query_builder'], $options['identifier'], $options['choice_label'], true)
+            );
+        }
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options): void
+    {
+        $view->vars['url'] = $this->router->generate($options['route_name'], $options['route_params']);
+        $view->vars['multiple'] = $options['multiple'];
+
+        if ($options['multiple']) {
+            $view->vars['full_name'] .= '[]';
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setRequired([
+            'class',
+            'route_name',
+        ]);
+        $resolver->setDefaults([
+            'compound' => false,
+            'multiple' => false,
+            'em' => null,
+            'query_builder' => null,
+            'choice_label' => null,
+            'route_params' => [],
+            'max_elements' => 10000,
+            'identifier' => null, //Internal
+        ]);
+
+        $emNormalizer = function (Options $options, $em) {
+            if (null !== $em) {
+                return $this->registry->getManager($em);
+            }
+
+            $em = $this->registry->getManagerForClass($options['class']);
+            if (null === $em) {
+                throw new RuntimeException(sprintf('Class "%s" : Entity manager not found', $options['class']));
+            }
+
+            return $em;
+        };
+        $resolver->setNormalizer('em', $emNormalizer);
+
+        $queryBuilderNormalizer = function (Options $options, $queryBuilder) {
+            $em = $options['em'];
+            $class = $options['class'];
+
+            if (null === $queryBuilder) {
+                $queryBuilder = $em->createQueryBuilder()
+                    ->from($class, 'c')
+                    ->select('c');
+            }
+
+            if ($queryBuilder instanceof \Closure) {
+                $queryBuilder = $queryBuilder($em->getRepository($class));
+            }
+
+            return $queryBuilder;
+        };
+        $resolver->setNormalizer('query_builder', $queryBuilderNormalizer);
+
+        $identifierNormalizer = function (Options $options, $identifier) {
+            if (null !== $identifier) {
+                return $identifier;
+            }
+
+            $em = $options['em'];
+            $identifiers = $em->getClassMetadata($options['class'])->getIdentifierFieldNames();
+            if (1 !== \count($identifiers)) {
+                throw new InvalidConfigurationException('Identifier not unique');
+            }
+
+            return $identifiers[0];
+        };
+        $resolver->setNormalizer('identifier', $identifierNormalizer);
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'ecommit_crud_entity_ajax';
+    }
+}
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 9f30a53..bc7a7b5 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -42,5 +42,11 @@
         <service id="Ecommit\CrudBundle\EventListener\MappingEntities" class="Ecommit\CrudBundle\EventListener\MappingEntities">
             <tag name="doctrine.event_listener" event="loadClassMetadata" />
         </service>
+
+        <service id="Ecommit\CrudBundle\Form\Type\EntityAjaxType" class="Ecommit\CrudBundle\Form\Type\EntityAjaxType">
+            <argument type="service" id="Doctrine\Persistence\ManagerRegistry" />
+            <argument type="service" id="Symfony\Component\Routing\RouterInterface" />
+            <tag name="form.type" />
+        </service>
     </services>
 </container>
diff --git a/src/Resources/views/Form/entity_ajax.html.twig b/src/Resources/views/Form/entity_ajax.html.twig
new file mode 100644
index 0000000..090f471
--- /dev/null
+++ b/src/Resources/views/Form/entity_ajax.html.twig
@@ -0,0 +1,20 @@
+{% block ecommit_crud_entity_ajax_widget %}
+    {% set attr = attr|merge({
+        'data-ec-crud-entity-ajax-url': url,
+        'data-ec-crud-entity-ajax-multiple': multiple ? 'true' : 'false',
+        'class': (attr.class|default('') ~ ' ec-crud-entity-ajax form-control')|trim,
+    }) %}
+
+    {% if multiple %}
+        {% set attr = attr|merge({'multiple': 'multiple'}) %}
+    {% endif %}
+
+    <select {{ block('widget_attributes') }}>
+        {# If null (invalid) or if invalid : Not display list because several labels are missing #}
+        {% if value is not null and valid %}
+            {% for id, label in value %}
+                <option value="{{ id }}" selected="selected">{{ label }}</option>
+            {% endfor %}
+        {% endif %}
+    </select>
+{% endblock %}
diff --git a/tests/DoctrineHelper.php b/tests/DoctrineHelper.php
new file mode 100644
index 0000000..2073dac
--- /dev/null
+++ b/tests/DoctrineHelper.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests;
+
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Tools\SchemaTool;
+use Doctrine\ORM\Tools\Setup;
+use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+
+class DoctrineHelper
+{
+    public static function createEntityManager(bool $addSchema = true): EntityManager
+    {
+        $connection = [
+            'driver' => 'pdo_sqlite',
+            'memory' => true,
+        ];
+
+        $config = Setup::createAnnotationMetadataConfiguration([__DIR__.'/Fixtures'], true, null, null, false);
+
+        $entityManager = EntityManager::create($connection, $config);
+        if (false === $addSchema) {
+            return $entityManager;
+        }
+
+        $classes = [
+            $entityManager->getClassMetadata(Tag::class),
+            $entityManager->getClassMetadata(EntityManyToOne::class),
+        ];
+
+        $schemaTool = new SchemaTool($entityManager);
+        try {
+            $schemaTool->dropSchema($classes);
+        } catch (\Exception $e) {
+        }
+
+        try {
+            $schemaTool->createSchema($classes);
+        } catch (\Exception $e) {
+        }
+
+        return $entityManager;
+    }
+
+    public static function loadTagsFixtures(EntityManager $entityManager): void
+    {
+        $entityManager->persist(new Tag(1, 'tag1'));
+        $entityManager->persist(new Tag(2, 'tag2'));
+        $entityManager->persist(new Tag(3, '3'));
+        $entityManager->persist(new Tag(4, 'tag_name'));
+        $entityManager->persist(new Tag(5, 'tag_name'));
+        $entityManager->flush();
+        $entityManager->clear();
+    }
+
+    public static function loadEntityManyToOneFixtures(EntityManager $entityManager): void
+    {
+        $tagRepository = $entityManager->getRepository(Tag::class);
+
+        $entityManager->persist(new EntityManyToOne(1, 'entity1', $tagRepository->find(2)));
+        $entityManager->persist(new EntityManyToOne(2, 'entity2', $tagRepository->find(3)));
+        $entityManager->persist(new EntityManyToOne(3, 'entity3', $tagRepository->find(4)));
+        $entityManager->persist(new EntityManyToOne(4, 'entity4', $tagRepository->find(5)));
+        $entityManager->persist(new EntityManyToOne(5, 'entity5', $tagRepository->find(5)));
+        $entityManager->flush();
+        $entityManager->clear();
+    }
+}
diff --git a/tests/Fixtures/EntityManyToOne.php b/tests/Fixtures/EntityManyToOne.php
new file mode 100644
index 0000000..eead4e1
--- /dev/null
+++ b/tests/Fixtures/EntityManyToOne.php
@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Fixtures;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class EntityManyToOne
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     */
+    protected $id;
+
+    /**
+     * @ORM\Column(type="string", length=255)
+     */
+    protected $name;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Tag")
+     */
+    protected $tag;
+
+    public function __construct(int $id, string $name, Tag $tag)
+    {
+        $this->id = $id;
+        $this->name = $name;
+        $this->tag = $tag;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function setId(?int $id): self
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    public function setName(?string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function getTag(): ?Tag
+    {
+        return $this->tag;
+    }
+
+    public function setTag(?Tag $tag): self
+    {
+        $this->tag = $tag;
+
+        return $this;
+    }
+}
diff --git a/tests/Fixtures/EntityToManyToOneSearcher.php b/tests/Fixtures/EntityToManyToOneSearcher.php
new file mode 100644
index 0000000..c13b305
--- /dev/null
+++ b/tests/Fixtures/EntityToManyToOneSearcher.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Fixtures;
+
+use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
+
+class EntityToManyToOneSearcher extends AbstractFormSearcher
+{
+    public $propertyName;
+}
diff --git a/tests/Fixtures/Tag.php b/tests/Fixtures/Tag.php
new file mode 100644
index 0000000..8654e04
--- /dev/null
+++ b/tests/Fixtures/Tag.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Fixtures;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class Tag
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     */
+    protected $id;
+
+    /**
+     * @ORM\Column(type="string", length=255)
+     */
+    protected $name;
+
+    public function __construct(int $id, string $name)
+    {
+        $this->id = $id;
+        $this->name = $name;
+    }
+
+    public function __toString()
+    {
+        return $this->name;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function setId(?int $id): self
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    public function setName(?string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+}
diff --git a/tests/Form/DataTransformer/AbstractEntityTransformerTest.php b/tests/Form/DataTransformer/AbstractEntityTransformerTest.php
new file mode 100644
index 0000000..6ad609c
--- /dev/null
+++ b/tests/Form/DataTransformer/AbstractEntityTransformerTest.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\DataTransformer;
+
+use Doctrine\ORM\EntityManager;
+use Ecommit\CrudBundle\Tests\DoctrineHelper;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Form\DataTransformerInterface;
+
+abstract class AbstractEntityTransformerTest extends TestCase
+{
+    /**
+     * @var EntityManager
+     */
+    protected $em;
+
+    protected function setUp(): void
+    {
+        $this->em = DoctrineHelper::createEntityManager();
+        DoctrineHelper::loadTagsFixtures($this->em);
+        DoctrineHelper::loadEntityManyToOneFixtures($this->em);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->em = null;
+    }
+
+    abstract protected function createTransformer(...$args): DataTransformerInterface;
+}
diff --git a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
new file mode 100644
index 0000000..4b755cd
--- /dev/null
+++ b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
@@ -0,0 +1,216 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\DataTransformer;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToChoicesTransformer;
+use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class EntitiesToChoicesTransformerTest extends AbstractEntityTransformerTest
+{
+    protected function createTransformer(...$args): DataTransformerInterface
+    {
+        return new EntitiesToChoicesTransformer(...$args);
+    }
+
+    /**
+     * @dataProvider getTestTransformProvider
+     */
+    public function testTransform($choiceLabel, array $expected): void
+    {
+        $collection = new ArrayCollection();
+        $collection->add($this->em->find(Tag::class, 1));
+        $collection->add($this->em->find(Tag::class, 3));
+
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', $choiceLabel, false, 10);
+
+        $this->assertSame($expected, $transformer->transform($collection));
+    }
+
+    public function getTestTransformProvider(): array
+    {
+        $closure = function (Tag $tag) {
+            return sprintf('name: %s', $tag->getName());
+        };
+
+        return [
+            [null, ['1' => 'tag1', '3' => '3']], //Choice label: null
+            ['name', ['1' => 'tag1', '3' => '3']], //Choice label: property
+            [$closure, [1 => 'name: tag1', '3' => 'name: 3']], //Choice label: closure
+        ];
+    }
+
+    public function testTransformWithChoiceLabelError(): void
+    {
+        $entity = $this->em->getRepository(EntityManyToOne::class)->find(1);
+
+        $collection = new ArrayCollection();
+        $collection->add($entity);
+
+        $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')->select('e');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('"choice_label" option or "__toString" method must be defined"');
+        $transformer->transform($collection);
+    }
+
+    public function testTransformNullValue(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $this->assertSame([], $transformer->transform(null));
+    }
+
+    public function testTransformNotCollection(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $this->expectException(UnexpectedTypeException::class);
+        $transformer->transform([]);
+    }
+
+    public function testReverseTransform(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $collection = $transformer->reverseTransform(['1', '3']);
+        $this->assertEquals(new ArrayCollection([
+            $this->em->find(Tag::class, 1),
+            $this->em->find(Tag::class, 3),
+        ]), $collection);
+    }
+
+    /**
+     * @dataProvider getTestReverseTransformNullValueProvider
+     */
+    public function testReverseTransformNullValue($value): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $this->assertEquals(new ArrayCollection(), $transformer->reverseTransform($value));
+    }
+
+    public function getTestReverseTransformNullValueProvider(): array
+    {
+        return [
+            [''],
+            [null],
+            [[]],
+        ];
+    }
+
+    public function testReverseTransformNotArray(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $this->expectException(TransformationFailedException::class);
+        $this->assertEquals(new ArrayCollection(), $transformer->reverseTransform('string'));
+    }
+
+    public function testReverseTransformRemoveNotScalarValues(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $collection = $transformer->reverseTransform(['1', ['val'], '3']);
+        $this->assertEquals(new ArrayCollection([
+            $this->em->find(Tag::class, 1),
+            $this->em->find(Tag::class, 3),
+        ]), $collection);
+    }
+
+    public function testReverseTransformWithEntityNotFoundIgnore(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $collection = $transformer->reverseTransform(['1', '999999', '3']);
+        $this->assertEquals(new ArrayCollection([
+            $this->em->find(Tag::class, 1),
+            $this->em->find(Tag::class, 3),
+        ]), $collection);
+    }
+
+    public function testReverseTransformWithEntityNotFoundThrowsException(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, true, 10);
+
+        $this->expectException(TransformationFailedException::class);
+        $this->expectExceptionMessage('Entities not found');
+        $transformer->reverseTransform(['1', '999999', '3']);
+    }
+
+    public function testReverseTransformWithAllEntitiesNotFoundIgnore(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $collection = $transformer->reverseTransform(['1000', '999999', '3000']);
+        $this->assertEquals(new ArrayCollection(), $collection);
+    }
+
+    public function testReverseTransformWithAllEntitiesNotFoundThrowsException(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, true, 10);
+
+        $this->expectException(TransformationFailedException::class);
+        $this->expectExceptionMessage('Entities not found');
+        $transformer->reverseTransform(['1000', '999999', '3000']);
+    }
+
+    public function testReverseTransformWithDuplicates(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        $collection = $transformer->reverseTransform(['1', '1', '3']);
+        $this->assertEquals(new ArrayCollection([
+            $this->em->find(Tag::class, 1),
+            $this->em->find(Tag::class, 3),
+        ]), $collection);
+    }
+
+    public function testReverseTransformMaxError(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 2);
+
+        $this->expectException(TransformationFailedException::class);
+        $this->expectExceptionMessage('This collection should contain 2 elements or less.');
+        $transformer->reverseTransform(['1', '2', '3']);
+    }
+
+    public function testReverseTransformQueryError(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'badIdentifier', null, false, 10);
+
+        $this->expectException(TransformationFailedException::class);
+        $this->expectExceptionMessage('Tranformation: Query Error');
+        $transformer->reverseTransform(['1', '1', '3']);
+    }
+}
diff --git a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
new file mode 100644
index 0000000..7a28863
--- /dev/null
+++ b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\DataTransformer;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToIdsTransformer;
+use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use Symfony\Component\Form\DataTransformerInterface;
+
+class EntitiesToIdsTransformerTest extends EntitiesToChoicesTransformerTest
+{
+    protected function createTransformer(...$args): DataTransformerInterface
+    {
+        return new EntitiesToIdsTransformer(...$args);
+    }
+
+    public function getTestTransformProvider(): array
+    {
+        $closure = function (Tag $tag) {
+            return sprintf('name: %s', $tag->getName());
+        };
+
+        return [
+            [null, ['1', '3']], //Choice label: null
+            ['name', ['1', '3']], //Choice label: property
+            [$closure, ['1', '3']], //Choice label: closure
+        ];
+    }
+
+    public function testTransformWithChoiceLabelError(): void
+    {
+        $entity = $this->em->getRepository(EntityManyToOne::class)->find(1);
+
+        $collection = new ArrayCollection();
+        $collection->add($entity);
+
+        $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')->select('e');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
+
+        //No throws exception
+        $this->assertSame(['1'], $transformer->transform($collection));
+    }
+}
diff --git a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
new file mode 100644
index 0000000..6a2c8bb
--- /dev/null
+++ b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
@@ -0,0 +1,168 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\DataTransformer;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToChoiceTransformer;
+use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+
+class EntityToChoiceTransformerTest extends AbstractEntityTransformerTest
+{
+    protected function createTransformer(...$args): DataTransformerInterface
+    {
+        return new EntityToChoiceTransformer(...$args);
+    }
+
+    /**
+     * @dataProvider getTestTransformProvider
+     */
+    public function testTransform($choiceLabel, $expected): void
+    {
+        $entity = $this->em->find(Tag::class, 3);
+
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', $choiceLabel, false);
+
+        $this->assertSame($expected, $transformer->transform($entity));
+    }
+
+    public function getTestTransformProvider(): array
+    {
+        $closure = function (Tag $tag) {
+            return sprintf('name: %s', $tag->getName());
+        };
+
+        return [
+            [null, ['3' => '3']], //Choice label: null
+            ['name', ['3' => '3']], //Choice label: property
+            [$closure, ['3' => 'name: 3']], //Choice label: closure
+        ];
+    }
+
+    public function testTransformWithChoiceLabelError(): void
+    {
+        $entity = $this->em->getRepository(EntityManyToOne::class)->find(1);
+
+        $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')->select('e');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('"choice_label" option or "__toString" method must be defined"');
+        $transformer->transform($entity);
+    }
+
+    public function testTransformNullValue(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false);
+
+        $this->assertNull($transformer->transform(null));
+    }
+
+    public function testTransformNotObject(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false);
+
+        $this->expectException(UnexpectedTypeException::class);
+        $transformer->transform('string');
+    }
+
+    public function testReverseTransform(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false);
+
+        $entity = $transformer->reverseTransform('3');
+        $this->assertEquals($this->em->find(Tag::class, 3), $entity);
+    }
+
+    /**
+     * @dataProvider getTestReverseTransformNullValueProvider
+     */
+    public function testReverseTransformNullValue($value): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false);
+
+        $this->assertNull($transformer->reverseTransform($value));
+    }
+
+    public function getTestReverseTransformNullValueProvider(): array
+    {
+        return [
+            [''],
+            [null],
+        ];
+    }
+
+    public function testReverseTransformNotScalar(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false);
+
+        $this->expectException(TransformationFailedException::class);
+        $this->assertEquals(new ArrayCollection(), $transformer->reverseTransform(['val']));
+    }
+
+    public function testReverseTransformWithEntityNotFoundReturnsNull(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false);
+
+        $this->assertNull($transformer->reverseTransform('999999'));
+    }
+
+    public function testReverseTransformWithEntityNotFoundThrowsException(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, true);
+
+        $this->expectException(TransformationFailedException::class);
+        $this->expectExceptionMessage('The entity with key "999999" could not be found or is not unique');
+        $transformer->reverseTransform('999999');
+    }
+
+    public function testReverseTransformNotUniqueReturnsNull(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'name', null, false);
+
+        $this->assertNull($transformer->reverseTransform('tag_name'));
+    }
+
+    public function testReverseTransformNotUniqueThrowsException(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'name', null, true);
+
+        $this->expectException(TransformationFailedException::class);
+        $this->expectExceptionMessage('The entity with key "tag_name" could not be found or is not unique');
+        $transformer->reverseTransform('tag_name');
+    }
+
+    public function testReverseTransformQueryError(): void
+    {
+        $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')->select('t');
+        $transformer = $this->createTransformer($queryBuilder, 'badIdentifier', null, false);
+
+        $this->expectException(TransformationFailedException::class);
+        $this->expectExceptionMessage('Tranformation: Query Error');
+        $transformer->reverseTransform('3');
+    }
+}
diff --git a/tests/Form/DataTransformer/EntityToIdTransformerTest.php b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
new file mode 100644
index 0000000..210759b
--- /dev/null
+++ b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\DataTransformer;
+
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
+use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use Symfony\Component\Form\DataTransformerInterface;
+
+class EntityToIdTransformerTest extends EntityToChoiceTransformerTest
+{
+    protected function createTransformer(...$args): DataTransformerInterface
+    {
+        return new EntityToIdTransformer(...$args);
+    }
+
+    public function getTestTransformProvider(): array
+    {
+        $closure = function (Tag $tag) {
+            return sprintf('name: %s', $tag->getName());
+        };
+
+        return [
+            [null, '3'], //Choice label: null
+            ['name', '3'], //Choice label: property
+            [$closure, '3'], //Choice label: closure
+        ];
+    }
+
+    public function testTransformWithChoiceLabelError(): void
+    {
+        $entity = $this->em->getRepository(EntityManyToOne::class)->find(1);
+
+        $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')->select('e');
+        $transformer = $this->createTransformer($queryBuilder, 'id', null, false);
+
+        //No throws exception
+        $this->assertSame('1', $transformer->transform($entity));
+    }
+}
diff --git a/tests/Form/Filter/FieldFilterEntityAjaxTest.php b/tests/Form/Filter/FieldFilterEntityAjaxTest.php
new file mode 100644
index 0000000..150b677
--- /dev/null
+++ b/tests/Form/Filter/FieldFilterEntityAjaxTest.php
@@ -0,0 +1,376 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityRepository;
+use Ecommit\CrudBundle\Form\Filter\FieldFilterEntityAjax;
+use Ecommit\CrudBundle\Form\Type\EntityAjaxType;
+use Ecommit\CrudBundle\Tests\DoctrineHelper;
+use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Fixtures\EntityToManyToOneSearcher;
+use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
+use Symfony\Bridge\Doctrine\ManagerRegistry;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\Forms;
+use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+use Symfony\Component\Routing\Router;
+
+class FieldFilterEntityAjaxTest extends TestCase
+{
+    /**
+     * @var EntityManager
+     */
+    protected $em;
+
+    /**
+     * @var FormFactoryInterface
+     */
+    protected $factory;
+
+    protected function setUp(): void
+    {
+        $this->em = DoctrineHelper::createEntityManager();
+        DoctrineHelper::loadTagsFixtures($this->em);
+        DoctrineHelper::loadEntityManyToOneFixtures($this->em);
+
+        $registry = $this->createMock(ManagerRegistry::class);
+        $registry->expects($this->any())
+            ->method('getManager')
+            ->with($this->equalTo('default'))
+            ->willReturn($this->em);
+        $registry->expects($this->any())
+            ->method('getManagerForClass')
+            ->willReturnCallback(function ($class) {
+                if (Tag::class === $class) {
+                    return $this->em;
+                }
+
+                return null;
+            });
+
+        $router = $this->createMock(Router::class);
+        $router->expects($this->any())
+            ->method('generate')
+            ->willReturnCallback(function (string $routeName, array $routeParams) {
+                if (\count($routeParams) > 0) {
+                    return '/'.$routeName.'?'.http_build_query($routeParams);
+                }
+
+                return '/'.$routeName;
+            });
+
+        $this->factory = Forms::createFormFactoryBuilder()
+            ->addType(new EntityAjaxType($registry, $router))
+            ->addTypeGuesser(new DoctrineOrmTypeGuesser($registry))
+            ->getFormFactory();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->em = null;
+    }
+
+    public function testOptionsAreRequired(): void
+    {
+        $this->expectException(MissingOptionsException::class);
+        $filter = new FieldFilterEntityAjax('columnId', 'propertyName');
+        $filter->init();
+    }
+
+    /**
+     * @dataProvider getTestViewAndQueryBuilderProvider
+     */
+    public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
+    {
+        $searcher = new EntityToManyToOneSearcher();
+        $searcher->propertyName = $modelData;
+
+        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'multiple' => $multiple,
+        ]);
+        $filter->init();
+
+        $formBuilder = $this->factory->createBuilder(FormType::class, [
+            'propertyName' => $searcher->propertyName,
+        ]);
+        $filter->addField($formBuilder);
+        $view = $formBuilder->getForm()->createView();
+
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
+
+        $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')
+            ->orderBy('e.id', 'asc');
+        $filter->changeQuery($queryBuilder, $searcher, 'e.tag');
+        $idsFound = [];
+        foreach ($queryBuilder->getQuery()->getResult() as $entity) {
+            $idsFound[] = $entity->getId();
+        }
+        $this->assertSame($expectedIdsFound, $idsFound);
+    }
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        return [
+            //No multiple
+            [false, null, null, [1, 2, 3, 4, 5]],
+            [false, 2, ['2' => 'tag2'], [1]],
+            [false, 5, ['5' => 'tag_name'], [4, 5]],
+            [false, 9999, null, []], //9999 : Entity not found
+
+            //Multiple
+            [true, [], [], [1, 2, 3, 4, 5]],
+            [true, [2], ['2' => 'tag2'], [1]],
+            [true, [2, 3], ['2' => 'tag2', '3' => '3'], [1, 2]],
+            [true, [2, 9999], ['2' => 'tag2'], [1]], //9999 : Entity not found
+            [true, [9999], [], []], //9999 : Entity not found
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitProvider
+     */
+    public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $expectedViewData): void
+    {
+        $searcher = new EntityToManyToOneSearcher();
+        $searcher->propertyName = ($multiple) ? [] : null;
+
+        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'multiple' => $multiple,
+        ]);
+        $filter->init();
+
+        $formBuilder = $this->factory->createBuilder(FormType::class, [
+            'propertyName' => $searcher->propertyName,
+        ]);
+        $filter->addField($formBuilder);
+
+        $form = $formBuilder->getForm();
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertSame($expectedModelData, $field->getData());
+        $this->assertSame($expectedViewData, $field->getViewData());
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            //No multiple
+            [false, null, null, null],
+            [false, '', null, null],
+            [false, '2', '2', ['2' => 'tag2']],
+
+            //Multiple
+            [true, [], [], []],
+            [true, ['2'], ['2'], ['2' => 'tag2']],
+            [true, ['2', '3'], ['2', '3'], ['2' => 'tag2', '3' => '3']],
+            [true, ['2', ['1']], ['2'], ['2' => 'tag2']], //Ignore not scalar
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitInvalidProvider
+     */
+    public function testSubmitInvalid(bool $multiple, $submittedData): void
+    {
+        $searcher = new EntityToManyToOneSearcher();
+        $searcher->propertyName = ($multiple) ? [] : null;
+
+        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'multiple' => $multiple,
+            'max' => 2,
+        ]);
+        $filter->init();
+
+        $formBuilder = $this->factory->createBuilder(FormType::class, [
+            'propertyName' => $searcher->propertyName,
+        ]);
+        $filter->addField($formBuilder);
+
+        $form = $formBuilder->getForm();
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertFalse($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertNull($field->getData());
+        $this->assertSame($submittedData, $field->getViewData()); //Twig doesn't display invalid list
+    }
+
+    public function getTestSubmitInvalidProvider(): array
+    {
+        return [
+            //No multiple
+            [false, []],
+            [false, '99999'],
+
+            //Multiple
+            [true, '1'],
+            [true, ['99999']],
+            [true, ['1', '99999']],
+            [true, ['1', '2', '3']], //max elements
+        ];
+    }
+
+    /**
+     * @dataProvider getTestViewWithQueryBuilderProvider
+     */
+    public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
+    {
+        if ($queryBuilderIsClosure) {
+            $queryBuilder = function (EntityRepository $entityRepository) {
+                return $entityRepository->createQueryBuilder('t')
+                    ->select('t')
+                    ->andWhere('t.id > 2');
+            };
+        } else {
+            $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
+                ->select('t')
+                ->andWhere('t.id > 2');
+        }
+
+        $searcher = new EntityToManyToOneSearcher();
+        $searcher->propertyName = $modelData;
+
+        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'multiple' => $multiple,
+        ], [
+            'query_builder' => $queryBuilder,
+        ]);
+        $filter->init();
+
+        $formBuilder = $this->factory->createBuilder(FormType::class, [
+            'propertyName' => $searcher->propertyName,
+        ]);
+        $filter->addField($formBuilder);
+        $view = $formBuilder->getForm()->createView();
+
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']); //Twig doesn't display invalid list
+
+        $queryBuilderResults = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')
+            ->orderBy('e.id', 'asc');
+        $filter->changeQuery($queryBuilderResults, $searcher, 'e.tag');
+        $idsFound = [];
+        foreach ($queryBuilderResults->getQuery()->getResult() as $entity) {
+            $idsFound[] = $entity->getId();
+        }
+        $this->assertSame($expectedIdsFound, $idsFound);
+    }
+
+    public function getTestViewWithQueryBuilderProvider(): array
+    {
+        return [
+            //No multiple - Valid
+            [false, false, '4', ['4' => 'tag_name'], [3]],
+            [true, false, '4', ['4' => 'tag_name'], [3]],
+
+            //No multiple - Invalid but display results
+            [false, false, '2', null, [1]],
+            [true, false, '2', null, [1]],
+
+            //Mutiple - valid
+            [false, true, ['4'], ['4' => 'tag_name'], [3]],
+            [true, true, ['4'], ['4' => 'tag_name'], [3]],
+
+            //Multiple - Invalid but display results
+            [false, true, ['2'], [], [1]],
+            [true, true, ['2'], [], [1]],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitWithQueryBuilderProvider
+     */
+    public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedViewData): void
+    {
+        if ($queryBuilderIsClosure) {
+            $queryBuilder = function (EntityRepository $entityRepository) {
+                return $entityRepository->createQueryBuilder('t')
+                    ->select('t')
+                    ->andWhere('t.id > 2');
+            };
+        } else {
+            $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
+                ->select('t')
+                ->andWhere('t.id > 2');
+        }
+
+        $searcher = new EntityToManyToOneSearcher();
+        $searcher->propertyName = ($multiple) ? [] : null;
+
+        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'multiple' => $multiple,
+        ], [
+            'query_builder' => $queryBuilder,
+        ]);
+        $filter->init();
+
+        $formBuilder = $this->factory->createBuilder(FormType::class, [
+            'propertyName' => $searcher->propertyName,
+        ]);
+        $filter->addField($formBuilder);
+
+        $form = $formBuilder->getForm();
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertSame($expectedValid, $field->isSynchronized());
+        $this->assertSame($expectedValid, $field->isValid());
+        $this->assertSame($expectedModelData, $field->getData());
+        $this->assertSame($expectedViewData, $field->getViewData()); //Twig doesn't display invalid list
+    }
+
+    public function getTestSubmitWithQueryBuilderProvider(): array
+    {
+        return [
+            //No multiple - Valid
+            [false, false, '4', true, '4', ['4' => 'tag_name']],
+            [true, false, '4', true, '4', ['4' => 'tag_name']],
+
+            //No multiple - Invalid
+            [false, false, '2', false, null, '2'],
+            [true, false, '2', false, null, '2'],
+
+            //Multiple - Valid
+            [false, true, ['4'], true, ['4'], ['4' => 'tag_name']],
+            [true, true, ['4'], true, ['4'], ['4' => 'tag_name']],
+
+            //Multiple - Valid
+            [false, true, ['2'], false, null, ['2']],
+            [true, true, ['2'], false, null, ['2']],
+        ];
+    }
+}
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
new file mode 100644
index 0000000..364fb07
--- /dev/null
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -0,0 +1,338 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Type;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityRepository;
+use Ecommit\CrudBundle\Form\Type\EntityAjaxType;
+use Ecommit\CrudBundle\Tests\DoctrineHelper;
+use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
+use Symfony\Bridge\Doctrine\ManagerRegistry;
+use Symfony\Component\Form\Exception\RuntimeException;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\Forms;
+use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+use Symfony\Component\Routing\Router;
+
+class EntityAjaxTypeTest extends TestCase
+{
+    /**
+     * @var EntityManager
+     */
+    protected $em;
+
+    /**
+     * @var FormFactoryInterface
+     */
+    protected $factory;
+
+    protected function setUp(): void
+    {
+        $this->em = DoctrineHelper::createEntityManager();
+        DoctrineHelper::loadTagsFixtures($this->em);
+
+        $registry = $this->createMock(ManagerRegistry::class);
+        $registry->expects($this->any())
+            ->method('getManager')
+            ->with($this->equalTo('default'))
+            ->willReturn($this->em);
+        $registry
+            ->expects($this->any())
+            ->method('getManagerForClass')
+            ->willReturnCallback(function ($class) {
+                if (Tag::class === $class) {
+                    return $this->em;
+                }
+
+                return null;
+            });
+
+        $router = $this->createMock(Router::class);
+        $router->expects($this->any())
+            ->method('generate')
+            ->willReturnCallback(function (string $routeName, array $routeParams) {
+                if (\count($routeParams) > 0) {
+                    return '/'.$routeName.'?'.http_build_query($routeParams);
+                }
+
+                return '/'.$routeName;
+            });
+
+        $this->factory = Forms::createFormFactoryBuilder()
+            ->addType(new EntityAjaxType($registry, $router))
+            ->addTypeGuesser(new DoctrineOrmTypeGuesser($registry))
+            ->getFormFactory();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->em = null;
+        $this->factory = null;
+    }
+
+    public function testOptionsAreRequired(): void
+    {
+        $this->expectException(MissingOptionsException::class);
+        $this->factory->createNamed('name', EntityAjaxType::class);
+    }
+
+    public function testInvalidClassOption(): void
+    {
+        $this->expectException(RuntimeException::class);
+        $this->factory->createNamed('name', EntityAjaxType::class, null, [
+            'class' => 'bad',
+            'route_name' => 'route_name',
+        ]);
+    }
+
+    /**
+     * @dataProvider getTestViewProvider
+     */
+    public function testView(bool $multiple, $modelData, $dataBuilderName, $expectedViewValue): void
+    {
+        $modelData = $this->buildData($this->em, $modelData, $dataBuilderName);
+
+        $field = $this->factory->create(EntityAjaxType::class, $modelData, [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'multiple' => $multiple,
+            'data_class' => null,
+        ]);
+        $view = $field->createView();
+
+        $this->assertSame($expectedViewValue, $view->vars['value']);
+        $this->assertSame('/route_name', $view->vars['url']);
+        $this->assertSame($multiple, $view->vars['multiple']);
+    }
+
+    public function getTestViewProvider(): array
+    {
+        return [
+            //No multiple
+            [false, null, 'no-transformation', null],
+            [false, 2, 'entity', ['2' => 'tag2']],
+
+            //Multiple
+            [true, [], 'collection', []],
+            [true, [2], 'collection', ['2' => 'tag2']],
+            [true, [2, 3], 'collection', ['2' => 'tag2', '3' => '3']],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitProvider
+     */
+    public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $expectedDataBuilderName, $expectedViewData): void
+    {
+        $field = $this->factory->create(EntityAjaxType::class, null, [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'multiple' => $multiple,
+        ]);
+
+        $field->submit($submittedData);
+
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $expectedModelData = $this->buildData($this->em, $expectedModelData, $expectedDataBuilderName);
+        $this->assertEquals($expectedModelData, $field->getData());
+        $this->assertEquals($expectedViewData, $field->getViewData());
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            //No multiple
+            [false, null, null, 'no-transformation', null],
+            [false, '', null, 'no-transformation', null],
+            [false, '2', 2, 'entity', ['2' => 'tag2']],
+
+            //Multiple
+            [true, [], [], 'collection', []],
+            [true, ['2'], [2], 'collection', ['2' => 'tag2']],
+            [true, ['2', '3'], [2, 3], 'collection', ['2' => 'tag2', '3' => '3']],
+            [true, ['2', ['1']], [2], 'collection', ['2' => 'tag2']], //Ignore not scalar
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitInvalidProvider
+     */
+    public function testSubmitInvalid(bool $multiple, $submittedData): void
+    {
+        $field = $this->factory->create(EntityAjaxType::class, null, [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'multiple' => $multiple,
+            'max_elements' => 2,
+        ]);
+
+        $field->submit($submittedData);
+
+        $this->assertFalse($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertNull($field->getData());
+        $this->assertSame($submittedData, $field->getViewData()); //Twig doesn't display invalid list
+    }
+
+    public function getTestSubmitInvalidProvider(): array
+    {
+        return [
+            //No multiple
+            [false, []],
+            [false, '99999'],
+
+            //Multiple
+            [true, '1'],
+            [true, ['99999']],
+            [true, ['1', '99999']],
+            [true, ['1', '2', '3']], //max elements
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitWithQueryBuilderProvider
+     */
+    public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedDataBuilderName, $expectedViewData): void
+    {
+        if ($queryBuilderIsClosure) {
+            $queryBuilder = function (EntityRepository $entityRepository) {
+                return $entityRepository->createQueryBuilder('t')
+                    ->select('t')
+                    ->andWhere('t.id > 2');
+            };
+        } else {
+            $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
+                ->select('t')
+                ->andWhere('t.id > 2');
+        }
+
+        $field = $this->factory->create(EntityAjaxType::class, null, [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'multiple' => $multiple,
+            'query_builder' => $queryBuilder,
+        ]);
+
+        $field->submit($submittedData);
+
+        $this->assertSame($expectedValid, $field->isSynchronized());
+        $this->assertSame($expectedValid, $field->isValid());
+        $expectedModelData = $this->buildData($this->em, $expectedModelData, $expectedDataBuilderName);
+        $this->assertEquals($expectedModelData, $field->getData());
+        $this->assertEquals($expectedViewData, $field->getViewData()); //Twig doesn't display invalid list
+    }
+
+    public function getTestSubmitWithQueryBuilderProvider(): array
+    {
+        return [
+            //No multiple - Valid
+            [false, false, '4', true, 4, 'entity', ['4' => 'tag_name']],
+            [true, false, '4', true, 4, 'entity', ['4' => 'tag_name']],
+
+            //No multiple - Invalid
+            [false, false, '2', false, null, 'no-transformation', '2'],
+            [true, false, '2', false, null, 'no-transformation', '2'],
+
+            //Multiple - Valid
+            [false, true, ['4', '5'], true, [4, 5], 'collection', ['4' => 'tag_name', '5' => 'tag_name']],
+            [true, true, ['4', '5'], true, [4, 5], 'collection', ['4' => 'tag_name', '5' => 'tag_name']],
+
+            //Multiple - Invalid
+            [false, true, ['2', '5'], false, null, 'no-transformation', ['2', '5']],
+            [true, true, ['2', '5'], false, null, 'no-transformation', ['2', '5']],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestViewWithChoiceLabelProvider
+     */
+    public function testViewWithChoiceLabel($choiceLabel, $expectedViewValue): void
+    {
+        $tag = $this->em->getRepository(Tag::class)->find(2);
+
+        $field = $this->factory->create(EntityAjaxType::class, $tag, [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'data_class' => null,
+            'choice_label' => $choiceLabel,
+        ]);
+        $view = $field->createView();
+
+        $this->assertSame($expectedViewValue, $view->vars['value']);
+    }
+
+    public function getTestViewWithChoiceLabelProvider(): array
+    {
+        $closure = function (Tag $tag) {
+            return sprintf('name: %s', $tag->getName());
+        };
+
+        return [
+            ['name', ['2' => 'tag2']],
+            [$closure, ['2' => 'name: tag2']],
+        ];
+    }
+
+    public function testViewWithRouteParams(): void
+    {
+        $tag = $this->em->getRepository(Tag::class)->find(2);
+
+        $field = $this->factory->create(EntityAjaxType::class, $tag, [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'route_params' => ['param1' => 'value1'],
+            'data_class' => null,
+        ]);
+        $view = $field->createView();
+
+        $this->assertSame('/route_name?param1=value1', $view->vars['url']);
+    }
+
+    public function testViewWithEmParams(): void
+    {
+        $tag = $this->em->getRepository(Tag::class)->find(2);
+
+        $field = $this->factory->create(EntityAjaxType::class, $tag, [
+            'class' => Tag::class,
+            'route_name' => 'route_name',
+            'em' => 'default',
+            'data_class' => null,
+        ]);
+        $view = $field->createView();
+
+        $this->assertSame(['2' => 'tag2'], $view->vars['value']);
+    }
+
+    protected function buildData(EntityManager $entityManager, $data, string $builderName)
+    {
+        if ('no-transformation' === $builderName) {
+            return $data;
+        } elseif ('entity' === $builderName) {
+            return $entityManager->find(Tag::class, $data);
+        } elseif ('collection' === $builderName) {
+            $collection = new ArrayCollection();
+            foreach ($data as $identifier) {
+                $collection->add($entityManager->find(Tag::class, $identifier));
+            }
+
+            return $collection;
+        }
+
+        throw new \Exception('Bad builder');
+    }
+}

From 8d8b1f8c555afc7d895bce0bcace1f264bbab4a9 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 22 Feb 2021 22:17:55 +0100
Subject: [PATCH 046/264] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 32cf282..24b9200 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,4 @@
 ![Tests](https://github.com/e-commit/EcommitCrudBundle/workflows/Tests/badge.svg)
 
 
-**WARNING: This branch is under development. Not use in production. You can use stable versions or 2.5 branch.**
+**WARNING: This branch is under development. Not use in production. You can use stable versions or 2.6 branch.**

From db141e1a90a64aea6469e72a3674390ff8127762 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 23 Feb 2021 13:13:45 +0100
Subject: [PATCH 047/264] Remove CrudHelper service and related Twig functions

Remove "crud_declare_modal", "crud_remote_modal" and "crud_form_modal" Twig functions
---
 src/Helper/CrudHelper.php         | 204 ------------------------------
 src/Resources/config/services.xml |  15 ---
 src/Twig/CrudExtension.php        |  54 +-------
 3 files changed, 1 insertion(+), 272 deletions(-)
 delete mode 100644 src/Helper/CrudHelper.php

diff --git a/src/Helper/CrudHelper.php b/src/Helper/CrudHelper.php
deleted file mode 100644
index 1e12c41..0000000
--- a/src/Helper/CrudHelper.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Helper;
-
-use Ecommit\JavascriptBundle\Helper\JqueryHelper;
-use Ecommit\JavascriptBundle\Overlay\AbstractOverlay;
-use Ecommit\UtilBundle\Helper\UtilHelper;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use Twig_Environment;
-
-class CrudHelper
-{
-    /**
-     * @var UtilHelper
-     */
-    protected $util;
-
-    /**
-     * @var JqueryHelper
-     */
-    protected $javascriptManager;
-
-    /**
-     * @var RouterInterface
-     */
-    protected $router;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    /**
-     * @var Twig_Environment
-     */
-    protected $templating;
-
-    /**
-     * @var AbstractOverlay
-     */
-    protected $overlay;
-
-    /**
-     * @var bool
-     */
-    protected $useBootstrap;
-
-    /**
-     * @var array
-     */
-    protected $parameters;
-
-    /**
-     * Constructor.
-     *
-     * @param Manager $javascriptManager
-     * @param bool    $useBootstrap
-     */
-    public function __construct(
-        UtilHelper $util,
-        JqueryHelper $javascriptManager,
-        RouterInterface $router,
-        TranslatorInterface $translator,
-        Twig_Environment $templating,
-        AbstractOverlay $overlay,
-        $parameters
-    ) {
-        $this->util = $util;
-        $this->javascriptManager = $javascriptManager;
-        $this->router = $router;
-        $this->translator = $translator;
-        $this->templating = $templating;
-        $this->overlay = $overlay;
-        $this->parameters = $parameters;
-        $this->useBootstrap = $parameters['use_bootstrap'];
-    }
-
-    /**
-     * @return bool
-     */
-    public function useBootstrap()
-    {
-        return $this->useBootstrap;
-    }
-
-    /**
-     * @return AbstractOverlay
-     */
-    public function getOverlayService()
-    {
-        return $this->overlay;
-    }
-
-    /**
-     * Returns declaration of modal.
-     *
-     * @param string $modalId Modal id
-     * @param array  $options
-     *
-     * @return string
-     */
-    public function declareModal($modalId, $options = [])
-    {
-        return $this->overlay->declareHtmlModal($modalId, $options);
-    }
-
-    /**
-     * Returns JS code to open modal window.
-     *
-     * @param string $modalId     Modal id
-     * @param string $url         Url
-     * @param array  $options     Array options
-     * @param array  $ajaxOptions Ajax options
-     *
-     * @return string
-     */
-    public function remoteModal($modalId, $url, $options, $ajaxOptions)
-    {
-        $modalId = str_replace(' ', '', $modalId);
-
-        $resolver = new OptionsResolver();
-        $resolver->setDefaults(
-            [
-                'js_on_close' => null,
-                'close_div_class' => 'overlay-close',
-            ]
-        );
-        $options = $resolver->resolve($options);
-
-        //Create Callback (Opening window)
-        $jsModal = "$('#$modalId .contentWrap').html(data); ";
-        $jsModal .= $this->overlay->declareJavascriptModal($modalId, ['js_on_close' => $options['js_on_close'], 'close_div_class' => $options['close_div_class']]);
-        $jsModal .= $this->overlay->openModal($modalId);
-
-        //Add callback
-        if (isset($ajaxOptions['success'])) {
-            $ajaxOptions['success'] = $jsModal.' '.$ajaxOptions['success'];
-        } else {
-            $ajaxOptions['success'] = $jsModal;
-        }
-
-        //Method
-        if (!isset($ajaxOptions['method'])) {
-            $ajaxOptions['method'] = 'GET';
-        }
-
-        return $this->javascriptManager->jQueryRemoteFunction($url, $ajaxOptions);
-    }
-
-    /**
-     * Returns modal form tag.
-     *
-     * @param string          $modalId     Modal id
-     * @param FormView|string $form        the form or the url
-     * @param array           $ajaxOptions Ajax options
-     * @param array           $htmlOptions Html options
-     *
-     * @return string
-     */
-    public function formModal($modalId, $form, $ajaxOptions, $htmlOptions)
-    {
-        $modalId = str_replace(' ', '', $modalId);
-        if (!isset($ajaxOptions['update'])) {
-            $ajaxOptions['update'] = $modalId.' .contentWrap';
-        }
-
-        return $this->javascriptManager->jQueryFormToRemote($form, $ajaxOptions, $htmlOptions);
-    }
-
-    /**
-     * Creates a link.
-     *
-     * @param string $name          Name link
-     * @param string $url           Url link
-     * @param array  $linkToOptions Html options
-     * @param array  $ajaxOptions   Ajax options (if null, Ajax is disabled)
-     *
-     * @return string
-     */
-    protected function listePrivateLink($name, $url, $linkToOptions = [], $ajaxOptions = null)
-    {
-        if (null === $ajaxOptions) {
-            //No Ajax, Simple link
-            $linkToOptions['href'] = $url;
-
-            return $this->util->tag('a', $linkToOptions, $name);
-        }
-        //Ajax Request
-        return $this->javascriptManager->jQueryLinkToRemote($name, $url, $ajaxOptions, $linkToOptions);
-    }
-}
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index bc7a7b5..9132245 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -17,22 +17,7 @@
         </service>
         <service id="ecommit_crud.response_generatror" alias="Ecommit\CrudBundle\Crud\CrudResponseGenerator" public="true" />
 
-        <service id="Ecommit\CrudBundle\Helper\CrudHelper" class="Ecommit\CrudBundle\Helper\CrudHelper" public="true">
-            <argument type="service" id="Ecommit\UtilBundle\Helper\UtilHelper"/>
-            <argument type="service" id="Ecommit\JavascriptBundle\Helper\JqueryHelper"/>
-            <argument type="service" id="Symfony\Component\Routing\RouterInterface"/>
-            <argument type="service" id="Symfony\Contracts\Translation\TranslatorInterface"/>
-            <argument type="service" id="Twig\Environment"/>
-            <argument type="service" id="ecommit_javascript.overlay"/>
-            <argument type="collection">
-                <argument key="use_bootstrap">%ecommit_javascript.use_bootstrap%</argument>
-                <argument key="images">%ecommit_crud.images%</argument>
-            </argument>
-        </service>
-        <service id="ecommit_crud.helper" alias="Ecommit\CrudBundle\Helper\CrudHelper" public="true" />
-
         <service id="Ecommit\CrudBundle\Twig\CrudExtension" class="Ecommit\CrudBundle\Twig\CrudExtension">
-            <argument type="service" id="Ecommit\CrudBundle\Helper\CrudHelper"/>
             <argument type="service" id="twig.form.renderer" />
             <argument>%ecommit_crud.theme%</argument>
             <argument>%ecommit_crud.icon_theme%</argument>
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index e149f23..155f90c 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -14,7 +14,6 @@
 namespace Ecommit\CrudBundle\Twig;
 
 use Ecommit\CrudBundle\Crud\Crud;
-use Ecommit\CrudBundle\Helper\CrudHelper;
 use Ecommit\CrudBundle\Paginator\AbstractPaginator;
 use Symfony\Component\Form\FormRendererInterface;
 use Symfony\Component\Form\FormView;
@@ -25,11 +24,6 @@
 
 class CrudExtension extends AbstractExtension
 {
-    /**
-     * @var CrudHelper
-     */
-    protected $crudHelper;
-
     /**
      * @var FormRendererInterface
      */
@@ -40,9 +34,8 @@ class CrudExtension extends AbstractExtension
 
     protected $lastTdValues = [];
 
-    public function __construct(CrudHelper $crudHelper, FormRendererInterface $formRenderer, string $theme, string $iconTheme)
+    public function __construct(FormRendererInterface $formRenderer, string $theme, string $iconTheme)
     {
-        $this->crudHelper = $crudHelper;
         $this->formRenderer = $formRenderer;
         $this->theme = $theme;
         $this->iconTheme = $iconTheme;
@@ -120,21 +113,6 @@ public function getFunctions()
                     'is_safe' => ['all'],
                 ]
             ),
-            new TwigFunction(
-                'crud_declare_modal',
-                [$this, 'declareModal'],
-                ['is_safe' => ['all']]
-            ),
-            new TwigFunction(
-                'crud_remote_modal',
-                [$this, 'remoteModal'],
-                ['is_safe' => ['all']]
-            ),
-            new TwigFunction(
-                'crud_form_modal',
-                [$this, 'formModal'],
-                ['is_safe' => ['all']]
-            ),
             new TwigFunction(
                 'form_start_ajax',
                 [$this, 'formStartAjax'],
@@ -571,36 +549,6 @@ public function searchFormReset(Environment $environment, Crud $crud, $options =
         ]));
     }
 
-    /**
-     * Twig function: "crud_declare_modal".
-     *
-     * @see CrudHelper:declareModal
-     */
-    public function declareModal($modalId, $options = [])
-    {
-        return $this->crudHelper->declareModal($modalId, $options);
-    }
-
-    /**
-     * Twig function: "crud_remote_modal".
-     *
-     * @see CrudHelper:remoteModal
-     */
-    public function remoteModal($modalId, $url, $options = [], $ajaxOptions = [])
-    {
-        return $this->crudHelper->remoteModal($modalId, $url, $options, $ajaxOptions);
-    }
-
-    /**
-     * Twig function: "crud_form_modal".
-     *
-     * @see CrudHelper:formModal
-     */
-    public function formModal($modalId, $form, $ajaxOptions = [], $htmlOptions = [])
-    {
-        return $this->crudHelper->formModal($modalId, $form, $ajaxOptions, $htmlOptions);
-    }
-
     public function formStartAjax(FormView $formView, array $options = []): string
     {
         $autoClass = 'ec-crud-ajax-form-auto';

From d15e6601885779b70855179c574934c1dc7a7fcd Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 23 Feb 2021 13:47:16 +0100
Subject: [PATCH 048/264] Remove FieldFilterSelect2*,
 FieldFilterJqueryAutocompleteEntityAjax and FieldFilterTokenInputEntitiesAjax

---
 ...ieldFilterJqueryAutocompleteEntityAjax.php | 102 ---------------
 src/Form/Filter/FieldFilterSelect2Choice.php  |  30 -----
 src/Form/Filter/FieldFilterSelect2Country.php |  30 -----
 src/Form/Filter/FieldFilterSelect2Entity.php  |  30 -----
 .../Filter/FieldFilterSelect2EntityAjax.php   |  70 -----------
 .../FieldFilterTokenInputEntitiesAjax.php     | 116 ------------------
 6 files changed, 378 deletions(-)
 delete mode 100644 src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
 delete mode 100644 src/Form/Filter/FieldFilterSelect2Choice.php
 delete mode 100644 src/Form/Filter/FieldFilterSelect2Country.php
 delete mode 100644 src/Form/Filter/FieldFilterSelect2Entity.php
 delete mode 100644 src/Form/Filter/FieldFilterSelect2EntityAjax.php
 delete mode 100644 src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php

diff --git a/src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php b/src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
deleted file mode 100644
index 8486ced..0000000
--- a/src/Form/Filter/FieldFilterJqueryAutocompleteEntityAjax.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
-use Ecommit\JavascriptBundle\Form\Type\JqueryAutocompleteEntityAjaxType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints as Assert;
-
-class FieldFilterJqueryAutocompleteEntityAjax extends AbstractFieldFilter
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'em' => null,
-                'query_builder' => null,
-                'choice_label' => null,
-                'identifier' => null,
-                'url' => null, //Required in FormType if route_name is empty
-                'route_name' => null,
-                'route_params' => null,
-                'max_length' => 255,
-            ]
-        );
-
-        $resolver->setRequired(
-            [
-                'class',
-            ]
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureTypeOptions($typeOptions)
-    {
-        foreach ($this->options as $optionName => $optionValue) {
-            if (!empty($optionValue) && !\in_array($optionName, ['validate', 'max_length'])) {
-                $typeOptions[$optionName] = $optionValue;
-            }
-        }
-        $typeOptions['input'] = 'key';
-
-        return $typeOptions;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, JqueryAutocompleteEntityAjaxType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAutoConstraints()
-    {
-        return [
-            new Assert\Length(
-                [
-                    'max' => $this->options['max_length'],
-                ]
-            ),
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
-    {
-        $value = $formData->get($this->property);
-        $parameterName = 'value_jquery_auto'.str_replace(' ', '', $this->property);
-        if (null === $value || '' === $value || !is_scalar($value)) {
-            return $queryBuilder;
-        }
-
-        return $queryBuilder->andWhere(sprintf('%s = :%s', $aliasSearch, $parameterName))
-            ->setParameter($parameterName, $value);
-    }
-}
diff --git a/src/Form/Filter/FieldFilterSelect2Choice.php b/src/Form/Filter/FieldFilterSelect2Choice.php
deleted file mode 100644
index 125f0df..0000000
--- a/src/Form/Filter/FieldFilterSelect2Choice.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\JavascriptBundle\Form\Type\Select2\Select2ChoiceType;
-use Symfony\Component\Form\FormBuilder;
-
-class FieldFilterSelect2Choice extends FieldFilterChoice
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, Select2ChoiceType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterSelect2Country.php b/src/Form/Filter/FieldFilterSelect2Country.php
deleted file mode 100644
index f2b91e0..0000000
--- a/src/Form/Filter/FieldFilterSelect2Country.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\JavascriptBundle\Form\Type\Select2\Select2CountryType;
-use Symfony\Component\Form\FormBuilder;
-
-class FieldFilterSelect2Country extends FieldFilterChoice
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, Select2CountryType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterSelect2Entity.php b/src/Form/Filter/FieldFilterSelect2Entity.php
deleted file mode 100644
index a219774..0000000
--- a/src/Form/Filter/FieldFilterSelect2Entity.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\JavascriptBundle\Form\Type\Select2\Select2ChoiceType;
-use Symfony\Component\Form\FormBuilder;
-
-class FieldFilterSelect2Entity extends FieldFilterEntity
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, Select2ChoiceType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterSelect2EntityAjax.php b/src/Form/Filter/FieldFilterSelect2EntityAjax.php
deleted file mode 100644
index 8a493a9..0000000
--- a/src/Form/Filter/FieldFilterSelect2EntityAjax.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\JavascriptBundle\Form\Type\Select2\Select2EntityAjaxType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class FieldFilterSelect2EntityAjax extends FieldFilterChoice
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'em' => null,
-                'query_builder' => null,
-                'choice_label' => null,
-                'identifier' => null,
-                'url' => null, //Required in FormType if route_name is empty
-                'route_name' => null,
-                'route_params' => null,
-            ]
-        );
-
-        $resolver->setRequired(
-            [
-                'class',
-            ]
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureTypeOptions($typeOptions)
-    {
-        foreach ($this->options as $optionName => $optionValue) {
-            if (!empty($optionValue) && !\in_array($optionName, ['validate', 'min'])) {
-                $typeOptions[$optionName] = $optionValue;
-            }
-        }
-        $typeOptions['input'] = 'key';
-
-        return $typeOptions;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, Select2EntityAjaxType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php b/src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
deleted file mode 100644
index bef813d..0000000
--- a/src/Form/Filter/FieldFilterTokenInputEntitiesAjax.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
-use Ecommit\JavascriptBundle\Form\Type\TokenInputEntitiesAjaxType;
-use Ecommit\ScalarValues\ScalarValues;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints as Assert;
-
-class FieldFilterTokenInputEntitiesAjax extends AbstractFieldFilter
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'em' => null,
-                'query_builder' => null,
-                'choice_label' => null,
-                'identifier' => null,
-                'url' => null, //Required in FormType if route_name is empty
-                'route_name' => null,
-                'route_params' => null,
-                'min' => null,
-                'max' => 99,
-            ]
-        );
-
-        $resolver->setRequired(
-            [
-                'class',
-            ]
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureTypeOptions($typeOptions)
-    {
-        foreach ($this->options as $optionName => $optionValue) {
-            if (!empty($optionValue) && !\in_array($optionName, ['validate', 'min'])) {
-                $typeOptions[$optionName] = $optionValue;
-            }
-        }
-        $typeOptions['input'] = 'key';
-
-        return $typeOptions;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, TokenInputEntitiesAjaxType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAutoConstraints()
-    {
-        return [
-            new Assert\Count(
-                [
-                    'min' => $this->options['min'],
-                    'max' => $this->options['max'],
-                ]
-            ),
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
-    {
-        $value = $formData->get($this->property);
-        $parameterName = 'value_choice'.str_replace(' ', '', $this->property);
-        if (null === $value || '' === $value || !\is_array($value)) {
-            return $queryBuilder;
-        }
-        $value = ScalarValues::filterScalarValues($value);
-        if (0 === \count($value)) {
-            return $queryBuilder;
-        }
-
-        if (\count($value) > $this->options['max']) {
-            return $queryBuilder;
-        }
-        if ($this->options['min'] && \count($value) < $this->options['min']) {
-            return $queryBuilder;
-        }
-
-        return $queryBuilder->andWhere($queryBuilder->expr()->in($aliasSearch, ':'.$parameterName))
-            ->setParameter($parameterName, $value);
-    }
-}

From 2eb6d8ba11feff7f151e65f4665960de3aea838e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 15 May 2021 16:22:08 +0200
Subject: [PATCH 049/264] New version of form searcher / filters

* Filters:
    - Filters are now services
    - Remove AbstractFieldFilter and FieldFilterDoctrineInterface classes
    - Filters should now extends AbstractFilter or implements FilterInterface
    - The old filters are deleted. Use new filter classes (filter options have been changed)
* Form Searcher:
    - Remove AbstractFormSearcher class. Use AbstractSearcher instead
* Add SearchFormBuilder class
* Crud class:
    - Update __construct signature
    - Remove router, formFactory, request, registry properties (services). Use container (locator) instead
    - Remove user and formSearcher properties
    - Remove initializeFieldsFilter method
    - Remove getSearcherForm method (use getSearchForm instead)
    - Add searchForm property (SearchFormBuilder|FormView)
    - Add getSearchForm method
    - Add getVirtualColumns and getVirtualColumn methods
    - createSearcherForm method use now SearchFormBuilder class
* CrudFactory class:
    - Update __construct signature
    - Remove all properties (services). Use container (locator) instead
* CrudSession class:
    - formSearcherData property is renamed to searchFormData.
    - Add searchFormIsSubmitted property
---
 phpunit.xml.dist                              |   1 +
 src/Crud/Crud.php                             | 309 ++++++------------
 src/Crud/CrudColumn.php                       |   4 +-
 src/Crud/CrudFactory.php                      |  54 +--
 src/Crud/CrudFilters.php                      |  37 +++
 src/Crud/CrudSession.php                      |   8 +-
 src/Crud/SearchFormBuilder.php                | 200 ++++++++++++
 .../Compiler/FiltersPass.php                  |  41 +++
 .../EcommitCrudExtension.php                  |   1 +
 src/EcommitCrudBundle.php                     |   2 +
 src/Form/Filter/AbstractFieldFilter.php       | 168 ----------
 src/Form/Filter/AbstractFilter.php            |  64 ++++
 src/Form/Filter/BooleanFilter.php             |  85 +++++
 src/Form/Filter/ChoiceFilter.php              |  45 +++
 src/Form/Filter/CollectionFilterTrait.php     |  78 +++++
 src/Form/Filter/DateFilter.php                | 116 +++++++
 ...terEntityAjax.php => EntityAjaxFilter.php} |  73 ++---
 src/Form/Filter/EntityFilter.php              |  80 +++++
 src/Form/Filter/FieldFilterBoolean.php        | 126 -------
 src/Form/Filter/FieldFilterChoice.php         | 130 --------
 src/Form/Filter/FieldFilterDate.php           | 158 ---------
 src/Form/Filter/FieldFilterEmpty.php          |  60 ----
 src/Form/Filter/FieldFilterEntity.php         | 107 ------
 src/Form/Filter/FieldFilterInteger.php        |  78 -----
 src/Form/Filter/FieldFilterNumber.php         |  30 --
 src/Form/Filter/FieldFilterText.php           |  91 ------
 src/Form/Filter/FilterInterface.php           |  30 ++
 src/Form/Filter/IntegerFilter.php             |  65 ++++
 ...octrineInterface.php => NotNullFilter.php} |  13 +-
 src/Form/Filter/NullFilter.php                |  35 ++
 src/Form/Filter/NumberFilter.php              |  31 ++
 src/Form/Filter/TextFilter.php                |  67 ++++
 src/Form/Searcher/AbstractFormSearcher.php    | 206 ------------
 src/Form/Searcher/AbstractSearcher.php        |  32 ++
 src/Form/Searcher/SearcherInterface.php       |  26 ++
 src/Form/Type/FormSearchType.php              |   2 +-
 src/Resources/config/filters.xml              |  46 +++
 src/Resources/config/services.xml             |  18 +-
 .../translations/EcommitCrudBundle.en.yml     |   4 +
 .../translations/EcommitCrudBundle.fr.yml     |   4 +
 src/Resources/translations/messages.en.yml    |   2 -
 src/Resources/translations/messages.fr.yml    |   2 -
 src/Resources/views/Theme/base.html.twig      |   2 +-
 tests/DoctrineHelper.php                      |  80 -----
 .../AbstractEntityTransformerTest.php         |  11 +-
 .../EntitiesToChoicesTransformerTest.php      |   4 +-
 .../EntitiesToIdsTransformerTest.php          |   4 +-
 .../EntityToChoiceTransformerTest.php         |   4 +-
 .../EntityToIdTransformerTest.php             |   4 +-
 tests/Form/Filter/AbstractFilterTest.php      | 144 ++++++++
 tests/Form/Filter/BooleanFilterTest.php       | 250 ++++++++++++++
 tests/Form/Filter/ChoiceFilterTest.php        | 227 +++++++++++++
 tests/Form/Filter/DateFilterTest.php          | 252 ++++++++++++++
 ...yAjaxTest.php => EntityAjaxFilterTest.php} | 179 ++--------
 tests/Form/Filter/EntityFilterTest.php        | 279 ++++++++++++++++
 tests/Form/Filter/IntegerFilterTest.php       | 144 ++++++++
 tests/Form/Filter/NotNullFilterTest.php       |  35 ++
 tests/Form/Filter/NullFilterTest.php          |  80 +++++
 tests/Form/Filter/NumberFilterTest.php        |  58 ++++
 tests/Form/Filter/TextFilterTest.php          | 187 +++++++++++
 tests/Form/Type/EntityAjaxTypeTest.php        |  73 ++---
 .../App/Controller/UserController.php         |   2 +-
 .../Controller/UserWithoutTraitController.php |   2 +-
 .../DataFixtures/EntityManyToOneFixtures.php  |  49 +++
 .../App/DataFixtures/TagFixtures.php          |  39 +++
 .../App/Entity}/EntityManyToOne.php           |  20 +-
 .../App/Entity}/Tag.php                       |   2 +-
 .../Searcher}/EntityToManyToOneSearcher.php   |   6 +-
 .../App/Form/Searcher/UserSearcher.php        |  27 +-
 tests/Functional/App/config/routes.yaml       |   6 +
 .../App/templates/user/search.html.twig       |   6 +-
 .../Controller/TestCrudControllerTest.php     |  19 ++
 72 files changed, 3149 insertions(+), 1775 deletions(-)
 create mode 100644 src/Crud/CrudFilters.php
 create mode 100644 src/Crud/SearchFormBuilder.php
 create mode 100644 src/DependencyInjection/Compiler/FiltersPass.php
 delete mode 100644 src/Form/Filter/AbstractFieldFilter.php
 create mode 100644 src/Form/Filter/AbstractFilter.php
 create mode 100644 src/Form/Filter/BooleanFilter.php
 create mode 100644 src/Form/Filter/ChoiceFilter.php
 create mode 100644 src/Form/Filter/CollectionFilterTrait.php
 create mode 100644 src/Form/Filter/DateFilter.php
 rename src/Form/Filter/{FieldFilterEntityAjax.php => EntityAjaxFilter.php} (53%)
 create mode 100644 src/Form/Filter/EntityFilter.php
 delete mode 100644 src/Form/Filter/FieldFilterBoolean.php
 delete mode 100644 src/Form/Filter/FieldFilterChoice.php
 delete mode 100644 src/Form/Filter/FieldFilterDate.php
 delete mode 100644 src/Form/Filter/FieldFilterEmpty.php
 delete mode 100644 src/Form/Filter/FieldFilterEntity.php
 delete mode 100644 src/Form/Filter/FieldFilterInteger.php
 delete mode 100644 src/Form/Filter/FieldFilterNumber.php
 delete mode 100644 src/Form/Filter/FieldFilterText.php
 create mode 100644 src/Form/Filter/FilterInterface.php
 create mode 100644 src/Form/Filter/IntegerFilter.php
 rename src/Form/Filter/{FieldFilterDoctrineInterface.php => NotNullFilter.php} (51%)
 create mode 100644 src/Form/Filter/NullFilter.php
 create mode 100644 src/Form/Filter/NumberFilter.php
 create mode 100644 src/Form/Filter/TextFilter.php
 delete mode 100644 src/Form/Searcher/AbstractFormSearcher.php
 create mode 100644 src/Form/Searcher/AbstractSearcher.php
 create mode 100644 src/Form/Searcher/SearcherInterface.php
 create mode 100644 src/Resources/config/filters.xml
 delete mode 100644 tests/DoctrineHelper.php
 create mode 100644 tests/Form/Filter/AbstractFilterTest.php
 create mode 100644 tests/Form/Filter/BooleanFilterTest.php
 create mode 100644 tests/Form/Filter/ChoiceFilterTest.php
 create mode 100644 tests/Form/Filter/DateFilterTest.php
 rename tests/Form/Filter/{FieldFilterEntityAjaxTest.php => EntityAjaxFilterTest.php} (57%)
 create mode 100644 tests/Form/Filter/EntityFilterTest.php
 create mode 100644 tests/Form/Filter/IntegerFilterTest.php
 create mode 100644 tests/Form/Filter/NotNullFilterTest.php
 create mode 100644 tests/Form/Filter/NullFilterTest.php
 create mode 100644 tests/Form/Filter/NumberFilterTest.php
 create mode 100644 tests/Form/Filter/TextFilterTest.php
 create mode 100644 tests/Functional/App/DataFixtures/EntityManyToOneFixtures.php
 create mode 100644 tests/Functional/App/DataFixtures/TagFixtures.php
 rename tests/{Fixtures => Functional/App/Entity}/EntityManyToOne.php (76%)
 rename tests/{Fixtures => Functional/App/Entity}/Tag.php (94%)
 rename tests/{Fixtures => Functional/App/Form/Searcher}/EntityToManyToOneSearcher.php (62%)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b02aeae..e931afd 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,6 +12,7 @@
         <env name="KERNEL_CLASS" value="Ecommit\CrudBundle\Tests\Functional\App\Kernel" />
         <env name="APP_ENV" value="test"/>
         <server name="PANTHER_WEB_SERVER_DIR" value="./tests/Functional/App/public" />
+        <ini name="intl.default_locale" value="fr" />
     </php>
 
     <extensions>
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index cb6aaac..58c4704 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -13,18 +13,16 @@
 
 namespace Ecommit\CrudBundle\Crud;
 
-use Doctrine\Bundle\DoctrineBundle\Registry;
 use Ecommit\CrudBundle\DoctrineExtension\Paginate;
 use Ecommit\CrudBundle\Entity\UserCrudSettings;
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
+use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 use Ecommit\CrudBundle\Form\Type\DisplaySettingsType;
-use Ecommit\CrudBundle\Form\Type\FormSearchType;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 class Crud
@@ -40,9 +38,9 @@ class Crud
     protected $sessionValues;
 
     /**
-     * @var Form
+     * @var SearchFormBuilder|FormView
      */
-    protected $formSearcher = null;
+    protected $searchForm;
 
     /**
      * @var Form
@@ -56,7 +54,6 @@ class Crud
     protected $defaultPersonalizedSort = [];
     protected $defaultSense = null;
     protected $defaultResultsPerPage = null;
-    protected $defaultFormSearcherData = null;
 
     protected $queryBuilder = null;
     protected $persistentSettings = false;
@@ -76,29 +73,9 @@ class Crud
     protected $divIdList = 'crud_list';
 
     /**
-     * @var RouterInterface
+     * @var ContainerInterface
      */
-    protected $router;
-
-    /**
-     * @var FormFactoryInterface
-     */
-    protected $formFactory;
-
-    /**
-     * @var Request
-     */
-    protected $request;
-
-    /**
-     * @var Registry
-     */
-    protected $registry;
-
-    /**
-     * @var User
-     */
-    protected $user;
+    protected $container;
 
     /**
      * Constructor.
@@ -107,23 +84,13 @@ class Crud
      *
      * @return Crud
      */
-    public function __construct(
-        $sessionName,
-        RouterInterface $router,
-        FormFactoryInterface $formFactory,
-        Request $request,
-        Registry $registry,
-        $user
-    ) {
+    public function __construct($sessionName, ContainerInterface $container)
+    {
         if (!preg_match('/^[a-zA-Z0-9_]{1,50}$/', $sessionName)) {
             throw new \Exception('Variable sessionName is not given or is invalid');
         }
         $this->sessionName = $sessionName;
-        $this->router = $router;
-        $this->formFactory = $formFactory;
-        $this->request = $request;
-        $this->registry = $registry;
-        $this->user = $user;
+        $this->container = $container;
         $this->sessionValues = new CrudSession();
 
         return $this;
@@ -328,7 +295,7 @@ public function getUrl($parameters = [])
     {
         $parameters = array_merge($this->routeParams, $parameters);
 
-        return $this->router->generate($this->routeName, $parameters);
+        return $this->container->get('router')->generate($this->routeName, $parameters);
     }
 
     /**
@@ -342,7 +309,7 @@ public function getSearchUrl($parameters = [])
     {
         $parameters = array_merge($this->routeParams, ['search' => 1], $parameters);
 
-        return $this->router->generate($this->routeName, $parameters);
+        return $this->container->get('router')->generate($this->routeName, $parameters);
     }
 
     /**
@@ -364,7 +331,7 @@ public function setBuildPaginator($value)
      */
     public function setPersistentSettings($value)
     {
-        if ($value && !($this->user instanceof UserInterface)) {
+        if ($value && !($this->container->get('security.token_storage')->getToken()->getUser() instanceof UserInterface)) {
             $value = false;
         }
         $this->persistentSettings = $value;
@@ -372,35 +339,9 @@ public function setPersistentSettings($value)
         return $this;
     }
 
-    /**
-     * Adds search form.
-     *
-     * @param string|null $type    The type of the form. If null, FormSearchType is used
-     * @param array       $options The options
-     *
-     * @return Crud
-     */
-    public function createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = [])
+    public function createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = []): self
     {
-        $this->defaultFormSearcherData = $defaultFormSearcherData;
-        $this->initializeFieldsFilter($defaultFormSearcherData);
-
-        if ($type) {
-            $formBuilder = $this->formFactory->createBuilder($type, null, $options);
-        } else {
-            $formName = sprintf('crud_search_%s', $this->sessionName);
-            $formBuilder = $this->formFactory->createNamedBuilder($formName, FormSearchType::class, null, $options);
-        }
-        foreach ($defaultFormSearcherData->getFieldsFilter($this->registry) as $field) {
-            if (!($field instanceof \Ecommit\CrudBundle\Form\Filter\AbstractFieldFilter)) {
-                throw new \Exception('Crud: AbstractFormSearcher: getFieldsFilter() must only returns AbstractFieldFilter implementations');
-            }
-
-            $formBuilder = $field->addField($formBuilder);
-        }
-        //Global
-        $formBuilder = $defaultFormSearcherData->globalBuildForm($formBuilder);
-        $this->formSearcher = $formBuilder;
+        $this->searchForm = new SearchFormBuilder($this->container, $this, $defaultData, $type, $options);
 
         return $this;
     }
@@ -410,22 +351,24 @@ public function createSearcherForm(AbstractFormSearcher $defaultFormSearcherData
      */
     public function processForm(): void
     {
-        if (empty($this->defaultFormSearcherData)) {
-            throw new NotFoundHttpException('Crud: Form searcher does not exist');
+        if (!$this->searchForm) {
+            throw new NotFoundHttpException('Crud: Search form does not exist');
         }
 
-        if ($this->request->query->has('raz')) {
+        $request = $this->container->get('request_stack')->getCurrentRequest();
+        if ($request->query->has('raz')) {
             return;
         }
-        if ('POST' == $this->request->getMethod()) {
+        if ('POST' == $request->getMethod()) {
             if ($this->displayResultsOnlyIfSearch) {
                 $this->displayResults = false;
             }
-            $this->formSearcher->handleRequest($this->request);
-            if ($this->formSearcher->isSubmitted() && $this->formSearcher->isValid()) {
+            $searchForm = $this->searchForm->getForm();
+            $searchForm->handleRequest($request);
+            if ($searchForm->isSubmitted() && $searchForm->isValid()) {
                 $this->displayResults = true;
-                $this->formSearcher->getData()->isSubmitted = true;
-                $this->changeFilterValues($this->formSearcher->getData());
+                $this->sessionValues->searchFormIsSubmitted = true;
+                $this->changeFilterValues($searchForm->getData());
                 $this->changePage(1);
                 $this->save();
             }
@@ -439,13 +382,13 @@ public function processForm(): void
      */
     protected function changeFilterValues($value): void
     {
-        if (empty($this->defaultFormSearcherData)) {
+        if (!$this->searchForm) {
             return;
         }
-        if (\get_class($value) == \get_class($this->defaultFormSearcherData)) {
-            $this->sessionValues->formSearcherData = $value;
+        if (\get_class($value) === \get_class($this->searchForm->getDefaultData())) {
+            $this->sessionValues->searchFormData = $value;
         } else {
-            $this->sessionValues->formSearcherData = clone $this->defaultFormSearcherData;
+            $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();
         }
     }
 
@@ -472,23 +415,22 @@ protected function changePage($value): void
     protected function save(): void
     {
         //Save in session
-        $session = $this->request->getSession();
-        $sessionValuesClean = clone $this->sessionValues;
-        if (\is_object($this->sessionValues->formSearcherData)) {
-            $sessionValuesClean->formSearcherData = clone $this->sessionValues->formSearcherData;
-            $sessionValuesClean->formSearcherData->clear();
+        $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
+        $sessionValues = clone $this->sessionValues;
+        if (\is_object($this->sessionValues->searchFormData)) {
+            $sessionValues->searchFormData = clone $this->sessionValues->searchFormData;
         }
-        $session->set($this->sessionName, $sessionValuesClean);
+        $session->set($this->sessionName, $sessionValues);
 
         //Save in database
         if ($this->persistentSettings && $this->updateDatabase) {
-            $objectDatabase = $this->registry->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
+            $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
                 [
-                    'user' => $this->user,
+                    'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
                     'crudName' => $this->sessionName,
                 ]
             );
-            $em = $this->registry->getManager();
+            $em = $this->container->get('doctrine')->getManager();
 
             if ($objectDatabase) {
                 //Update object in database
@@ -502,7 +444,7 @@ protected function save(): void
                     $this->sessionValues->sort != $this->defaultSort
                 ) {
                     $objectDatabase = new UserCrudSettings();
-                    $objectDatabase->setUser($this->user);
+                    $objectDatabase->setUser($this->container->get('security.token_storage')->getToken()->getUser());
                     $objectDatabase->setCrudName($this->sessionName);
                     $objectDatabase->updateFromSessionManager($this->sessionValues);
                     $em->persist($objectDatabase);
@@ -553,19 +495,16 @@ public function init(): void
             }
         }
 
-        if (!empty($this->defaultFormSearcherData)) {
-            //Set url
-            $this->formSearcher->setAction($this->getSearchUrl());
-            //Transform FormBuilder to Form
-            $this->formSearcher = $this->formSearcher->getForm();
+        if ($this->searchForm) {
+            $this->searchForm->createForm();
         }
 
         //Loads user values inside this object
         $this->load();
 
         //Display or not results
-        if (!empty($this->defaultFormSearcherData) && $this->displayResultsOnlyIfSearch) {
-            $this->displayResults = $this->sessionValues->formSearcherData->isSubmitted;
+        if ($this->searchForm && $this->displayResultsOnlyIfSearch) {
+            $this->displayResults = $this->sessionValues->searchFormIsSubmitted;
         }
 
         $this->createDisplaySettingsForm();
@@ -573,59 +512,35 @@ public function init(): void
         //Process request (resultsPerPage, sort, sense, change_columns)
         $this->processRequest();
 
-        //Searcher form: Allocates object (Defaults values and validators)
-        if (!empty($this->defaultFormSearcherData) && !$this->request->query->has('raz')) {
+        //Searcher form: Allocates object
+        if ($this->searchForm && !$this->container->get('request_stack')->getCurrentRequest()->query->has('raz')) {
             //IMPORTANT
-            //We have not to allocate directelly the "$this->sessionValues->formSearcherData" object
+            //We have not to allocate directelly the "$this->sessionValues->searchFormData" object
             //because otherwise it will be linked to form, and will be updated when the "bind" function will
             //be called (If form is not valid, the session values will still be updated: Undesirable behavior)
-            $values = clone $this->sessionValues->formSearcherData;
-            $values->setFieldsFilter($this->defaultFormSearcherData->getFieldsFilter()); //Copy fields from defaultFormSearcherData to current data
-            $values->setCommonOptions($this->defaultFormSearcherData->getCommonOptions());
-            $this->formSearcher->setData($values);
+            $values = clone $this->sessionValues->searchFormData;
+            try {
+                $this->searchForm->getForm()->setData($values);
+            } catch (TransformationFailedException $exception) {
+                //Avoid error if data stored in session is invalid
+            }
         }
 
         //Saves
         $this->save();
     }
 
-    /**
-     * Init "fieldFilters" property in $formSearcherData object
-     * Inject the registry in $formSearcherData objet if implements FieldFilterDoctrineInterface.
-     */
-    protected function initializeFieldsFilter(AbstractFormSearcher $formSearcherData): void
-    {
-        foreach ($formSearcherData->getFieldsFilter($this->registry) as $field) {
-            if (!($field instanceof \Ecommit\CrudBundle\Form\Filter\AbstractFieldFilter)) {
-                throw new \Exception('Crud: AbstractFormSearcher: getFieldsFilter() must only returns AbstractFieldFilter implementations');
-            }
-
-            if (isset($this->availableColumns[$field->getColumnId()])) {
-                $column = $this->availableColumns[$field->getColumnId()];
-            } elseif (isset($this->availableVirtualColumns[$field->getColumnId()])) {
-                $column = $this->availableVirtualColumns[$field->getColumnId()];
-            } else {
-                throw new \Exception('Crud: AbstractFormSearcher: getFieldsFilter(): Column id does not exit: '.$field->getColumnId());
-            }
-
-            $field->setLabel($column->label, $formSearcherData->displayLabelInErrors());
-        }
-    }
-
     /**
      * Load user values.
      */
     protected function load(): void
     {
-        $session = $this->request->getSession();
+        $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
         $object = $session->get($this->sessionName); //Load from session
 
         if (!empty($object)) {
             $this->sessionValues = $object;
             $this->checkCrudSession();
-            if (!empty($this->defaultFormSearcherData)) {
-                $object->formSearcherData->setCommonOptions($this->defaultFormSearcherData->getCommonOptions());
-            }
 
             return;
         }
@@ -633,16 +548,16 @@ protected function load(): void
         //If session is null => Retrieve from database
         //Only if persistent settings is enabled
         if ($this->persistentSettings) {
-            $objectDatabase = $this->registry->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
+            $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
                 [
-                    'user' => $this->user,
+                    'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
                     'crudName' => $this->sessionName,
                 ]
             );
             if ($objectDatabase) {
                 $this->sessionValues = $objectDatabase->transformToCrudSession(new CrudSession());
-                if (!empty($this->defaultFormSearcherData)) {
-                    $this->sessionValues->formSearcherData = clone $this->defaultFormSearcherData;
+                if ($this->searchForm) {
+                    $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();
                 }
                 $this->checkCrudSession();
 
@@ -655,8 +570,8 @@ protected function load(): void
         $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
         $this->sessionValues->sense = $this->defaultSense;
         $this->sessionValues->sort = $this->defaultSort;
-        if (!empty($this->defaultFormSearcherData)) {
-            $this->sessionValues->formSearcherData = clone $this->defaultFormSearcherData;
+        if ($this->searchForm) {
+            $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();
         }
     }
 
@@ -670,7 +585,7 @@ protected function checkCrudSession(): void
         $this->changeColumnsDisplayed($this->sessionValues->displayedColumns);
         $this->changeSort($this->sessionValues->sort);
         $this->changeSense($this->sessionValues->sense);
-        $this->changeFilterValues($this->sessionValues->formSearcherData);
+        $this->changeFilterValues($this->sessionValues->searchFormData);
         $this->changePage($this->sessionValues->page);
     }
 
@@ -763,32 +678,33 @@ protected function changeSense($value): void
      */
     protected function processRequest(): void
     {
-        if ($this->request->query->has('razsettings')) {
+        $request = $this->container->get('request_stack')->getCurrentRequest();
+        if ($request->query->has('razsettings')) {
             //Reset display settings
             $this->razDisplaySettings();
 
             return;
         }
-        if ($this->request->query->has('raz')) {
+        if ($request->query->has('raz')) {
             $this->raz();
 
             return;
         }
 
-        $this->formDisplaySettings->handleRequest($this->request);
+        $this->formDisplaySettings->handleRequest($request);
         if ($this->formDisplaySettings->isSubmitted() && $this->formDisplaySettings->isValid()) {
             $displaySettingsData = $this->formDisplaySettings->getData();
             $this->changeColumnsDisplayed($displaySettingsData['displayedColumns']);
             $this->changeNumberResultsDisplayed($displaySettingsData['resultsPerPage']);
         }
-        if ($this->request->query->has('sort')) {
-            $this->changeSort($this->request->query->get('sort'));
+        if ($request->query->has('sort')) {
+            $this->changeSort($request->query->get('sort'));
         }
-        if ($this->request->query->has('sense')) {
-            $this->changeSense($this->request->query->get('sense'));
+        if ($request->query->has('sense')) {
+            $this->changeSense($request->query->get('sense'));
         }
-        if ($this->request->query->has('page')) {
-            $this->changePage($this->request->query->get('page'));
+        if ($request->query->has('page')) {
+            $this->changePage($request->query->get('page'));
         }
     }
 
@@ -808,7 +724,7 @@ public function createDisplaySettingsForm(): void
         ];
         $formName = sprintf('crud_display_settings_%s', $this->getSessionName());
 
-        $this->formDisplaySettings = $this->formFactory->createNamed($formName, DisplaySettingsType::class, $data, [
+        $this->formDisplaySettings = $this->container->get('form.factory')->createNamed($formName, DisplaySettingsType::class, $data, [
             'results_per_page_choices' => $resultsPerPageChoices,
             'columns_choices' => $columnsChoices,
             'action' => $this->getUrl(['display-settings' => 1]),
@@ -828,10 +744,10 @@ protected function razDisplaySettings(): void
 
         if ($this->persistentSettings) {
             //Remove settings in database
-            $qb = $this->registry->getManager()->createQueryBuilder();
+            $qb = $this->container->get('doctrine')->getManager()->createQueryBuilder();
             $qb->delete('EcommitCrudBundle:UserCrudSettings', 's')
                 ->andWhere('s.user = :user AND s.crudName = :crud_name')
-                ->setParameters(['user' => $this->user, 'crud_name' => $this->sessionName])
+                ->setParameters(['user' => $this->container->get('security.token_storage')->getToken()->getUser(), 'crud_name' => $this->sessionName])
                 ->getQuery()
                 ->execute();
         }
@@ -842,10 +758,10 @@ protected function razDisplaySettings(): void
      */
     public function raz(): void
     {
-        if ($this->defaultFormSearcherData) {
-            $newValue = clone $this->defaultFormSearcherData;
+        if ($this->searchForm) {
+            $newValue = clone $this->searchForm->getDefaultData();
             $this->changeFilterValues($newValue);
-            $this->formSearcher->setData(clone $newValue);
+            $this->searchForm->getForm()->setData(clone $newValue);
         }
         $this->changePage(1);
         $this->save();
@@ -902,37 +818,8 @@ public function buildQuery(): void
         }
 
         //Adds form searcher filters
-        if (!empty($this->defaultFormSearcherData)) {
-            foreach ($this->defaultFormSearcherData->getFieldsFilter() as $field) {
-                if (!($this->queryBuilder instanceof \Doctrine\ORM\QueryBuilder) &&
-                    !($this->queryBuilder instanceof \Doctrine\DBAL\Query\QueryBuilder)) {
-                    throw new \Exception('getFieldsFilter can not be used');
-                }
-
-                if (isset($this->availableColumns[$field->getColumnId()])) {
-                    $column = $this->availableColumns[$field->getColumnId()];
-                } elseif (isset($this->availableVirtualColumns[$field->getColumnId()])) {
-                    $column = $this->availableVirtualColumns[$field->getColumnId()];
-                } else {
-                    throw new \Exception('Crud: AbstractFormSearcher: getFieldsFilter(): Column id does not exit: '.$field->getColumnId());
-                }
-
-                //Get alias search
-                if (empty($column->aliasSearch)) {
-                    $aliasSearch = $column->alias;
-                } else {
-                    $aliasSearch = $column->aliasSearch;
-                }
-
-                $this->queryBuilder = $field->changeQuery(
-                    $this->queryBuilder,
-                    $this->sessionValues->formSearcherData,
-                    $aliasSearch
-                );
-            }
-
-            //Global change Query
-            $this->queryBuilder = $this->sessionValues->formSearcherData->globalChangeQuery($this->queryBuilder);
+        if ($this->searchForm) {
+            $this->searchForm->updateQueryBuilder($this->queryBuilder, $this->sessionValues->searchFormData);
         }
 
         //Builds paginator
@@ -978,16 +865,11 @@ public function getDefaultResultsPerPage()
     public function clearTemplate(): void
     {
         $this->queryBuilder = null;
-        $this->formFactory = null;
-        $this->request = null;
-        $this->registry = null;
-        if (empty($this->defaultFormSearcherData)) {
-            $this->formSearcher = null;
-        } else {
-            $this->formSearcher = $this->formSearcher->createView();
+        if ($this->searchForm) {
+            $this->searchForm->createFormView();
+            $this->searchForm = $this->searchForm->getForm();
         }
         $this->formDisplaySettings = $this->formDisplaySettings->createView();
-        $this->defaultFormSearcherData = null;
     }
 
     /**
@@ -1013,6 +895,29 @@ public function getColumn($columnId)
         throw new \Exception('Crud: Column '.$columnId.' does not exist');
     }
 
+    /**
+     * Returns availabled virtual columns.
+     *
+     * @return array
+     */
+    public function getVirtualColumns()
+    {
+        return $this->availableVirtualColumns;
+    }
+
+    /**
+     * Returns one virtual column.
+     *
+     * @return CrudColumn $columnId
+     */
+    public function getVirtualColumn($columnId)
+    {
+        if (isset($this->availableVirtualColumns[$columnId])) {
+            return $this->availableVirtualColumns[$columnId];
+        }
+        throw new \Exception('Crud: Column '.$columnId.' does not exist');
+    }
+
     /**
      * Returns user values.
      *
@@ -1048,11 +953,11 @@ public function setPaginator($value)
     /**
      * Returns the search form.
      *
-     * @return FormBuilder (before init) or Form (before clearTemplate) or FormView (after clearTemplate)
+     * @return SearchFormBuilder (before clearTemplate) or FormView (after clearTemplate)
      */
-    public function getSearcherForm()
+    public function getSearchForm()
     {
-        return $this->formSearcher;
+        return $this->searchForm;
     }
 
     /**
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index b8fe869..ca6e080 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -41,7 +41,7 @@ public function __construct($id, $alias, $label, $sortable, $defaultDisplayed, $
         $this->label = $label;
         $this->sortable = $sortable;
         $this->defaultDisplayed = $defaultDisplayed;
-        $this->aliasSearch = $aliasSearch;
-        $this->aliasSort = $aliasSort;
+        $this->aliasSearch = $aliasSearch ?: $alias;
+        $this->aliasSort = $aliasSort ?: $alias;
     }
 }
diff --git a/src/Crud/CrudFactory.php b/src/Crud/CrudFactory.php
index fadaedb..6d166dd 100644
--- a/src/Crud/CrudFactory.php
+++ b/src/Crud/CrudFactory.php
@@ -13,51 +13,18 @@
 
 namespace Ecommit\CrudBundle\Crud;
 
-use Symfony\Bridge\Doctrine\ManagerRegistry;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Psr\Container\ContainerInterface;
 
 class CrudFactory
 {
     /**
-     * @var RouterInterface
+     * @var ContainerInterface
      */
-    protected $router;
+    protected $container;
 
-    /**
-     * @var FormFactoryInterface
-     */
-    protected $formFactory;
-
-    /**
-     * @var RequestStack
-     */
-    protected $requestStack;
-
-    /**
-     * @var ManagerRegistry
-     */
-    protected $registry;
-
-    /**
-     * @var TokenStorageInterface
-     */
-    protected $tokenStorage;
-
-    public function __construct(
-        RouterInterface $router,
-        FormFactoryInterface $formFactory,
-        RequestStack $requestStack,
-        ManagerRegistry $registry,
-        TokenStorageInterface $tokenStorage
-    ) {
-        $this->router = $router;
-        $this->formFactory = $formFactory;
-        $this->requestStack = $requestStack;
-        $this->registry = $registry;
-        $this->tokenStorage = $tokenStorage;
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
     }
 
     /**
@@ -67,13 +34,6 @@ public function __construct(
      */
     public function create($sessionName)
     {
-        return new Crud(
-            $sessionName,
-            $this->router,
-            $this->formFactory,
-            $this->requestStack->getCurrentRequest(),
-            $this->registry,
-            $this->tokenStorage->getToken()->getUser()
-        );
+        return new Crud($sessionName, $this->container);
     }
 }
diff --git a/src/Crud/CrudFilters.php b/src/Crud/CrudFilters.php
new file mode 100644
index 0000000..5c45518
--- /dev/null
+++ b/src/Crud/CrudFilters.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud;
+
+use Ecommit\CrudBundle\Form\Filter\FilterInterface;
+use Psr\Container\ContainerInterface;
+
+final class CrudFilters
+{
+    protected $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    public function has($filter): bool
+    {
+        return $this->container->has($filter);
+    }
+
+    public function get($filter): FilterInterface
+    {
+        return $this->container->get($filter);
+    }
+}
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index 252b3a4..131743c 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -13,7 +13,7 @@
 
 namespace Ecommit\CrudBundle\Crud;
 
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
+use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 
 class CrudSession
 {
@@ -21,9 +21,11 @@ class CrudSession
      * Search's object (used by "setData" inside the form). Used to
      * save the data of the search form.
      *
-     * @var AbstractFormSearcher
+     * @var SearcherInterface
      */
-    public $formSearcherData = null;
+    public $searchFormData = null;
+
+    public $searchFormIsSubmitted = false;
 
     /**
      * Number of results, in one page.
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
new file mode 100644
index 0000000..7f789fd
--- /dev/null
+++ b/src/Crud/SearchFormBuilder.php
@@ -0,0 +1,200 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud;
+
+use Ecommit\CrudBundle\Form\Filter\FilterInterface;
+use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
+use Ecommit\CrudBundle\Form\Type\FormSearchType;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+
+final class SearchFormBuilder
+{
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * @var Crud
+     */
+    protected $crud;
+
+    /**
+     * @var SearcherInterface
+     */
+    protected $defaultData;
+
+    protected $options;
+
+    protected $form;
+
+    protected $filters = [];
+
+    public function __construct(ContainerInterface $container, Crud $crud, SearcherInterface $defaultData, ?string $type, array $options)
+    {
+        $this->container = $container;
+        $this->crud = $crud;
+        $this->defaultData = $defaultData;
+
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'autovalidate' => true,
+            'validation_groups' => null,
+            'form_options' => [],
+        ]);
+        $defaultData->configureOptions($resolver);
+        $this->options = $resolver->resolve($options);
+
+        $this->createFormBuilder($type);
+    }
+
+    protected function createFormBuilder(?string $type): void
+    {
+        $formFactory = $this->container->get('form.factory');
+
+        if ($type) {
+            $this->form = $formFactory->createBuilder($type, null, $this->options['form_options']);
+        } else {
+            $formName = sprintf('crud_search_%s', $this->crud->getSessionName());
+            $this->form = $formFactory->createNamedBuilder($formName, FormSearchType::class, null, $this->options['form_options']);
+        }
+
+        $this->defaultData->buildForm($this, $this->options);
+    }
+
+    public function addFilter(string $property, string $filter, array $options = []): self
+    {
+        if (!$this->container->get('ecommit_crud.filters')->has($filter)) {
+            throw new \Exception(sprintf('Filter "%s" not found', $filter));
+        }
+        /** @var FilterInterface $filterService */
+        $filterService = $this->container->get('ecommit_crud.filters')->get($filter);
+
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'column_id' => $property,
+            'autovalidate' => $this->options['autovalidate'],
+            'validation_groups' => $this->options['validation_groups'],
+            'required' => false,
+            'type_options' => [],
+            'alias_search' => function (Options $options) {
+                $columns = $this->crud->getColumns();
+                if (\array_key_exists($options['column_id'], $columns)) {
+                    return $columns[$options['column_id']]->aliasSearch;
+                }
+
+                $virtualColumns = $this->crud->getVirtualColumns();
+                if (\array_key_exists($options['column_id'], $virtualColumns)) {
+                    return $virtualColumns[$options['column_id']]->aliasSearch;
+                }
+
+                return null;
+            },
+            'label' => function (Options $options) {
+                $columns = $this->crud->getColumns();
+                if (\array_key_exists($options['column_id'], $columns)) {
+                    return $columns[$options['column_id']]->label;
+                }
+
+                $virtualColumns = $this->crud->getVirtualColumns();
+                if (\array_key_exists($options['column_id'], $virtualColumns)) {
+                    return $virtualColumns[$options['column_id']]->label;
+                }
+
+                return null;
+            },
+        ]);
+        $filterService->configureOptions($resolver);
+        $resolvedOptions = $resolver->resolve($options);
+
+        $this->filters[$property] = [
+            'name' => $filter,
+            'options' => $resolvedOptions,
+        ];
+
+        return $this;
+    }
+
+    public function addField(string $property, string $type, array $options = []): self
+    {
+        $this->form->add($property, $type, $options);
+
+        return $this;
+    }
+
+    public function getField(string $property)
+    {
+        return $this->form->get($property);
+    }
+
+    public function createForm(): void
+    {
+        //Add filters
+        foreach ($this->filters as $property => $filter) {
+            //Check if column exists
+            $columnId = $filter['options']['column_id'];
+            if (!\array_key_exists($columnId, $this->crud->getColumns()) && !\array_key_exists($columnId, $this->crud->getVirtualColumns())) {
+                throw new \Exception(sprintf('Column "%s" not found', $columnId));
+            }
+
+            /** @var FilterInterface $filterService */
+            $filterService = $this->container->get('ecommit_crud.filters')->get($filter['name']);
+            $filterService->buildForm($this, $property, $filter['options']);
+        }
+
+        $this->form->setAction($this->crud->getSearchUrl());
+        $this->form = $this->form->getForm();
+    }
+
+    public function createFormView(): void
+    {
+        $this->form = $this->form->createView();
+    }
+
+    /**
+     * @return FormBuilder|Form|FormView
+     */
+    public function getForm()
+    {
+        return $this->form;
+    }
+
+    public function getDefaultData(): SearcherInterface
+    {
+        return $this->defaultData;
+    }
+
+    public function updateQueryBuilder($queryBuilder, SearcherInterface $searcher): void
+    {
+        $searcher->updateQueryBuilder($queryBuilder, $this->options);
+
+        foreach ($this->filters as $property => $filter) {
+            $propertyAccessor = PropertyAccess::createPropertyAccessor();
+            $value = $propertyAccessor->getValue($searcher, $property);
+
+            /** @var FilterInterface $filterService */
+            $filterService = $this->container->get('ecommit_crud.filters')->get($filter['name']);
+            if (!$filterService->supportsQueryBuilder($queryBuilder)) {
+                throw new \Exception('"%s" filter does not support "%s" query builder', $filter['name'], \get_class($queryBuilder));
+            }
+            $filterService->updateQueryBuilder($queryBuilder, $property, $value, $filter['options']);
+        }
+    }
+}
diff --git a/src/DependencyInjection/Compiler/FiltersPass.php b/src/DependencyInjection/Compiler/FiltersPass.php
new file mode 100644
index 0000000..341008f
--- /dev/null
+++ b/src/DependencyInjection/Compiler/FiltersPass.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\DependencyInjection\Compiler;
+
+use Ecommit\CrudBundle\Crud\CrudFilters;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class FiltersPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        $taggedServices = $container->findTaggedServiceIds('ecommit_crud.filter');
+        $lazyServicesRefs = [];
+
+        foreach ($taggedServices as $id => $tagAttributes) {
+            $definition = $container->getDefinition($id);
+            $class = $container->getParameterBag()->resolveValue($definition->getClass());
+            $name = $class::getName();
+
+            $lazyServicesRefs[$name] = new Reference($id);
+        }
+
+        $container->register(CrudFilters::class, CrudFilters::class)
+            ->setPublic(false)
+            ->setArguments([ServiceLocatorTagPass::register($container, $lazyServicesRefs)]);
+    }
+}
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index 088e1db..15b74c5 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -35,6 +35,7 @@ public function load(array $config, ContainerBuilder $container): void
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
+        $loader->load('filters.xml');
 
         $container->setParameter('ecommit_crud.theme', $config['theme']);
         $container->setParameter('ecommit_crud.icon_theme', $config['icon_theme']);
diff --git a/src/EcommitCrudBundle.php b/src/EcommitCrudBundle.php
index 1b97606..b08b895 100644
--- a/src/EcommitCrudBundle.php
+++ b/src/EcommitCrudBundle.php
@@ -13,6 +13,7 @@
 
 namespace Ecommit\CrudBundle;
 
+use Ecommit\CrudBundle\DependencyInjection\Compiler\FiltersPass;
 use Ecommit\CrudBundle\DependencyInjection\Compiler\TwigFormPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -24,5 +25,6 @@ public function build(ContainerBuilder $container): void
         parent::build($container);
 
         $container->addCompilerPass(new TwigFormPass());
+        $container->addCompilerPass(new FiltersPass());
     }
 }
diff --git a/src/Form/Filter/AbstractFieldFilter.php b/src/Form/Filter/AbstractFieldFilter.php
deleted file mode 100644
index f3c886a..0000000
--- a/src/Form/Filter/AbstractFieldFilter.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-
-abstract class AbstractFieldFilter
-{
-    protected $columnId;
-    protected $property;
-    protected $options;
-    protected $typeOptions;
-    protected $isInitiated = false;
-
-    /**
-     * @param string $columnId    Column id
-     * @param string $property    Field Name (search form)
-     * @param array  $options     Options
-     * @param array  $typeOptions Type options
-     */
-    public function __construct($columnId, $property, $options = [], $typeOptions = [])
-    {
-        $this->columnId = $columnId;
-        $this->property = $property;
-
-        $this->options = $options;
-        if (!isset($typeOptions['required'])) {
-            $typeOptions['required'] = false;
-        }
-        $this->typeOptions = $typeOptions;
-    }
-
-    public function init(): void
-    {
-        if ($this->isInitiated) {
-            return;
-        }
-
-        // Define options
-        $resolver = new OptionsResolver();
-        $this->configureCommonOptions($resolver);
-        $this->configureOptions($resolver);
-        $this->options = $resolver->resolve($this->options);
-
-        // Define type options
-        $this->typeOptions = $this->configureTypeOptions($this->typeOptions);
-
-        $this->isInitiated = true;
-    }
-
-    protected function configureCommonOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'validate' => true,
-            ]
-        );
-    }
-
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-    }
-
-    /**
-     * @param array $typeOptions
-     *
-     * @return array
-     */
-    protected function configureTypeOptions($typeOptions)
-    {
-        return $typeOptions;
-    }
-
-    /**
-     * Adds the field into the form.
-     *
-     * @return FormBuilder
-     */
-    abstract public function addField(FormBuilder $formBuilder);
-
-    /**
-     * Changes the query.
-     *
-     * @param QueryBuilder $queryBuilder
-     * @param string       $aliasSearch
-     *
-     * @return QueryBuilder
-     */
-    abstract public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch);
-
-    /**
-     * Add auto validation.
-     *
-     * @param $value
-     */
-    public function autoValidate(AbstractFormSearcher $value, ExecutionContextInterface $context): void
-    {
-        if (!$this->options['validate']) {
-            return;
-        }
-        $autoConstraints = $this->getAutoConstraints();
-        if (0 == \count($autoConstraints)) {
-            return;
-        }
-        $context->getValidator()
-            ->inContext($context)
-            ->atPath($this->getProperty())
-            ->validate($value->get($this->getProperty()), $autoConstraints);
-    }
-
-    /**
-     * Gets auto constraints list.
-     *
-     * @return array
-     */
-    protected function getAutoConstraints()
-    {
-        return [];
-    }
-
-    /**
-     * Returns the column id associated at this object.
-     *
-     * @return string
-     */
-    public function getColumnId()
-    {
-        return $this->columnId;
-    }
-
-    /**
-     * Returns the property associated at this object.
-     *
-     * @return string
-     */
-    public function getProperty()
-    {
-        return $this->property;
-    }
-
-    /**
-     * @param string $label
-     * @param bool   $displayLabelInErrors
-     */
-    public function setLabel($label, $displayLabelInErrors = false): void
-    {
-        if (!empty($label) && !isset($this->typeOptions['label'])) {
-            $this->typeOptions['label'] = $label;
-        }
-        if (!isset($this->typeOptions['label_attr']['data-display-in-errors']) && $displayLabelInErrors) {
-            $this->typeOptions['label_attr']['data-display-in-errors'] = '1';
-        }
-    }
-}
diff --git a/src/Form/Filter/AbstractFilter.php b/src/Form/Filter/AbstractFilter.php
new file mode 100644
index 0000000..ce7367d
--- /dev/null
+++ b/src/Form/Filter/AbstractFilter.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+abstract class AbstractFilter implements FilterInterface
+{
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
+    {
+    }
+
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+    }
+
+    public function supportsQueryBuilder(object $queryBuilder): bool
+    {
+        return $queryBuilder instanceof \Doctrine\ORM\QueryBuilder || $queryBuilder instanceof \Doctrine\DBAL\Query\QueryBuilder;
+    }
+
+    public static function getName(): string
+    {
+        return static::class;
+    }
+
+    protected function getTypeOptions(array $options, array $filterTypeOptions = []): array
+    {
+        $typeOptions = array_merge(
+            [
+                'required' => $options['required'],
+                'label' => $options['label'],
+            ],
+            $filterTypeOptions
+        );
+
+        if ($options['autovalidate']) {
+            $typeOptions['validation_groups'] = $options['validation_groups'];
+        } elseif (isset($typeOptions['constraints'])) {
+            unset($typeOptions['constraints']);
+        }
+
+        return array_merge(
+            $typeOptions,
+            $options['type_options']
+        );
+    }
+}
diff --git a/src/Form/Filter/BooleanFilter.php b/src/Form/Filter/BooleanFilter.php
new file mode 100644
index 0000000..fbd2394
--- /dev/null
+++ b/src/Form/Filter/BooleanFilter.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class BooleanFilter extends AbstractFilter
+{
+    public const VALUE_TRUE = 'T';
+    public const VALUE_FALSE = 'F';
+
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
+    {
+        $typeOptions = $this->getTypeOptions($options, [
+            'choices' => [
+                'filter.true' => static::VALUE_TRUE,
+                'filter.false' => static::VALUE_FALSE,
+            ],
+            'choice_translation_domain' => 'EcommitCrudBundle',
+        ]);
+        $builder->addField($property, ChoiceType::class, $typeOptions);
+    }
+
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        if (null === $value || '' === $value || !is_scalar($value)) {
+            return;
+        }
+
+        $parameterTrueName = 'value_boolean_true_'.str_replace(' ', '', $property);
+        $parameterFalseName = 'value_boolean_false_'.str_replace(' ', '', $property);
+
+        if (static::VALUE_TRUE === $value) {
+            $or = $queryBuilder->expr()->orX();
+            $or->add(sprintf('%s = :%s', $options['alias_search'], $parameterTrueName));
+            $queryBuilder->setParameter($parameterTrueName, $options['value_true']);
+            if ($options['not_null_is_true']) {
+                $or->add(sprintf('%s IS NOT NULL AND %s != :%s', $options['alias_search'], $options['alias_search'], $parameterFalseName));
+                $queryBuilder->setParameter($parameterFalseName, $options['value_false']);
+            }
+            $queryBuilder->andWhere($or);
+        } elseif (static::VALUE_FALSE === $value) {
+            if (null === $options['value_false']) {
+                $queryBuilder->andWhere(sprintf('%s IS NULL', $options['alias_search']));
+
+                return;
+            }
+
+            $or = $queryBuilder->expr()->orX();
+            $or->add(sprintf('%s = :%s', $options['alias_search'], $parameterFalseName));
+            $queryBuilder->setParameter($parameterFalseName, $options['value_false']);
+            if ($options['null_is_false']) {
+                $or->add(sprintf('%s IS NULL', $options['alias_search']));
+            }
+            $queryBuilder->andWhere($or);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'value_true' => 1,
+            'value_false' => 0,
+            'not_null_is_true' => false,
+            'null_is_false' => true,
+        ]);
+        $resolver->setAllowedTypes('value_true', ['string', 'integer']);
+        $resolver->setAllowedTypes('value_false', ['null', 'string', 'integer']);
+        $resolver->setAllowedTypes('not_null_is_true', 'boolean');
+        $resolver->setAllowedTypes('null_is_false', 'boolean');
+    }
+}
diff --git a/src/Form/Filter/ChoiceFilter.php b/src/Form/Filter/ChoiceFilter.php
new file mode 100644
index 0000000..685961d
--- /dev/null
+++ b/src/Form/Filter/ChoiceFilter.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class ChoiceFilter extends AbstractFilter
+{
+    use CollectionFilterTrait;
+
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
+    {
+        $typeOptions = $this->getTypeOptions($options, array_merge($this->getCollectionTypeOptions($options), [
+            'choices' => $options['choices'],
+        ]));
+        $builder->addField($property, $options['type'], $typeOptions);
+    }
+
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        $this->updateCollectionQueryBuilder($queryBuilder, $property, $value, $options);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $this->configureCollectionOptions($resolver);
+        $resolver->setDefaults([
+            'choices' => [],
+            'type' => ChoiceType::class,
+        ]);
+    }
+}
diff --git a/src/Form/Filter/CollectionFilterTrait.php b/src/Form/Filter/CollectionFilterTrait.php
new file mode 100644
index 0000000..45e87bf
--- /dev/null
+++ b/src/Form/Filter/CollectionFilterTrait.php
@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\DoctrineExtension\QueryBuilderFilter;
+use Ecommit\ScalarValues\ScalarValues;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints as Assert;
+
+trait CollectionFilterTrait
+{
+    protected function getCollectionTypeOptions(array $options): array
+    {
+        $constraints = [];
+        if ($options['multiple']) {
+            $constraints = [
+                new Assert\Count([
+                    'min' => $options['min'],
+                    'max' => $options['max'],
+                ]),
+            ];
+        }
+
+        return [
+            'multiple' => $options['multiple'],
+            'constraints' => $constraints,
+        ];
+    }
+
+    protected function updateCollectionQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        if (null === $value || '' === $value || [] === $value) {
+            return;
+        }
+
+        $parameterName = 'value_collection'.str_replace(' ', '', $property);
+
+        if ($options['multiple']) {
+            if (!\is_array($value)) {
+                $value = [$value];
+            }
+            $value = ScalarValues::filterScalarValues($value);
+            if (\count($value) > $options['max'] || 0 === \count($value)) {
+                return;
+            }
+            if ($options['min'] && \count($value) < $options['min']) {
+                return;
+            }
+            QueryBuilderFilter::addMultiFilter($queryBuilder, QueryBuilderFilter::SELECT_IN, $value, $options['alias_search'], $parameterName);
+        } else {
+            if (!is_scalar($value)) {
+                return;
+            }
+            $queryBuilder->andWhere(sprintf('%s = :%s', $options['alias_search'], $parameterName))
+                ->setParameter($parameterName, $value);
+        }
+    }
+
+    protected function configureCollectionOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'multiple' => false,
+            'min' => null,
+            'max' => 1000,
+        ]);
+    }
+}
diff --git a/src/Form/Filter/DateFilter.php b/src/Form/Filter/DateFilter.php
new file mode 100644
index 0000000..f4cb7ed
--- /dev/null
+++ b/src/Form/Filter/DateFilter.php
@@ -0,0 +1,116 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class DateFilter extends AbstractFilter
+{
+    public const GREATER_THAN = '>';
+    public const GREATER_EQUAL = '>=';
+    public const SMALLER_THAN = '<';
+    public const SMALLER_EQUAL = '<=';
+    public const EQUAL = '=';
+
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
+    {
+        $typeOptions = $this->getTypeOptions($options, [
+            'input' => 'datetime',
+        ]);
+        $type = ($options['with_time']) ? DateTimeType::class : DateType::class;
+        $builder->addField($property, $type, $typeOptions);
+    }
+
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        if (null === $value || '' === $value || !$value instanceof \DateTimeInterface) {
+            return;
+        }
+
+        if ($value instanceof \DateTime) {
+            $value = \DateTimeImmutable::createFromMutable($value);
+        }
+        $parameterName = 'value_date_'.str_replace(' ', '', $property);
+
+        switch ($options['comparator']) {
+            case self::SMALLER_THAN:
+            case self::GREATER_EQUAL:
+                if (!$options['with_time']) {
+                    $value = $value->setTime(0, 0, 0);
+                }
+                $value = $value->format('Y-m-d H:i:s');
+                $queryBuilder->andWhere(
+                    sprintf('%s %s :%s', $options['alias_search'], $options['comparator'], $parameterName)
+                )
+                    ->setParameter($parameterName, $value);
+                break;
+            case self::SMALLER_EQUAL:
+            case self::GREATER_THAN:
+                if (!$options['with_time']) {
+                    $value = $value->setTime(23, 59, 59);
+                }
+                $value = $value->format('Y-m-d H:i:s');
+                $queryBuilder->andWhere(
+                    sprintf('%s %s :%s', $options['alias_search'], $options['comparator'], $parameterName)
+                )
+                    ->setParameter($parameterName, $value);
+                break;
+            default:
+                $valueDateInf = $value;
+                $valueDateSup = $value;
+                if (!$options['with_time']) {
+                    $valueDateInf = $valueDateInf->setTime(0, 0, 0);
+                    $valueDateSup = $valueDateSup->setTime(23, 59, 59);
+                }
+                $valueDateInf = $valueDateInf->format('Y-m-d H:i:s');
+                $valueDateSup = $valueDateSup->format('Y-m-d H:i:s');
+                $parameterNameInf = 'value_date_inf_'.str_replace(' ', '', $property);
+                $parameterNameSup = 'value_date_sup_'.str_replace(' ', '', $property);
+                $queryBuilder->andWhere(
+                    sprintf(
+                        '%s >= :%s AND %s <= :%s',
+                        $options['alias_search'],
+                        $parameterNameInf,
+                        $options['alias_search'],
+                        $parameterNameSup
+                    )
+                )
+                    ->setParameter($parameterNameInf, $valueDateInf)
+                    ->setParameter($parameterNameSup, $valueDateSup);
+                break;
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'with_time' => false,
+        ]);
+
+        $resolver->setRequired([
+            'comparator',
+        ]);
+
+        $resolver->setAllowedValues('comparator', [
+            self::EQUAL,
+            self::GREATER_EQUAL,
+            self::GREATER_THAN,
+            self::SMALLER_EQUAL,
+            self::SMALLER_THAN,
+        ]);
+    }
+}
diff --git a/src/Form/Filter/FieldFilterEntityAjax.php b/src/Form/Filter/EntityAjaxFilter.php
similarity index 53%
rename from src/Form/Filter/FieldFilterEntityAjax.php
rename to src/Form/Filter/EntityAjaxFilter.php
index d2dfe86..77270c6 100644
--- a/src/Form/Filter/FieldFilterEntityAjax.php
+++ b/src/Form/Filter/EntityAjaxFilter.php
@@ -13,69 +13,58 @@
 
 namespace Ecommit\CrudBundle\Form\Filter;
 
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToIdsTransformer;
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
 use Ecommit\CrudBundle\Form\Type\EntityAjaxType;
-use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\ReversedTransformer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class FieldFilterEntityAjax extends FieldFilterChoice
+class EntityAjaxFilter extends AbstractFilter
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'route_params' => [],
-        ]);
+    use CollectionFilterTrait;
 
-        $resolver->setRequired([
-            'class',
-            'route_name',
-        ]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureTypeOptions($typeOptions)
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
     {
-        $options = ['class', 'route_name', 'route_params', 'multiple'];
-        foreach ($options as $option) {
-            if (!isset($typeOptions[$option])) {
-                $typeOptions[$option] = $this->options[$option];
-            }
-        }
-        if (!isset($typeOptions['max_elements'])) {
-            $typeOptions['max_elements'] = $this->options['max'];
-        }
+        $typeOptions = $this->getTypeOptions($options, array_merge($this->getCollectionTypeOptions($options), [
+            'class' => $options['class'],
+            'route_name' => $options['route_name'],
+            'route_params' => $options['route_params'],
+            'max_elements' => $options['max'],
+        ]));
 
-        return $typeOptions;
-    }
+        $builder->addField($property, EntityAjaxType::class, $typeOptions);
 
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, EntityAjaxType::class, $this->typeOptions);
-        $typeOptions = $formBuilder->get($this->property)->getOptions();
-        if ($this->options['multiple']) {
-            $formBuilder->get($this->property)->addModelTransformer(
+        $typeOptions = $builder->getField($property)->getOptions();
+        if ($options['multiple']) {
+            $builder->getField($property)->addModelTransformer(
                 new ReversedTransformer(
                     new EntitiesToIdsTransformer($typeOptions['query_builder'], $typeOptions['identifier'], $typeOptions['choice_label'], false, $typeOptions['max_elements'])
                 )
             );
         } else {
-            $formBuilder->get($this->property)->addModelTransformer(
+            $builder->getField($property)->addModelTransformer(
                 new ReversedTransformer(
                     new EntityToIdTransformer($typeOptions['query_builder'], $typeOptions['identifier'], $typeOptions['choice_label'], false)
                 )
             );
         }
+    }
 
-        return $formBuilder;
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        $this->updateCollectionQueryBuilder($queryBuilder, $property, $value, $options);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $this->configureCollectionOptions($resolver);
+        $resolver->setDefaults([
+            'route_params' => [],
+        ]);
+        $resolver->setRequired([
+            'class',
+            'route_name',
+        ]);
     }
 }
diff --git a/src/Form/Filter/EntityFilter.php b/src/Form/Filter/EntityFilter.php
new file mode 100644
index 0000000..302f2d5
--- /dev/null
+++ b/src/Form/Filter/EntityFilter.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Doctrine\ORM\EntityRepository;
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToIdsTransformer;
+use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\Exception\InvalidConfigurationException;
+use Symfony\Component\Form\ReversedTransformer;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class EntityFilter extends AbstractFilter
+{
+    use CollectionFilterTrait;
+
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
+    {
+        $typeOptions = $this->getTypeOptions($options, array_merge($this->getCollectionTypeOptions($options), [
+            'class' => $options['class'],
+            'query_builder' => function (EntityRepository $er) {
+                return $er->createQueryBuilder('e');
+            },
+        ]));
+
+        if (isset($typeOptions['choices'])) {
+            throw new \Exception('"Choices" option is not allowed. Use "query_builder" option');
+        }
+
+        $builder->addField($property, EntityType::class, $typeOptions);
+
+        $typeOptions = $builder->getField($property)->getOptions();
+
+        $em = $typeOptions['em'];
+        $identifiers = $em->getClassMetadata($options['class'])->getIdentifierFieldNames();
+        if (1 !== \count($identifiers)) {
+            throw new InvalidConfigurationException('Identifier not unique');
+        }
+        $identifier = $identifiers[0];
+
+        if ($options['multiple']) {
+            $builder->getField($property)->addModelTransformer(
+                new ReversedTransformer(
+                    new EntitiesToIdsTransformer($typeOptions['query_builder'], $identifier, $typeOptions['choice_label'], false, $options['max'])
+                )
+            );
+        } else {
+            $builder->getField($property)->addModelTransformer(
+                new ReversedTransformer(
+                    new EntityToIdTransformer($typeOptions['query_builder'], $identifier, $typeOptions['choice_label'], false)
+                )
+            );
+        }
+    }
+
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        $this->updateCollectionQueryBuilder($queryBuilder, $property, $value, $options);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $this->configureCollectionOptions($resolver);
+        $resolver->setRequired([
+            'class',
+        ]);
+    }
+}
diff --git a/src/Form/Filter/FieldFilterBoolean.php b/src/Form/Filter/FieldFilterBoolean.php
deleted file mode 100644
index 6c85175..0000000
--- a/src/Form/Filter/FieldFilterBoolean.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class FieldFilterBoolean extends AbstractFieldFilter
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'value_true' => 1,
-                'value_false' => 0,
-                'not_null_is_true' => false,
-                'null_is_false' => true,
-            ]
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureTypeOptions($typeOptions)
-    {
-        $typeOptions['multiple'] = false;
-        $typeOptions['choices'] = self::getChoices();
-        if (!isset($typeOptions['placeholder']) && !$typeOptions['required']) {
-            $typeOptions['placeholder'] = 'filter.choices.placeholder';
-        }
-
-        return $typeOptions;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, ChoiceType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
-    {
-        $value = $formData->get($this->property);
-        if (empty($value) || !is_scalar($value)) {
-            return $queryBuilder;
-        }
-
-        if ('T' == $value) {
-            $parameterName = 'value_true'.str_replace(' ', '', $this->property);
-            if ($this->options['not_null_is_true']) {
-                $parameterNameFalse = 'value_false'.str_replace(' ', '', $this->property);
-                $queryBuilder->andWhere(
-                    sprintf(
-                        '(%s = :%s OR (%s IS NOT NULL AND %s != :%s))',
-                        $aliasSearch,
-                        $parameterName,
-                        $aliasSearch,
-                        $aliasSearch,
-                        $parameterNameFalse
-                    )
-                )
-                    ->setParameter($parameterName, $this->options['value_true'])
-                    ->setParameter($parameterNameFalse, $this->options['value_false']);
-            } else {
-                $queryBuilder->andWhere(sprintf('%s = :%s', $aliasSearch, $parameterName))
-                    ->setParameter($parameterName, $this->options['value_true']);
-            }
-
-            return $queryBuilder;
-        } elseif ('F' == $value) {
-            $parameterName = 'value_false'.str_replace(' ', '', $this->property);
-            if (null === $this->options['value_false']) {
-                $queryBuilder->andWhere(sprintf('%s IS NULL', $aliasSearch));
-            } elseif ($this->options['null_is_false']) {
-                $queryBuilder->andWhere(
-                    sprintf(
-                        '(%s = :%s OR %s IS NULL)',
-                        $aliasSearch,
-                        $parameterName,
-                        $aliasSearch
-                    )
-                )
-                    ->setParameter($parameterName, $this->options['value_false']);
-            } else {
-                $queryBuilder->andWhere(sprintf('%s = :%s', $aliasSearch, $parameterName))
-                    ->setParameter($parameterName, $this->options['value_false']);
-            }
-
-            return $queryBuilder;
-        }
-
-        return $queryBuilder;
-    }
-
-    public static function getChoices()
-    {
-        return [
-            'filter.true' => 'T',
-            'filter.false' => 'F',
-        ];
-    }
-}
diff --git a/src/Form/Filter/FieldFilterChoice.php b/src/Form/Filter/FieldFilterChoice.php
deleted file mode 100644
index 6f2420c..0000000
--- a/src/Form/Filter/FieldFilterChoice.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\CrudBundle\DoctrineExtension\QueryBuilderFilter;
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
-use Ecommit\ScalarValues\ScalarValues;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints as Assert;
-
-class FieldFilterChoice extends AbstractFieldFilter
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureCommonOptions(OptionsResolver $resolver): void
-    {
-        parent::configureCommonOptions($resolver);
-
-        $resolver->setDefaults(
-            [
-                'multiple' => false,
-                'min' => null,
-                'max' => 99,
-            ]
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'choices' => null,
-            ]
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureTypeOptions($typeOptions)
-    {
-        $typeOptions['choices'] = $this->options['choices'];
-        $typeOptions['multiple'] = $this->options['multiple'];
-        if (!isset($typeOptions['placeholder']) && !$typeOptions['required']) {
-            $typeOptions['placeholder'] = 'filter.choices.placeholder';
-        }
-
-        return $typeOptions;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, ChoiceType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAutoConstraints()
-    {
-        if ($this->options['multiple']) {
-            return [
-                new Assert\Count(
-                    [
-                        'min' => $this->options['min'],
-                        'max' => $this->options['max'],
-                    ]
-                ),
-            ];
-        }
-
-        return [];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
-    {
-        $value = $formData->get($this->property);
-        $parameterName = 'value_choice'.str_replace(' ', '', $this->property);
-        if (null === $value || '' === $value || [] === $value) {
-            return $queryBuilder;
-        }
-
-        if ($this->options['multiple']) {
-            if (!\is_array($value)) {
-                $value = [$value];
-            }
-            $value = ScalarValues::filterScalarValues($value);
-            if (\count($value) > $this->options['max'] || 0 === \count($value)) {
-                return $queryBuilder;
-            }
-            if ($this->options['min'] && \count($value) < $this->options['min']) {
-                return $queryBuilder;
-            }
-            QueryBuilderFilter::addMultiFilter($queryBuilder, QueryBuilderFilter::SELECT_IN, $value, $aliasSearch, $parameterName);
-        } else {
-            if (!is_scalar($value)) {
-                return $queryBuilder;
-            }
-            $queryBuilder->andWhere(sprintf('%s = :%s', $aliasSearch, $parameterName))
-                ->setParameter($parameterName, $value);
-        }
-
-        return $queryBuilder;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterDate.php b/src/Form/Filter/FieldFilterDate.php
deleted file mode 100644
index bb33ac3..0000000
--- a/src/Form/Filter/FieldFilterDate.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
-use Ecommit\JavascriptBundle\Form\Type\JqueryDatePickerType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class FieldFilterDate extends AbstractFieldFilter
-{
-    public const GREATER_THAN = '>';
-    public const GREATER_EQUAL = '>=';
-    public const SMALLER_THAN = '<';
-    public const SMALLER_EQUAL = '<=';
-    public const EQUAL = '=';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'type' => JqueryDatePickerType::class,
-                'with_time' => function (Options $options) {
-                    if (DateTimeType::class === $options['type']) {
-                        return true;
-                    }
-
-                    return false;
-                },
-            ]
-        );
-
-        $resolver->setRequired(
-            [
-                'comparator',
-            ]
-        );
-
-        $resolver->setAllowedValues(
-            'comparator',
-            [
-                self::EQUAL,
-                self::GREATER_EQUAL,
-                self::GREATER_THAN,
-                self::SMALLER_EQUAL,
-                self::SMALLER_THAN,
-            ]
-        );
-
-        $resolver->setAllowedValues(
-            'type',
-            [
-                DateType::class,
-                DateTimeType::class,
-                JqueryDatePickerType::class,
-            ]
-        );
-    }
-
-    protected function configureTypeOptions($typeOptions)
-    {
-        $typeOptions['input'] = 'datetime';
-
-        if (JqueryDatePickerType::class === $this->options['type'] && $this->options['with_time'] && empty($this->typeOptions['time_format'])) {
-            $typeOptions['time_format'] = 'H:i:s';
-        }
-
-        return $typeOptions;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, $this->options['type'], $this->typeOptions);
-
-        return $formBuilder;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
-    {
-        $value = $formData->get($this->property);
-        if (!empty($value) && $value instanceof \DateTime) {
-            $parameterName = 'value_date_'.str_replace(' ', '', $this->property);
-
-            switch ($this->options['comparator']) {
-                case self::SMALLER_THAN:
-                case self::GREATER_EQUAL:
-                    if (!$this->options['with_time']) {
-                        $value->setTime(0, 0, 0);
-                    }
-                    $value = $value->format('Y-m-d H:i:s');
-                    $queryBuilder->andWhere(
-                        sprintf('%s %s :%s', $aliasSearch, $this->options['comparator'], $parameterName)
-                    )
-                        ->setParameter($parameterName, $value);
-                    break;
-                case self::SMALLER_EQUAL:
-                case self::GREATER_THAN:
-                    if (!$this->options['with_time']) {
-                        $value->setTime(23, 59, 59);
-                    }
-                    $value = $value->format('Y-m-d H:i:s');
-                    $queryBuilder->andWhere(
-                        sprintf('%s %s :%s', $aliasSearch, $this->options['comparator'], $parameterName)
-                    )
-                        ->setParameter($parameterName, $value);
-                    break;
-                default:
-                    $valueDateInf = clone $value;
-                    $valueDateSup = clone $value;
-                    if (!$this->options['with_time']) {
-                        $valueDateInf->setTime(0, 0, 0);
-                        $valueDateSup->setTime(23, 59, 59);
-                    }
-                    $valueDateInf = $valueDateInf->format('Y-m-d H:i:s');
-                    $valueDateSup = $valueDateSup->format('Y-m-d H:i:s');
-                    $parameterNameInf = 'value_date_inf_'.str_replace(' ', '', $this->property);
-                    $parameterNameSup = 'value_date_sup_'.str_replace(' ', '', $this->property);
-                    $queryBuilder->andWhere(
-                        sprintf(
-                            '%s >= :%s AND %s <= :%s',
-                            $aliasSearch,
-                            $parameterNameInf,
-                            $aliasSearch,
-                            $parameterNameSup
-                        )
-                    )
-                        ->setParameter($parameterNameInf, $valueDateInf)
-                        ->setParameter($parameterNameSup, $valueDateSup);
-                    break;
-            }
-        }
-
-        return $queryBuilder;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterEmpty.php b/src/Form/Filter/FieldFilterEmpty.php
deleted file mode 100644
index bcf72fb..0000000
--- a/src/Form/Filter/FieldFilterEmpty.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\FormBuilder;
-
-class FieldFilterEmpty extends AbstractFieldFilter
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureTypeOptions($typeOptions)
-    {
-        $typeOptions['value'] = 1;
-
-        return $typeOptions;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, CheckboxType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
-    {
-        $value = $formData->get($this->property);
-        if (empty($value) || !is_scalar($value)) {
-            return $queryBuilder;
-        }
-
-        if (1 == $value) {
-            $queryBuilder->andWhere(
-                sprintf('(%s IS NULL OR %s = \'\')', $aliasSearch, $aliasSearch)
-            );
-        }
-
-        return $queryBuilder;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterEntity.php b/src/Form/Filter/FieldFilterEntity.php
deleted file mode 100644
index 069c582..0000000
--- a/src/Form/Filter/FieldFilterEntity.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Doctrine\Persistence\ManagerRegistry;
-use Ecommit\JavascriptBundle\Form\Type\EntityNormalizerTrait;
-use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\PropertyAccess\PropertyAccess;
-
-class FieldFilterEntity extends FieldFilterChoice implements FieldFilterDoctrineInterface
-{
-    use EntityNormalizerTrait;
-
-    /**
-     * @var ManagerRegistry
-     */
-    protected $registry;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        parent::configureOptions($resolver);
-
-        $resolver->setDefaults(
-            [
-                'choice_label' => null,
-                'em' => null,
-                'query_builder' => null,
-                'identifier' => null,
-            ]
-        );
-
-        $resolver->setRequired(
-            [
-                'class',
-            ]
-        );
-
-        $resolver->setNormalizer('em', $this->getEmNormalizer($this->registry));
-        $resolver->setNormalizer('query_builder', $this->getQueryBuilderNormalizer());
-        $resolver->setNormalizer('identifier', $this->getIdentifierNormalizer());
-    }
-
-    protected function configureTypeOptions($typeOptions)
-    {
-        $typeOptions = parent::configureTypeOptions($typeOptions);
-
-        $queryBuilderLoader = new ORMQueryBuilderLoader($this->options['query_builder']);
-
-        $accessor = PropertyAccess::createPropertyAccessor();
-        $choices = [];
-        foreach ($queryBuilderLoader->getEntities() as $entity) {
-            $id = $accessor->getValue($entity, $this->options['identifier']);
-            $choices[$this->extractLabel($entity)] = $id;
-        }
-
-        $typeOptions['choices'] = $choices;
-        if (!isset($typeOptions['placeholder']) && !$typeOptions['required']) {
-            $typeOptions['placeholder'] = 'filter.choices.placeholder';
-        }
-
-        return $typeOptions;
-    }
-
-    /**
-     * Extract property that should be used for displaying the entities as text in the HTML element.
-     *
-     * @param object $object
-     *
-     * @throws \Exception
-     */
-    protected function extractLabel($object)
-    {
-        if ($this->options['choice_label']) {
-            $accessor = PropertyAccess::createPropertyAccessor();
-
-            return $accessor->getValue($object, $this->options['choice_label']);
-        } elseif (method_exists($object, '__toString')) {
-            return (string) $object;
-        }
-        throw new \Exception('"choice_label" option or "__toString" method must be defined"');
-    }
-
-    public function getRegistry()
-    {
-        return $this->registry;
-    }
-
-    public function setRegistry(ManagerRegistry $registry): void
-    {
-        $this->registry = $registry;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterInteger.php b/src/Form/Filter/FieldFilterInteger.php
deleted file mode 100644
index 2c7e091..0000000
--- a/src/Form/Filter/FieldFilterInteger.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
-use Symfony\Component\Form\Extension\Core\Type\IntegerType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class FieldFilterInteger extends AbstractFieldFilter
-{
-    public const GREATER_THAN = '>';
-    public const GREATER_EQUAL = '>=';
-    public const SMALLER_THAN = '<';
-    public const SMALLER_EQUAL = '<=';
-    public const EQUAL = '=';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setRequired(
-            [
-                'comparator',
-            ]
-        );
-
-        $resolver->setAllowedValues(
-            'comparator',
-            [
-                self::EQUAL,
-                self::GREATER_EQUAL,
-                self::GREATER_THAN,
-                self::SMALLER_EQUAL,
-                self::SMALLER_THAN,
-            ]
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, IntegerType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
-    {
-        $value = $formData->get($this->property);
-        if (null !== $value && is_numeric($value)) { //Important: Is_null but not is_empty
-            $parameterName = 'value_integer_'.str_replace(' ', '', $this->property);
-            $queryBuilder->andWhere(
-                sprintf('%s %s :%s', $aliasSearch, $this->options['comparator'], $parameterName)
-            )
-                ->setParameter($parameterName, $value);
-        }
-
-        return $queryBuilder;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterNumber.php b/src/Form/Filter/FieldFilterNumber.php
deleted file mode 100644
index 2c96ea7..0000000
--- a/src/Form/Filter/FieldFilterNumber.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
-use Symfony\Component\Form\FormBuilder;
-
-class FieldFilterNumber extends FieldFilterInteger
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, NumberType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-}
diff --git a/src/Form/Filter/FieldFilterText.php b/src/Form/Filter/FieldFilterText.php
deleted file mode 100644
index 18bc8cb..0000000
--- a/src/Form/Filter/FieldFilterText.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Filter;
-
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints as Assert;
-
-class FieldFilterText extends AbstractFieldFilter
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(
-            [
-                'must_begin' => false,
-                'must_end' => false,
-                'min_length' => null,
-                'max_length' => 255,
-            ]
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addField(FormBuilder $formBuilder)
-    {
-        $formBuilder->add($this->property, TextType::class, $this->typeOptions);
-
-        return $formBuilder;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAutoConstraints()
-    {
-        return [
-            new Assert\Length(
-                [
-                    'min' => $this->options['min_length'],
-                    'max' => $this->options['max_length'],
-                ]
-            ),
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function changeQuery($queryBuilder, AbstractFormSearcher $formData, $aliasSearch)
-    {
-        $value = $formData->get($this->property);
-        $parameterName = 'value_text_'.str_replace(' ', '', $this->property);
-        if (null === $value || '' === $value || !is_scalar($value)) {
-            return $queryBuilder;
-        }
-
-        if ($this->options['must_begin'] && $this->options['must_end']) {
-            $queryBuilder->andWhere(sprintf('%s = :%s', $aliasSearch, $parameterName))
-                ->setParameter($parameterName, $value);
-        } else {
-            $after = ($this->options['must_begin']) ? '' : '%';
-            $before = ($this->options['must_end']) ? '' : '%';
-            $value = addcslashes($value, '%_');
-            $like = $after.$value.$before;
-            $queryBuilder->andWhere(
-                $queryBuilder->expr()->like($aliasSearch, ':'.$parameterName)
-            )
-                ->setParameter($parameterName, $like);
-        }
-
-        return $queryBuilder;
-    }
-}
diff --git a/src/Form/Filter/FilterInterface.php b/src/Form/Filter/FilterInterface.php
new file mode 100644
index 0000000..d93ef4a
--- /dev/null
+++ b/src/Form/Filter/FilterInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+interface FilterInterface
+{
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void;
+
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void;
+
+    public function configureOptions(OptionsResolver $resolver): void;
+
+    public function supportsQueryBuilder(object $queryBuilder): bool;
+
+    public static function getName(): string;
+}
diff --git a/src/Form/Filter/IntegerFilter.php b/src/Form/Filter/IntegerFilter.php
new file mode 100644
index 0000000..37af333
--- /dev/null
+++ b/src/Form/Filter/IntegerFilter.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class IntegerFilter extends AbstractFilter
+{
+    public const GREATER_THAN = '>';
+    public const GREATER_EQUAL = '>=';
+    public const SMALLER_THAN = '<';
+    public const SMALLER_EQUAL = '<=';
+    public const EQUAL = '=';
+
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
+    {
+        $typeOptions = $this->getTypeOptions($options);
+        $builder->addField($property, IntegerType::class, $typeOptions);
+    }
+
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        if (null === $value || '' === $value || !is_scalar($value) || !$this->testNumberValue($value)) {
+            return;
+        }
+
+        $parameterName = 'value_integer_'.str_replace(' ', '', $property);
+
+        $queryBuilder->andWhere(sprintf('%s %s :%s', $options['alias_search'], $options['comparator'], $parameterName))
+            ->setParameter($parameterName, $value);
+    }
+
+    protected function testNumberValue($value): bool
+    {
+        return \is_int($value) || (\is_string($value) && preg_match('/^\d+$/', $value));
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setRequired([
+            'comparator',
+        ]);
+
+        $resolver->setAllowedValues('comparator', [
+            self::EQUAL,
+            self::GREATER_EQUAL,
+            self::GREATER_THAN,
+            self::SMALLER_EQUAL,
+            self::SMALLER_THAN,
+        ]);
+    }
+}
diff --git a/src/Form/Filter/FieldFilterDoctrineInterface.php b/src/Form/Filter/NotNullFilter.php
similarity index 51%
rename from src/Form/Filter/FieldFilterDoctrineInterface.php
rename to src/Form/Filter/NotNullFilter.php
index 52df090..a64cce9 100644
--- a/src/Form/Filter/FieldFilterDoctrineInterface.php
+++ b/src/Form/Filter/NotNullFilter.php
@@ -13,11 +13,14 @@
 
 namespace Ecommit\CrudBundle\Form\Filter;
 
-use Doctrine\Persistence\ManagerRegistry;
-
-interface FieldFilterDoctrineInterface
+class NotNullFilter extends NullFilter
 {
-    public function getRegistry();
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        if (!$value) {
+            return;
+        }
 
-    public function setRegistry(ManagerRegistry $registry);
+        $queryBuilder->andWhere(sprintf('%s IS NOT NULL', $options['alias_search']));
+    }
 }
diff --git a/src/Form/Filter/NullFilter.php b/src/Form/Filter/NullFilter.php
new file mode 100644
index 0000000..10f5584
--- /dev/null
+++ b/src/Form/Filter/NullFilter.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+
+class NullFilter extends AbstractFilter
+{
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
+    {
+        $typeOptions = $this->getTypeOptions($options);
+        $builder->addField($property, CheckboxType::class, $typeOptions);
+    }
+
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        if (!$value) {
+            return;
+        }
+
+        $queryBuilder->andWhere(sprintf('%s IS NULL', $options['alias_search']));
+    }
+}
diff --git a/src/Form/Filter/NumberFilter.php b/src/Form/Filter/NumberFilter.php
new file mode 100644
index 0000000..b44c91a
--- /dev/null
+++ b/src/Form/Filter/NumberFilter.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+
+class NumberFilter extends IntegerFilter
+{
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
+    {
+        $typeOptions = $this->getTypeOptions($options);
+        $builder->addField($property, NumberType::class, $typeOptions);
+    }
+
+    protected function testNumberValue($value): bool
+    {
+        return is_numeric($value);
+    }
+}
diff --git a/src/Form/Filter/TextFilter.php b/src/Form/Filter/TextFilter.php
new file mode 100644
index 0000000..a4a8ee1
--- /dev/null
+++ b/src/Form/Filter/TextFilter.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Filter;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class TextFilter extends AbstractFilter
+{
+    public function buildForm(SearchFormBuilder $builder, string $property, array $options): void
+    {
+        $typeOptions = $this->getTypeOptions($options, [
+            'constraints' => [
+                new Assert\Length([
+                    'min' => $options['min_length'],
+                    'max' => $options['max_length'],
+                ]),
+            ],
+        ]);
+        $builder->addField($property, $options['type'], $typeOptions);
+    }
+
+    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    {
+        if (null === $value || '' === $value || !is_scalar($value)) {
+            return;
+        }
+
+        $parameterName = 'value_text_'.str_replace(' ', '', $property);
+
+        if ($options['must_begin'] && $options['must_end']) {
+            $queryBuilder->andWhere(sprintf('%s = :%s', $options['alias_search'], $parameterName))
+                ->setParameter($parameterName, $value);
+        } else {
+            $after = ($options['must_begin']) ? '' : '%';
+            $before = ($options['must_end']) ? '' : '%';
+            $value = addcslashes($value, '%_');
+            $like = $after.$value.$before;
+            $queryBuilder->andWhere($queryBuilder->expr()->like($options['alias_search'], ':'.$parameterName))
+                ->setParameter($parameterName, $like);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'must_begin' => false,
+            'must_end' => false,
+            'min_length' => null,
+            'max_length' => 255,
+            'type' => TextType::class,
+        ]);
+    }
+}
diff --git a/src/Form/Searcher/AbstractFormSearcher.php b/src/Form/Searcher/AbstractFormSearcher.php
deleted file mode 100644
index 419e24e..0000000
--- a/src/Form/Searcher/AbstractFormSearcher.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Form\Searcher;
-
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\PropertyAccess\Exception\AccessException;
-use Symfony\Component\PropertyAccess\PropertyAccess;
-use Symfony\Component\PropertyAccess\PropertyAccessor;
-use Symfony\Component\Validator\Constraints\Callback;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-abstract class AbstractFormSearcher
-{
-    protected $fieldFilters;
-
-    /**
-     * @var PropertyAccessor
-     */
-    protected $accessor;
-
-    protected $commonOptions = [];
-
-    public $isSubmitted = false;
-
-    /**
-     * Declares fields.
-     *
-     * @return array
-     */
-    public function configureFieldsFilter()
-    {
-        return [];
-    }
-
-    /**
-     * Gets field value.
-     *
-     * @param string $field Field Name
-     *
-     * @return mixed
-     */
-    public function get($field)
-    {
-        try {
-            $value = $this->getAccessor()->getValue($this, $field);
-        } catch (AccessException $e) {
-            $value = null;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Clears this objet
-     * Used before storing this object in session
-     * By default, If one property is not public and it doesn't begin
-     * by "field", it will be deleted.
-     */
-    public function clear(): void
-    {
-        unset($this->fieldFilters);
-        unset($this->accessor);
-        $this->clearExceptFields();
-    }
-
-    /**
-     * Sub method of "clear" method
-     * Remove properties if they are not fields
-     * If one property is not public and it doesn't begin
-     * by "field", it will be deleted.
-     */
-    protected function clearExceptFields(): void
-    {
-        foreach ($this as $key => $value) {
-            $variable = new \ReflectionProperty($this, $key);
-            if (!$variable->isPublic() && !preg_match('/^field/', $key)) {
-                unset($this->$key);
-            }
-        }
-    }
-
-    /**
-     * Returns fields.
-     *
-     * @return array
-     */
-    public function getFieldsFilter($registry = null)
-    {
-        if (!$this->fieldFilters) {
-            $this->fieldFilters = [];
-            foreach ($this->configureFieldsFilter() as $field) {
-                $this->fieldFilters[] = $field;
-                if (!empty($registry) && $field instanceof \Ecommit\CrudBundle\Form\Filter\FieldFilterDoctrineInterface) {
-                    $field->setRegistry($registry);
-                }
-                $field->init();
-            }
-        }
-
-        return $this->fieldFilters;
-    }
-
-    /**
-     * Sets fields.
-     */
-    public function setFieldsFilter(array $filters): void
-    {
-        $this->fieldFilters = $filters;
-    }
-
-    /**
-     * Changes the form (global change).
-     *
-     * @return \Symfony\Component\Form\FormBuilderInterface
-     */
-    public function globalBuildForm(FormBuilderInterface $formBuilder)
-    {
-        return $formBuilder;
-    }
-
-    /**
-     * Changes the query (global change).
-     *
-     * @param QueryBuilder $queryBuilder
-     *
-     * @return QueryBuilder
-     */
-    public function globalChangeQuery($queryBuilder)
-    {
-        return $queryBuilder;
-    }
-
-    /**
-     * Returns true if auto validation is enabled.
-     *
-     * @return bool
-     */
-    public function automaticValidationIsEnabled()
-    {
-        return true;
-    }
-
-    /**
-     * Returns true if labels are displayed in errors messages.
-     *
-     * @return bool
-     */
-    public function displayLabelInErrors()
-    {
-        return false;
-    }
-
-    public static function loadValidatorMetadata(ClassMetadata $metadata): void
-    {
-        $metadata->addConstraint(new Callback('validateFormSearcher'));
-    }
-
-    public static function validateFormSearcher($value, ExecutionContextInterface $context): void
-    {
-        if ($value->automaticValidationIsEnabled()) {
-            foreach ($value->getFieldsFilter() as $field) {
-                $field->autoValidate($value, $context);
-            }
-        }
-    }
-
-    /**
-     * @return PropertyAccessor
-     */
-    protected function getAccessor()
-    {
-        if (!isset($this->accessor) || !$this->accessor) {
-            $this->accessor = PropertyAccess::createPropertyAccessor();
-        }
-
-        return $this->accessor;
-    }
-
-    /**
-     * @return array
-     */
-    public function getCommonOptions()
-    {
-        return $this->commonOptions;
-    }
-
-    /**
-     * @param array $commonOptions
-     */
-    public function setCommonOptions($commonOptions): void
-    {
-        $this->commonOptions = $commonOptions;
-    }
-}
diff --git a/src/Form/Searcher/AbstractSearcher.php b/src/Form/Searcher/AbstractSearcher.php
new file mode 100644
index 0000000..af9742f
--- /dev/null
+++ b/src/Form/Searcher/AbstractSearcher.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Searcher;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+abstract class AbstractSearcher implements SearcherInterface
+{
+    public function buildForm(SearchFormBuilder $builder, array $options): void
+    {
+    }
+
+    public function updateQueryBuilder($queryBuilder, array $options): void
+    {
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+    }
+}
diff --git a/src/Form/Searcher/SearcherInterface.php b/src/Form/Searcher/SearcherInterface.php
new file mode 100644
index 0000000..1b515cb
--- /dev/null
+++ b/src/Form/Searcher/SearcherInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Form\Searcher;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+interface SearcherInterface
+{
+    public function buildForm(SearchFormBuilder $builder, array $options): void;
+
+    public function updateQueryBuilder($queryBuilder, array $options): void;
+
+    public function configureOptions(OptionsResolver $resolver): void;
+}
diff --git a/src/Form/Type/FormSearchType.php b/src/Form/Type/FormSearchType.php
index 23ad991..c9615e0 100644
--- a/src/Form/Type/FormSearchType.php
+++ b/src/Form/Type/FormSearchType.php
@@ -32,7 +32,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'data_class' => 'Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher',
+            'data_class' => 'Ecommit\CrudBundle\Form\Searcher\SearcherInterface',
             'csrf_protection' => false,
         ]);
     }
diff --git a/src/Resources/config/filters.xml b/src/Resources/config/filters.xml
new file mode 100644
index 0000000..e59211d
--- /dev/null
+++ b/src/Resources/config/filters.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="Ecommit\CrudBundle\Form\Filter\BooleanFilter" class="Ecommit\CrudBundle\Form\Filter\BooleanFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+
+        <service id="Ecommit\CrudBundle\Form\Filter\ChoiceFilter" class="Ecommit\CrudBundle\Form\Filter\ChoiceFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+
+        <service id="Ecommit\CrudBundle\Form\Filter\DateFilter" class="Ecommit\CrudBundle\Form\Filter\DateFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+
+        <service id="Ecommit\CrudBundle\Form\Filter\EntityAjaxFilter" class="Ecommit\CrudBundle\Form\Filter\EntityAjaxFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+
+        <service id="Ecommit\CrudBundle\Form\Filter\EntityFilter" class="Ecommit\CrudBundle\Form\Filter\EntityFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+
+        <service id="Ecommit\CrudBundle\Form\Filter\IntegerFilter" class="Ecommit\CrudBundle\Form\Filter\IntegerFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+
+        <service id="Ecommit\CrudBundle\Form\Filter\NotNullFilter" class="Ecommit\CrudBundle\Form\Filter\NotNullFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+
+        <service id="Ecommit\CrudBundle\Form\Filter\NullFilter" class="Ecommit\CrudBundle\Form\Filter\NullFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+
+        <service id="Ecommit\CrudBundle\Form\Filter\NumberFilter" class="Ecommit\CrudBundle\Form\Filter\NumberFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+
+        <service id="Ecommit\CrudBundle\Form\Filter\TextFilter" class="Ecommit\CrudBundle\Form\Filter\TextFilter">
+            <tag name="ecommit_crud.filter" />
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 9132245..a88fc74 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -3,12 +3,20 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
+        <service id="ecommit_crud.locator" class="Symfony\Component\DependencyInjection\ServiceLocator">
+            <argument type="collection">
+                <argument key="router" type="service" id="Symfony\Component\Routing\RouterInterface"/>
+                <argument key="form.factory" type="service" id="Symfony\Component\Form\FormFactoryInterface"/>
+                <argument key="request_stack" type="service" id="Symfony\Component\HttpFoundation\RequestStack"/>
+                <argument key="doctrine" type="service" id="Doctrine\Persistence\ManagerRegistry"/>
+                <argument key="security.token_storage" type="service" id="Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface"/>
+                <argument key="ecommit_crud.filters" type="service" id="Ecommit\CrudBundle\Crud\CrudFilters"/>
+            </argument>
+            <tag name="container.service_locator"/>
+        </service>
+
         <service id="Ecommit\CrudBundle\Crud\CrudFactory" class="Ecommit\CrudBundle\Crud\CrudFactory" public="true">
-            <argument type="service" id="Symfony\Component\Routing\RouterInterface"/>
-            <argument type="service" id="Symfony\Component\Form\FormFactoryInterface"/>
-            <argument type="service" id="Symfony\Component\HttpFoundation\RequestStack"/>
-            <argument type="service" id="Doctrine\Persistence\ManagerRegistry" />
-            <argument type="service" id="Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface"/>
+            <argument type="service" id="ecommit_crud.locator"/>
         </service>
         <service id="ecommit_crud.factory" alias="Ecommit\CrudBundle\Crud\CrudFactory" public="true" />
 
diff --git a/src/Resources/translations/EcommitCrudBundle.en.yml b/src/Resources/translations/EcommitCrudBundle.en.yml
index e10b05f..0edb125 100644
--- a/src/Resources/translations/EcommitCrudBundle.en.yml
+++ b/src/Resources/translations/EcommitCrudBundle.en.yml
@@ -7,6 +7,10 @@ display_settings:
     title: Display Settings
     uncheck_all: Uncheck all
 
+filter:
+    'false': No
+    'true': Yes
+
 search:
     reset: Reset
     submit: Search
diff --git a/src/Resources/translations/EcommitCrudBundle.fr.yml b/src/Resources/translations/EcommitCrudBundle.fr.yml
index cb8f54b..22824a1 100644
--- a/src/Resources/translations/EcommitCrudBundle.fr.yml
+++ b/src/Resources/translations/EcommitCrudBundle.fr.yml
@@ -7,6 +7,10 @@ display_settings:
     title: Propriétés d'affichage
     uncheck_all: Tout désélectionner
 
+filter:
+    'false': Non
+    'true': Oui
+
 search:
     reset: R.A.Z
     submit: Rechercher
diff --git a/src/Resources/translations/messages.en.yml b/src/Resources/translations/messages.en.yml
index 1254d59..c8228c3 100644
--- a/src/Resources/translations/messages.en.yml
+++ b/src/Resources/translations/messages.en.yml
@@ -2,8 +2,6 @@
 Page %firstPage%/%lastPage%: Page %page%/%lastPage%
 Results %first%-%last%: Results %first%-%last%
 Page %page%/%lastPage%: Page %page%/%lastPage%
-filter.true: Yes
-filter.false: No
 filter.choices.placeholder: All
 picker.add: Add
 picker.list: Select
diff --git a/src/Resources/translations/messages.fr.yml b/src/Resources/translations/messages.fr.yml
index c3bfdc1..28cef22 100644
--- a/src/Resources/translations/messages.fr.yml
+++ b/src/Resources/translations/messages.fr.yml
@@ -2,8 +2,6 @@
 Page %firstPage%/%lastPage%: Page %page%/%lastPage%
 Results %first%-%last%: Résultats %first%-%last%
 Page %page%/%lastPage%: Page %page%/%lastPage%
-filter.true: Oui
-filter.false: Non
 filter.choices.placeholder: Tous
 picker.add: Ajouter
 picker.list: Sélectionner
diff --git a/src/Resources/views/Theme/base.html.twig b/src/Resources/views/Theme/base.html.twig
index 648948b..5d14cf2 100644
--- a/src/Resources/views/Theme/base.html.twig
+++ b/src/Resources/views/Theme/base.html.twig
@@ -232,7 +232,7 @@
 
 {% block search_form_start %}
 {% spaceless %}
-    {{ form_start(crud.searcherForm, {'attr': form_attr}) }}
+    {{ form_start(crud.searchForm, {'attr': form_attr}) }}
 {% endspaceless %}
 {% endblock %}
 
diff --git a/tests/DoctrineHelper.php b/tests/DoctrineHelper.php
deleted file mode 100644
index 2073dac..0000000
--- a/tests/DoctrineHelper.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Tests;
-
-use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Tools\SchemaTool;
-use Doctrine\ORM\Tools\Setup;
-use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
-use Ecommit\CrudBundle\Tests\Fixtures\Tag;
-
-class DoctrineHelper
-{
-    public static function createEntityManager(bool $addSchema = true): EntityManager
-    {
-        $connection = [
-            'driver' => 'pdo_sqlite',
-            'memory' => true,
-        ];
-
-        $config = Setup::createAnnotationMetadataConfiguration([__DIR__.'/Fixtures'], true, null, null, false);
-
-        $entityManager = EntityManager::create($connection, $config);
-        if (false === $addSchema) {
-            return $entityManager;
-        }
-
-        $classes = [
-            $entityManager->getClassMetadata(Tag::class),
-            $entityManager->getClassMetadata(EntityManyToOne::class),
-        ];
-
-        $schemaTool = new SchemaTool($entityManager);
-        try {
-            $schemaTool->dropSchema($classes);
-        } catch (\Exception $e) {
-        }
-
-        try {
-            $schemaTool->createSchema($classes);
-        } catch (\Exception $e) {
-        }
-
-        return $entityManager;
-    }
-
-    public static function loadTagsFixtures(EntityManager $entityManager): void
-    {
-        $entityManager->persist(new Tag(1, 'tag1'));
-        $entityManager->persist(new Tag(2, 'tag2'));
-        $entityManager->persist(new Tag(3, '3'));
-        $entityManager->persist(new Tag(4, 'tag_name'));
-        $entityManager->persist(new Tag(5, 'tag_name'));
-        $entityManager->flush();
-        $entityManager->clear();
-    }
-
-    public static function loadEntityManyToOneFixtures(EntityManager $entityManager): void
-    {
-        $tagRepository = $entityManager->getRepository(Tag::class);
-
-        $entityManager->persist(new EntityManyToOne(1, 'entity1', $tagRepository->find(2)));
-        $entityManager->persist(new EntityManyToOne(2, 'entity2', $tagRepository->find(3)));
-        $entityManager->persist(new EntityManyToOne(3, 'entity3', $tagRepository->find(4)));
-        $entityManager->persist(new EntityManyToOne(4, 'entity4', $tagRepository->find(5)));
-        $entityManager->persist(new EntityManyToOne(5, 'entity5', $tagRepository->find(5)));
-        $entityManager->flush();
-        $entityManager->clear();
-    }
-}
diff --git a/tests/Form/DataTransformer/AbstractEntityTransformerTest.php b/tests/Form/DataTransformer/AbstractEntityTransformerTest.php
index 6ad609c..eb250b2 100644
--- a/tests/Form/DataTransformer/AbstractEntityTransformerTest.php
+++ b/tests/Form/DataTransformer/AbstractEntityTransformerTest.php
@@ -14,11 +14,11 @@
 namespace Ecommit\CrudBundle\Tests\Form\DataTransformer;
 
 use Doctrine\ORM\EntityManager;
-use Ecommit\CrudBundle\Tests\DoctrineHelper;
-use PHPUnit\Framework\TestCase;
+use Doctrine\Persistence\ManagerRegistry;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\DataTransformerInterface;
 
-abstract class AbstractEntityTransformerTest extends TestCase
+abstract class AbstractEntityTransformerTest extends KernelTestCase
 {
     /**
      * @var EntityManager
@@ -27,9 +27,8 @@ abstract class AbstractEntityTransformerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->em = DoctrineHelper::createEntityManager();
-        DoctrineHelper::loadTagsFixtures($this->em);
-        DoctrineHelper::loadEntityManyToOneFixtures($this->em);
+        static::bootKernel();
+        $this->em = static::$container->get(ManagerRegistry::class)->getManager();
     }
 
     protected function tearDown(): void
diff --git a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
index 4b755cd..a4ba25f 100644
--- a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
@@ -15,8 +15,8 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToChoicesTransformer;
-use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
-use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
diff --git a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
index 7a28863..91c938d 100644
--- a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
@@ -15,8 +15,8 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToIdsTransformer;
-use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
-use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
 use Symfony\Component\Form\DataTransformerInterface;
 
 class EntitiesToIdsTransformerTest extends EntitiesToChoicesTransformerTest
diff --git a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
index 6a2c8bb..7f625e4 100644
--- a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
@@ -15,8 +15,8 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToChoiceTransformer;
-use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
-use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
diff --git a/tests/Form/DataTransformer/EntityToIdTransformerTest.php b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
index 210759b..ea3a879 100644
--- a/tests/Form/DataTransformer/EntityToIdTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
@@ -14,8 +14,8 @@
 namespace Ecommit\CrudBundle\Tests\Form\DataTransformer;
 
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
-use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
-use Ecommit\CrudBundle\Tests\Fixtures\Tag;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
 use Symfony\Component\Form\DataTransformerInterface;
 
 class EntityToIdTransformerTest extends EntityToChoiceTransformerTest
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTest.php
new file mode 100644
index 0000000..533e8b1
--- /dev/null
+++ b/tests/Form/Filter/AbstractFilterTest.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Query\Parameter;
+use Doctrine\Persistence\ManagerRegistry;
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudFactory;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\EntityToManyToOneSearcher;
+use Psr\Container\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+
+abstract class AbstractFilterTest extends KernelTestCase
+{
+    /**
+     * @var EntityManager
+     */
+    protected $em;
+
+    /**
+     * @var FormFactoryInterface
+     */
+    protected $factory;
+
+    /**
+     * @var CrudFactory
+     */
+    protected $crudFactory;
+
+    protected function setUp(): void
+    {
+        static::bootKernel();
+
+        $this->em = static::$container->get(ManagerRegistry::class)->getManager();
+        $this->factory = static::$container->get(FormFactoryInterface::class);
+
+        $session = $this->createMock(SessionInterface::class);
+        $session->expects($this->any())
+            ->method('get')
+            ->willReturn(null);
+        $session->expects($this->any())
+            ->method('set');
+
+        $request = new Request();
+        $request->setSession($session);
+        $requestStack = $this->createMock(RequestStack::class);
+        $requestStack->expects($this->any())
+            ->method('getCurrentRequest')
+            ->willReturn($request);
+
+        $container = $this->createMock(ContainerInterface::class);
+        $container->expects($this->any())
+            ->method('get')
+            ->willReturnCallback(function ($name) use ($requestStack) {
+                if ('request_stack' === $name) {
+                    return $requestStack;
+                }
+
+                return static::$container->get('ecommit_crud.locator')->get($name);
+            });
+
+        $this->crudFactory = new CrudFactory($container);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->em = null;
+        $this->factory = null;
+        $this->crudFactory = null;
+    }
+
+    protected function createCrud(string $alias, $propertyData = null): Crud
+    {
+        $searcher = new EntityToManyToOneSearcher();
+        $searcher->propertyName = $propertyData;
+
+        $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e');
+
+        $crud = $this->crudFactory->create('session_name');
+        $crud->addColumn('propertyName', $alias, 'label1')
+            ->addColumn('id', 'e.id', 'id')
+            ->setQueryBuilder($queryBuilder)
+            ->setAvailableResultsPerPage([5, 5, 10, 50], 5)
+            ->setDefaultSort('id', Crud::ASC)
+            ->createSearchForm($searcher)
+            ->setRoute('user_ajax_crud');
+
+        return $crud;
+    }
+
+    protected function initCrudAndGetForm(Crud $crud): FormInterface
+    {
+        $crud->init();
+
+        return $crud->getSearchForm()->getForm();
+    }
+
+    protected function initCrudAndGetFormView(Crud $crud): FormView
+    {
+        $crud->init();
+        $crud->getSearchForm()->createFormView();
+
+        return $crud->getSearchForm()->getForm();
+    }
+
+    protected function checkQueryBuilder(Crud $crud, ?string $whereExpected, array $parametersExpected = []): void
+    {
+        $crud->buildQuery();
+
+        $queryBuilder = $crud->getQueryBuilder();
+        if (null === $whereExpected) {
+            $this->assertNotRegExp('/WHERE/', $queryBuilder->getDql());
+        } else {
+            $pattern = '/WHERE '.preg_quote($whereExpected, '/').' ORDER BY/i';
+            $this->assertRegExp($pattern, $queryBuilder->getDql());
+        }
+
+        $parameters = [];
+        /** @var Parameter $parameter */
+        foreach ($queryBuilder->getParameters() as $parameter) {
+            $parameters[$parameter->getName()] = $parameter->getValue();
+        }
+        $this->assertEquals($parametersExpected, $parameters);
+    }
+}
diff --git a/tests/Form/Filter/BooleanFilterTest.php b/tests/Form/Filter/BooleanFilterTest.php
new file mode 100644
index 0000000..3cef85c
--- /dev/null
+++ b/tests/Form/Filter/BooleanFilterTest.php
@@ -0,0 +1,250 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Ecommit\CrudBundle\Form\Filter\BooleanFilter;
+
+class BooleanFilterTest extends AbstractFilterTest
+{
+    /**
+     * @dataProvider getTestViewAndQueryBuilderProvider
+     */
+    public function testViewAndQueryBuilder($modelData, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        return [
+            [null, '', null, []],
+            ['', '', null, []],
+            ['T', 'T', 'e.name = :value_boolean_true_propertyName', ['value_boolean_true_propertyName' => 1]],
+            ['F', 'F', 'e.name = :value_boolean_false_propertyName OR e.name IS NULL', ['value_boolean_false_propertyName' => 0]],
+        ];
+    }
+
+    public function testInvalidInput(): void
+    {
+        $crud = $this->createCrud('e.name', 'bad-value');
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, null, []);
+    }
+
+    /**
+     * @dataProvider getTestValueTrueOptionProvider
+     */
+    public function testValueTrueOption($modelData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+            'value_true' => 'val',
+        ]);
+
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestValueTrueOptionProvider(): array
+    {
+        return [
+            [null, null, []],
+            ['', null, []],
+            ['T', 'e.name = :value_boolean_true_propertyName', ['value_boolean_true_propertyName' => 'val']],
+            ['F', 'e.name = :value_boolean_false_propertyName OR e.name IS NULL', ['value_boolean_false_propertyName' => 0]],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestValueFalseOptionProvider
+     */
+    public function testValueFalseOption($modelData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+            'value_false' => 'val',
+        ]);
+
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestValueFalseOptionProvider(): array
+    {
+        return [
+            [null, null, []],
+            ['', null, []],
+            ['T', 'e.name = :value_boolean_true_propertyName', ['value_boolean_true_propertyName' => 1]],
+            ['F', 'e.name = :value_boolean_false_propertyName OR e.name IS NULL', ['value_boolean_false_propertyName' => 'val']],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestValueFalseNullOptionProvider
+     */
+    public function testValueFalseNullOption($modelData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+            'value_false' => null,
+        ]);
+
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestValueFalseNullOptionProvider(): array
+    {
+        return [
+            [null, null, []],
+            ['', null, []],
+            ['T', 'e.name = :value_boolean_true_propertyName', ['value_boolean_true_propertyName' => 1]],
+            ['F', 'e.name IS NULL', []],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestNotNullIsTrueOptionProvider
+     */
+    public function testNotNullIsTrueOption($notNullIsTrue, $modelData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+            'not_null_is_true' => $notNullIsTrue,
+        ]);
+
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestNotNullIsTrueOptionProvider(): array
+    {
+        return [
+            [false, null, null, []],
+            [false, '', null, []],
+            [false, 'T', 'e.name = :value_boolean_true_propertyName', ['value_boolean_true_propertyName' => 1]],
+            [false, 'F', 'e.name = :value_boolean_false_propertyName OR e.name IS NULL', ['value_boolean_false_propertyName' => 0]],
+
+            [true, null, null, []],
+            [true, '', null, []],
+            [true, 'T', 'e.name = :value_boolean_true_propertyName OR (e.name IS NOT NULL AND e.name != :value_boolean_false_propertyName)', ['value_boolean_true_propertyName' => 1, 'value_boolean_false_propertyName' => 0]],
+            [true, 'F', 'e.name = :value_boolean_false_propertyName OR e.name IS NULL', ['value_boolean_false_propertyName' => 0]],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestNullIsFalseOptionProvider
+     */
+    public function testNullIsFalseOption($nullIsFalse, $modelData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+            'null_is_false' => $nullIsFalse,
+        ]);
+
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestNullIsFalseOptionProvider(): array
+    {
+        return [
+            [true, null, null, []],
+            [true, '', null, []],
+            [true, 'T', 'e.name = :value_boolean_true_propertyName', ['value_boolean_true_propertyName' => 1]],
+            [true, 'F', 'e.name = :value_boolean_false_propertyName OR e.name IS NULL', ['value_boolean_false_propertyName' => 0]],
+
+            [false, null, null, []],
+            [false, '', null, []],
+            [false, 'T', 'e.name = :value_boolean_true_propertyName', ['value_boolean_true_propertyName' => 1]],
+            [false, 'F', 'e.name = :value_boolean_false_propertyName', ['value_boolean_false_propertyName' => 0]],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitProvider
+     */
+    public function testSubmit($submittedData, $expectedModelData, $expectedViewData): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertSame($expectedModelData, $field->getData());
+        $this->assertSame($expectedViewData, $field->getViewData());
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            [null, null, ''],
+            ['', null, ''],
+            ['T', 'T', 'T'],
+            ['F', 'F', 'F'],
+        ];
+    }
+
+    public function testSubmitInvalidFormat(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => ['not-scalar'],
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertFalse($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertNull($field->getData());
+    }
+
+    public function testSubmitBadChoice(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => 'bad-value',
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertFalse($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertNull($field->getData());
+    }
+}
diff --git a/tests/Form/Filter/ChoiceFilterTest.php b/tests/Form/Filter/ChoiceFilterTest.php
new file mode 100644
index 0000000..c5a9a3e
--- /dev/null
+++ b/tests/Form/Filter/ChoiceFilterTest.php
@@ -0,0 +1,227 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Ecommit\CrudBundle\Form\Filter\ChoiceFilter;
+use Symfony\Component\Form\Extension\Core\Type\LanguageType;
+
+class ChoiceFilterTest extends AbstractFilterTest
+{
+    /**
+     * @dataProvider getTestViewAndQueryBuilderProvider
+     */
+    public function testViewAndQueryBuilder($modelData, bool $multiple, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.tag', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+            'choices' => ['val1' => '1', 'val2' => '2'],
+            'multiple' => $multiple,
+        ]);
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $this->assertEquals($expectedViewData, $view->children['propertyName']->vars['value']);
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        return [
+            //No multiple
+            [null, false, '', null, []],
+            ['', false, '', null, []],
+            ['2', false, '2', 'e.tag = :value_collectionpropertyName', ['value_collectionpropertyName' => '2']],
+            ['5', false, '', 'e.tag = :value_collectionpropertyName', ['value_collectionpropertyName' => '5']], //Not exists
+
+            //Multiple
+            [null, true, [], null, []],
+            [[], true, [], null, []],
+            [['2'], true, ['2'], 'e.tag IN (:value_collectionpropertyName)', ['value_collectionpropertyName' => ['2']]],
+            [['5'], true, [], 'e.tag IN (:value_collectionpropertyName)', ['value_collectionpropertyName' => ['5']]], //Not exists
+        ];
+    }
+
+    public function testInvalidMin(): void
+    {
+        $crud = $this->createCrud('e.tag', ['1', '2']);
+        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+            'choices' => ['val1' => '1', 'val2' => '2'],
+            'multiple' => true,
+            'min' => 3,
+        ]);
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, null, []);
+    }
+
+    public function testInvalidMax(): void
+    {
+        $crud = $this->createCrud('e.tag', ['1', '2']);
+        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+            'choices' => ['val1' => '1', 'val2' => '2'],
+            'multiple' => true,
+            'max' => 1,
+        ]);
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, null, []);
+    }
+
+    /**
+     * @dataProvider getTestSubmitProvider
+     */
+    public function testSubmit($submittedData, bool $multiple, $expectedModelData, $expectedViewData): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+            'choices' => ['val1' => '1', 'val2' => '2'],
+            'multiple' => $multiple,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertSame($expectedModelData, $field->getData());
+        $this->assertSame($expectedViewData, $field->getViewData());
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            //No multiple
+            [null, false, null, ''],
+            ['', false, null, ''],
+            ['1', false, '1', '1'],
+
+            //Multiple
+            [null, true, [], []],
+            [[], true, [], []],
+            [['1'], true, ['1'], ['1']],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitInvalidFormatProvider
+     */
+    public function testSubmitInvalidFormat($submittedData, bool $multiple): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+            'choices' => ['val1' => '1', 'val2' => '2'],
+            'multiple' => $multiple,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertFalse($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertNull($field->getData());
+    }
+
+    public function getTestSubmitInvalidFormatProvider(): array
+    {
+        return [
+            //No multiple
+            [['not-scalar'], false],
+
+            //Multiple
+            ['not-array', true],
+        ];
+    }
+
+    public function testSubmitInvalidMinLength(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+            'choices' => ['val1' => '1', 'val2' => '2'],
+            'multiple' => true,
+            'min' => 3,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => ['1'],
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertSame(['1'], $field->getData());
+    }
+
+    public function testSubmitInvalidMaxLength(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+            'choices' => ['val1' => '1', 'val2' => '2'],
+            'multiple' => true,
+            'max' => 1,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => ['1', '2'],
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertSame(['1', '2'], $field->getData());
+    }
+
+    public function testSubmitWithoutValidation(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+            'choices' => ['val1' => '1', 'val2' => '2'],
+            'multiple' => true,
+            'min' => 3,
+            'autovalidate' => false,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => ['1'],
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertSame(['1'], $field->getData());
+        $this->assertSame(['1'], $field->getViewData());
+    }
+
+    public function testWithType(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+            'type' => LanguageType::class,
+        ]);
+
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $field = $view['propertyName'];
+        $this->assertContains('language', $field->vars['block_prefixes']);
+        $this->assertGreaterThan(0, \count($field->vars['choices']));
+    }
+}
diff --git a/tests/Form/Filter/DateFilterTest.php b/tests/Form/Filter/DateFilterTest.php
new file mode 100644
index 0000000..c6cdc8e
--- /dev/null
+++ b/tests/Form/Filter/DateFilterTest.php
@@ -0,0 +1,252 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Ecommit\CrudBundle\Form\Filter\DateFilter;
+use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+
+class DateFilterTest extends AbstractFilterTest
+{
+    public function testOptionsAreRequired(): void
+    {
+        $this->expectException(MissingOptionsException::class);
+
+        $crud = $this->createCrud('e.createdAt');
+        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class);
+    }
+
+    /**
+     * @dataProvider getTestViewAndQueryBuilderProvider
+     */
+    public function testViewAndQueryBuilder($modelData, bool $withTime, string $comparator, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.createdAt', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+            'comparator' => $comparator,
+            'with_time' => $withTime,
+        ]);
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        $data = [
+            //Null value
+            [null, false, DateFilter::GREATER_THAN, ['year' => '', 'month' => '', 'day' => ''], null, []],
+            [null, false, DateFilter::GREATER_EQUAL, ['year' => '', 'month' => '', 'day' => ''], null, []],
+            [null, false, DateFilter::SMALLER_THAN, ['year' => '', 'month' => '', 'day' => ''], null, []],
+            [null, false, DateFilter::SMALLER_EQUAL, ['year' => '', 'month' => '', 'day' => ''], null, []],
+            [null, false, DateFilter::EQUAL, ['year' => '', 'month' => '', 'day' => ''], null, []],
+
+            [null, true, DateFilter::GREATER_THAN, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']], null, []],
+            [null, true, DateFilter::GREATER_EQUAL, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']], null, []],
+            [null, true, DateFilter::SMALLER_THAN, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']], null, []],
+            [null, true, DateFilter::SMALLER_EQUAL, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']], null, []],
+            [null, true, DateFilter::EQUAL, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']], null, []],
+        ];
+
+        //Not empty value
+        foreach ([new \DateTimeImmutable('2021-04-01 13:10:20'), new \DateTime('2021-04-01 13:10:20')] as $inputDate) {
+            $data = array_merge($data, [
+                [$inputDate, false, DateFilter::GREATER_THAN, ['year' => '2021', 'month' => '4', 'day' => '1'], 'e.createdAt > :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 23:59:59']],
+                [$inputDate, false, DateFilter::GREATER_EQUAL, ['year' => '2021', 'month' => '4', 'day' => '1'], 'e.createdAt >= :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 00:00:00']],
+                [$inputDate, false, DateFilter::SMALLER_THAN, ['year' => '2021', 'month' => '4', 'day' => '1'], 'e.createdAt < :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 00:00:00']],
+                [$inputDate, false, DateFilter::SMALLER_EQUAL, ['year' => '2021', 'month' => '4', 'day' => '1'], 'e.createdAt <= :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 23:59:59']],
+                [$inputDate, false, DateFilter::EQUAL, ['year' => '2021', 'month' => '4', 'day' => '1'], 'e.createdAt >= :value_date_inf_propertyName AND e.createdAt <= :value_date_sup_propertyName', ['value_date_inf_propertyName' => '2021-04-01 00:00:00', 'value_date_sup_propertyName' => '2021-04-01 23:59:59']],
+
+                [$inputDate, true, DateFilter::GREATER_THAN, ['date' => ['year' => '2021', 'month' => '4', 'day' => '1'], 'time' => ['hour' => '13', 'minute' => '10']], 'e.createdAt > :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 13:10:20']],
+                [$inputDate, true, DateFilter::GREATER_EQUAL, ['date' => ['year' => '2021', 'month' => '4', 'day' => '1'], 'time' => ['hour' => '13', 'minute' => '10']], 'e.createdAt >= :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 13:10:20']],
+                [$inputDate, true, DateFilter::SMALLER_THAN, ['date' => ['year' => '2021', 'month' => '4', 'day' => '1'], 'time' => ['hour' => '13', 'minute' => '10']], 'e.createdAt < :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 13:10:20']],
+                [$inputDate, true, DateFilter::SMALLER_EQUAL, ['date' => ['year' => '2021', 'month' => '4', 'day' => '1'], 'time' => ['hour' => '13', 'minute' => '10']], 'e.createdAt <= :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 13:10:20']],
+                [$inputDate, true, DateFilter::EQUAL, ['date' => ['year' => '2021', 'month' => '4', 'day' => '1'], 'time' => ['hour' => '13', 'minute' => '10']], 'e.createdAt >= :value_date_inf_propertyName AND e.createdAt <= :value_date_sup_propertyName', ['value_date_inf_propertyName' => '2021-04-01 13:10:20', 'value_date_sup_propertyName' => '2021-04-01 13:10:20']],
+            ]);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @dataProvider getTestInvalidInputProvider
+     */
+    public function testInvalidInput($modelData): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+            'comparator' => DateFilter::GREATER_THAN,
+        ]);
+
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, null, []);
+    }
+
+    public function getTestInvalidInputProvider(): array
+    {
+        return [
+            [['not-scalar']],
+            ['not-date'],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitProvider
+     */
+    public function testSubmit($withTime, $submittedData, $expectedModelData, $expectedViewData): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+            'comparator' => DateFilter::GREATER_THAN,
+            'with_time' => $withTime,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertEquals($expectedModelData, $field->getData());
+        $this->assertSame($expectedViewData, $field->getViewData());
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            //Without time
+            [false, null, null, ['year' => '', 'month' => '', 'day' => '']],
+            [false, ['year' => '', 'month' => '', 'day' => ''], null, ['year' => '', 'month' => '', 'day' => '']],
+            [false, ['year' => '2021', 'month' => '4', 'day' => '1'], new \DateTime('2021-04-01 00:00:00'), ['year' => '2021', 'month' => '4', 'day' => '1']],
+
+            //With time
+            [true, null, null, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']]],
+            [true, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']], null, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']]],
+            [true, ['date' => ['year' => '2021', 'month' => '4', 'day' => '1'], 'time' => ['hour' => '13', 'minute' => '10']], new \DateTime('2021-04-01 13:10:00'), ['date' => ['year' => '2021', 'month' => '4', 'day' => '1'], 'time' => ['hour' => '13', 'minute' => '10']]],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitInvalidFormatProvider
+     */
+    public function testSubmitInvalidFormat($submittedData): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+            'comparator' => DateFilter::GREATER_THAN,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertFalse($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertNull($field->getData());
+    }
+
+    public function getTestSubmitInvalidFormatProvider(): array
+    {
+        return [
+            ['bad-value'],
+            [['year' => '2021', 'month' => '2', 'day' => '31']], //the date does not exist
+        ];
+    }
+
+    /**
+     * @dataProvider getTestViewAndQueryBuilderWithSingleTextWidgetProvider
+     */
+    public function testViewAndQueryBuilderWithSingleTextWidget($modelData, bool $withTime, string $comparator, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.createdAt', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+            'comparator' => $comparator,
+            'with_time' => $withTime,
+            'type_options' => [
+                'widget' => 'single_text',
+                'format' => ($withTime) ? 'dd/MM/yyyy HH:mm' : 'dd/MM/yyyy',
+                'html5' => false,
+            ],
+        ]);
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestViewAndQueryBuilderWithSingleTextWidgetProvider(): array
+    {
+        $inputValue = new \DateTime('2021-04-01 13:10:20');
+
+        return [
+            //Null value
+            [null, false, DateFilter::GREATER_THAN, '', null, []],
+            [null, true, DateFilter::GREATER_THAN, '', null, []],
+
+            //Not empty value
+            [$inputValue, false, DateFilter::GREATER_THAN, '01/04/2021', 'e.createdAt > :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 23:59:59']],
+            [$inputValue, true, DateFilter::GREATER_THAN, '01/04/2021 13:10', 'e.createdAt > :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 13:10:20']],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitWithSingleTextWidgetProvider
+     */
+    public function testSubmitWithSingleTextWidget($withTime, $submittedData, $expectedModelData, $expectedViewData): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+            'comparator' => DateFilter::GREATER_THAN,
+            'with_time' => $withTime,
+            'type_options' => [
+                'widget' => 'single_text',
+                'format' => ($withTime) ? 'dd/MM/yyyy HH:mm' : 'dd/MM/yyyy',
+                'html5' => false,
+            ],
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertEquals($expectedModelData, $field->getData());
+        $this->assertSame($expectedViewData, $field->getViewData());
+    }
+
+    public function getTestSubmitWithSingleTextWidgetProvider(): array
+    {
+        return [
+            //Without time
+            [false, null, null, ''],
+            [false, '', null, ''],
+            [false, '01/04/2021', new \DateTime('2021-04-01 00:00:00'), '01/04/2021'],
+
+            //With time
+            [true, null, null, ''],
+            [true, '', null, ''],
+            [true, '01/04/2021 13:10', new \DateTime('2021-04-01 13:10:00'), '01/04/2021 13:10'],
+        ];
+    }
+}
diff --git a/tests/Form/Filter/FieldFilterEntityAjaxTest.php b/tests/Form/Filter/EntityAjaxFilterTest.php
similarity index 57%
rename from tests/Form/Filter/FieldFilterEntityAjaxTest.php
rename to tests/Form/Filter/EntityAjaxFilterTest.php
index 150b677..9aa6049 100644
--- a/tests/Form/Filter/FieldFilterEntityAjaxTest.php
+++ b/tests/Form/Filter/EntityAjaxFilterTest.php
@@ -13,83 +13,19 @@
 
 namespace Ecommit\CrudBundle\Tests\Form\Filter;
 
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
-use Ecommit\CrudBundle\Form\Filter\FieldFilterEntityAjax;
-use Ecommit\CrudBundle\Form\Type\EntityAjaxType;
-use Ecommit\CrudBundle\Tests\DoctrineHelper;
-use Ecommit\CrudBundle\Tests\Fixtures\EntityManyToOne;
-use Ecommit\CrudBundle\Tests\Fixtures\EntityToManyToOneSearcher;
-use Ecommit\CrudBundle\Tests\Fixtures\Tag;
-use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
-use Symfony\Bridge\Doctrine\ManagerRegistry;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\Form\Forms;
+use Ecommit\CrudBundle\Form\Filter\EntityAjaxFilter;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
-use Symfony\Component\Routing\Router;
 
-class FieldFilterEntityAjaxTest extends TestCase
+class EntityAjaxFilterTest extends AbstractFilterTest
 {
-    /**
-     * @var EntityManager
-     */
-    protected $em;
-
-    /**
-     * @var FormFactoryInterface
-     */
-    protected $factory;
-
-    protected function setUp(): void
-    {
-        $this->em = DoctrineHelper::createEntityManager();
-        DoctrineHelper::loadTagsFixtures($this->em);
-        DoctrineHelper::loadEntityManyToOneFixtures($this->em);
-
-        $registry = $this->createMock(ManagerRegistry::class);
-        $registry->expects($this->any())
-            ->method('getManager')
-            ->with($this->equalTo('default'))
-            ->willReturn($this->em);
-        $registry->expects($this->any())
-            ->method('getManagerForClass')
-            ->willReturnCallback(function ($class) {
-                if (Tag::class === $class) {
-                    return $this->em;
-                }
-
-                return null;
-            });
-
-        $router = $this->createMock(Router::class);
-        $router->expects($this->any())
-            ->method('generate')
-            ->willReturnCallback(function (string $routeName, array $routeParams) {
-                if (\count($routeParams) > 0) {
-                    return '/'.$routeName.'?'.http_build_query($routeParams);
-                }
-
-                return '/'.$routeName;
-            });
-
-        $this->factory = Forms::createFormFactoryBuilder()
-            ->addType(new EntityAjaxType($registry, $router))
-            ->addTypeGuesser(new DoctrineOrmTypeGuesser($registry))
-            ->getFormFactory();
-    }
-
-    protected function tearDown(): void
-    {
-        $this->em = null;
-    }
-
     public function testOptionsAreRequired(): void
     {
         $this->expectException(MissingOptionsException::class);
-        $filter = new FieldFilterEntityAjax('columnId', 'propertyName');
-        $filter->init();
+
+        $crud = $this->createCrud('e.tag');
+        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class);
     }
 
     /**
@@ -97,29 +33,19 @@ public function testOptionsAreRequired(): void
      */
     public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
     {
-        $searcher = new EntityToManyToOneSearcher();
-        $searcher->propertyName = $modelData;
-
-        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+        $crud = $this->createCrud('e.tag', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'multiple' => $multiple,
         ]);
-        $filter->init();
-
-        $formBuilder = $this->factory->createBuilder(FormType::class, [
-            'propertyName' => $searcher->propertyName,
-        ]);
-        $filter->addField($formBuilder);
-        $view = $formBuilder->getForm()->createView();
+        $view = $this->initCrudAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
-        $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')
-            ->orderBy('e.id', 'asc');
-        $filter->changeQuery($queryBuilder, $searcher, 'e.tag');
+        $crud->buildQuery();
         $idsFound = [];
-        foreach ($queryBuilder->getQuery()->getResult() as $entity) {
+        foreach ($crud->getQueryBuilder()->getQuery()->getResult() as $entity) {
             $idsFound[] = $entity->getId();
         }
         $this->assertSame($expectedIdsFound, $idsFound);
@@ -148,22 +74,14 @@ public function getTestViewAndQueryBuilderProvider(): array
      */
     public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $expectedViewData): void
     {
-        $searcher = new EntityToManyToOneSearcher();
-        $searcher->propertyName = ($multiple) ? [] : null;
-
-        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'multiple' => $multiple,
         ]);
-        $filter->init();
 
-        $formBuilder = $this->factory->createBuilder(FormType::class, [
-            'propertyName' => $searcher->propertyName,
-        ]);
-        $filter->addField($formBuilder);
-
-        $form = $formBuilder->getForm();
+        $form = $this->initCrudAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -196,23 +114,15 @@ public function getTestSubmitProvider(): array
      */
     public function testSubmitInvalid(bool $multiple, $submittedData): void
     {
-        $searcher = new EntityToManyToOneSearcher();
-        $searcher->propertyName = ($multiple) ? [] : null;
-
-        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'multiple' => $multiple,
             'max' => 2,
         ]);
-        $filter->init();
-
-        $formBuilder = $this->factory->createBuilder(FormType::class, [
-            'propertyName' => $searcher->propertyName,
-        ]);
-        $filter->addField($formBuilder);
 
-        $form = $formBuilder->getForm();
+        $form = $this->initCrudAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -221,7 +131,6 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
         $this->assertFalse($field->isSynchronized());
         $this->assertFalse($field->isValid());
         $this->assertNull($field->getData());
-        $this->assertSame($submittedData, $field->getViewData()); //Twig doesn't display invalid list
     }
 
     public function getTestSubmitInvalidProvider(): array
@@ -256,31 +165,22 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
                 ->andWhere('t.id > 2');
         }
 
-        $searcher = new EntityToManyToOneSearcher();
-        $searcher->propertyName = $modelData;
-
-        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+        $crud = $this->createCrud('e.tag', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'multiple' => $multiple,
-        ], [
-            'query_builder' => $queryBuilder,
-        ]);
-        $filter->init();
-
-        $formBuilder = $this->factory->createBuilder(FormType::class, [
-            'propertyName' => $searcher->propertyName,
+            'type_options' => [
+                'query_builder' => $queryBuilder,
+            ],
         ]);
-        $filter->addField($formBuilder);
-        $view = $formBuilder->getForm()->createView();
+        $view = $this->initCrudAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']); //Twig doesn't display invalid list
 
-        $queryBuilderResults = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')
-            ->orderBy('e.id', 'asc');
-        $filter->changeQuery($queryBuilderResults, $searcher, 'e.tag');
+        $crud->buildQuery();
         $idsFound = [];
-        foreach ($queryBuilderResults->getQuery()->getResult() as $entity) {
+        foreach ($crud->getQueryBuilder()->getQuery()->getResult() as $entity) {
             $idsFound[] = $entity->getId();
         }
         $this->assertSame($expectedIdsFound, $idsFound);
@@ -324,24 +224,17 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
                 ->andWhere('t.id > 2');
         }
 
-        $searcher = new EntityToManyToOneSearcher();
-        $searcher->propertyName = ($multiple) ? [] : null;
-
-        $filter = new FieldFilterEntityAjax('columnId', 'propertyName', [
+        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'multiple' => $multiple,
-        ], [
-            'query_builder' => $queryBuilder,
-        ]);
-        $filter->init();
-
-        $formBuilder = $this->factory->createBuilder(FormType::class, [
-            'propertyName' => $searcher->propertyName,
+            'type_options' => [
+                'query_builder' => $queryBuilder,
+            ],
         ]);
-        $filter->addField($formBuilder);
 
-        $form = $formBuilder->getForm();
+        $form = $this->initCrudAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
diff --git a/tests/Form/Filter/EntityFilterTest.php b/tests/Form/Filter/EntityFilterTest.php
new file mode 100644
index 0000000..bf1b294
--- /dev/null
+++ b/tests/Form/Filter/EntityFilterTest.php
@@ -0,0 +1,279 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Doctrine\ORM\EntityRepository;
+use Ecommit\CrudBundle\Form\Filter\EntityFilter;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
+use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+
+class EntityFilterTest extends AbstractFilterTest
+{
+    public function testOptionsAreRequired(): void
+    {
+        $this->expectException(MissingOptionsException::class);
+
+        $crud = $this->createCrud('e.tag');
+        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class);
+    }
+
+    /**
+     * @dataProvider getTestViewAndQueryBuilderProvider
+     */
+    public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
+    {
+        $crud = $this->createCrud('e.tag', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+            'class' => Tag::class,
+            'multiple' => $multiple,
+        ]);
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
+
+        $crud->buildQuery();
+        $idsFound = [];
+        foreach ($crud->getQueryBuilder()->getQuery()->getResult() as $entity) {
+            $idsFound[] = $entity->getId();
+        }
+        $this->assertSame($expectedIdsFound, $idsFound);
+    }
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        return [
+            //No multiple
+            [false, null, '', [1, 2, 3, 4, 5]],
+            [false, 2, '2', [1]],
+            [false, 5, '5', [4, 5]],
+            [false, 9999, '', []], //9999 : Entity not found
+
+            //Multiple
+            [true, [], [], [1, 2, 3, 4, 5]],
+            [true, [2], ['2'], [1]],
+            [true, [2, 3], ['2', '3'], [1, 2]],
+            [true, [2, 9999], ['2'], [1]], //9999 : Entity not found
+            [true, [9999], [], []], //9999 : Entity not found
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitProvider
+     */
+    public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $expectedViewData): void
+    {
+        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+            'class' => Tag::class,
+            'multiple' => $multiple,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertSame($expectedModelData, $field->getData());
+        $this->assertSame($expectedViewData, $field->getViewData());
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            //No multiple
+            [false, null, null, ''],
+            [false, '', null, ''],
+            [false, '2', '2', '2'],
+
+            //Multiple
+            [true, [], [], []],
+            [true, ['2'], ['2'], ['2']],
+            [true, ['2', '3'], ['2', '3'], ['2', '3']],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitInvalidProvider
+     */
+    public function testSubmitInvalid(bool $multiple, $submittedData): void
+    {
+        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+            'class' => Tag::class,
+            'multiple' => $multiple,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertFalse($field->isValid());
+    }
+
+    public function getTestSubmitInvalidProvider(): array
+    {
+        return [
+            //No multiple
+            [false, []],
+            [false, '99999'],
+
+            //Multiple
+            [true, '1'],
+            [true, ['99999']],
+            [true, ['1', '99999']],
+        ];
+    }
+
+    public function testSubmitInvalidMaxCount(): void
+    {
+        $crud = $this->createCrud('e.tag', []);
+        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+            'class' => Tag::class,
+            'multiple' => true,
+            'max' => 2,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => ['1', '2', '3'],
+        ]);
+
+        $this->assertFalse($form->isValid());
+        $field = $form->get('propertyName');
+        $this->assertSame(['1', '2', '3'], $field->getData());
+    }
+
+    /**
+     * @dataProvider getTestViewWithQueryBuilderProvider
+     */
+    public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
+    {
+        if ($queryBuilderIsClosure) {
+            $queryBuilder = function (EntityRepository $entityRepository) {
+                return $entityRepository->createQueryBuilder('t')
+                    ->select('t')
+                    ->andWhere('t.id > 2');
+            };
+        } else {
+            $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
+                ->select('t')
+                ->andWhere('t.id > 2');
+        }
+
+        $crud = $this->createCrud('e.tag', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+            'class' => Tag::class,
+            'multiple' => $multiple,
+            'type_options' => [
+                'query_builder' => $queryBuilder,
+            ],
+        ]);
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
+
+        $crud->buildQuery();
+        $idsFound = [];
+        foreach ($crud->getQueryBuilder()->getQuery()->getResult() as $entity) {
+            $idsFound[] = $entity->getId();
+        }
+        $this->assertSame($expectedIdsFound, $idsFound);
+    }
+
+    public function getTestViewWithQueryBuilderProvider(): array
+    {
+        return [
+            //No multiple - Valid
+            [false, false, '4', '4', [3]],
+            [true, false, '4', '4', [3]],
+
+            //No multiple - Invalid
+            [false, false, '2', '', [1]],
+            [true, false, '2', '', [1]],
+
+            //Mutiple - valid
+            [false, true, ['4'], ['4'], [3]],
+            [true, true, ['4'], ['4'], [3]],
+
+            //Multiple - Invalid
+            [false, true, ['2'], [], [1]],
+            [true, true, ['2'], [], [1]],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitWithQueryBuilderProvider
+     */
+    public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedViewData): void
+    {
+        if ($queryBuilderIsClosure) {
+            $queryBuilder = function (EntityRepository $entityRepository) {
+                return $entityRepository->createQueryBuilder('t')
+                    ->select('t')
+                    ->andWhere('t.id > 2');
+            };
+        } else {
+            $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
+                ->select('t')
+                ->andWhere('t.id > 2');
+        }
+
+        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+            'class' => Tag::class,
+            'multiple' => $multiple,
+            'type_options' => [
+                'query_builder' => $queryBuilder,
+            ],
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertSame($expectedValid, $field->isValid());
+        if ($field->isValid()) {
+            $this->assertSame($expectedModelData, $field->getData());
+            $this->assertSame($expectedViewData, $field->getViewData());
+        }
+    }
+
+    public function getTestSubmitWithQueryBuilderProvider(): array
+    {
+        return [
+            //No multiple - Valid
+            [false, false, '4', true, '4', '4'],
+            [true, false, '4', true, '4', '4'],
+
+            //No multiple - Invalid
+            [false, false, '2', false, null, '2'],
+            [true, false, '2', false, null, '2'],
+
+            //Multiple - Valid
+            [false, true, ['4'], true, ['4'], ['4']],
+            [true, true, ['4'], true, ['4'], ['4']],
+
+            //Multiple - Invalid
+            [false, true, ['2'], false, [], []],
+            [true, true, ['2'], false, [], []],
+        ];
+    }
+}
diff --git a/tests/Form/Filter/IntegerFilterTest.php b/tests/Form/Filter/IntegerFilterTest.php
new file mode 100644
index 0000000..098dbec
--- /dev/null
+++ b/tests/Form/Filter/IntegerFilterTest.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Ecommit\CrudBundle\Form\Filter\IntegerFilter;
+use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+
+class IntegerFilterTest extends AbstractFilterTest
+{
+    public const TEST_FILTER = IntegerFilter::class;
+
+    public function testOptionsAreRequired(): void
+    {
+        $this->expectException(MissingOptionsException::class);
+
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER);
+    }
+
+    /**
+     * @dataProvider getTestViewAndQueryBuilderProvider
+     */
+    public function testViewAndQueryBuilder($modelData, string $comparator, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
+            'comparator' => $comparator,
+        ]);
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        return [
+            //Null value
+            [null, IntegerFilter::GREATER_THAN, '', null, []],
+            [null, IntegerFilter::GREATER_EQUAL, '', null, []],
+            [null, IntegerFilter::SMALLER_THAN, '', null, []],
+            [null, IntegerFilter::SMALLER_EQUAL, '', null, []],
+            [null, IntegerFilter::EQUAL, '', null, []],
+
+            //String value
+            ['5', IntegerFilter::GREATER_THAN, '5', 'e.name > :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            ['5', IntegerFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            ['5', IntegerFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            ['5', IntegerFilter::SMALLER_EQUAL, '5', 'e.name <= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            ['5', IntegerFilter::EQUAL, '5', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+
+            //Int value
+            [5, IntegerFilter::GREATER_THAN, '5', 'e.name > :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            [5, IntegerFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            [5, IntegerFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            [5, IntegerFilter::SMALLER_EQUAL, '5', 'e.name <= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            [5, IntegerFilter::EQUAL, '5', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+        ];
+    }
+
+    public function testInvalidInput(): void
+    {
+        $crud = $this->createCrud('e.name', ['not-scalar']);
+        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
+            'comparator' => IntegerFilter::GREATER_THAN,
+        ]);
+
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, null, []);
+    }
+
+    /**
+     * @dataProvider getTestSubmitProvider
+     */
+    public function testSubmit($submittedData, $expectedModelData, $expectedViewData): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
+            'comparator' => IntegerFilter::GREATER_THAN,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertSame($expectedModelData, $field->getData());
+        $this->assertSame($expectedViewData, $field->getViewData());
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            [null, null, ''],
+            ['', null, ''],
+            ['5', 5, '5'],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitInvalidFormatProvider
+     */
+    public function testSubmitInvalidFormat($submittedData): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
+            'comparator' => IntegerFilter::GREATER_THAN,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertFalse($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertNull($field->getData());
+    }
+
+    public function getTestSubmitInvalidFormatProvider(): array
+    {
+        return [
+            [['not-scalar']],
+            ['aaa'],
+        ];
+    }
+}
diff --git a/tests/Form/Filter/NotNullFilterTest.php b/tests/Form/Filter/NotNullFilterTest.php
new file mode 100644
index 0000000..3118f70
--- /dev/null
+++ b/tests/Form/Filter/NotNullFilterTest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Ecommit\CrudBundle\Form\Filter\NotNullFilter;
+
+class NotNullFilterTest extends NullFilterTest
+{
+    public const TEST_FILTER = NotNullFilter::class;
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        return [
+            //Null value
+            [null, false, null, []],
+
+            //Not checked
+            [false, false, null, []],
+
+            //Checked
+            [true, true, 'e.name IS NOT NULL', []],
+        ];
+    }
+}
diff --git a/tests/Form/Filter/NullFilterTest.php b/tests/Form/Filter/NullFilterTest.php
new file mode 100644
index 0000000..4567411
--- /dev/null
+++ b/tests/Form/Filter/NullFilterTest.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Ecommit\CrudBundle\Form\Filter\NullFilter;
+
+class NullFilterTest extends AbstractFilterTest
+{
+    public const TEST_FILTER = NullFilter::class;
+
+    /**
+     * @dataProvider getTestViewAndQueryBuilderProvider
+     */
+    public function testViewAndQueryBuilder($modelData, $expectedChecked, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER);
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $this->assertSame('1', $view->children['propertyName']->vars['value']);
+        $this->assertSame($expectedChecked, $view->children['propertyName']->vars['checked']);
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        return [
+            //Null value
+            [null, false, null, []],
+
+            //Not checked
+            [false, false, null, []],
+
+            //Checked
+            [true, true, 'e.name IS NULL', []],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestSubmitProvider
+     */
+    public function testSubmit($submittedData, $expectedModelData): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertSame($expectedModelData, $field->getData());
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            [null, false],
+            ['', true],
+            ['0', true],
+            ['2', true],
+            ['1', true],
+        ];
+    }
+}
diff --git a/tests/Form/Filter/NumberFilterTest.php b/tests/Form/Filter/NumberFilterTest.php
new file mode 100644
index 0000000..5c22882
--- /dev/null
+++ b/tests/Form/Filter/NumberFilterTest.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Ecommit\CrudBundle\Form\Filter\NumberFilter;
+
+class NumberFilterTest extends IntegerFilterTest
+{
+    public const TEST_FILTER = NumberFilter::class;
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        return [
+            //Null value
+            [null, NumberFilter::GREATER_THAN, '', null, []],
+            [null, NumberFilter::GREATER_EQUAL, '', null, []],
+            [null, NumberFilter::SMALLER_THAN, '', null, []],
+            [null, NumberFilter::SMALLER_EQUAL, '', null, []],
+            [null, NumberFilter::EQUAL, '', null, []],
+
+            //String value
+            ['5', NumberFilter::GREATER_THAN, '5', 'e.name > :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            ['5', NumberFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            ['5', NumberFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            ['5', NumberFilter::SMALLER_EQUAL, '5', 'e.name <= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            ['5.25', NumberFilter::EQUAL, '5,25', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5.25']],
+
+            //Int value
+            [5, NumberFilter::GREATER_THAN, '5', 'e.name > :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            [5, NumberFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            [5, NumberFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            [5, NumberFilter::SMALLER_EQUAL, '5', 'e.name <= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
+            [5.25, NumberFilter::EQUAL, '5,25', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5.25']],
+        ];
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            [null, null, ''],
+            ['', null, ''],
+            ['5', 5.0, '5'],
+            ['5.25', 5.25, '5,25'],
+            ['5,25', 5.25, '5,25'],
+        ];
+    }
+}
diff --git a/tests/Form/Filter/TextFilterTest.php b/tests/Form/Filter/TextFilterTest.php
new file mode 100644
index 0000000..38fb5f0
--- /dev/null
+++ b/tests/Form/Filter/TextFilterTest.php
@@ -0,0 +1,187 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Form\Filter;
+
+use Ecommit\CrudBundle\Form\Filter\TextFilter;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+
+class TextFilterTest extends AbstractFilterTest
+{
+    /**
+     * @dataProvider getTestViewAndQueryBuilderProvider
+     */
+    public function testViewAndQueryBuilder($modelData, bool $mustBegin, bool $mustEnd, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
+    {
+        $crud = $this->createCrud('e.name', $modelData);
+        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+            'must_begin' => $mustBegin,
+            'must_end' => $mustEnd,
+        ]);
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
+
+        $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
+    }
+
+    public function getTestViewAndQueryBuilderProvider(): array
+    {
+        return [
+            //Null value
+            [null, false, false, '', null, []],
+            [null, false, true, '', null, []],
+            [null, true, false, '', null, []],
+            [null, true, true, '', null, []],
+
+            //Empty value
+            ['', false, false, '', null, []],
+            ['', false, true, '', null, []],
+            ['', true, false, '', null, []],
+            ['', true, true, '', null, []],
+
+            //Not empty value
+            ['val', false, false, 'val', 'e.name LIKE :value_text_propertyName', ['value_text_propertyName' => '%val%']],
+            ['val', false, true, 'val', 'e.name LIKE :value_text_propertyName', ['value_text_propertyName' => '%val']],
+            ['val', true, false, 'val', 'e.name LIKE :value_text_propertyName', ['value_text_propertyName' => 'val%']],
+            ['val', true, true, 'val', 'e.name = :value_text_propertyName', ['value_text_propertyName' => 'val']],
+
+            //Escape
+            ['v%a_l', false, false, 'v%a_l', 'e.name LIKE :value_text_propertyName', ['value_text_propertyName' => '%v\%a\_l%']],
+        ];
+    }
+
+    public function testInvalidInput(): void
+    {
+        $crud = $this->createCrud('e.name', ['not-scalar']);
+        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class);
+
+        $crud->init();
+
+        $this->checkQueryBuilder($crud, null, []);
+    }
+
+    /**
+     * @dataProvider getTestSubmitProvider
+     */
+    public function testSubmit($submittedData, $expectedModelData, $expectedViewData): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => $submittedData,
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertSame($expectedModelData, $field->getData());
+        $this->assertSame($expectedViewData, $field->getViewData());
+    }
+
+    public function getTestSubmitProvider(): array
+    {
+        return [
+            [null, null, ''],
+            ['', null, ''],
+            ['val', 'val', 'val'],
+        ];
+    }
+
+    public function testSubmitInvalidFormat(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => ['not-scalar'],
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertFalse($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertNull($field->getData());
+    }
+
+    public function testSubmitInvalidMinLength(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+            'min_length' => 5,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => 'val',
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertSame('val', $field->getData());
+    }
+
+    public function testSubmitInvalidMaxLength(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+            'max_length' => 2,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => 'val',
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertSame('val', $field->getData());
+    }
+
+    public function testSubmitWithoutValidation(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+            'max_length' => 2,
+            'autovalidate' => false,
+        ]);
+
+        $form = $this->initCrudAndGetForm($crud);
+        $form->submit([
+            'propertyName' => 'val',
+        ]);
+
+        $field = $form->get('propertyName');
+        $this->assertTrue($field->isSynchronized());
+        $this->assertTrue($field->isValid());
+        $this->assertSame('val', $field->getData());
+        $this->assertSame('val', $field->getViewData());
+    }
+
+    public function testWithType(): void
+    {
+        $crud = $this->createCrud('e.name');
+        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+            'type' => TextareaType::class,
+        ]);
+
+        $view = $this->initCrudAndGetFormView($crud);
+
+        $field = $view['propertyName'];
+        $this->assertContains('textarea', $field->vars['block_prefixes']);
+    }
+}
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index 364fb07..321a3ef 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -16,19 +16,14 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Form\Type\EntityAjaxType;
-use Ecommit\CrudBundle\Tests\DoctrineHelper;
-use Ecommit\CrudBundle\Tests\Fixtures\Tag;
-use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
-use Symfony\Bridge\Doctrine\ManagerRegistry;
-use Symfony\Component\Form\Exception\RuntimeException;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\Form\Forms;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
-use Symfony\Component\Routing\Router;
 
-class EntityAjaxTypeTest extends TestCase
+class EntityAjaxTypeTest extends KernelTestCase
 {
     /**
      * @var EntityManager
@@ -42,40 +37,10 @@ class EntityAjaxTypeTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->em = DoctrineHelper::createEntityManager();
-        DoctrineHelper::loadTagsFixtures($this->em);
-
-        $registry = $this->createMock(ManagerRegistry::class);
-        $registry->expects($this->any())
-            ->method('getManager')
-            ->with($this->equalTo('default'))
-            ->willReturn($this->em);
-        $registry
-            ->expects($this->any())
-            ->method('getManagerForClass')
-            ->willReturnCallback(function ($class) {
-                if (Tag::class === $class) {
-                    return $this->em;
-                }
-
-                return null;
-            });
-
-        $router = $this->createMock(Router::class);
-        $router->expects($this->any())
-            ->method('generate')
-            ->willReturnCallback(function (string $routeName, array $routeParams) {
-                if (\count($routeParams) > 0) {
-                    return '/'.$routeName.'?'.http_build_query($routeParams);
-                }
-
-                return '/'.$routeName;
-            });
-
-        $this->factory = Forms::createFormFactoryBuilder()
-            ->addType(new EntityAjaxType($registry, $router))
-            ->addTypeGuesser(new DoctrineOrmTypeGuesser($registry))
-            ->getFormFactory();
+        static::bootKernel();
+
+        $this->em = static::$container->get(ManagerRegistry::class)->getManager();
+        $this->factory = static::$container->get(FormFactoryInterface::class);
     }
 
     protected function tearDown(): void
@@ -92,10 +57,10 @@ public function testOptionsAreRequired(): void
 
     public function testInvalidClassOption(): void
     {
-        $this->expectException(RuntimeException::class);
+        $this->expectException(\Exception::class);
         $this->factory->createNamed('name', EntityAjaxType::class, null, [
             'class' => 'bad',
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
         ]);
     }
 
@@ -108,14 +73,14 @@ public function testView(bool $multiple, $modelData, $dataBuilderName, $expected
 
         $field = $this->factory->create(EntityAjaxType::class, $modelData, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'multiple' => $multiple,
             'data_class' => null,
         ]);
         $view = $field->createView();
 
         $this->assertSame($expectedViewValue, $view->vars['value']);
-        $this->assertSame('/route_name', $view->vars['url']);
+        $this->assertSame('/fake', $view->vars['url']);
         $this->assertSame($multiple, $view->vars['multiple']);
     }
 
@@ -140,7 +105,7 @@ public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $
     {
         $field = $this->factory->create(EntityAjaxType::class, null, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'multiple' => $multiple,
         ]);
 
@@ -176,7 +141,7 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
     {
         $field = $this->factory->create(EntityAjaxType::class, null, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'multiple' => $multiple,
             'max_elements' => 2,
         ]);
@@ -223,7 +188,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
 
         $field = $this->factory->create(EntityAjaxType::class, null, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'multiple' => $multiple,
             'query_builder' => $queryBuilder,
         ]);
@@ -267,7 +232,7 @@ public function testViewWithChoiceLabel($choiceLabel, $expectedViewValue): void
 
         $field = $this->factory->create(EntityAjaxType::class, $tag, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'data_class' => null,
             'choice_label' => $choiceLabel,
         ]);
@@ -294,13 +259,13 @@ public function testViewWithRouteParams(): void
 
         $field = $this->factory->create(EntityAjaxType::class, $tag, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'route_params' => ['param1' => 'value1'],
             'data_class' => null,
         ]);
         $view = $field->createView();
 
-        $this->assertSame('/route_name?param1=value1', $view->vars['url']);
+        $this->assertSame('/fake?param1=value1', $view->vars['url']);
     }
 
     public function testViewWithEmParams(): void
@@ -309,7 +274,7 @@ public function testViewWithEmParams(): void
 
         $field = $this->factory->create(EntityAjaxType::class, $tag, [
             'class' => Tag::class,
-            'route_name' => 'route_name',
+            'route_name' => 'fake_route',
             'em' => 'default',
             'data_class' => null,
         ]);
diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index 8869537..848dfa1 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -35,7 +35,7 @@ protected function getCrud(): Crud
             ->setQueryBuilder($queryBuilder)
             ->setAvailableResultsPerPage([5, 5, 10, 50], 5)
             ->setDefaultSort('firstName', Crud::ASC)
-            ->createSearcherForm(new UserSearcher())
+            ->createSearchForm(new UserSearcher())
             ->setRoute('user_ajax_crud')
             ->setPersistentSettings(true)
             ->init();
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index b639cf4..c1ef676 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -38,7 +38,7 @@ protected function getCrud(string $sessionName, array $routeParams = []): Crud
             ->setQueryBuilder($queryBuilder)
             ->setAvailableResultsPerPage([5, 5, 10, 50], 5)
             ->setDefaultSort('firstName', Crud::ASC)
-            ->createSearcherForm(new UserSearcher())
+            ->createSearchForm(new UserSearcher())
             ->setRoute('user_without_trait_ajax_crud', $routeParams)
             ->setPersistentSettings(true)
             ->init();
diff --git a/tests/Functional/App/DataFixtures/EntityManyToOneFixtures.php b/tests/Functional/App/DataFixtures/EntityManyToOneFixtures.php
new file mode 100644
index 0000000..acbbea9
--- /dev/null
+++ b/tests/Functional/App/DataFixtures/EntityManyToOneFixtures.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\App\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\EntityManyToOne;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
+
+class EntityManyToOneFixtures extends Fixture implements DependentFixtureInterface
+{
+    public function load(ObjectManager $manager): void
+    {
+        $dataSet = [
+            [1, 'entity1', 2],
+            [2, 'entity2', 3],
+            [3, 'entity3', 4],
+            [4, 'entity4', 5],
+            [5, 'entity5', 5],
+        ];
+
+        $tagRepository = $manager->getRepository(Tag::class);
+        foreach ($dataSet as $data) {
+            $entity = new EntityManyToOne($data[0], $data[1], $tagRepository->find($data[2]));
+            $manager->persist($entity);
+        }
+
+        $manager->flush();
+    }
+
+    public function getDependencies()
+    {
+        return [
+            TagFixtures::class,
+        ];
+    }
+}
diff --git a/tests/Functional/App/DataFixtures/TagFixtures.php b/tests/Functional/App/DataFixtures/TagFixtures.php
new file mode 100644
index 0000000..06604cd
--- /dev/null
+++ b/tests/Functional/App/DataFixtures/TagFixtures.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\App\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
+
+class TagFixtures extends Fixture
+{
+    public function load(ObjectManager $manager): void
+    {
+        $dataSet = [
+            [1, 'tag1'],
+            [2, 'tag2'],
+            [3, '3'],
+            [4, 'tag_name'],
+            [5, 'tag_name'],
+        ];
+
+        foreach ($dataSet as $data) {
+            $tag = new Tag($data[0], $data[1]);
+            $manager->persist($tag);
+        }
+
+        $manager->flush();
+    }
+}
diff --git a/tests/Fixtures/EntityManyToOne.php b/tests/Functional/App/Entity/EntityManyToOne.php
similarity index 76%
rename from tests/Fixtures/EntityManyToOne.php
rename to tests/Functional/App/Entity/EntityManyToOne.php
index eead4e1..664fc6a 100644
--- a/tests/Fixtures/EntityManyToOne.php
+++ b/tests/Functional/App/Entity/EntityManyToOne.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Tests\Fixtures;
+namespace Ecommit\CrudBundle\Tests\Functional\App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
@@ -36,11 +36,17 @@ class EntityManyToOne
      */
     protected $tag;
 
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    protected $createdAt;
+
     public function __construct(int $id, string $name, Tag $tag)
     {
         $this->id = $id;
         $this->name = $name;
         $this->tag = $tag;
+        $this->createdAt = new \DateTime();
     }
 
     public function getId(): ?int
@@ -78,4 +84,16 @@ public function setTag(?Tag $tag): self
 
         return $this;
     }
+
+    public function getCreatedAt(): ?\DateTime
+    {
+        return $this->createdAt;
+    }
+
+    public function setCreatedAt(?\DateTime $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
 }
diff --git a/tests/Fixtures/Tag.php b/tests/Functional/App/Entity/Tag.php
similarity index 94%
rename from tests/Fixtures/Tag.php
rename to tests/Functional/App/Entity/Tag.php
index 8654e04..f6eb856 100644
--- a/tests/Fixtures/Tag.php
+++ b/tests/Functional/App/Entity/Tag.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Tests\Fixtures;
+namespace Ecommit\CrudBundle\Tests\Functional\App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Fixtures/EntityToManyToOneSearcher.php b/tests/Functional/App/Form/Searcher/EntityToManyToOneSearcher.php
similarity index 62%
rename from tests/Fixtures/EntityToManyToOneSearcher.php
rename to tests/Functional/App/Form/Searcher/EntityToManyToOneSearcher.php
index c13b305..d00b0f4 100644
--- a/tests/Fixtures/EntityToManyToOneSearcher.php
+++ b/tests/Functional/App/Form/Searcher/EntityToManyToOneSearcher.php
@@ -11,11 +11,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Tests\Fixtures;
+namespace Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher;
 
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
+use Ecommit\CrudBundle\Form\Searcher\AbstractSearcher;
 
-class EntityToManyToOneSearcher extends AbstractFormSearcher
+class EntityToManyToOneSearcher extends AbstractSearcher
 {
     public $propertyName;
 }
diff --git a/tests/Functional/App/Form/Searcher/UserSearcher.php b/tests/Functional/App/Form/Searcher/UserSearcher.php
index bb4a595..d115659 100644
--- a/tests/Functional/App/Form/Searcher/UserSearcher.php
+++ b/tests/Functional/App/Form/Searcher/UserSearcher.php
@@ -13,10 +13,12 @@
 
 namespace Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher;
 
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
 use Ecommit\CrudBundle\Form\Filter as Filter;
-use Ecommit\CrudBundle\Form\Searcher\AbstractFormSearcher;
+use Ecommit\CrudBundle\Form\Searcher\AbstractSearcher;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 
-class UserSearcher extends AbstractFormSearcher
+class UserSearcher extends AbstractSearcher
 {
     public $username;
 
@@ -24,12 +26,21 @@ class UserSearcher extends AbstractFormSearcher
 
     public $lastName;
 
-    public function configureFieldsFilter()
+    public function buildForm(SearchFormBuilder $builder, array $options): void
     {
-        return [
-            new Filter\FieldFilterText('username', 'username', []),
-            new Filter\FieldFilterText('firstName', 'firstName', []),
-            new Filter\FieldFilterText('lastName', 'lastName', []),
-        ];
+        $builder->addFilter('username', Filter\TextFilter::class);
+        $builder->addFilter('firstName', Filter\TextFilter::class);
+        $builder->addField('lastName', TextType::class, [
+            'required' => false,
+            'label' => 'last_name',
+        ]);
+    }
+
+    public function updateQueryBuilder($queryBuilder, array $options): void
+    {
+        if (null !== $this->lastName) {
+            $queryBuilder->andWhere('u.lastName = :lastName')
+                ->setParameter('lastName', $this->lastName);
+        }
     }
 }
diff --git a/tests/Functional/App/config/routes.yaml b/tests/Functional/App/config/routes.yaml
index 7a9b6ad..7e3fb40 100644
--- a/tests/Functional/App/config/routes.yaml
+++ b/tests/Functional/App/config/routes.yaml
@@ -13,3 +13,9 @@ user_without_trait_crud:
 user_without_trait_ajax_crud:
     path: /user-without-trait/ajax-crud
     controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserWithoutTraitController::ajaxCrudAction
+
+fake_route:
+    path: /fake
+    controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction
+    defaults:
+        path: /
diff --git a/tests/Functional/App/templates/user/search.html.twig b/tests/Functional/App/templates/user/search.html.twig
index 8191c04..197d222 100644
--- a/tests/Functional/App/templates/user/search.html.twig
+++ b/tests/Functional/App/templates/user/search.html.twig
@@ -1,7 +1,7 @@
 {{ crud_search_form_start(crud, {}, {'class': 'form-inline'}) }}
-    {{ form_row(crud.searcherform.username) }}
-    {{ form_row(crud.searcherform.firstName) }}
-    {{ form_row(crud.searcherform.lastName) }}
+    {{ form_row(crud.searchForm.username) }}
+    {{ form_row(crud.searchForm.firstName) }}
+    {{ form_row(crud.searchForm.lastName) }}
 
     <div>
         {{ crud_search_form_submit(crud) }}
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 3c683b9..d4e8904 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -212,6 +212,25 @@ public function testPersistentValuesAfterSearch(Client $client): Client
     /**
      * @depends testPersistentValuesAfterSearch
      */
+    public function testSearchWithoutFilter(Client $client): Client
+    {
+        $form = $client->getCrawler()->filterXPath('//div[@id="crud_search"]/descendant::button[@type="submit" and contains(text(), "Search")]')->form();
+        $form['crud_search_'.static::SESSION_NAME.'[lastName]'] = 'Plait';
+        $client->submit($form);
+        $this->waitForAjax($client);
+
+        $this->assertSame([1, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+        $this->assertSame('HenriPlait', $this->getFirstUsername($client->getCrawler()));
+        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+
+        return $client;
+    }
+
+    /**
+     * @depends testSearchWithoutFilter
+     */
     public function testResetSearch(Client $client): Client
     {
         $button = $client->getCrawler()->filterXPath('//div[@id="crud_search"]/descendant::button[contains(text(), "Reset")]');

From e7215ec1c2c6eaa70cb7fc9daef0c91612671a31 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 15 May 2021 19:12:56 +0200
Subject: [PATCH 050/264] Changing the signatures of each method of classes
 QueryBuilderInterface and RestQueryBuilder

---
 .github/workflows/tests.yml        | 14 +------
 composer.json                      |  9 +++--
 src/Crud/QueryBuilderInterface.php | 14 ++-----
 src/Crud/Rest/RestQueryBuilder.php | 65 ++++++------------------------
 4 files changed, 21 insertions(+), 81 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ae14648..7df04f9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,21 +13,9 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    -   php-version: '7.2'
+                    -   php-version: '7.4'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with lowest'
-                    -   php-version: '7.2'
-                        symfony-version: '^4'
-                        description: 'with SF ^4'
-                    -   php-version: '7.2'
-                        symfony-version: '^5'
-                        description: 'with SF ^5'
-                    -   php-version: '7.3'
-                        symfony-version: '^4'
-                        description: 'with SF ^4'
-                    -   php-version: '7.3'
-                        symfony-version: '^5'
-                        description: 'with SF ^5'
                     -   php-version: '7.4'
                         symfony-version: '^4'
                         description: 'with SF ^4'
diff --git a/composer.json b/composer.json
index 3612d34..be2e851 100644
--- a/composer.json
+++ b/composer.json
@@ -10,20 +10,21 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
+        "php": "^7.4|^8.0",
         "ext-mbstring": "*",
         "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
-        "doctrine/orm": "^2.6.3",
+        "doctrine/orm": "^2.6.4",
         "doctrine/persistence": "^1.3|^2.0",
         "ecommit/javascript-bundle": "2.6.*@dev",
-        "ecommit/util-bundle": "3.0.*@dev",
         "ecommit/scalar-values": "^1.0",
+        "ecommit/util-bundle": "3.0.*@dev",
         "symfony/asset": "^4.4|^5.0",
         "symfony/config": "^4.4.12|^5.1.4",
         "symfony/dependency-injection": "^4.4.12|^5.1.4",
         "symfony/doctrine-bridge": "^4.4|^5.0",
         "symfony/form": "^4.4|^5.0",
         "symfony/framework-bundle": "^4.4|^5.0",
+        "symfony/http-client": "^4.4.11|^5.1.3",
         "symfony/http-foundation": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4|^5.0",
         "symfony/options-resolver": "^4.4|^5.0",
@@ -38,11 +39,11 @@
     },
     "require-dev": {
         "dbrekelmans/bdi": "^0.3.0",
+        "doctrine/annotations": "^1.7",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^2.18.0",
         "phpunit/phpunit": "^8.4.1",
         "symfony/dom-crawler": "^4.4|^5.0",
-        "symfony/http-client": "^4.4.11|^5.1.3",
         "symfony/panther": "^1.0",
         "symfony/webpack-encore-bundle": "^1.7.3",
         "symfony/yaml": "^4.4|^5.0"
diff --git a/src/Crud/QueryBuilderInterface.php b/src/Crud/QueryBuilderInterface.php
index 767a448..76e5e5f 100644
--- a/src/Crud/QueryBuilderInterface.php
+++ b/src/Crud/QueryBuilderInterface.php
@@ -15,17 +15,9 @@
 
 interface QueryBuilderInterface
 {
-    /**
-     * @param string $sort
-     * @param string $sense
-     */
-    public function addOrderBy($sort, $sense);
+    public function addOrderBy(string $sort, string $sense): self;
 
-    /**
-     * @param string $sort
-     * @param string $sense
-     */
-    public function orderBy($sort, $sense);
+    public function orderBy(string $sort, string $sense): self;
 
-    public function addParameter(QueryBuilderParameterInterface $parameter);
+    public function addParameter(QueryBuilderParameterInterface $parameter): self;
 }
diff --git a/src/Crud/Rest/RestQueryBuilder.php b/src/Crud/Rest/RestQueryBuilder.php
index 9e963a2..cad820c 100644
--- a/src/Crud/Rest/RestQueryBuilder.php
+++ b/src/Crud/Rest/RestQueryBuilder.php
@@ -15,6 +15,8 @@
 
 use Ecommit\CrudBundle\Crud\QueryBuilderInterface;
 use Ecommit\CrudBundle\Crud\QueryBuilderParameterInterface;
+use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Contracts\HttpClient\ResponseInterface;
 
 class RestQueryBuilder implements QueryBuilderInterface
 {
@@ -58,14 +60,7 @@ class RestQueryBuilder implements QueryBuilderInterface
      */
     protected $orders = [];
 
-    /**
-     * RestQueryBuilder constructor.
-     *
-     * @param string $url
-     * @param string $method
-     * @param array  $defaultParameters Array of RestQueryBuilderParameter objects
-     */
-    public function __construct($url, $method, $defaultParameters = [])
+    public function __construct(string $url, string $method, array $defaultParameters = [])
     {
         $this->url = $url;
         $this->method = $method;
@@ -74,36 +69,21 @@ public function __construct($url, $method, $defaultParameters = [])
         }
     }
 
-    /**
-     * @return $this
-     */
-    public function setOrderBuilder(\Closure $orderBuilder)
+    public function setOrderBuilder(\Closure $orderBuilder): self
     {
         $this->orderBuilder = $orderBuilder;
 
         return $this;
     }
 
-    /**
-     * @return $this
-     */
-    public function setPaginationBuilder(\Closure $paginationBuilder)
+    public function setPaginationBuilder(\Closure $paginationBuilder): self
     {
         $this->paginationBuilder = $paginationBuilder;
 
         return $this;
     }
 
-    /**
-     * @param string $parameter
-     * @param string $value
-     * @param string $method
-     *
-     * @throws \Exception
-     *
-     * @return $this
-     */
-    public function addParameter(QueryBuilderParameterInterface $parameter)
+    public function addParameter(QueryBuilderParameterInterface $parameter): self
     {
         if (!($parameter instanceof RestQueryBuilderParameter)) {
             throw new \Exception('Bad class');
@@ -126,26 +106,14 @@ public function addParameter(QueryBuilderParameterInterface $parameter)
         return $this;
     }
 
-    /**
-     * @param string $sort
-     * @param string $sense
-     *
-     * @return $this
-     */
-    public function addOrderBy($sort, $sense)
+    public function addOrderBy(string $sort, string $sense): self
     {
         $this->orders[$sort] = $sense;
 
         return $this;
     }
 
-    /**
-     * @param string $sort
-     * @param string $sense
-     *
-     * @return $this
-     */
-    public function orderBy($sort, $sense)
+    public function orderBy($sort, $sense): self
     {
         $this->orders = [];
         $this->addOrderBy($sort, $sense);
@@ -153,18 +121,9 @@ public function orderBy($sort, $sense)
         return $this;
     }
 
-    /**
-     * @param int   $page
-     * @param int   $resultsPerPage
-     * @param array $options
-     *
-     * @throws \Exception
-     *
-     * @return mixed|\Psr\Http\Message\ResponseInterface
-     */
-    public function getResponse($page, $resultsPerPage, $options = [])
+    public function getResponse(int $page, int $resultsPerPage, array $options = []): ResponseInterface
     {
-        $client = new \GuzzleHttp\Client();
+        $client = HttpClient::create();
 
         //Add paginator parameters
         if ($this->paginationBuilder && $this->paginationBuilder instanceof \Closure) {
@@ -182,12 +141,12 @@ public function getResponse($page, $resultsPerPage, $options = [])
             }
         }
 
-        //Add parameters to GuzzleHttp options
+        //Add parameters to client options
         foreach ($this->queryParameters as $parameterName => $parameterValue) {
             $options['query'][$parameterName] = $parameterValue;
         }
         foreach ($this->formParameters as $parameterName => $parameterValue) {
-            $options['form_params'][$parameterName] = $parameterValue;
+            $options['body'][$parameterName] = $parameterValue;
         }
         if ($this->bodyParameter) {
             $options['body'] = $this->bodyParameter;

From a0c52e6ceb4b0943d1b22f7735eb0541b9368301 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 15 May 2021 20:44:54 +0200
Subject: [PATCH 051/264] Remove ecommit/util-bundle and
 ecommit/javascript-bundle dependencies

---
 composer.json                                 |  2 --
 .../bootstrap_3_horizontal_layout.html.twig   |  8 +++---
 .../views/Form/bootstrap_3_layout.html.twig   |  8 +++---
 src/Resources/views/Form/div_layout.html.twig |  4 +--
 src/Resources/views/IconTheme/base.html.twig  |  8 +++---
 .../views/IconTheme/fontawesome4.html.twig    | 20 ++++++-------
 src/Resources/views/Theme/base.html.twig      | 28 +++++++++----------
 .../views/Theme/bootstrap3.html.twig          |  8 +++---
 tests/Functional/App/Kernel.php               |  4 ---
 9 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/composer.json b/composer.json
index be2e851..d615240 100644
--- a/composer.json
+++ b/composer.json
@@ -15,9 +15,7 @@
         "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
         "doctrine/orm": "^2.6.4",
         "doctrine/persistence": "^1.3|^2.0",
-        "ecommit/javascript-bundle": "2.6.*@dev",
         "ecommit/scalar-values": "^1.0",
-        "ecommit/util-bundle": "3.0.*@dev",
         "symfony/asset": "^4.4|^5.0",
         "symfony/config": "^4.4.12|^5.1.4",
         "symfony/dependency-injection": "^4.4.12|^5.1.4",
diff --git a/src/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
index 23117f1..d27af82 100644
--- a/src/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
+++ b/src/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
@@ -1,7 +1,7 @@
 {% extends 'bootstrap_3_horizontal_layout.html.twig' %}
 
 {% block form_row -%}
-    {% spaceless %}
+    {% apply spaceless %}
         <div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}">
             {{ form_label(form) }}
             <div class="{{ block('form_group_class') }}">
@@ -9,11 +9,11 @@
                 {{ form_widget(form) }}
             </div>
         </div>
-    {% endspaceless %}
+    {% endapply %}
 {%- endblock form_row %}
 
 {% block form_errors %}
-    {% spaceless %}
+    {% apply spaceless %}
         {% if errors|length > 0 %}
             {% if form.parent %}
                 <span class="help-block">
@@ -43,5 +43,5 @@
                 {% endfor %}
             {% endif %}
         {% endif %}
-    {% endspaceless %}
+    {% endapply %}
 {% endblock form_errors %}
diff --git a/src/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Resources/views/Form/bootstrap_3_layout.html.twig
index 5ed44f4..4ef3bfb 100644
--- a/src/Resources/views/Form/bootstrap_3_layout.html.twig
+++ b/src/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -1,17 +1,17 @@
 {% extends 'bootstrap_3_layout.html.twig' %}
 
 {% block form_row -%}
-    {% spaceless %}
+    {% apply spaceless %}
         <div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}">
             {{ form_label(form) }}
             {{ form_errors(form) }}
             {{ form_widget(form) }}
         </div>
-    {% endspaceless %}
+    {% endapply %}
 {%- endblock form_row %}
 
 {% block form_errors %}
-    {% spaceless %}
+    {% apply spaceless %}
         {% if errors|length > 0 %}
             {% if form.parent %}
                 <span class="help-block">
@@ -41,5 +41,5 @@
                 {% endfor %}
             {% endif %}
         {% endif %}
-    {% endspaceless %}
+    {% endapply %}
 {% endblock form_errors %}
diff --git a/src/Resources/views/Form/div_layout.html.twig b/src/Resources/views/Form/div_layout.html.twig
index e48a354..05740e2 100644
--- a/src/Resources/views/Form/div_layout.html.twig
+++ b/src/Resources/views/Form/div_layout.html.twig
@@ -1,6 +1,6 @@
 {% extends 'form_div_layout.html.twig' %}
 {% block form_errors %}
-{% spaceless %}
+{% apply spaceless %}
     {% if errors|length > 0 %}
     <ul class="form_error">
         {% for error in errors %}
@@ -19,5 +19,5 @@
         {% endfor %}
     </ul>
     {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endblock form_errors %}
diff --git a/src/Resources/views/IconTheme/base.html.twig b/src/Resources/views/IconTheme/base.html.twig
index 83f4187..0fccae9 100644
--- a/src/Resources/views/IconTheme/base.html.twig
+++ b/src/Resources/views/IconTheme/base.html.twig
@@ -1,13 +1,13 @@
 {% block asc %}
-{% spaceless %}
+{% apply spaceless %}
     <i>^</i>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {% block desc %}
-{% spaceless %}
+{% apply spaceless %}
     <i>v</i>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {% block display_settings %}{% endblock %}
diff --git a/src/Resources/views/IconTheme/fontawesome4.html.twig b/src/Resources/views/IconTheme/fontawesome4.html.twig
index 8ecc763..a1776ae 100644
--- a/src/Resources/views/IconTheme/fontawesome4.html.twig
+++ b/src/Resources/views/IconTheme/fontawesome4.html.twig
@@ -1,31 +1,31 @@
 {% use '@EcommitCrud/IconTheme/base.html.twig' %}
 
 {% block asc %}
-{% spaceless %}
+{% apply spaceless %}
     <i class="fa fa-sort-alpha-asc"></i>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {% block desc %}
-{% spaceless %}
+{% apply spaceless %}
     <i class="fa fa-sort-alpha-desc"></i>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {% block display_settings %}
-{% spaceless %}
+{% apply spaceless %}
     <i class="fa fa-cog" aria-hidden="true"></i>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {% block search %}
-{% spaceless %}
+{% apply spaceless %}
     <i class="fa fa-search" aria-hidden="true"></i>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {% block reset %}
-{% spaceless %}
+{% apply spaceless %}
     <i class="fa fa-fire" aria-hidden="true"></i>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
diff --git a/src/Resources/views/Theme/base.html.twig b/src/Resources/views/Theme/base.html.twig
index 5d14cf2..3e4382e 100644
--- a/src/Resources/views/Theme/base.html.twig
+++ b/src/Resources/views/Theme/base.html.twig
@@ -1,7 +1,7 @@
 {# paginator_links / crud_paginator_links #}
 
 {% block paginator_links %}
-{% spaceless %}
+{% apply spaceless %}
     {% if paginator.haveToPaginate %}
         {% set ul_attr = ul_attr|merge({class: (ul_attr.class|default('') ~ ' ec-crud-pagination')|trim}) %}
         <nav{% with { attr: nav_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
@@ -10,7 +10,7 @@
             </ul>
         </nav>
     {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {% block paginator_links_content %}
@@ -85,7 +85,7 @@
 {# th #}
 
 {% block th %}
-{% spaceless %}
+{% apply spaceless %}
     {% if not column.sortable %}
         {{ block('th_not_sortable', template_name) }}
     {% elseif crud.sessionValues.sort != column.id %}
@@ -95,7 +95,7 @@
     {% else %}
         {{ block('th_sortable_active_asc', template_name) }}
     {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {% block th_not_sortable %}
@@ -144,7 +144,7 @@
 {# td #}
 
 {% block td %}
-{% spaceless %}
+{% apply spaceless %}
     {% if repeatedValue %}
         {% if td_attr.title is not defined %}
             {% set td_attr = td_attr|merge({title: value}) %}
@@ -154,13 +154,13 @@
     <td{% with { attr: td_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
         {{- (options.escape) ? value : value|raw -}}
     </td>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {# Display settings #}
 
 {% block display_settings %}
-{% spaceless %}
+{% apply spaceless %}
     {% if crud.displayResults %}
         {% set displaySettingsContainerAttributes = {'class': 'ec-crud-display-settings', 'id': 'ec-crud-display-settings-'~crud.sessionName, 'data-crud-list-id': crud.divIdList} %}
         {% if modal %}
@@ -171,7 +171,7 @@
             {{ block('display_settings_container_without_modal', template_name) }}
         {% endif %}
     {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {% block display_settings_button_modal %}
@@ -231,29 +231,29 @@
 {# search_form_start #}
 
 {% block search_form_start %}
-{% spaceless %}
+{% apply spaceless %}
     {{ form_start(crud.searchForm, {'attr': form_attr}) }}
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {# search_form_submit #}
 
 {% block search_form_submit %}
-    {% spaceless %}
+    {% apply spaceless %}
         <button type="submit" {% with { attr: button_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
             {{ crud_icon('search') }} {{ 'search.submit'|trans({}, 'EcommitCrudBundle') }}
         </button>
-    {% endspaceless %}
+    {% endapply %}
 {% endblock %}
 
 {# search_form_reset #}
 
 {% block search_form_reset %}
-{% spaceless %}
+{% apply spaceless %}
     <button type="button" {% with { attr: button_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
         {{ crud_icon('reset') }} {{ 'search.reset'|trans({}, 'EcommitCrudBundle') }}
     </button>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {# Attributes #}
diff --git a/src/Resources/views/Theme/bootstrap3.html.twig b/src/Resources/views/Theme/bootstrap3.html.twig
index de5cbc6..aea6dec 100644
--- a/src/Resources/views/Theme/bootstrap3.html.twig
+++ b/src/Resources/views/Theme/bootstrap3.html.twig
@@ -86,17 +86,17 @@
 {# search_form_submit #}
 
 {% block search_form_submit %}
-{% spaceless %}
+{% apply spaceless %}
     {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-default btn-sm')|trim}) %}
     {{ parent() }}
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
 
 {# search_form_reset #}
 
 {% block search_form_reset %}
-{% spaceless %}
+{% apply spaceless %}
     {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-default btn-sm')|trim}) %}
     {{ parent() }}
-{% endspaceless %}
+{% endapply %}
 {% endblock %}
diff --git a/tests/Functional/App/Kernel.php b/tests/Functional/App/Kernel.php
index 2dbe1bc..a8009fe 100644
--- a/tests/Functional/App/Kernel.php
+++ b/tests/Functional/App/Kernel.php
@@ -16,8 +16,6 @@
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
 use Ecommit\CrudBundle\EcommitCrudBundle;
-use Ecommit\JavascriptBundle\EcommitJavascriptBundle;
-use Ecommit\UtilBundle\EcommitUtilBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
@@ -61,8 +59,6 @@ public function registerBundles()
             new SecurityBundle(),
             new WebpackEncoreBundle(),
             new EcommitCrudBundle(),
-            new EcommitJavascriptBundle(),
-            new EcommitUtilBundle(),
         ];
     }
 

From 8292b461fb3eb28d14a75afa62dac3e89c6f351b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 15 May 2021 21:18:19 +0200
Subject: [PATCH 052/264] Add PHP hint in Crud classes

---
 src/Crud/Crud.php        | 199 ++++++---------------------------------
 src/Crud/CrudColumn.php  |   2 +-
 src/Crud/CrudFactory.php |   7 +-
 3 files changed, 32 insertions(+), 176 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 58c4704..7ab5428 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -77,13 +77,6 @@ class Crud
      */
     protected $container;
 
-    /**
-     * Constructor.
-     *
-     * @param string $sessionName Session name
-     *
-     * @return Crud
-     */
     public function __construct($sessionName, ContainerInterface $container)
     {
         if (!preg_match('/^[a-zA-Z0-9_]{1,50}$/', $sessionName)) {
@@ -107,10 +100,8 @@ public function __construct($sessionName, ContainerInterface $container)
      *                        * default_displayed: If the column is displayed, by default (Default: true)
      *                        * alias_search: Column SQL alias, used during searchs. If null, $alias is used.
      *                        * alias_sort: Column(s) SQL alias (string or array of strings), used during sorting. If null, $alias is used.
-     *
-     * @return Crud
      */
-    public function addColumn($id, $alias, $label, $options = [])
+    public function addColumn(string $id, string $alias, string $label, array $options = []): self
     {
         if (mb_strlen($id) > 30) {
             throw new \Exception('Column id is too long');
@@ -148,10 +139,8 @@ public function addColumn($id, $alias, $label, $options = [])
      *
      * @param string $id          Column id (used everywhere inside the crud)
      * @param string $aliasSearch column SQL alias, used during searchs
-     *
-     * @return Crud
      */
-    public function addVirtualColumn($id, $aliasSearch)
+    public function addVirtualColumn(string $id, string $aliasSearch): self
     {
         $column = new CrudColumn($id, $aliasSearch, null, false, false, null, null);
         $this->availableVirtualColumns[$id] = $column;
@@ -159,24 +148,12 @@ public function addVirtualColumn($id, $aliasSearch)
         return $this;
     }
 
-    /**
-     * Gets the query builder.
-     *
-     * @return QueryBuilder
-     */
     public function getQueryBuilder()
     {
         return $this->queryBuilder;
     }
 
-    /**
-     * Sets the query builder.
-     *
-     * @param QueryBuilder $queryBuilder
-     *
-     * @return Crud
-     */
-    public function setQueryBuilder($queryBuilder)
+    public function setQueryBuilder($queryBuilder): self
     {
         if (!($queryBuilder instanceof \Doctrine\ORM\QueryBuilder) &&
             !($queryBuilder instanceof \Doctrine\DBAL\Query\QueryBuilder) &&
@@ -188,24 +165,12 @@ public function setQueryBuilder($queryBuilder)
         return $this;
     }
 
-    /**
-     * Returns available results per page.
-     *
-     * @return array
-     */
-    public function getAvailableResultsPerPage()
+    public function getAvailableResultsPerPage(): array
     {
         return $this->availableResultsPerPage;
     }
 
-    /**
-     * Sets available results per page.
-     *
-     * @param int $defaultValue
-     *
-     * @return Crud
-     */
-    public function setAvailableResultsPerPage(array $availableResultsPerPage, $defaultValue)
+    public function setAvailableResultsPerPage(array $availableResultsPerPage, int $defaultValue): self
     {
         $this->availableResultsPerPage = $availableResultsPerPage;
         $this->defaultResultsPerPage = $defaultValue;
@@ -218,10 +183,8 @@ public function setAvailableResultsPerPage(array $availableResultsPerPage, $defa
      *
      * @param string $sort  Column id
      * @param const  $sense Sense (Crud::ASC / Crud::DESC)
-     *
-     * @return Crud
      */
-    public function setDefaultSort($sort, $sense)
+    public function setDefaultSort(string $sort, string $sense): self
     {
         $this->defaultSort = $sort;
         $this->defaultSense = $sense;
@@ -235,10 +198,8 @@ public function setDefaultSort($sort, $sense)
      * @param array $criterias Criterias :
      *                         If key is defined: Key = Sort  Value = Sense
      *                         If key is not defined: Value = Sort
-     *
-     * @return Crud
      */
-    public function setDefaultPersonalizedSort(array $criterias)
+    public function setDefaultPersonalizedSort(array $criterias): self
     {
         $this->defaultPersonalizedSort = $criterias;
 
@@ -248,15 +209,7 @@ public function setDefaultPersonalizedSort(array $criterias)
         return $this;
     }
 
-    /**
-     * Sets the list route.
-     *
-     * @param string $routeName
-     * @param array  $parameters
-     *
-     * @return Crud
-     */
-    public function setRoute($routeName, $parameters = [])
+    public function setRoute(string $routeName, array $parameters = []): self
     {
         $this->routeName = $routeName;
         $this->routeParams = $parameters;
@@ -264,22 +217,12 @@ public function setRoute($routeName, $parameters = [])
         return $this;
     }
 
-    /**
-     * Returns the route name.
-     *
-     * @return string
-     */
-    public function getRouteName()
+    public function getRouteName(): ?string
     {
         return $this->routeName;
     }
 
-    /**
-     * Returns the route params.
-     *
-     * @return array
-     */
-    public function getRouteParams()
+    public function getRouteParams(): array
     {
         return $this->routeParams;
     }
@@ -288,10 +231,8 @@ public function getRouteParams()
      * Returns the list url.
      *
      * @param array $parameters Additional parameters
-     *
-     * @return string
      */
-    public function getUrl($parameters = [])
+    public function getUrl($parameters = []): string
     {
         $parameters = array_merge($this->routeParams, $parameters);
 
@@ -302,10 +243,8 @@ public function getUrl($parameters = [])
      * Returns the search url.
      *
      * @param array $parameters Additional parameters
-     *
-     * @return string
      */
-    public function getSearchUrl($parameters = [])
+    public function getSearchUrl($parameters = []): string
     {
         $parameters = array_merge($this->routeParams, ['search' => 1], $parameters);
 
@@ -317,7 +256,7 @@ public function getSearchUrl($parameters = [])
      *
      * @param bool|closure|array $value
      */
-    public function setBuildPaginator($value)
+    public function setBuildPaginator($value): self
     {
         $this->buildPaginator = $value;
 
@@ -329,7 +268,7 @@ public function setBuildPaginator($value)
      *
      * @param bool $value
      */
-    public function setPersistentSettings($value)
+    public function setPersistentSettings(bool $value): self
     {
         if ($value && !($this->container->get('security.token_storage')->getToken()->getUser() instanceof UserInterface)) {
             $value = false;
@@ -456,10 +395,8 @@ protected function save(): void
 
     /**
      * Return default displayed columns.
-     *
-     * @return array
      */
-    public function getDefaultDisplayedColumns()
+    public function getDefaultDisplayedColumns(): array
     {
         $columns = [];
         foreach ($this->availableColumns as $column) {
@@ -851,10 +788,8 @@ public function buildQuery(): void
 
     /**
      * Return default results per page.
-     *
-     * @return int
      */
-    public function getDefaultResultsPerPage()
+    public function getDefaultResultsPerPage(): ?int
     {
         return $this->defaultResultsPerPage;
     }
@@ -874,20 +809,13 @@ public function clearTemplate(): void
 
     /**
      * Returns availabled columns.
-     *
-     * @return array
      */
-    public function getColumns()
+    public function getColumns(): array
     {
         return $this->availableColumns;
     }
 
-    /**
-     * Returns one column.
-     *
-     * @return CrudColumn $columnId
-     */
-    public function getColumn($columnId)
+    public function getColumn(string $columnId): CrudColumn
     {
         if (isset($this->availableColumns[$columnId])) {
             return $this->availableColumns[$columnId];
@@ -897,20 +825,13 @@ public function getColumn($columnId)
 
     /**
      * Returns availabled virtual columns.
-     *
-     * @return array
      */
-    public function getVirtualColumns()
+    public function getVirtualColumns(): array
     {
         return $this->availableVirtualColumns;
     }
 
-    /**
-     * Returns one virtual column.
-     *
-     * @return CrudColumn $columnId
-     */
-    public function getVirtualColumn($columnId)
+    public function getVirtualColumn(string $columnId): CrudColumn
     {
         if (isset($this->availableVirtualColumns[$columnId])) {
             return $this->availableVirtualColumns[$columnId];
@@ -918,31 +839,16 @@ public function getVirtualColumn($columnId)
         throw new \Exception('Crud: Column '.$columnId.' does not exist');
     }
 
-    /**
-     * Returns user values.
-     *
-     * @return CrudSession
-     */
-    public function getSessionValues()
+    public function getSessionValues(): CrudSession
     {
         return $this->sessionValues;
     }
 
-    /**
-     * Returns the paginator.
-     *
-     * @return object
-     */
     public function getPaginator()
     {
         return $this->paginator;
     }
 
-    /**
-     * Sets the paginator.
-     *
-     * @param object $value
-     */
     public function setPaginator($value)
     {
         $this->paginator = $value;
@@ -970,98 +876,53 @@ public function getDisplaySettingsForm()
         return $this->formDisplaySettings;
     }
 
-    /**
-     * Returns the div id search.
-     *
-     * @return string
-     */
-    public function getDivIdSearch()
+    public function getDivIdSearch(): string
     {
         return $this->divIdSearch;
     }
 
-    /**
-     * Sets the div id search.
-     *
-     * @param string
-     *
-     * @return Crud
-     */
-    public function setDivIdSearch($divIdSearch)
+    public function setDivIdSearch(string $divIdSearch): self
     {
         $this->divIdSearch = $divIdSearch;
 
         return $this;
     }
 
-    /**
-     * Returns the div id list.
-     *
-     * @return string
-     */
-    public function getDivIdList()
+    public function getDivIdList(): string
     {
         return $this->divIdList;
     }
 
-    /**
-     * Sets the div id list.
-     *
-     * @param string
-     *
-     * @return Crud
-     */
-    public function setDivIdList($divIdList)
+    public function setDivIdList(string $divIdList): self
     {
         $this->divIdList = $divIdList;
 
         return $this;
     }
 
-    /**
-     * Gets session name.
-     *
-     * @return string
-     */
-    public function getSessionName()
+    public function getSessionName(): ?string
     {
         return $this->sessionName;
     }
 
-    /**
-     * @return bool
-     */
-    public function getDisplayResultsOnlyIfSearch()
+    public function getDisplayResultsOnlyIfSearch(): bool
     {
         return $this->displayResultsOnlyIfSearch;
     }
 
-    /**
-     * @param bool $displayResultsOnlyIfSearch
-     *
-     * @return Crud
-     */
-    public function setDisplayResultsOnlyIfSearch($displayResultsOnlyIfSearch)
+    public function setDisplayResultsOnlyIfSearch(bool $displayResultsOnlyIfSearch): self
     {
         $this->displayResultsOnlyIfSearch = $displayResultsOnlyIfSearch;
 
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function getDisplayResults()
+    public function getDisplayResults(): bool
     {
         return $this->displayResults;
     }
 
-    /**
-     * @param bool $displayResults
-     *
-     * @return Crud
-     */
-    public function setDisplayResults($displayResults)
+    public function setDisplayResults(bool $displayResults): self
     {
         $this->displayResults = $displayResults;
 
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index ca6e080..d2f8d14 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -34,7 +34,7 @@ class CrudColumn
      * @param string $aliasSearch      Column SQL alias, used during searchs
      * @param string $aliasSort        Column(s) SQL alias (string or array of strings), used during sorting
      */
-    public function __construct($id, $alias, $label, $sortable, $defaultDisplayed, $aliasSearch, $aliasSort)
+    public function __construct(string $id, string $alias, ?string $label, bool $sortable, bool $defaultDisplayed, ?string $aliasSearch, ?string $aliasSort)
     {
         $this->id = $id;
         $this->alias = $alias;
diff --git a/src/Crud/CrudFactory.php b/src/Crud/CrudFactory.php
index 6d166dd..3b49567 100644
--- a/src/Crud/CrudFactory.php
+++ b/src/Crud/CrudFactory.php
@@ -27,12 +27,7 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    /**
-     * @param $sessionName
-     *
-     * @return Crud
-     */
-    public function create($sessionName)
+    public function create(string $sessionName): Crud
     {
         return new Crud($sessionName, $this->container);
     }

From 8134e02209851142cd35674ffa65bcbc28ec05fc Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 11:44:21 +0200
Subject: [PATCH 053/264] Changing the order of methods

---
 src/Crud/Crud.php | 112 +++++++++++++++++++++++-----------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 7ab5428..978ef67 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -89,6 +89,62 @@ public function __construct($sessionName, ContainerInterface $container)
         return $this;
     }
 
+    /**
+     * Inits the CRUD.
+     */
+    public function init(): void
+    {
+        //Cheks not empty values
+        $check_values = [
+            'availableColumns',
+            'availableResultsPerPage',
+            'defaultSort',
+            'defaultSense',
+            'defaultResultsPerPage',
+            'queryBuilder',
+            'routeName',
+        ];
+        foreach ($check_values as $value) {
+            if (empty($this->$value)) {
+                throw new \Exception('Config Crud: Option '.$value.' is required');
+            }
+        }
+
+        if ($this->searchForm) {
+            $this->searchForm->createForm();
+        }
+
+        //Loads user values inside this object
+        $this->load();
+
+        //Display or not results
+        if ($this->searchForm && $this->displayResultsOnlyIfSearch) {
+            $this->displayResults = $this->sessionValues->searchFormIsSubmitted;
+        }
+
+        $this->createDisplaySettingsForm();
+
+        //Process request (resultsPerPage, sort, sense, change_columns)
+        $this->processRequest();
+
+        //Searcher form: Allocates object
+        if ($this->searchForm && !$this->container->get('request_stack')->getCurrentRequest()->query->has('raz')) {
+            //IMPORTANT
+            //We have not to allocate directelly the "$this->sessionValues->searchFormData" object
+            //because otherwise it will be linked to form, and will be updated when the "bind" function will
+            //be called (If form is not valid, the session values will still be updated: Undesirable behavior)
+            $values = clone $this->sessionValues->searchFormData;
+            try {
+                $this->searchForm->getForm()->setData($values);
+            } catch (TransformationFailedException $exception) {
+                //Avoid error if data stored in session is invalid
+            }
+        }
+
+        //Saves
+        $this->save();
+    }
+
     /**
      * Add a column inside the crud.
      *
@@ -411,62 +467,6 @@ public function getDefaultDisplayedColumns(): array
         return $columns;
     }
 
-    /**
-     * Inits the CRUD.
-     */
-    public function init(): void
-    {
-        //Cheks not empty values
-        $check_values = [
-            'availableColumns',
-            'availableResultsPerPage',
-            'defaultSort',
-            'defaultSense',
-            'defaultResultsPerPage',
-            'queryBuilder',
-            'routeName',
-        ];
-        foreach ($check_values as $value) {
-            if (empty($this->$value)) {
-                throw new \Exception('Config Crud: Option '.$value.' is required');
-            }
-        }
-
-        if ($this->searchForm) {
-            $this->searchForm->createForm();
-        }
-
-        //Loads user values inside this object
-        $this->load();
-
-        //Display or not results
-        if ($this->searchForm && $this->displayResultsOnlyIfSearch) {
-            $this->displayResults = $this->sessionValues->searchFormIsSubmitted;
-        }
-
-        $this->createDisplaySettingsForm();
-
-        //Process request (resultsPerPage, sort, sense, change_columns)
-        $this->processRequest();
-
-        //Searcher form: Allocates object
-        if ($this->searchForm && !$this->container->get('request_stack')->getCurrentRequest()->query->has('raz')) {
-            //IMPORTANT
-            //We have not to allocate directelly the "$this->sessionValues->searchFormData" object
-            //because otherwise it will be linked to form, and will be updated when the "bind" function will
-            //be called (If form is not valid, the session values will still be updated: Undesirable behavior)
-            $values = clone $this->sessionValues->searchFormData;
-            try {
-                $this->searchForm->getForm()->setData($values);
-            } catch (TransformationFailedException $exception) {
-                //Avoid error if data stored in session is invalid
-            }
-        }
-
-        //Saves
-        $this->save();
-    }
-
     /**
      * Load user values.
      */

From 1ffd5d17b9347cbf0649b1472bbb9671170bc090 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 12:15:15 +0200
Subject: [PATCH 054/264] Several modifications in CRUD classes

* CrudSession::searchFormIsSubmitted property is renamed to searchFormIsSubmittedAndValid
* Minor fixes
---
 src/Crud/Crud.php        | 86 ++++++++++++++++++++--------------------
 src/Crud/CrudSession.php |  2 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 978ef67..d7bdb7a 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -95,7 +95,7 @@ public function __construct($sessionName, ContainerInterface $container)
     public function init(): void
     {
         //Cheks not empty values
-        $check_values = [
+        $checkValues = [
             'availableColumns',
             'availableResultsPerPage',
             'defaultSort',
@@ -104,7 +104,7 @@ public function init(): void
             'queryBuilder',
             'routeName',
         ];
-        foreach ($check_values as $value) {
+        foreach ($checkValues as $value) {
             if (empty($this->$value)) {
                 throw new \Exception('Config Crud: Option '.$value.' is required');
             }
@@ -119,7 +119,7 @@ public function init(): void
 
         //Display or not results
         if ($this->searchForm && $this->displayResultsOnlyIfSearch) {
-            $this->displayResults = $this->sessionValues->searchFormIsSubmitted;
+            $this->displayResults = $this->sessionValues->searchFormIsSubmittedAndValid;
         }
 
         $this->createDisplaySettingsForm();
@@ -362,7 +362,7 @@ public function processForm(): void
             $searchForm->handleRequest($request);
             if ($searchForm->isSubmitted() && $searchForm->isValid()) {
                 $this->displayResults = true;
-                $this->sessionValues->searchFormIsSubmitted = true;
+                $this->sessionValues->searchFormIsSubmittedAndValid = true;
                 $this->changeFilterValues($searchForm->getData());
                 $this->changePage(1);
                 $this->save();
@@ -370,38 +370,11 @@ public function processForm(): void
         }
     }
 
-    /**
-     * User action: Changes search form values.
-     *
-     * @param object $value
-     */
-    protected function changeFilterValues($value): void
-    {
-        if (!$this->searchForm) {
-            return;
-        }
-        if (\get_class($value) === \get_class($this->searchForm->getDefaultData())) {
-            $this->sessionValues->searchFormData = $value;
-        } else {
-            $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();
-        }
-    }
-
-    /**
-     * User action: Changes page number.
-     *
-     * @param string $value Page number
-     */
-    protected function changePage($value): void
+    protected function testIfDatabaseMustMeUpdated($oldValue, $new_value): void
     {
-        if (!is_scalar($value)) {
-            $value = 1;
-        }
-        $value = (int) $value;
-        if ($value > 1000000000000) {
-            $value = 1;
+        if ($oldValue != $new_value) {
+            $this->updateDatabase = true;
         }
-        $this->sessionValues->page = $value;
     }
 
     /**
@@ -542,13 +515,6 @@ protected function changeNumberResultsDisplayed($value): void
         $this->testIfDatabaseMustMeUpdated($oldValue, $value);
     }
 
-    protected function testIfDatabaseMustMeUpdated($oldValue, $new_value): void
-    {
-        if ($oldValue != $new_value) {
-            $this->updateDatabase = true;
-        }
-    }
-
     /**
      * User Action: Changes displayed columns.
      *
@@ -584,7 +550,7 @@ protected function changeSort($value): void
         $oldValue = $this->sessionValues->sort;
         $availableColumns = $this->availableColumns;
         if ((is_scalar($value) && \array_key_exists($value, $availableColumns) && $availableColumns[$value]->sortable)
-            || (is_scalar($value) && 'defaultPersonalizedSort' == $value && $this->defaultPersonalizedSort)) {
+            || (is_scalar($value) && 'defaultPersonalizedSort' === $value && $this->defaultPersonalizedSort)) {
             $this->sessionValues->sort = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
@@ -601,7 +567,7 @@ protected function changeSort($value): void
     protected function changeSense($value): void
     {
         $oldValue = $this->sessionValues->sense;
-        if (is_scalar($value) && (self::ASC == $value || self::DESC == $value)) {
+        if (is_scalar($value) && (self::ASC === $value || self::DESC === $value)) {
             $this->sessionValues->sense = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
@@ -610,6 +576,40 @@ protected function changeSense($value): void
         }
     }
 
+    /**
+     * User action: Changes search form values.
+     *
+     * @param object $value
+     */
+    protected function changeFilterValues($value): void
+    {
+        if (!$this->searchForm) {
+            return;
+        }
+        if (\get_class($value) === \get_class($this->searchForm->getDefaultData())) {
+            $this->sessionValues->searchFormData = $value;
+        } else {
+            $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();
+        }
+    }
+
+    /**
+     * User action: Changes page number.
+     *
+     * @param string $value Page number
+     */
+    protected function changePage($value): void
+    {
+        if (!is_scalar($value)) {
+            $value = 1;
+        }
+        $value = (int) $value;
+        if ($value > 1000000000000) {
+            $value = 1;
+        }
+        $this->sessionValues->page = $value;
+    }
+
     /**
      * Process request.
      */
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index 131743c..6585b39 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -25,7 +25,7 @@ class CrudSession
      */
     public $searchFormData = null;
 
-    public $searchFormIsSubmitted = false;
+    public $searchFormIsSubmittedAndValid = false;
 
     /**
      * Number of results, in one page.

From 99056db7e5f3666c43589416c6f57e6d90148eda Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 12:17:19 +0200
Subject: [PATCH 055/264] Remove ecommit_crud.images option

---
 src/DependencyInjection/Configuration.php        | 7 -------
 src/DependencyInjection/EcommitCrudExtension.php | 1 -
 2 files changed, 8 deletions(-)

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index e664b86..a997ebf 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -35,13 +35,6 @@ public function getConfigTreeBuilder()
             ->children()
                 ->scalarNode('theme')->isRequired()->end()
                 ->scalarNode('icon_theme')->isRequired()->end()
-                ->arrayNode('images')
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->scalarNode('th_image_up')->defaultValue('/bundles/ecommitcrud/images/i16/sort_incr.png')->end()
-                        ->scalarNode('th_image_down')->defaultValue('/bundles/ecommitcrud/images/i16/sort_decrease.png')->end()
-                    ->end()
-                ->end()
             ->end()
         ;
 
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index 15b74c5..0dbeef1 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -39,6 +39,5 @@ public function load(array $config, ContainerBuilder $container): void
 
         $container->setParameter('ecommit_crud.theme', $config['theme']);
         $container->setParameter('ecommit_crud.icon_theme', $config['icon_theme']);
-        $container->setParameter('ecommit_crud.images', ['th_image_up' => $config['images']['th_image_up'], 'th_image_down' => $config['images']['th_image_down']]);
     }
 }

From 18cf61cdb7b4611aebd6de57836bfb38feadc0fb Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 12:17:50 +0200
Subject: [PATCH 056/264] Remove list.png

---
 src/Resources/public/images/i16/LICENSE  |  32 -----------------------
 src/Resources/public/images/i16/list.png | Bin 3383 -> 0 bytes
 2 files changed, 32 deletions(-)
 delete mode 100644 src/Resources/public/images/i16/LICENSE
 delete mode 100644 src/Resources/public/images/i16/list.png

diff --git a/src/Resources/public/images/i16/LICENSE b/src/Resources/public/images/i16/LICENSE
deleted file mode 100644
index a065aca..0000000
--- a/src/Resources/public/images/i16/LICENSE
+++ /dev/null
@@ -1,32 +0,0 @@
-Icons used:
-
---------------------------------------------------------
-FAM FAM FAM
-
-Mark James
-http://www.famfamfam.com/lab/icons/silk/
-
-This work is licensed under a
-Creative Commons Attribution 2.5 License.
-[ http://creativecommons.org/licenses/by/2.5/ ]
-
-This means you may use it for any purpose,
-and make any changes you like.
-All I ask is that you include a link back
-to this page in your credits.
-
-Are you using this icon set? Send me an email
-(including a link or picture if available) to
-mjames@gmail.com
-
-Any other questions about this icon set please
-contact mjames@gmail.com
-
---------------------------------------------------------
-
-TITLE:	Crystal Project Icons
-AUTHOR:	Everaldo Coelho
-SITE:	http://www.everaldo.com
-CONTACT: everaldo@everaldo.com
-
-Copyright (c)  2006-2007  Everaldo Coelho.
diff --git a/src/Resources/public/images/i16/list.png b/src/Resources/public/images/i16/list.png
deleted file mode 100644
index 2c9c154bc43d433e489677f05f7ee7388ffeaf0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3383
zcmV-74ao9|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C`
z008P>0026e000+nl3&F}0006~Nkl<Zc-nN5&x@Qz5Qd+suAcd3T%$x0Pl8}D?!gU$
zCLkI!0sRxadG$}p-H_vwgTaG%@el-0!LWkK<_CnJF$6+H4;vD)o1NL6@9VDeFrV%Y
zVjY^I>G!F(i&xHFxU@c<?wu&5&P%OScWQCmgW?qgk}64*JV*=&nVb@c3||;G*DWVI
zwYK{9>fU@#SDjibrE^O0e*vb7CFRJ<h~Y3}n#e=r{)2~RHRR2AkH5vvbVgU5Qk_~V
zUF&o`AghurF&bu?CNs3ecs$_VgFlYh^I6M{UmwwR1rQLHEBZrZ(e{;7Vtd+Rqm>t9
za^@sW=0IHgUjG5G3=XIce}1zS<{pd&aHMR(9$*DlUV-Rf=Q&`#Iu6tgw9RV(m`G3q
zxONU7|A0S!1N-!QqRjD|6XfLterUQE*!_??Sw{#gJa7lBMOW_;8?PTcY#e>(Hz<by
z72@_u+#$lTWQlB0=QH^EbEvzZ0&1|kM%{R?2ey!3f;xkwixp|YR6rck<l-Tlb7U|g
zefBN?SJ6VUA?EH>fE!;?XZK<MDe3GwvA>OPd<o-Mmz7?ieFmR=jfi7Om2ANN@1zed
zP=7iNE?^Dtko5kg<sCT0<`;`-K>r1WXgmDM1c?=p4B?2h_%9!`lpwEADx!c2CMt^z
zojy;R>mmn9k#rRK=qg0|Z!`x^RuHtY?PpK!e0TZkYFB%s0TGozKxAQ6B^LJ~q7sT=
zN`A8S*Ik?L?)<p9dFyHQXo(>D%y|UF!n<mU2=4(JCMiT{G;!_k0RY;b98O&50~i1R
N002ovPDHLkV1iv8NhtsT


From fa6637aba4ea6891072d6f0eb2348af5ccc25629 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 12:19:58 +0200
Subject: [PATCH 057/264] Remove old translations (used by paginator and
 picker)

---
 src/Resources/translations/messages.en.yml | 7 -------
 src/Resources/translations/messages.fr.yml | 7 -------
 2 files changed, 14 deletions(-)
 delete mode 100644 src/Resources/translations/messages.en.yml
 delete mode 100644 src/Resources/translations/messages.fr.yml

diff --git a/src/Resources/translations/messages.en.yml b/src/Resources/translations/messages.en.yml
deleted file mode 100644
index c8228c3..0000000
--- a/src/Resources/translations/messages.en.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-'{0} No results|{1} 1 result found|]1,Inf] %count% results found': '{0} No results|{1} 1 result found|]1,Inf] %count% results found'
-Page %firstPage%/%lastPage%: Page %page%/%lastPage%
-Results %first%-%last%: Results %first%-%last%
-Page %page%/%lastPage%: Page %page%/%lastPage%
-filter.choices.placeholder: All
-picker.add: Add
-picker.list: Select
diff --git a/src/Resources/translations/messages.fr.yml b/src/Resources/translations/messages.fr.yml
deleted file mode 100644
index 28cef22..0000000
--- a/src/Resources/translations/messages.fr.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-'{0} No results|{1} 1 result found|]1,Inf] %count% results found': '{0} Pas de résultat|{1} 1 résultat trouvé|]1,Inf] %count% résultats trouvés'
-Page %firstPage%/%lastPage%: Page %page%/%lastPage%
-Results %first%-%last%: Résultats %first%-%last%
-Page %page%/%lastPage%: Page %page%/%lastPage%
-filter.choices.placeholder: Tous
-picker.add: Ajouter
-picker.list: Sélectionner

From 4dedbaa2bc5f4aa2b9523c20c0d37c7460dbb061 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 18:31:20 +0200
Subject: [PATCH 058/264] [Twig] Use snake_case for template variables

---
 src/Resources/views/Theme/base.html.twig      | 24 +++++++++----------
 .../views/Theme/bootstrap3.html.twig          |  4 ++--
 src/Twig/CrudExtension.php                    |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Resources/views/Theme/base.html.twig b/src/Resources/views/Theme/base.html.twig
index 3e4382e..a727cee 100644
--- a/src/Resources/views/Theme/base.html.twig
+++ b/src/Resources/views/Theme/base.html.twig
@@ -117,16 +117,16 @@
 {% block th_sortable_active_asc %}
     {% set th_attr = th_attr.sortable_active_asc|merge({class: (th_attr.sortable_active_asc.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-active-asc')|trim}) %}
     {% set a_attr = a_attr.sortable_active_asc %}
-    {% set newSense = constant('Ecommit\\CrudBundle\\Crud\\Crud::DESC') %}
-    {% set iconName = 'asc' %}
+    {% set new_sense = constant('Ecommit\\CrudBundle\\Crud\\Crud::DESC') %}
+    {% set icon_name = 'asc' %}
     {{ block('th_sortable_active', template_name) }}
 {% endblock %}
 
 {% block th_sortable_active_desc %}
     {% set th_attr = th_attr.sortable_active_desc|merge({class: (th_attr.sortable_active_desc.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-active-desc')|trim}) %}
     {% set a_attr = a_attr.sortable_active_desc %}
-    {% set newSense = constant('Ecommit\\CrudBundle\\Crud\\Crud::ASC') %}
-    {% set iconName = 'desc' %}
+    {% set new_sense = constant('Ecommit\\CrudBundle\\Crud\\Crud::ASC') %}
+    {% set icon_name = 'desc' %}
     {{ block('th_sortable_active', template_name) }}
 {% endblock %}
 
@@ -135,8 +135,8 @@
         {% set a_attr = a_attr|merge({class: (a_attr.class|default('') ~ ' ec-crud-ajax-link-auto')|trim}) %}
     {% endif %}
     <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id, 'sense': newSense})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>
-            {{- label|trans }} {{ crud_icon(iconName) -}}
+        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id, 'sense': new_sense})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>
+            {{- label|trans }} {{ crud_icon(icon_name) -}}
         </a>
     </th>
 {% endblock %}
@@ -145,7 +145,7 @@
 
 {% block td %}
 {% apply spaceless %}
-    {% if repeatedValue %}
+    {% if repeated_value %}
         {% if td_attr.title is not defined %}
             {% set td_attr = td_attr|merge({title: value}) %}
         {% endif %}
@@ -162,7 +162,7 @@
 {% block display_settings %}
 {% apply spaceless %}
     {% if crud.displayResults %}
-        {% set displaySettingsContainerAttributes = {'class': 'ec-crud-display-settings', 'id': 'ec-crud-display-settings-'~crud.sessionName, 'data-crud-list-id': crud.divIdList} %}
+        {% set display_settings_container_attributes = {'class': 'ec-crud-display-settings', 'id': 'ec-crud-display-settings-'~crud.sessionName, 'data-crud-list-id': crud.divIdList} %}
         {% if modal %}
             {{ block('display_settings_button_modal', template_name) }}
             {{ block('display_settings_container_modal', template_name) }}
@@ -197,8 +197,8 @@
 {% endblock %}
 
 {% block display_settings_container_without_modal %}
-    {% set displaySettingsContainerAttributes = displaySettingsContainerAttributes|default({})|merge({'data-modal': '0', 'style': 'display: none;'}) %}
-    <div{% with { attr: displaySettingsContainerAttributes } %}{{ block('attributes', template_name) }}{% endwith %}>
+    {% set display_settings_container_attributes = display_settings_container_attributes|default({})|merge({'data-modal': '0', 'style': 'display: none;'}) %}
+    <div{% with { attr: display_settings_container_attributes } %}{{ block('attributes', template_name) }}{% endwith %}>
         {{ block('display_settings_content_without_modal', template_name) }}
     </div>
 {% endblock %}
@@ -259,8 +259,8 @@
 {# Attributes #}
 
 {% block attributes %}
-    {%- for attrName, attrValue in attr -%}
+    {%- for attr_name, attr_value in attr -%}
         {{- " " -}}
-        {{- attrName }}="{{ attrValue }}"
+        {{- attr_name }}="{{ attr_value }}"
     {%- endfor -%}
 {% endblock %}
diff --git a/src/Resources/views/Theme/bootstrap3.html.twig b/src/Resources/views/Theme/bootstrap3.html.twig
index aea6dec..0bd32db 100644
--- a/src/Resources/views/Theme/bootstrap3.html.twig
+++ b/src/Resources/views/Theme/bootstrap3.html.twig
@@ -26,8 +26,8 @@
 {% endblock %}
 
 {% block display_settings_container_modal %}
-    {% set displaySettingsContainerAttributes = displaySettingsContainerAttributes|default({})|merge({class: (displaySettingsContainerAttributes.class|default('') ~ ' modal fade')|trim, 'data-modal': '1', 'style': 'display: none;', 'role': 'dialog'}) %}
-    <div{% with { attr: displaySettingsContainerAttributes } %}{{ block('attributes', template_name) }}{% endwith %}>
+    {% set display_settings_container_attributes = display_settings_container_attributes|default({})|merge({class: (display_settings_container_attributes.class|default('') ~ ' modal fade')|trim, 'data-modal': '1', 'style': 'display: none;', 'role': 'dialog'}) %}
+    <div{% with { attr: display_settings_container_attributes } %}{{ block('attributes', template_name) }}{% endwith %}>
         {{ block('display_settings_content_modal', template_name) }}
     </div>
 {% endblock %}
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 155f90c..9f43505 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -389,7 +389,7 @@ public function td(Environment $environment, string $columnId, Crud $crud, $valu
             'column' => $column,
             'crud' => $crud,
             'value' => $value,
-            'repeatedValue' => $repeatedValue,
+            'repeated_value' => $repeatedValue,
             'options' => $options,
         ]));
     }

From da36049384fa7e994773ed69191a9ca4908a4626 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 18:36:42 +0200
Subject: [PATCH 059/264] Add missing "options" Twig variables

---
 src/Twig/CrudExtension.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 9f43505..2ba8d24 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -239,6 +239,7 @@ public function paginatorLinks(Environment $environment, AbstractPaginator $pagi
             'pages' => $pages,
             'route_name' => $routeName,
             'route_params' => $routeParams,
+            'options' => $options,
         ]));
     }
 
@@ -424,6 +425,7 @@ public function displaySettings(Environment $environment, Crud $crud, array $opt
         return $this->renderBlock($environment, $this->theme, 'display_settings', array_merge($options, [
             'crud' => $crud,
             'form' => $form,
+            'options' => $options,
         ]));
     }
 
@@ -473,6 +475,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
 
         return $this->renderBlock($environment, $this->theme, 'search_form_start', array_merge($options, [
             'crud' => $crud,
+            'options' => $options,
         ]));
     }
 
@@ -500,6 +503,7 @@ public function searchFormSubmit(Environment $environment, Crud $crud, $options
 
         return $this->renderBlock($environment, $this->theme, 'search_form_submit', array_merge($options, [
             'crud' => $crud,
+            'options' => $options,
         ]));
     }
 
@@ -546,6 +550,7 @@ public function searchFormReset(Environment $environment, Crud $crud, $options =
 
         return $this->renderBlock($environment, $this->theme, 'search_form_reset', array_merge($options, [
             'crud' => $crud,
+            'options' => $options,
         ]));
     }
 

From 868dbf6ae3b70411c3eb1ccaf275ecd8a4643e5e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 18:57:36 +0200
Subject: [PATCH 060/264] [Twig] Add "theme" and "block" options

---
 src/Twig/CrudExtension.php                    | 28 +++++++++++----
 .../Functional/App/templates/theme.html.twig  |  3 ++
 tests/Twig/CrudExtensionTest.php              | 35 +++++++++++++++++++
 3 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 tests/Functional/App/templates/theme.html.twig

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 2ba8d24..5f6f6e8 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -192,6 +192,8 @@ public function paginatorLinks(Environment $environment, AbstractPaginator $pagi
                 }
             },
             'render' => null,
+            'theme' => $this->theme,
+            'block' => 'paginator_links',
         ]);
         $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
         $resolver->setAllowedTypes('max_pages_before', 'int');
@@ -234,7 +236,7 @@ public function paginatorLinks(Environment $environment, AbstractPaginator $pagi
             }
         }
 
-        return $this->renderBlock($environment, $this->theme, 'paginator_links', array_merge($options, [
+        return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
             'paginator' => $paginator,
             'pages' => $pages,
             'route_name' => $routeName,
@@ -296,6 +298,8 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
                 }
             },
             'render' => null,
+            'theme' => $this->theme,
+            'block' => 'th',
         ]);
         $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
         $resolver->setAllowedTypes('label', ['null', 'string']);
@@ -326,7 +330,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
             $label = $column->label;
         }
 
-        return $this->renderBlock($environment, $this->theme, 'th', array_merge($options, [
+        return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
             'column' => $column,
             'crud' => $crud,
             'options' => $options,
@@ -352,6 +356,8 @@ public function td(Environment $environment, string $columnId, Crud $crud, $valu
             'repeated_values_string' => null,
             'td_attr' => [],
             'render' => null,
+            'theme' => $this->theme,
+            'block' => 'td',
         ]);
         $resolver->setAllowedTypes('escape', 'bool');
         $resolver->setAllowedTypes('repeated_values_string', ['null', 'string']);
@@ -386,7 +392,7 @@ public function td(Environment $environment, string $columnId, Crud $crud, $valu
             }
         }
 
-        return $this->renderBlock($environment, $this->theme, 'td', array_merge($options, [
+        return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
             'column' => $column,
             'crud' => $crud,
             'value' => $value,
@@ -408,6 +414,8 @@ public function displaySettings(Environment $environment, Crud $crud, array $opt
         $resolver->setDefaults([
             'modal' => true,
             'render' => null,
+            'theme' => $this->theme,
+            'block' => 'display_settings',
         ]);
         $resolver->setAllowedTypes('modal', 'bool');
         $options = $resolver->resolve($options);
@@ -422,7 +430,7 @@ public function displaySettings(Environment $environment, Crud $crud, array $opt
             ]);
         }
 
-        return $this->renderBlock($environment, $this->theme, 'display_settings', array_merge($options, [
+        return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
             'crud' => $crud,
             'form' => $form,
             'options' => $options,
@@ -442,6 +450,8 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
             'ajax_options' => [],
             'form_attr' => [],
             'render' => null,
+            'theme' => $this->theme,
+            'block' => 'search_form_start',
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('form_attr', ['array']);
@@ -473,7 +483,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
             $options['form_attr']['novalidate'] = 'novalidate';
         }
 
-        return $this->renderBlock($environment, $this->theme, 'search_form_start', array_merge($options, [
+        return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
             'crud' => $crud,
             'options' => $options,
         ]));
@@ -490,6 +500,8 @@ public function searchFormSubmit(Environment $environment, Crud $crud, $options
         $resolver->setDefaults([
             'button_attr' => [],
             'render' => null,
+            'theme' => $this->theme,
+            'block' => 'search_form_submit',
         ]);
         $resolver->setAllowedTypes('button_attr', ['array']);
         $options = $resolver->resolve($options);
@@ -501,7 +513,7 @@ public function searchFormSubmit(Environment $environment, Crud $crud, $options
             ]);
         }
 
-        return $this->renderBlock($environment, $this->theme, 'search_form_submit', array_merge($options, [
+        return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
             'crud' => $crud,
             'options' => $options,
         ]));
@@ -520,6 +532,8 @@ public function searchFormReset(Environment $environment, Crud $crud, $options =
             'ajax_options' => [],
             'button_attr' => [],
             'render' => null,
+            'theme' => $this->theme,
+            'block' => 'search_form_reset',
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('button_attr', ['array']);
@@ -548,7 +562,7 @@ public function searchFormReset(Environment $environment, Crud $crud, $options =
             $options['button_attr']['class'] = $class;
         }
 
-        return $this->renderBlock($environment, $this->theme, 'search_form_reset', array_merge($options, [
+        return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
             'crud' => $crud,
             'options' => $options,
         ]));
diff --git a/tests/Functional/App/templates/theme.html.twig b/tests/Functional/App/templates/theme.html.twig
new file mode 100644
index 0000000..a705f98
--- /dev/null
+++ b/tests/Functional/App/templates/theme.html.twig
@@ -0,0 +1,3 @@
+{% block hello_world %}
+    Hello world
+{% endblock %}
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index a38bec2..3b3e841 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -377,6 +377,21 @@ public function testPaginatorWithRenderOption(): void
         $this->assertRegExp('/OK/', $result);
     }
 
+    public function testPaginatorWithThemeAndBlockOptions(): void
+    {
+        $paginator = new ArrayPaginator(5);
+        $paginator->setData(range(1, 100));
+        $paginator->setPage(1);
+        $paginator->init();
+
+        $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
+            'theme' => 'theme.html.twig',
+            'block' => 'hello_world',
+        ]);
+
+        $this->assertRegExp('/Hello world/', $result);
+    }
+
     public function testPaginatorWithBadOptions(): void
     {
         $this->expectException(UndefinedOptionsException::class);
@@ -504,6 +519,16 @@ public function testThWithRenderOption(): void
         $this->assertRegExp('/OK/', $html);
     }
 
+    public function testThWithThemeAndBlockOptions(): void
+    {
+        $html = $this->crudExtension->th($this->environment, 'column1', $this->createCrud(), [
+            'theme' => 'theme.html.twig',
+            'block' => 'hello_world',
+        ]);
+
+        $this->assertRegExp('/Hello world/', $html);
+    }
+
     public function testThWithBadOptions(): void
     {
         $this->expectException(UndefinedOptionsException::class);
@@ -665,6 +690,16 @@ public function testTdWithRenderOption(): void
         $this->assertRegExp('/OK/', $html);
     }
 
+    public function testTdWithThemeAndBlockOptions(): void
+    {
+        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+            'theme' => 'theme.html.twig',
+            'block' => 'hello_world',
+        ]);
+
+        $this->assertRegExp('/Hello world/', $html);
+    }
+
     public function testTdWithBadOptions(): void
     {
         $this->expectException(UndefinedOptionsException::class);

From 3c7f28cfa1ca043daf32c7ba6726b0066197eb32 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 19:01:24 +0200
Subject: [PATCH 061/264] [crud_icon] Add "iconTheme" argument

---
 src/Twig/CrudExtension.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 5f6f6e8..d0f4d75 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -649,9 +649,13 @@ protected function getAjaxAttributes(array $options): array
         return $attributes;
     }
 
-    public function crudIcon(Environment $environment, string $iconName): string
+    public function crudIcon(Environment $environment, string $iconName, ?string $iconTheme = null): string
     {
-        return $this->renderBlock($environment, $this->iconTheme, $iconName);
+        if (null === $iconTheme) {
+            $iconTheme = $this->iconTheme;
+        }
+
+        return $this->renderBlock($environment, $iconTheme, $iconName);
     }
 
     protected function renderBlock(Environment $environment, string $templateName, string $blockName, array $parameters = []): ?string

From 831e1d584bee6c646b6ca6b75acc0f21af5b1c01 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 19:25:42 +0200
Subject: [PATCH 062/264] Add Twig configuration

---
 src/Crud/Crud.php                             | 23 ++++++++++++
 src/DependencyInjection/Configuration.php     |  4 +++
 .../EcommitCrudExtension.php                  |  1 +
 src/Resources/config/services.xml             |  1 +
 src/Twig/CrudExtension.php                    | 35 ++++++++++++++-----
 5 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index d7bdb7a..c7dfbb2 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -63,6 +63,8 @@ class Crud
     protected $displayResultsOnlyIfSearch = false;
     protected $displayResults = true;
 
+    protected $twigFunctionsConfiguration = [];
+
     /*
      * Router
      */
@@ -928,4 +930,25 @@ public function setDisplayResults(bool $displayResults): self
 
         return $this;
     }
+
+    public function getTwigFunctionsConfiguration(): array
+    {
+        return $this->twigFunctionsConfiguration;
+    }
+
+    public function getTwigFunctionConfiguration(string $function): array
+    {
+        if (isset($this->twigFunctionsConfiguration[$function])) {
+            return $this->twigFunctionsConfiguration;
+        }
+
+        return [];
+    }
+
+    public function setTwigFunctionsConfiguration(array $twigFunctionsConfiguration): self
+    {
+        $this->twigFunctionsConfiguration = $twigFunctionsConfiguration;
+
+        return $this;
+    }
 }
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index a997ebf..b9fcab8 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -35,6 +35,10 @@ public function getConfigTreeBuilder()
             ->children()
                 ->scalarNode('theme')->isRequired()->end()
                 ->scalarNode('icon_theme')->isRequired()->end()
+                ->arrayNode('twig_functions_configuration')
+                    ->treatNullLike([])
+                    ->prototype('variable')->end()
+                ->end()
             ->end()
         ;
 
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index 0dbeef1..af8da93 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -39,5 +39,6 @@ public function load(array $config, ContainerBuilder $container): void
 
         $container->setParameter('ecommit_crud.theme', $config['theme']);
         $container->setParameter('ecommit_crud.icon_theme', $config['icon_theme']);
+        $container->setParameter('ecommit_crud.twig_functions_configuration', $config['twig_functions_configuration']);
     }
 }
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index a88fc74..f17e875 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -29,6 +29,7 @@
             <argument type="service" id="twig.form.renderer" />
             <argument>%ecommit_crud.theme%</argument>
             <argument>%ecommit_crud.icon_theme%</argument>
+            <argument>%ecommit_crud.twig_functions_configuration%</argument>
             <tag name="twig.extension"/>
         </service>
 
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index d0f4d75..9f7f461 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -31,14 +31,16 @@ class CrudExtension extends AbstractExtension
 
     protected $theme;
     protected $iconTheme;
+    protected $configuration;
 
     protected $lastTdValues = [];
 
-    public function __construct(FormRendererInterface $formRenderer, string $theme, string $iconTheme)
+    public function __construct(FormRendererInterface $formRenderer, string $theme, string $iconTheme, array $configuration)
     {
         $this->formRenderer = $formRenderer;
         $this->theme = $theme;
         $this->iconTheme = $iconTheme;
+        $this->configuration = $configuration;
     }
 
     public function getName()
@@ -199,7 +201,7 @@ public function paginatorLinks(Environment $environment, AbstractPaginator $pagi
         $resolver->setAllowedTypes('max_pages_before', 'int');
         $resolver->setAllowedTypes('max_pages_after', 'int');
         $resolver->setAllowedValues('type', ['sliding', 'elastic']);
-        $options = $resolver->resolve($options);
+        $options = $resolver->resolve($this->buildOptions('paginator_links', $options));
 
         if ($options['render']) {
             return $environment->render($options['render'], [
@@ -256,6 +258,8 @@ public function crudPaginatorLinks(Environment $environment, Crud $crud, array $
             $options['ajax_options']['update'] = '#'.$crud->getDivIdList();
         }
 
+        $options = $this->buildOptions('crud_paginator_links', $options, $crud);
+
         return $this->paginatorLinks($environment, $crud->getPaginator(), $crud->getRouteName(), $crud->getRouteParams(), $options);
     }
 
@@ -303,7 +307,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
         ]);
         $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
         $resolver->setAllowedTypes('label', ['null', 'string']);
-        $options = $resolver->resolve($options);
+        $options = $resolver->resolve($this->buildOptions('th', $options, $crud));
 
         //If the column is not to be shown, returns empty
         $sessionValues = $crud->getSessionValues();
@@ -362,7 +366,7 @@ public function td(Environment $environment, string $columnId, Crud $crud, $valu
         $resolver->setAllowedTypes('escape', 'bool');
         $resolver->setAllowedTypes('repeated_values_string', ['null', 'string']);
         $resolver->setAllowedTypes('td_attr', ['null', 'array']);
-        $options = $resolver->resolve($options);
+        $options = $resolver->resolve($this->buildOptions('td', $options, $crud));
 
         //If the column is not to be shown, returns empty
         $sessionValues = $crud->getSessionValues();
@@ -418,7 +422,7 @@ public function displaySettings(Environment $environment, Crud $crud, array $opt
             'block' => 'display_settings',
         ]);
         $resolver->setAllowedTypes('modal', 'bool');
-        $options = $resolver->resolve($options);
+        $options = $resolver->resolve($this->buildOptions('display_settings', $options, $crud));
 
         $form = $crud->getDisplaySettingsForm();
 
@@ -455,7 +459,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('form_attr', ['array']);
-        $options = $resolver->resolve($options);
+        $options = $resolver->resolve($this->buildOptions('search_form_start', $options, $crud));
 
         if ($options['render']) {
             return $environment->render($options['render'], [
@@ -504,7 +508,7 @@ public function searchFormSubmit(Environment $environment, Crud $crud, $options
             'block' => 'search_form_submit',
         ]);
         $resolver->setAllowedTypes('button_attr', ['array']);
-        $options = $resolver->resolve($options);
+        $options = $resolver->resolve($this->buildOptions('search_form_submit', $options, $crud));
 
         if ($options['render']) {
             return $environment->render($options['render'], [
@@ -537,7 +541,7 @@ public function searchFormReset(Environment $environment, Crud $crud, $options =
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('button_attr', ['array']);
-        $options = $resolver->resolve($options);
+        $options = $resolver->resolve($this->buildOptions('search_form_reset', $options, $crud));
 
         if ($options['render']) {
             return $environment->render($options['render'], [
@@ -667,4 +671,19 @@ protected function renderBlock(Environment $environment, string $templateName, s
 
         return ob_get_clean();
     }
+
+    protected function buildOptions(string $function, array $inlineOptions, ?Crud $crud = null): array
+    {
+        $options = [];
+
+        if (isset($this->configuration[$function])) {
+            $options = $this->configuration[$function];
+        }
+
+        if (null !== $crud) {
+            $options = array_merge($options, $crud->getTwigFunctionConfiguration($function));
+        }
+
+        return array_merge($options, $inlineOptions);
+    }
 }

From 8a02f4c840ec6dda65cd4d4c78df53cd20636fe0 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 16 May 2021 19:28:02 +0200
Subject: [PATCH 063/264] [Crud] Rename "formDisplaySettings" property to
 "displaySettingsForm"

---
 src/Crud/Crud.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index c7dfbb2..951a780 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -45,7 +45,7 @@ class Crud
     /**
      * @var Form
      */
-    protected $formDisplaySettings = null;
+    protected $displaySettingsForm = null;
 
     protected $availableColumns = [];
     protected $availableVirtualColumns = [];
@@ -630,9 +630,9 @@ protected function processRequest(): void
             return;
         }
 
-        $this->formDisplaySettings->handleRequest($request);
-        if ($this->formDisplaySettings->isSubmitted() && $this->formDisplaySettings->isValid()) {
-            $displaySettingsData = $this->formDisplaySettings->getData();
+        $this->displaySettingsForm->handleRequest($request);
+        if ($this->displaySettingsForm->isSubmitted() && $this->displaySettingsForm->isValid()) {
+            $displaySettingsData = $this->displaySettingsForm->getData();
             $this->changeColumnsDisplayed($displaySettingsData['displayedColumns']);
             $this->changeNumberResultsDisplayed($displaySettingsData['resultsPerPage']);
         }
@@ -663,7 +663,7 @@ public function createDisplaySettingsForm(): void
         ];
         $formName = sprintf('crud_display_settings_%s', $this->getSessionName());
 
-        $this->formDisplaySettings = $this->container->get('form.factory')->createNamed($formName, DisplaySettingsType::class, $data, [
+        $this->displaySettingsForm = $this->container->get('form.factory')->createNamed($formName, DisplaySettingsType::class, $data, [
             'results_per_page_choices' => $resultsPerPageChoices,
             'columns_choices' => $columnsChoices,
             'action' => $this->getUrl(['display-settings' => 1]),
@@ -806,7 +806,7 @@ public function clearTemplate(): void
             $this->searchForm->createFormView();
             $this->searchForm = $this->searchForm->getForm();
         }
-        $this->formDisplaySettings = $this->formDisplaySettings->createView();
+        $this->displaySettingsForm = $this->displaySettingsForm->createView();
     }
 
     /**
@@ -875,7 +875,7 @@ public function getSearchForm()
      */
     public function getDisplaySettingsForm()
     {
-        return $this->formDisplaySettings;
+        return $this->displaySettingsForm;
     }
 
     public function getDivIdSearch(): string

From b29e365add37ac67b014009bce63d3ecabc4a506 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 3 Jul 2021 16:34:04 +0200
Subject: [PATCH 064/264] Add symfony/intl dependency

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index d615240..9ef6e6c 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,7 @@
         "symfony/http-client": "^4.4.11|^5.1.3",
         "symfony/http-foundation": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4|^5.0",
+        "symfony/intl": "^4.4|^5.0",
         "symfony/options-resolver": "^4.4|^5.0",
         "symfony/property-access": "^4.4|^5.0",
         "symfony/routing": "^4.4|^5.0",

From b2cec9f7e2d2f88e635f2ed59d0c73829e20db26 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 4 Jul 2021 19:53:13 +0200
Subject: [PATCH 065/264] [CrudExtension] Add missing doc and fix configuration
 name

---
 src/Twig/CrudExtension.php | 80 +++++++++++++++++++++++++++++---------
 1 file changed, 62 insertions(+), 18 deletions(-)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 9f7f461..ea1d718 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -140,7 +140,7 @@ public function getFunctions()
     }
 
     /**
-     * Returns links paginator.
+     * Displays links paginator.
      *
      * @param string $routeName   Route name
      * @param array  $routeParams Route parameters
@@ -154,7 +154,9 @@ public function getFunctions()
      *                            * ul_attr: "ul" attributes
      *                            * li_attr: "li" attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
      *                            * a_attr: "a" CSS attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
-     *                            * render: Template used for generation. If null, default template is used
+     *                            * render: Template used for generation without the default process. If null, default process is used
+     *                            * theme: Theme used. If null, default theme is used
+     *                            * block: Twig block used. Default: paginator_links
      */
     public function paginatorLinks(Environment $environment, AbstractPaginator $paginator, string $routeName, array $routeParams = [], array $options = []): string
     {
@@ -248,7 +250,7 @@ public function paginatorLinks(Environment $environment, AbstractPaginator $pagi
     }
 
     /**
-     * Returns CRUD links paginator.
+     * Displays CRUD links paginator.
      *
      * @see CrudExtension::paginatorLinks()
      */
@@ -264,7 +266,7 @@ public function crudPaginatorLinks(Environment $environment, Crud $crud, array $
     }
 
     /**
-     * Returns CRUD th tag.
+     * Displays CRUD th tag.
      *
      * @param string $columnId Column to display
      * @param array  $options  Options:
@@ -272,7 +274,9 @@ public function crudPaginatorLinks(Environment $environment, Crud $crud, array $
      *                         * label: Th label. If null, CRUD configuration is used
      *                         * th_attr: "th" attributes
      *                         * a_attr: "a" attributes
-     *                         * render: Template used for generation. If null, default template is used
+     *                         * render: Template used for generation without the default process. If null, default process is used
+     *                         * theme: Theme used. If null, default theme is used
+     *                         * block: Twig block used. Default: th
      */
     public function th(Environment $environment, string $columnId, Crud $crud, array $options = []): string
     {
@@ -307,7 +311,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
         ]);
         $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
         $resolver->setAllowedTypes('label', ['null', 'string']);
-        $options = $resolver->resolve($this->buildOptions('th', $options, $crud));
+        $options = $resolver->resolve($this->buildOptions('crud_th', $options, $crud));
 
         //If the column is not to be shown, returns empty
         $sessionValues = $crud->getSessionValues();
@@ -343,14 +347,16 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
     }
 
     /**
-     * Returns CRUD td tag.
+     * Displays CRUD td tag.
      *
      * @param string $columnId Column to display
      * @param array  $options  Options:
      *                         * escape: Escape or not value. Default: true
      *                         * repeated_values_string: If not null, use this value if the original value is repeated. Default: null
      *                         * td_attr: "td" attributes
-     *                         * render: Template used for generation. If null, default template is used
+     *                         * render: Template used for generation without the default process. If null, default process is used
+     *                         * theme: Theme used. If null, default theme is used
+     *                         * block: Twig block used. Default: td
      */
     public function td(Environment $environment, string $columnId, Crud $crud, $value, $options = []): string
     {
@@ -366,7 +372,7 @@ public function td(Environment $environment, string $columnId, Crud $crud, $valu
         $resolver->setAllowedTypes('escape', 'bool');
         $resolver->setAllowedTypes('repeated_values_string', ['null', 'string']);
         $resolver->setAllowedTypes('td_attr', ['null', 'array']);
-        $options = $resolver->resolve($this->buildOptions('td', $options, $crud));
+        $options = $resolver->resolve($this->buildOptions('crud_td', $options, $crud));
 
         //If the column is not to be shown, returns empty
         $sessionValues = $crud->getSessionValues();
@@ -406,11 +412,13 @@ public function td(Environment $environment, string $columnId, Crud $crud, $valu
     }
 
     /**
-     * Returns CRUD td tag.
+     * Returns CRUD display settings button.
      *
      * @param array $options Options:
      *                       * modal: Use modal or not. Default: true
-     *                       * render: Template used for generation. If null, default template is used
+     *                       * render: Template used for generation without the default process. If null, default process is used
+     *                       * theme: Theme used. If null, default theme is used
+     *                       * block: Twig block used. Default: display_settings
      */
     public function displaySettings(Environment $environment, Crud $crud, array $options = []): string
     {
@@ -422,7 +430,7 @@ public function displaySettings(Environment $environment, Crud $crud, array $opt
             'block' => 'display_settings',
         ]);
         $resolver->setAllowedTypes('modal', 'bool');
-        $options = $resolver->resolve($this->buildOptions('display_settings', $options, $crud));
+        $options = $resolver->resolve($this->buildOptions('crud_display_settings', $options, $crud));
 
         $form = $crud->getDisplaySettingsForm();
 
@@ -442,10 +450,14 @@ public function displaySettings(Environment $environment, Crud $crud, array $opt
     }
 
     /**
+     * Search form start tag.
+     *
      * @param array $options Options:
      *                       * ajax_options: Ajax options. Default: []
      *                       * form_attr: "form" attributes
-     *                       * render: Template used for generation. If null, default template is used
+     *                       * render: Template used for generation without the default process. If null, default process is used
+     *                       * theme: Theme used. If null, default theme is used
+     *                       * block: Twig block used. Default: search_form_start
      */
     public function searchFormStart(Environment $environment, Crud $crud, array $options = [])
     {
@@ -459,7 +471,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('form_attr', ['array']);
-        $options = $resolver->resolve($this->buildOptions('search_form_start', $options, $crud));
+        $options = $resolver->resolve($this->buildOptions('crud_search_form_start', $options, $crud));
 
         if ($options['render']) {
             return $environment->render($options['render'], [
@@ -494,9 +506,13 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
     }
 
     /**
+     * Search form submit button.
+     *
      * @param array $options Options:
      *                       * button_attr: "button" attributes
-     *                       * render: Template used for generation. If null, default template is used
+     *                       * render: Template used for generation without the default process. If null, default process is used
+     *                       * theme: Theme used. If null, default theme is used
+     *                       * block: Twig block used. Default: search_form_submit
      */
     public function searchFormSubmit(Environment $environment, Crud $crud, $options = [], $ajaxOptions = [], $htmlOptions = [])
     {
@@ -508,7 +524,7 @@ public function searchFormSubmit(Environment $environment, Crud $crud, $options
             'block' => 'search_form_submit',
         ]);
         $resolver->setAllowedTypes('button_attr', ['array']);
-        $options = $resolver->resolve($this->buildOptions('search_form_submit', $options, $crud));
+        $options = $resolver->resolve($this->buildOptions('crud_search_form_submit', $options, $crud));
 
         if ($options['render']) {
             return $environment->render($options['render'], [
@@ -524,10 +540,14 @@ public function searchFormSubmit(Environment $environment, Crud $crud, $options
     }
 
     /**
+     * Search form reset button.
+     *
      * @param array $options Options:
      *                       * ajax_options: Ajax options. Default: []
      *                       * button_attr: "button" attributes
-     *                       * render: Template used for generation. If null, default template is used
+     *                       * render: Template used for generation without the default process. If null, default process is used
+     *                       * theme: Theme used. If null, default theme is used
+     *                       * block: Twig block used. Default: search_form_reset
      */
     public function searchFormReset(Environment $environment, Crud $crud, $options = [], $ajaxOptions = [], $htmlOptions = [])
     {
@@ -541,7 +561,7 @@ public function searchFormReset(Environment $environment, Crud $crud, $options =
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('button_attr', ['array']);
-        $options = $resolver->resolve($this->buildOptions('search_form_reset', $options, $crud));
+        $options = $resolver->resolve($this->buildOptions('crud_search_form_reset', $options, $crud));
 
         if ($options['render']) {
             return $environment->render($options['render'], [
@@ -572,6 +592,13 @@ public function searchFormReset(Environment $environment, Crud $crud, $options =
         ]));
     }
 
+    /**
+     * Ajax form start tag.
+     *
+     * @param array $options Options:
+     *                       * auto_class: Auto CSS class used. Default: ec-crud-ajax-form-auto
+     *                       * ajax_options: See "ajaxAttributes" method options
+     */
     public function formStartAjax(FormView $formView, array $options = []): string
     {
         $autoClass = 'ec-crud-ajax-form-auto';
@@ -597,6 +624,23 @@ public function formStartAjax(FormView $formView, array $options = []): string
         return $this->formRenderer->renderBlock($formView, 'form_start', $options);
     }
 
+    /**
+     * Displays Ajax attributes.
+     *
+     * @param array $ajaxOptions Options:
+     *                           * url: Ajax url
+     *                           * update: Update the DOM with the response - jquery selector (eg: #mydiv)
+     *                           * update_mode: Update the DOM with the response - mode (update / before / after / prepend / append). Default: update
+     *                           * on_before_send: Callback
+     *                           * on_success: Callback
+     *                           * on_error: Callback
+     *                           * on_complete: Callback
+     *                           * data_type: Request type. Default: html
+     *                           * method: Resquest method: Default: POST
+     *                           * data: Data sent
+     *                           * cache: Use cache. Default: false
+     *                           * options: Array of options
+     */
     public function ajaxAttributes(Environment $environment, array $ajaxOptions): string
     {
         $this->validateAjaxOptions($ajaxOptions);

From abd0e6604b19a54947d19abde2973d70137df879 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 4 Jul 2021 20:02:13 +0200
Subject: [PATCH 066/264] Add doc and src/Resources/assets folder

---
 .eslintrc.js                                  |   2 +-
 .github/workflows/tests.yml                   |   2 +-
 README.md                                     |   8 +
 doc/cookbook/advanced-searcher.md             | 124 ++++++
 doc/cookbook/data-template.md                 |  29 ++
 doc/cookbook/display_results.md               |  37 ++
 doc/cookbook/div_ids.md                       |  39 ++
 doc/cookbook/paginator.md                     |  83 ++++
 doc/cookbook/rest.md                          |   3 +
 doc/cookbook/sort.md                          |  97 ++++
 doc/cookbook/template_configuration.md        |  70 +++
 doc/cookbook/virtual_columns.md               |  38 ++
 doc/crud.md                                   | 416 ++++++++++++++++++
 doc/index.md                                  |  28 ++
 doc/install.md                                | 103 +++++
 doc/references/ajax.md                        | 180 ++++++++
 doc/references/entity_ajax_type.md            |  22 +
 doc/references/filters.md                     | 174 ++++++++
 doc/references/js-callbacks.md                |  66 +++
 doc/references/modal.md                       | 117 +++++
 doc/references/searcher.md                    |  16 +
 doc/references/twig.md                        |  19 +
 package.json                                  |   1 +
 src/Resources/{public => assets}/js/ajax.js   |   0
 .../{public => assets}/js/callback.js         |   0
 src/Resources/{public => assets}/js/crud.js   |   0
 .../js/modal/engine/bootstrap3.js             |   0
 .../js/modal/modal-manager.js                 |   0
 .../{public => assets}/js/options-resolver.js |   0
 .../js/scrollToFirstMessage.js                |   0
 src/Resources/assets/package.json             |   6 +
 tests/Functional/App/assets/js/app.js         |   6 +-
 .../App/templates/user/list.html.twig         |  42 +-
 tests/Resources/public/js/ajax.spec.js        |   2 +-
 tests/Resources/public/js/callback.spec.js    |   2 +-
 .../Resources/public/js/modal/engine/test.js  |   2 +-
 .../public/js/modal/modal-manager.spec.js     |   4 +-
 .../public/js/options-resolver.spec.js        |   2 +-
 38 files changed, 1708 insertions(+), 32 deletions(-)
 create mode 100644 doc/cookbook/advanced-searcher.md
 create mode 100644 doc/cookbook/data-template.md
 create mode 100644 doc/cookbook/display_results.md
 create mode 100644 doc/cookbook/div_ids.md
 create mode 100644 doc/cookbook/paginator.md
 create mode 100644 doc/cookbook/rest.md
 create mode 100644 doc/cookbook/sort.md
 create mode 100644 doc/cookbook/template_configuration.md
 create mode 100644 doc/cookbook/virtual_columns.md
 create mode 100644 doc/crud.md
 create mode 100644 doc/index.md
 create mode 100644 doc/install.md
 create mode 100644 doc/references/ajax.md
 create mode 100644 doc/references/entity_ajax_type.md
 create mode 100644 doc/references/filters.md
 create mode 100644 doc/references/js-callbacks.md
 create mode 100644 doc/references/modal.md
 create mode 100644 doc/references/searcher.md
 create mode 100644 doc/references/twig.md
 rename src/Resources/{public => assets}/js/ajax.js (100%)
 rename src/Resources/{public => assets}/js/callback.js (100%)
 rename src/Resources/{public => assets}/js/crud.js (100%)
 rename src/Resources/{public => assets}/js/modal/engine/bootstrap3.js (100%)
 rename src/Resources/{public => assets}/js/modal/modal-manager.js (100%)
 rename src/Resources/{public => assets}/js/options-resolver.js (100%)
 rename src/Resources/{public => assets}/js/scrollToFirstMessage.js (100%)
 create mode 100644 src/Resources/assets/package.json

diff --git a/.eslintrc.js b/.eslintrc.js
index 2eb458a..76d8e29 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,7 +12,7 @@ module.exports = {
         Atomics: 'readonly',
         SharedArrayBuffer: 'readonly'
     },
-    ignorePatterns: ['/src/Resources/public/js/scrollToFirstMessage.js'],
+    ignorePatterns: ['/src/Resources/assets/js/scrollToFirstMessage.js'],
     parserOptions: {
         ecmaVersion: 2018,
         sourceType: 'module'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7df04f9..bf6d29c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -106,4 +106,4 @@ jobs:
 
             -   name: Run ESLint
                 if: matrix.coding-standards
-                run: ./node_modules/.bin/eslint src/Resources/public/js/* tests/Resources/public/js/*
+                run: ./node_modules/.bin/eslint src/Resources/assets/js/* tests/Resources/public/js/*
diff --git a/README.md b/README.md
index 24b9200..54bac68 100644
--- a/README.md
+++ b/README.md
@@ -5,3 +5,11 @@
 
 
 **WARNING: This branch is under development. Not use in production. You can use stable versions or 2.6 branch.**
+
+## Documentation ##
+
+[Read the Documentation (French documentation)](doc/index.md)
+
+## License ##
+
+This bundle is available under the MIT license. See the complete license in the *LICENSE* file.
diff --git a/doc/cookbook/advanced-searcher.md b/doc/cookbook/advanced-searcher.md
new file mode 100644
index 0000000..3b0fe4d
--- /dev/null
+++ b/doc/cookbook/advanced-searcher.md
@@ -0,0 +1,124 @@
+# Personnalisation avancée de la classe Searcher
+
+## Solution 1: Utilisation de addField et updateQueryBuilder
+
+```php
+<?php
+//src/Form/Searcher/CarSearcher
+namespace App\Form\Searcher;
+
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Ecommit\CrudBundle\Form\Filter as Filter;
+use Ecommit\CrudBundle\Form\Searcher\AbstractSearcher;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+
+class CarSearcher extends AbstractSearcher
+{
+    public $id;
+
+    public $name;
+
+    public function buildForm(SearchFormBuilder $builder, array $options): void
+    {
+        //Filtre habituel
+        $builder->addFilter('id', Filter\IntegerFilter::class, [
+            'comparator' => Filter\IntegerFilter::EQUAL,
+        ]);
+
+        //Ajout manuel d'un champ dans filtre de recherche
+        $builder->addField('name', TextType::class, [
+            'required' => false,
+        ]);
+    }
+    
+    public function updateQueryBuilder($queryBuilder, array $options): void
+    {
+        //Traitement du filtre de recherche "name"
+        if (null !== $this->name) {
+            $queryBuilder->andWhere('c1.name = :name')
+                ->setParameter('name', $this->name);
+        }
+    }
+}
+```
+
+## Solution 2: Utilisation d'une classe FormType
+
+```php
+<?php
+//src/Form/Searcher/CarSearcher
+namespace App\Form\Searcher;
+
+use Ecommit\CrudBundle\Form\Searcher\AbstractSearcher;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class CarSearcher extends AbstractSearcher
+{
+    /**
+     * @Assert\Length(max=255)
+     */
+    public $name;
+
+    public function updateQueryBuilder($queryBuilder, array $options): void
+    {
+        //Traitement du filtre de recherche "name"
+        if (null !== $this->name) {
+            $queryBuilder->andWhere('c1.name = :name')
+                ->setParameter('name', $this->name);
+        }
+    }
+}
+```
+
+> **_REMARQUE:_**  Pensez à la validation de vos champs.
+
+
+```php
+<?php
+//src/Form/Type/CarSearcherType
+namespace App\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CarSearcherType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder->addField('name', TextType::class, [
+            'required' => false,
+        ]);
+    }
+}
+```
+
+```diff
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+//...
++ use App\Form\Type\CarSearcherType;
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
+-           ->createSearchForm(new CarSearcher())
++           ->createSearchForm(new CarSearcher(), CarSearcherType::class , [
++               //Options
++           ])
+            //...
+            ->init();
+
+        return $crud;
+    }
+}
+```
diff --git a/doc/cookbook/data-template.md b/doc/cookbook/data-template.md
new file mode 100644
index 0000000..a218d2e
--- /dev/null
+++ b/doc/cookbook/data-template.md
@@ -0,0 +1,29 @@
+# Ajout de données aux templates
+
+Par défaut, un contrôleur héritant de `AbstractCrudController` ou utilisant `CrudControllerTrait` retourne aux templates l'objet Crud (nom de variable Twig: `crud`).
+
+Pour passer des variables supplémentaires aux templates Twig, peuvent être surchargées les méthodes :
+* `beforeBuildQuery` : Ajouter des données avant la génération de la requête Doctrine
+* `afterBuildQuery` : Ajouter des données après la génération de la requête Doctrine
+
+Exemple :
+
+```php
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+use Ecommit\CrudBundle\Controller\AbstractCrudController;
+
+class MyCrudController extends AbstractCrudController
+{
+    //...
+
+    protected function beforeBuildQuery(Crud $crud, array $data): array
+    {
+        $data['my_var'] = 'my value';
+        
+        return $data;
+    }
+    
+}
diff --git a/doc/cookbook/display_results.md b/doc/cookbook/display_results.md
new file mode 100644
index 0000000..166f61c
--- /dev/null
+++ b/doc/cookbook/display_results.md
@@ -0,0 +1,37 @@
+# Affichage des résultats uniquement si recherche envoyée
+
+Par défaut, le CRUD affiche les résultats même si le formulaire de recherche n'a pas été utilisé.
+
+Il est possible d'afficher les résultats uniquement si et seulement si :
+* le formulaire de recherche a été envoyé 
+* les données du formulaire de recherche sont valides
+
+Pour cela, il suffit de passer la valeur `true` à la méthode `setDisplayResultsOnlyIfSearch` :
+
+```diff
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
++           ->setDisplayResultsOnlyIfSearch(true)
+            //...
+            ->init();
+
+        return $crud;
+    }
+
+    //...
+}
+```
diff --git a/doc/cookbook/div_ids.md b/doc/cookbook/div_ids.md
new file mode 100644
index 0000000..b13760b
--- /dev/null
+++ b/doc/cookbook/div_ids.md
@@ -0,0 +1,39 @@
+# Personnaliser les IDs des Divs
+
+Par défaut, les IDs des DIVs de liste et recherche sont :
+
+| DIV | ID |
+| --- | --- |
+| DIV liste des résultats | crud_list |
+| DIV formulaire de recherche | crud_search |
+
+Ces IDs peuvent être changés par les méthodes `setDivIdList` et `setDivIdSearch`:
+
+```diff
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
++           ->setDivIdList('my_div1')
++           ->setDivIdSearch('my_div2')
+            //...
+            ->init();
+
+        return $crud;
+    }
+
+    //...
+}
+```
diff --git a/doc/cookbook/paginator.md b/doc/cookbook/paginator.md
new file mode 100644
index 0000000..a80d80f
--- /dev/null
+++ b/doc/cookbook/paginator.md
@@ -0,0 +1,83 @@
+# Création manuelle du paginator
+
+Par défaut, un paginator `Ecommit\CrudBundle\Paginator\AbstractDoctrinePaginator` est automatiquement créé. Le comportement par défaut peut être modifié par
+la méthode `setBuildPaginator`.
+
+**Exemple 1 - Options de génération :**
+
+```diff
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
++           ->setBuildPaginator([
++               //Options de Ecommit\CrudBundle\DoctrineExtension\Paginate::createDoctrinePaginator
++               'behavior' => 'identifier_by_sub_request',
++               'identifier' => 'c1.id',
++               'count_options' => [
++                   'behavior' => 'count_by_alias',
++                   'alias' => 'c1.id',
++               ],
++           ])
+            //...
+            ->init();
+
+        return $crud;
+    }
+
+    //...
+}
+```
+
+**Exemple 2 - Création manuelle du paginator :**
+
+```diff
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
++ use Ecommit\CrudBundle\Paginator\DoctrineORMPaginator;
+
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
++           ->setBuildPaginator(function ($queryBuilder, $page, $resultsPerPage) {
++               $paginator = new DoctrineORMPaginator($resultsPerPage);
++               
++               $queryBuilder->andWhere('c1.active = 1');
++               $paginator->setQueryBuilder($queryBuilder);
++               $paginator->setPage($page);
++               $paginator->init();
++
++               return $paginator;
++           })
+            //...
+            ->init();
+
+        return $crud;
+    }
+
+    //...
+}
+```
diff --git a/doc/cookbook/rest.md b/doc/cookbook/rest.md
new file mode 100644
index 0000000..8787031
--- /dev/null
+++ b/doc/cookbook/rest.md
@@ -0,0 +1,3 @@
+# Utilisation d'un CRUD avec REST
+
+Documentation disponible prochainement.
diff --git a/doc/cookbook/sort.md b/doc/cookbook/sort.md
new file mode 100644
index 0000000..136213f
--- /dev/null
+++ b/doc/cookbook/sort.md
@@ -0,0 +1,97 @@
+# Tri par défaut personnalisé
+
+La méthode `setDefaultSort` permet  de définir le tri par défaut :
+
+```php
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+use Ecommit\CrudBundle\Crud\Crud;
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
+            ->setDefaultSort('id', Crud::ASC)
+            //...
+            ->init();
+
+        return $crud;
+    }
+
+    //...
+}
+```
+
+Sur deux colonnes (ici va trier sur c1.id puis c1.name) :
+
+```php
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+use Ecommit\CrudBundle\Crud\Crud;
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id',  ['alias_sort' => ['c1.id', 'c1.name']])
+            //...
+            ->setRoute('my_crud_ajax')
+            ->setDefaultSort('id', Crud::ASC)
+            //...
+            ->init();
+
+        return $crud;
+    }
+
+    //...
+}
+```
+
+Il est aussi possible de définir un tri par défaut personnalisé grâce à la méthode `setDefaultPersonalizedSort` :
+
+```php
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+use Ecommit\CrudBundle\Crud\Crud;
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
+            ->setDefaultPersonalizedSort([
+                'c1.purchaseDate' => Crud::DESC,
+                'c1.id' => Crud::ASC,
+            ])
+            //...
+            ->init();
+
+        return $crud;
+    }
+
+    //...
+}
+```
diff --git a/doc/cookbook/template_configuration.md b/doc/cookbook/template_configuration.md
new file mode 100644
index 0000000..3c24dd1
--- /dev/null
+++ b/doc/cookbook/template_configuration.md
@@ -0,0 +1,70 @@
+# Configuration par défaut des templates des CRUD
+
+Il est possible de définir les options par défaut des fonctions Twig suivantes :
+* paginator_links
+* crud_paginator_links
+* crud_th
+* crud_td
+* crud_display_settings
+* crud_search_form_start
+* crud_search_form_submit
+* crud_search_form_reset
+
+Ces options par défaut peuvent être définies :
+* Pour l'application
+* Pour un CRUD
+
+
+L'ordre de priorité prise en compte pour les options est le suivant :
+* Options définies lors de l'appel de la méthode Twig
+* Options définies dans le CRUD
+* Options définies dans l'application
+* Options par défaut de EcommitCrudBundle
+
+## Options définies dans l'application
+
+```yaml
+#config/packages/ecommit_crud.yaml
+ecommit_crud:
+    twig_functions_configuration:
+        #Nom de la fonction Twig
+        crud_td:
+            #Options par défaut
+            escape: false
+```
+
+## Options définies dans le CRUD
+
+```diff
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
++           ->setTwigFunctionsConfiguration([
++               //Nom de la fonction Twig
++               'crud_td' => [
++                   //Options par défaut
++                   'escape' => false,
++               ],
++           ])
+            //...
+            ->init();
+
+        return $crud;
+    }
+
+    //...
+}
+```
diff --git a/doc/cookbook/virtual_columns.md b/doc/cookbook/virtual_columns.md
new file mode 100644
index 0000000..97c22e6
--- /dev/null
+++ b/doc/cookbook/virtual_columns.md
@@ -0,0 +1,38 @@
+# Colonnes virtuelles
+
+Des colonnes virtuelles peuvent être ajoutées au CRUD. Une colonne virtuelle ne s'affiche pas dans la liste des
+résultats mais les utilisateurs peuvent faire des recherches dessus.
+
+Pour ajouter une colonne virtuelle, la méthode `addVirtualColumn` doit être utilisée.
+
+Cette méthode prend comme paramètres:
+* Id de la colonne **Requis**
+* Alias Doctrine utilisé lors de la recherche SQL. **Requis**
+
+```diff
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
++           ->addVirtualColumn('my_virtual_column', 'c1.name')
+            ->setRoute('my_crud_ajax')
+            //...
+            ->init();
+
+        return $crud;
+    }
+
+    //...
+}
+```
diff --git a/doc/crud.md b/doc/crud.md
new file mode 100644
index 0000000..c255320
--- /dev/null
+++ b/doc/crud.md
@@ -0,0 +1,416 @@
+# Création d'un CRUD
+
+## Introduction
+
+Supposons que notre projet possède ces 2 entités Doctrine :
+
+```php
+<?php
+//src/Entity/Car
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
+
+/**
+* @ORM\Entity
+*/
+class Car
+{
+    /**
+    * @ORM\Id
+    * @ORM\Column(type="integer")
+    * @ORM\GeneratedValue(strategy="AUTO")
+    */
+    protected $id;
+
+    /**
+    * @ORM\Column(type="string", length="255")
+    */
+    protected $name;
+
+    /**
+    *
+    * @ORM\Column(type="date")
+    * @Assert\DateTime()
+    */
+    protected $purchaseDate;
+
+    /**
+    *
+    * @ORM\ManyToOne(targetEntity="Category")
+    * @ORM\JoinColumn(name="category_id", referencedColumnName="id")
+    */
+    protected $category;
+
+    /**
+    *
+    * @ORM\Column(type="boolean")
+    */
+    protected $active;
+
+    //Getters and Setters
+
+    //...
+}
+```
+
+```php
+<?php
+//src/Entity/Category
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+* @ORM\Entity
+*/
+class Category
+{
+
+    /**
+    * @ORM\Id
+    * @ORM\Column(type="integer")
+    * @ORM\GeneratedValue(strategy="AUTO")
+    */
+    protected $id;
+
+    /**
+    * @ORM\Column(type="string", length="255")
+    */
+    protected $name;
+
+    public function __toString()
+    {
+        return $this->name;
+    }
+
+    //Getters and Setters
+
+    //...
+}
+```
+
+## Création du contrôleur
+
+Nous devons créer une classe contrôleur héritant la classe abstraite `Ecommit\CrudBundle\Controller\AbstractCrudController`. 
+
+Notre classe doit surcharger les méthodes abstraites :
+* getCrud
+* getTemplateName
+
+```php
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+use App\Entity\Car;
+use Ecommit\CrudBundle\Controller\AbstractCrudController;
+use Ecommit\CrudBundle\Crud\Crud;
+use Symfony\Component\Routing\Annotation\Route;
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        $em = $this->getDoctrine()->getManager();
+        $queryBuilder = $em->createQueryBuilder();
+        $queryBuilder->from(Car::class, 'c1')
+            ->select('c1, c2')
+            ->innerJoin('c1.category', 'c2');
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            ->addColumn('name', 'c1.name', 'Name')
+            ->addColumn('category', 'c2.name', 'Category', ['alias_search' => 'c2.id'])
+            ->addColumn('purchase_date', 'c1.purchaseDate', 'Purchase date')
+            ->addColumn('active', 'c1.active', 'Active')
+            ->setQueryBuilder($queryBuilder)
+            ->setAvailableResultsPerPage([2, 5, 10], 5)
+            ->setDefaultSort('id', Crud::ASC)
+            ->setRoute('my_crud_ajax')
+            ->setPersistentSettings(true) //Enregistre les paramètres d'affichage en base de données. Par défaut: false
+            ->init();
+
+        return $crud;
+    }
+    
+    protected function getTemplateName(string $action): string
+    {
+        return sprintf('my_crud/%s.html.twig', $action);
+    }
+    
+    /**
+     * @Route("/my-crud", name="my_crud")
+     */
+    public function crudAction()
+    {
+        return $this->getCrudResponse();
+    }
+
+    /**
+     * @Route("/my-crud/ajax", name="my_crud_ajax")
+     */
+    public function ajaxCrudAction()
+    {
+        return $this->getAjaxCrudResponse();
+    }
+}
+```
+
+Explications de configCrud():
+
+* Avec `$this->createCrud('my_crud')`, nous créons un CRUD (instance de `Ecommit\CrudBundle\Crud\Crud`) dont le nom est `my_crud`.
+* Nous déclarons chaque colonne du CRUD par la méthode `addColumn()`. Cette méthode prend en paramètres :
+    * Id de la colonne (Nous donnons un ID à la colonne). Cet ID est totalement indépendant des noms de colonnes DQL/SQL. **Dans ce document, à chaque fois que nous parlerons de l'ID d'une colonne, c'est ce paramètre qui sera concerné. Requis**
+    * Alias Doctrine (du query builder) utilisé pour la requête Doctrine **Requis**
+    * Label donné à la colonne (le label sera traduit si traduction est active sur le projet) **Requis**
+    * Tableau d'options (facultatif):
+        * **sortable**: Booléen qui définit si on active (ou non) le tri sur cette colonne **Défaut: True**
+        * **default_displayed**: Booléen qui définit si on affiche (ou non) cette colonne par défaut **Défaut: True**
+        * **alias_search**: Alias Doctrine utilisé lors de la recherche DQL/SQL. Si pas défini, utilise l'alias Doctrine défini en 2ème paramètre
+        * **alias_sort**: Alias Doctrine (chaine de caractères ou tableau de chaines de caractères) utilisé(s) lors du tri sur cette colonne. Si pas défini, utilise l'alias Doctrine défini en 2ème paramètre
+* Nous donnons la requête Doctrine (sous forme d'objet QueryBuilder ou d'une fonction anonyme) avec la méthode setQueryBuilder() Le moteur du CRUD modifiera automatiquement cette requête, en fonction des actions demandées par l'utilisateur
+* Nous définissions les paramètres du nombre de pages avec la méthode `setAvailableResultsPerPage()`. Cette méthode prend 2 paramètres :
+    * Un tableau contenant les différents nombres possibles du nombre de résultats par page. **Requis**
+    * Le nombre de résultats par page, par défaut. **Requis**
+* Nous définissions le tri par défaut par la méthode `setDefaultSort`. Cette méthode prend 2 paramètres :
+    * L'id de la colonne utilisée pour le tri par défaut **Requis**
+    * Le sens du tri par défaut (`Crud::ASC` ou `Crud::DESC`). **Requis**
+* On définit par la fonction `setRoute` la route Ajax utilisée pour mettre à jour notre liste
+* On active par la fonction `setPersistentSettings` l'enregistrement des propriétés d'affichage des utilisateurs en base de données. Par défaut, désactivé.
+* On initialise le Crud par la méthode `init()`.
+* On retourne notre objet créé
+
+## Ajout templates
+
+```twig
+{# templates/my_crud/index.html.twig #}
+{% extends 'layout.html.twig' %}
+
+{% block content %}
+    <div id="crud_list">
+        {% include 'my_crud/list.html.twig' %}
+    </div>
+{% endblock %}
+```
+
+```twig
+{# templates/my_crud/list.html.twig #}
+{% if crud.paginator %}
+    <div>
+        <table class="result">
+            <thead>
+            <tr>
+                {{ crud_th('id', crud) }}
+                {{ crud_th('name', crud) }}
+                {{ crud_th('category', crud) }}
+                {{ crud_th('purchase_date', crud) }}
+                {{ crud_th('active', crud) }}
+            </tr>
+            </thead>
+            <tbody>
+            {% for car in crud.paginator %}
+                <tr>
+                    {{ crud_td('id', crud, car.id) }}
+                    {{ crud_td('name', crud, car.name) }}
+                    {{ crud_td('category', crud, car.category.name) }}
+                    {{ crud_td('purchase_date', crud, car.purchaseDate|date('Y-m-d')) }}
+                    {{ crud_td('active', crud, (car.active) ? 'yes' : 'no') }}
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+
+
+    <div class="info-pagination">
+        {{ 'pagination_count_results'|trans({'count': crud.paginator.countResults}) }}<br />
+        {{ 'pagination_indices'|trans({'first': crud.paginator.firstIndice, 'last': crud.paginator.lastIndice}) }}  -
+        {{ 'pagination_pages'|trans({'page': crud.paginator.page, 'lastPage': crud.paginator.lastPage}) }}
+    </div>
+
+    {{ crud_paginator_links(crud) }}
+{% endif %}
+
+{{ crud_display_settings(crud) }}
+```
+
+Vous pouvez ajouter par exemple les traductions suivantes (+intl-icu) à votre projet :
+
+```yaml
+# translations/messages+intl-icu.fr.yaml
+pagination_count_results: >
+    {count, plural,
+        =0    {Pas de résultat}
+        one   {1 résultat trouvé}
+        other {# résultats trouvés}
+    }
+pagination_indices: Résultats {first}-{last}
+pagination_pages: Page {page}/{lastPage}
+```
+
+## Ajout formulaire de recherche (FACULTATIF)
+
+La classe Searcher représente les champs du formulaire de recherche.
+
+Si vous ne désirez pas activer le formulaire de recherche sur le CRUD, passez ce paragraphe.
+
+Note classe doit hériter de `Ecommit\CrudBundle\Form\Searcher\AbstractSearcher` (ou implémenter `Ecommit\CrudBundle\Form\Searcher\SearcherInterface`) :
+
+```php
+<?php
+//src/Form/Searcher/CarSearcher
+namespace App\Form\Searcher;
+
+use App\Entity\Category;
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Ecommit\CrudBundle\Form\Filter as Filter;
+use Ecommit\CrudBundle\Form\Searcher\AbstractSearcher;
+
+class CarSearcher extends AbstractSearcher
+{
+    public $id;
+
+    public $name;
+
+    public $nameEmpty;
+
+    public $purchaseBeginningDate;
+
+    public $purchaseEndDate;
+
+    public $category;
+
+    public $active;
+
+    public function buildForm(SearchFormBuilder $builder, array $options): void
+    {
+        //La méthode addFilter a 3 arguments:
+        //  - Le nom du filtre = Nom de la propriété dans cette classe (créer dans cette classe une données membre public ou avec des getters / setters
+        //  - Le type du filtre à utiliser
+        //  - Un tableau d'options (facultatif)
+
+        //Le lien entre un filtre et une donnée membre de cette classe se fait par le 1er argument de la méthode addFilter.
+        //Par défaut, le lien entre un filtre et une colonne du CRUD se fait par le 1er argument de la méthode addFilter.
+        //Si le nom du filtre n'est pas identique à l'ID d'une colonne du CRUD, on peut spécifier pour chaque filtre l'ID de
+        //la colonne du CRUD associée (voir exemples ci-dessous pour les filtres "nameEmpty", "purchaseBeginningDate" et "purchaseEndDate")
+
+        $builder->addFilter('id', Filter\IntegerFilter::class, [
+            'comparator' => Filter\IntegerFilter::EQUAL,
+        ]);
+
+        $builder->addFilter('name', Filter\TextFilter::class, [
+            'must_begin' => true,
+        ]);
+
+        $builder->addFilter('nameEmpty', Filter\NullFilter::class, [
+            //On ne souhaite pas relier le filtre "nameEmpty" à la colonne "nameEmpty" du CRUD (qui n'existe pas).
+            //On précise donc manuellement l'ID de la colonne
+            'column_id' => 'name',
+            'type_options' => [
+                'label' => 'Name empty',
+            ],
+        ]);
+
+        $builder->addFilter('purchaseBeginningDate', Filter\DateFilter::class, [
+            'comparator' => Filter\DateFilter::GREATER_EQUAL,
+            'column_id' => 'purchase_date',
+            'type_options' => [
+                'label' => 'Purchase date - From'
+            ],
+        ]);
+
+        $builder->addFilter('purchaseEndDate', Filter\DateFilter::class, [
+            'comparator' => Filter\DateFilter::SMALLER_EQUAL,
+            'column_id' => 'purchase_date',
+            'type_options' => [
+                'label' => 'Purchase date - To'
+            ],
+        ]);
+
+        $builder->addFilter('active', Filter\BooleanFilter::class);
+
+        $builder->addFilter('category', Filter\EntityFilter::class, [
+            'class' => Category::class,
+            'multiple' => 'true',
+        ]);
+    }
+}
+```
+
+> **_REMARQUE:_**  La liste des différents filtres disponibles (ainsi que leurs configurations) est disponible [ici](references/filters.md)
+
+> **_REMARQUE:_**  Il est aussi possible de faire des recherches plus complexes sans utiliser les filtres pré-définis. [En savoir plus](cookbook/advanced-searcher.md)
+
+Une fois la classe Searcher créée, nous devons modifier notre contrôleur :
+
+```diff
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+//...
++ use App\Form\Searcher\CarSearcher;
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
++           ->createSearchForm(new CarSearcher())
+            //...
+            ->init();
+
+        return $crud;
+    }
+}
+```
+
+Nous devons ensuite créer un nouveau template Twig :
+
+```twig
+{# templates/my_crud/search.html.twig #}
+{{ crud_search_form_start(crud) }}
+    {{ form_row(crud.searchForm.id) }}
+    {{ form_row(crud.searchForm.name) }}
+    {{ form_row(crud.searchForm.nameEmpty) }}
+    {{ form_row(crud.searchForm.purchaseBeginningDate) }}
+    {{ form_row(crud.searchForm.purchaseEndDate) }}
+    {{ form_row(crud.searchForm.active) }}
+    {{ form_row(crud.searchForm.category) }}
+
+    <div>
+        {{ crud_search_form_submit(crud) }}
+        {{ crud_search_form_reset(crud) }}
+    </div>
+</form>
+```
+
+Et enfin modifier le template principal :
+
+```twig
+{# templates/my_crud/index.html.twig #}
+{% extends 'layout.html.twig' %}
+
+{% block content %}
+    <div id="crud_search">
+        {% include 'my_crud/search.html.twig'  %}
+    </div>
+
+    <div id="crud_list">
+        {% include 'my_crud/list.html.twig' %}
+    </div>
+{% endblock %}
+```
+
+> **_REMARQUE:_**  [En savoir plus sur la configuration du formulaire de recherche](references/searcher.md)
+
+
+
+> **_REMARQUE:_**  [En savoir plus sur l'utilisation avancée du CRUD](index.md#fonctionnalités-avancées)
diff --git a/doc/index.md b/doc/index.md
new file mode 100644
index 0000000..a179a65
--- /dev/null
+++ b/doc/index.md
@@ -0,0 +1,28 @@
+# EcommitCrudBundle - Documentation
+
+## Pour commmencer
+
+* [Installation](install.md)
+* [Création d'un CRUD](crud.md)
+
+## Références
+
+* [Options du formulaire de recherche](references/searcher.md)
+* [Filtres du formulaire de recherche](references/filters.md)
+* [EntityAjaxType](references/entity_ajax_type.md)
+* [Fonctions Twig](references/twig.md)
+* [Fonctions Ajax](references/ajax.md)
+* [Gestionnaire de fenêtre modale](references/modal.md)
+* [Callbacks JavaScript](references/js-callbacks.md)
+
+## Fonctionnalités avancées
+
+* [Personnalisation avancée de la classe Searcher](cookbook/advanced-searcher.md)
+* [Ajout de données aux templates](cookbook/data-template.md)
+* [Affichage des résultats uniquement si recherche envoyée](cookbook/display_results.md)
+* [Personnaliser les IDs des Divs](cookbook/div_ids.md)
+* [Création manuelle du paginator](cookbook/paginator.md)
+* [Utilisation d'un CRUD avec REST](cookbook/rest.md)
+* [Tri par défaut personnalisé](cookbook/sort.md)
+* [Configuration par défaut des templates des CRUD](cookbook/template_configuration.md)
+* [Colonnes virtuelles](cookbook/virtual_columns.md)
diff --git a/doc/install.md b/doc/install.md
new file mode 100644
index 0000000..a748ebe
--- /dev/null
+++ b/doc/install.md
@@ -0,0 +1,103 @@
+# Installation
+
+Prérequis :
+* Projet Symfony fonctionnel
+* Entité utilisateur avec Doctrine
+* Yarn
+* Webpack Encore
+* jQuery
+* Un gestionnaire de thème chargé par Webpack Encore parmi :
+    * Bootstrap 3
+    * Votre thème personnalisé (créer un thème Twig qui hérite `@EcommitCrud/Theme/base.html.twig`)
+* Un gestionnaire d'icones chargé par Webpack Encore parmi :
+    * Fontawesome 4
+    * Votre thème personnalisé (créer un thème Twig qui hérite `@EcommitCrud/IconTheme/base.html.twig`)
+
+Installez le bundle avec Composer : A la racine de votre projet Symfony, éxécutez la commande suivante :
+
+```bash
+$ composer require ecommit/crud-bundle:3.*@dev
+$ yarn add --dev @ecommit/crud-bundle@link:vendor/ecommit/crud-bundle/src/Resources/assets
+```
+
+Activez le bundle dans le fichier de configuration `config/bundles.php` de votre projet :
+
+```php
+return [
+    //...
+    Ecommit\CrudBundle\EcommitCrudBundle::class => ['all' => true],
+    //...
+];
+```
+
+Ajoutez à votre projet le fichier de configuration `config/packages/ecommit_crud.yaml` :
+
+```yaml
+ecommit_crud:
+    #Theme
+    #Themes disponibles :
+    #@EcommitCrud/Theme/base.html.twig
+    #@EcommitCrud/Theme/bootstrap3.html.twig (boostrap3 requis)
+    theme: '@EcommitCrud/Theme/bootstrap3.html.twig'
+
+    #Theme pour les icones
+    #Themes disponibles :
+    #@EcommitCrud/IconTheme/base.html.twig
+    #@EcommitCrud/IconTheme/fontawesome4.html.twig (fontawesome4 requis)
+    icon_theme: '@EcommitCrud/IconTheme/fontawesome4.html.twig'
+```
+
+Votre entité Doctrine "utilisateur" doit implémenter l'interface `Ecommit\CrudBundle\Entity\UserCrudInterface`. Exemple :
+
+```php
+<?php
+
+namespace App\Entity;
+
+use Ecommit\CrudBundle\Entity\UserCrudInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+class User implements UserInterface, UserCrudInterface
+{
+    //...
+}
+```
+
+La configuration Doctrine doit être adaptée en conséquence :
+
+```yaml
+#config/packages/doctrine.yaml
+
+doctrine:
+    orm:
+        resolve_target_entities:
+            #Adaptez App\Entity\User en fonction du nom de votre classe utilisateur
+            Ecommit\CrudBundle\Entity\UserCrudInterface: App\Entity\User
+```
+
+Dans votre entrée principale [Webpack Encore](https://symfony.com/doc/current/frontend.html), rajoutez les instructions suivantes :
+
+```js
+//Exemple dans assets/js/app.js
+import '@ecommit/crud-bundle/js/crud';
+import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager';
+//Bootstrap3 requis (et chargé via Webpack Encore)
+var modalEngine = require('@ecommit/crud-bundle/js/modal/engine/bootstrap3');
+modalManager.defineEngine(modalEngine);
+```
+
+Recompiliez avec Webpack Encore:
+
+```bash
+yarn encore dev
+```
+
+Mettez à jour vos entités Doctrine :
+
+```bash
+php bin/console doctrine:schema:update --force
+
+#Ou si vous utilisez Doctrine Migrations:
+#php bin/console doctrine:migrations:diff
+#php bin/console doctrine:migrations:migrate
+```
diff --git a/doc/references/ajax.md b/doc/references/ajax.md
new file mode 100644
index 0000000..a44ac01
--- /dev/null
+++ b/doc/references/ajax.md
@@ -0,0 +1,180 @@
+# Fonctions Ajax
+
+## Fonctions
+
+### sendRequest
+
+Fonction permettant de faire une requête AJAX.
+
+```js
+import * as ajax from '@ecommit/crud-bundle/js/ajax';
+
+ajax.sendRequest({
+    url: '/test',
+    //Options
+});
+```
+
+Options :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| url | Url de l'action Ajax | Oui |  |
+| update | Si défini, mise à jour du DOM avec le résultat. (voir doc de la fonction `updateDom` plus bas) | Non | |
+| updateMode | Méthode à utiliser pour la mise à jour du DOM (voir doc de la fonction `updateDom` plus bas) | Non | update |
+| onBeforeSend | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant l'envoi de la requête | Non | |
+| onSuccess | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas de succès de la réponse | Non | |
+| onError | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas d'erreur lors de la réponse | Non | |
+| onComplete | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) après réponse | Non | |
+| dataType | Type de données attendu (html, xml, json, jsonp, text) | Non | html |
+| method | Méthode HTTP | Non | POST |
+| data | Données envoyées dans la requête | Non | |
+| cache | Utilise ou non le cache | Non | false |
+| options | Tableau d'options de la fonction `ajax` de jQuery | Non | { } |
+
+### click
+
+Fonction permettant de faire une requête AJAX lors d'un clic sur élément du DOM.
+
+L'élément du DOM doit avoir comme classe CSS `ec-crud-ajax-click-auto`.
+
+Toutes les options de la fonction `sendRequest` peuvent être utilisées en les passant par les attributs `data-`. Pour cela:
+* Préfixer chaque option par `data-ec-crud-ajax-`
+* Les options d'origine (en JavaScript) de `sendRequest` sont en camelCase. Pour leur écriture par des attributs HTML, remplacer chaque nouveau mot en majuscule par un tiret.
+Exemple: L'équivalent de l'option `updateMode` est `data-ec-crud-ajax-update-mode` en attribut HTML.
+
+Exemple :
+
+```html
+<button class="ec-crud-ajax-click-auto" data-ec-crud-ajax-url="/goodRequest">Go !</button>
+```
+
+### link
+
+Fonction permettant de faire une requête AJAX lors d'un clic sur lien.
+
+Toutes les options de la fonction `sendRequest` peuvent être utilisées en les passant par les attributs `data-`. Pour cela:
+* Préfixer chaque option par `data-ec-crud-ajax-`
+* Les options d'origine (en JavaScript) de `sendRequest` sont en camelCase. Pour leur écriture par des attributs HTML, remplacer chaque nouveau mot en majuscule par un tiret.
+  Exemple: L'équivalent de l'option `updateMode` est `data-ec-crud-ajax-update-mode` en attribut HTML.
+
+#### Mode automatique
+
+Le lien doit avoir comme classe CSS `ec-crud-ajax-link-auto`.
+
+Exemple :
+
+```html
+<a href="/goodRequest" class="ec-crud-ajax-link-auto">Go !</a>
+```
+
+L'URL utilisée pour la requête Ajax est:
+* La valeur de l'attribut `data-ec-crud-ajax-url` (si présent)
+* Ou la valeur de `href`
+
+#### Mode manuel
+
+```html
+<a href="/goodRequest" id="linkToTest">Go !</a>
+```
+
+```js
+import * as ajax from '@ecommit/crud-bundle/js/ajax';
+
+//Argument n°1: Lien
+//Argument n°2: Options de sendRequest
+ajax.link($('#linkToTest'), {
+    //Options de sendRequest
+    method: 'GET',
+});
+```
+
+* L'URL utilisée pour la requête Ajax est:
+    * La valeur de l'attribut `data-ec-crud-ajax-url` (si présent)
+    * Ou la valeur de l'option `url` de la fonction `link` (si présent)
+    * Ou la valeur de `href`
+* Les attributs `data-ec-crud-ajax-*` (si présents) écrasent les options de la fonction `link` (si présent)
+
+### sendForm
+
+Fonction permettant de faire une requête AJAX depuis l'envoi d'un formulaire.
+
+Toutes les options de la fonction `sendRequest` peuvent être utilisées en les passant par les attributs `data-`. Pour cela:
+* Préfixer chaque option par `data-ec-crud-ajax-`
+* Les options d'origine (en JavaScript) de `sendRequest` sont en camelCase. Pour leur écriture par des attributs HTML, remplacer chaque nouveau mot en majuscule par un tiret.
+  Exemple: L'équivalent de l'option `updateMode` est `data-ec-crud-ajax-update-mode` en attribut HTML.
+
+#### Mode automatique
+
+Le formulaire doit avoir comme classe CSS `ec-crud-ajax-form-auto`.
+
+Exemple :
+
+```html
+<form action="/goodRequest" method="POST" class="ec-crud-ajax-form-auto">
+```
+
+* L'URL utilisée pour la requête Ajax est:
+    * La valeur de l'attribut `data-ec-crud-ajax-url` (si présent)
+    * Ou la valeur de `action`
+* La méthode utilisée pour la requête Ajax est:
+    * La valeur de l'attribut `data-ec-crud-ajax-method` (si présent)
+    * Ou la valeur de `method`
+* Les données envoyées lors de la requête Ajax sont:
+    * La valeur de l'attribut `data-ec-crud-ajax-data` (si présent)
+    * Ou les données du formulaire
+
+#### Mode manuel
+
+```html
+<form action="/goodRequest" method="POST" id="formToTest">
+```
+
+```js
+import * as ajax from '@ecommit/crud-bundle/js/ajax';
+
+//Argument n°1: Formulaire
+//Argument n°2: Options de sendRequest
+ajax.sendForm($('#formToTest'), {
+    //Options de sendRequest
+    cache: true,
+});
+```
+
+* L'URL utilisée pour la requête Ajax est:
+    * La valeur de l'attribut `data-ec-crud-ajax-url` (si présent)
+    * Ou la valeur de l'option `url` de la fonction `sendForm` (si présent)
+    * Ou la valeur de `action`
+* La méthode utilisée pour la requête Ajax est:
+    * La valeur de l'attribut `data-ec-crud-ajax-method` (si présent)
+    * Ou la valeur de l'option `method` de la fonction `sendForm` (si présent)
+    * Ou la valeur de `method`
+* Les données envoyées lors de la requête Ajax sont:
+    * La valeur de l'attribut `data-ec-crud-ajax-data` (si présent)
+    * Ou la valeur de l'option `data` de la fonction `sendForm` (si présent)
+    * Ou les données du formulaire
+* Les attributs `data-ec-crud-ajax-*` (si présents) écrasent les options de la fonction `sendForm` (si présent)
+
+
+### updateDom
+
+Permet la mise à jour du DOM.
+
+```js
+import * as ajax from '@ecommit/crud-bundle/js/ajax';
+
+//Argument n°1: Element à mettre à jour
+//Argument n°2: Méthode de mise à jour
+//Argument n°3: Contenu
+ajax.updateDom($('#myDiv'), 'update', 'Hello world');
+```
+
+Méthodes disponibles pour la mise à jour :
+
+| Méthode | Description |
+| ------- | ----------- |
+| update | Utilise le fonction  [`html` de jQuery](https://api.jquery.com/html/) |
+| before | Utilise le fonction  [`before` de jQuery](https://api.jquery.com/before/) |
+| after | Utilise le fonction  [`after` de jQuery](https://api.jquery.com/after/) |
+| prepend | Utilise le fonction  [`prepend` de jQuery](https://api.jquery.com/prepend/) |
+| append | Utilise le fonction  [`append` de jQuery](https://api.jquery.com/append/) |
diff --git a/doc/references/entity_ajax_type.md b/doc/references/entity_ajax_type.md
new file mode 100644
index 0000000..1fcb753
--- /dev/null
+++ b/doc/references/entity_ajax_type.md
@@ -0,0 +1,22 @@
+# EntityAjaxType
+
+**Classe / Service** : `Ecommit\CrudBundle\Form\Type\EntityAjaxType`
+
+Type de formulaire qui permet de sélectionner une entité Doctrine dans une liste déroulante dont les résultats sont
+fournis en Ajax (idéal pour les longues listes déroulantes).
+
+Peut être par exemple utilisé avec [Select2](https://select2.org/)
+
+
+## Options
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| class | Classe de l'entité Doctrine | Oui | |
+| route_name | Route Symfony pour la requête Ajax | Oui | |
+| multiple | Choix multiple nou non | Non | Non |
+| em | Entity Manager Doctrine à utiliser | Non | Entity Manager par défaut en fonction de l'option `class` |
+| query_builder | Query Builder à utiliser | Non | |
+| choice_label | Rendu des labels | Non | |
+| route_params | Paramètres de la route Symfony pour la requête Ajax | Non | [ ] |
+| max_elements | Nombre d'éléments maxi pouvant être sélectionnés | Non | 10000 |
diff --git a/doc/references/filters.md b/doc/references/filters.md
new file mode 100644
index 0000000..a1ed941
--- /dev/null
+++ b/doc/references/filters.md
@@ -0,0 +1,174 @@
+# Filtres
+
+## Options générales pour tous les filtres
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| column_id | ID de la colonne du CRUD associée | Non | Nom du filtre 
+| autovalidate | Si `true`, active la validation automatique (en fonction du filtre utilisé) | Non | [Valeur de autovalidate du formulaire](searcher.md) |
+| validation_groups | Groupe de validation | Non | [Valeur de validation_groups du formulaire](searcher.md) |
+| required | Si `true`, filtre obligatoire | Non | Non |
+| type_options | Options du champs du formulaire Symfony généré | Non | [ ] |
+
+
+## BooleanFilter
+
+**Description** : Case à cocher pour filtrer un booléen.
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\BooleanFilter`
+
+**Options** :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| value_true | Valeur du booléen (pour la recherche) dans sa valeur "vrai" | Non | 1 |
+| value_false | Valeur du booléen (pour la recherche) dans sa valeur "faux" | Non | 0 |
+| not_null_is_true | Si `true`, toute valeur non nulle (pour la recherche) est considérée comme "vrai" | Non | false |
+| null_is_false | Si `true`, toute valeur nulle (pour la recherche) est considérée comme "faux" | Non | true |
+
+Voir aussi les [options générales](#options-générales-pour-tous-les-filtres) 
+
+
+## ChoiceFilter
+
+**Description** : Choix de valeur(s) parmi une liste
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\ChoiceFilter`
+
+**Options** :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| multiple | Si `true`, autorise le choix multiple | Non | false |
+| min | Si défini et option multiple à `true`, nombre mini d'éléments à sélectionner | Non | null |
+| max | Nombre mini d'éléments sélectionnables | Non | 1000 |
+| choices | Valeurs à proposer | Non | [ ] |
+| type | "Type" de formulaire Symfony à utiliser | Non | Symfony\Component\Form\Extension\Core\Type\ChoiceType |
+
+Voir aussi les [options générales](#options-générales-pour-tous-les-filtres) 
+
+
+## DateFilter
+
+**Description** : Filtre d'une date 
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\DateFilter`
+
+**Options** :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| comparator | Signe de comparaison (>, >= <, <=, =) à utiliser pour filtrer la date. Utiliser une constante de `Ecommit\CrudBundle\Form\Filter\DateFilter` | Oui | |
+| with_time | Si `true`, gère aussi l'heure | Non | false|
+
+Voir aussi les [options générales](#options-générales-pour-tous-les-filtres)
+
+
+## EntityFilter
+
+**Description** : Filtre une entité Doctrine
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\EntityFilter`
+
+**Options** :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| multiple | Si `true`, autorise le choix multiple | Non | false |
+| min | Si défini et option multiple à `true`, nombre mini d'éléments à sélectionner | Non | null |
+| max | Nombre mini d'éléments sélectionnables | Non | 1000 |
+| class | Classe de l'entité Doctrine | Oui | |
+
+
+Voir aussi les [options générales](#options-générales-pour-tous-les-filtres)
+
+
+## EntityAjaxFilter
+
+**Description** : Filtre une entité Doctrine en utilisant [`Ecommit\CrudBundle\Form\Type\EntityAjaxType`](entity_ajax_type.md)
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\EntityAjaxFilter`
+
+**Options** :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| multiple | Si `true`, autorise le choix multiple | Non | false |
+| min | Si défini et option multiple à `true`, nombre mini d'éléments à sélectionner | Non | null |
+| max | Nombre mini d'éléments sélectionnables | Non | 1000 |
+| class | Classe de l'entité Doctrine | Oui | |
+| route_name | Route à utiliser pour la recherche Ajax | Oui | |
+| route_params | Paramètres à utiliser pour la recherche Ajax | Non | [ ] |
+
+Voir aussi les [options générales](#options-générales-pour-tous-les-filtres) 
+
+Voir la [documentation](entity_ajax_type.md) de `Ecommit\CrudBundle\Form\Type\EntityAjaxType`
+
+
+## IntegerFilter
+
+**Description** : Filtre un entier
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\IntegerFilter`
+
+**Options** :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| comparator | Signe de comparaison (>, >= <, <=, =) à utiliser pour filtrer la valeur. Utiliser une constante de `Ecommit\CrudBundle\Form\Filter\IntegerFilter` | Oui | |
+
+Voir aussi les [options générales](#options-générales-pour-tous-les-filtres)
+
+
+## NotNullFilter
+
+**Description** : Filtre toute valeur non nulle
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\NotNullFilter`
+
+**Options** : [Options générales](#options-générales-pour-tous-les-filtres)
+
+
+## NullFilter
+
+**Description** : Filtre toute valeur nulle
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\NullFilter`
+
+**Options** : [Options générales](#options-générales-pour-tous-les-filtres)
+
+
+## NumberFilter
+
+**Description** : Filtre une valeur numérique
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\NumberFilter`
+
+**Options** :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| comparator | Signe de comparaison (>, >= <, <=, =) à utiliser pour filtrer la valeur. Utiliser une constante de `Ecommit\CrudBundle\Form\Filter\NumberFilter` | Oui | |
+
+Voir aussi les [options générales](#options-générales-pour-tous-les-filtres)
+
+
+
+## TextFilter
+
+**Description** : Filtre un texte
+
+**Classe** : `Ecommit\CrudBundle\Form\Filter\TextFilter`
+
+**Options** :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| must_begin | Si `true`, utilise le filtre par "qui commence par" | Non | false |
+| must_end | Si `true`, utilise le filtre par "qui se termine par" | Non | false |
+| min_length | Si définie, longueur minimale de la longueur du terme recherché | Non | null |
+| max_length | Si définie, longueur maximale de la longueur du terme recherché | Non | 255 |
+| type | "Type" de formulaire Symfony à utiliser | Non | Symfony\Component\Form\Extension\Core\Type\TextType |
+
+
+Voir aussi les [options générales](#options-générales-pour-tous-les-filtres)
diff --git a/doc/references/js-callbacks.md b/doc/references/js-callbacks.md
new file mode 100644
index 0000000..0683180
--- /dev/null
+++ b/doc/references/js-callbacks.md
@@ -0,0 +1,66 @@
+# Callbacks JavaScript
+
+## Définition des callbacks
+
+```js
+//Methode 1
+var callback = function (arg) {
+    alert('go');
+    //...
+};
+
+//Methode 2
+var callback = 'alert("go")';
+
+//Méthode 3
+var callback = 'function (arg) { alert("go"); }';
+```
+
+
+Gestion de plusieurs callbacks :
+
+```js
+var callbacks = [
+    //Callback 1
+    function (arg) {
+        alert('go');
+        //...
+    },
+    
+    //Callback 2
+    'alert("go")'
+];
+
+//Gestion des priorités (priorité par défaut = 0)
+var callbacks = [
+    //Callback 1
+    {
+        callback: function (arg) {
+            alert('go');
+            //...
+        },
+        priority: 10
+    },
+    
+    //Callback 2
+    {
+        callback: 'alert("go")',
+        priority: 20
+    }
+];
+```
+
+
+## Appel des callbacks
+
+```js
+import runCallback from '@ecommit/crud-bundle/js/callback';
+
+var callbacks = [
+    //... Voir paragraphe précédent
+];
+
+//1er argument: Callback ou liste de callbacks
+//2ème argument: Argument passé à l'appel de chaque callback
+runCallback(callbacks, '5');
+```
diff --git a/doc/references/modal.md b/doc/references/modal.md
new file mode 100644
index 0000000..3b72a57
--- /dev/null
+++ b/doc/references/modal.md
@@ -0,0 +1,117 @@
+# Gestionnaire de fenêtre modale
+
+## Définition modale
+
+Avant d'utiliser une fenêtre modale, vous devez manuellement ajouter le code source HTML de celle-ci.
+
+Exemple avec Bootstrap:
+
+```html
+<div id="main_modal" class="modal fade" tabindex="-1" role="dialog">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+        </div>
+    </div>
+</div>
+```
+
+## Ouverture fenêtre modale
+
+### Ouverture manuelle
+
+```js
+import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager';
+
+modalManager.openModal({
+    //Options
+    element: '#main_modal'
+});
+```
+
+Options disponibles :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| element | Modal (élement du DOM) | Oui |  |
+| onOpen | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant l'ouverture de la modale | Non | |
+| onClose | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant la fermeture de la modale | Non | |
+
+
+### Ouverture automatique
+
+Ouverture de la fenêtre modale lors d'un clic sur un élément du DOM. 
+L'élément du DOM doit avoir comme classe CSS `ec-crud-modal-auto`.
+
+Toutes les options de la fonction `openModal` peuvent être utilisées en les passant par les attributs `data-`. Pour cela:
+* Préfixer chaque option par `data-ec-crud-modal-`
+* Les options d'origine (en JavaScript) de `openModal` sont en camelCase. Pour leur écriture par des attributs HTML, remplacer chaque nouveau mot en majuscule par un tiret.
+  Exemple: L'équivalent de l'option `onOpen` est `data-ec-crud-modal-on-open` en attribut HTML.
+
+Exemple :
+
+```html
+<a href="#" class="ec-crud-modal-auto" data-ec-crud-modal-element="#main_modal">Go !</a>
+```
+
+## Ouverture fenêtre modale avec Ajax
+
+### Ouverture manuelle
+
+```js
+import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager';
+
+modalManager.openRemoteModal({
+    //Options
+    url: '/goodRequest',
+    element: '#main_modal',
+    elementContent: '#main_modal .modal-content'
+});
+```
+
+Options disponibles :
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| url | Url de l'action Ajax | Oui |  |
+| element | Modal (élement du DOM) | Oui |  |
+| elementContent | Element du DOM à mettre à jour | Oui | |
+| onOpen | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant l'ouverture de la modale | Non | |
+| onClose | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant la fermeture de la modale | Non | |
+| method | Méthode HTTP | Non | POST |
+| ajaxOptions | Options Ajax (voir [sendRequest](ajax.md#sendrequest) | Non | { } |
+
+
+### Ouverture automatique
+
+Ouverture de la fenêtre modale lors d'un clic sur un bouton ou un lien.
+Le bouton ou le lien doit avoir comme classe CSS `ec-crud-remote-modal-auto`.
+
+Toutes les options de la fonction `openRemoteModal` peuvent être utilisées en les passant par les attributs `data-`. Pour cela:
+* Préfixer chaque option par `data-ec-crud-modal-`
+* Les options d'origine (en JavaScript) de `openRemoteModal` sont en camelCase. Pour leur écriture par des attributs HTML, remplacer chaque nouveau mot en majuscule par un tiret.
+  Exemple: L'équivalent de l'option `onOpen` est `data-ec-crud-modal-on-open` en attribut HTML.
+
+Exemple avec un bouton :
+
+```html
+<button class="ec-crud-remote-modal-auto" data-ec-crud-modal-element="#main_modal" data-ec-crud-modal-element-content="#main_modal .modal-content" data-ec-crud-modal-url="/goodRequest">Go !</button>
+```
+
+Exemple avec un lien :
+
+```html
+<a href="/goodRequest" class="ec-crud-remote-modal-auto" data-ec-crud-modal-element="#main_modal" data-ec-crud-modal-element-content="#main_modal .modal-content">Go !</a>
+```
+
+Avec un lien, l'URL utilisée pour la requête Ajax est:
+* La valeur de l'attribut `data-ec-crud-modal-url` (si présent)
+* Ou la valeur de `href`
+
+
+## Fermeture fenêtre modale
+
+```js
+import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager';
+
+modalManager.closeModal('#main_modal');
+```
diff --git a/doc/references/searcher.md b/doc/references/searcher.md
new file mode 100644
index 0000000..4da2517
--- /dev/null
+++ b/doc/references/searcher.md
@@ -0,0 +1,16 @@
+# Options du formulaire de recherche
+
+## Options disponibles
+
+| Option | Description | Requis  | Valeur par défaut |
+| ------ | ----------- | --------| ----------------- |
+| autovalidate | Si `true`, active la validation automatique (en fonction des filtres utilisés) | Non | true |
+| validation_groups | Groupe de validation | Non | null |
+| form_options | Options du formulaire Symfony généré | Non | [ ] |
+| alias_search | Alias Doctrine à utiliser pour la recherche | Non | Valeur définie dans la déclaration de la colonne du CRUD associée |
+| label | Label | Non | Valeur définie dans la déclaration de la colonne du CRUD associée |
+
+
+## Définition des options
+
+Dans le contrôleur, passer les options dans le 3ème argument (tableau) de la méthode `createSearchForm`.
diff --git a/doc/references/twig.md b/doc/references/twig.md
new file mode 100644
index 0000000..5495112
--- /dev/null
+++ b/doc/references/twig.md
@@ -0,0 +1,19 @@
+# Fonctions Twig
+
+Ce bundle offre différentes fonctions Twig :
+
+| Fonction | Description |
+| -------- | ----------- |
+| paginator_links | Affiche les liens d'un paginator |
+| crud_paginator_links | Affiche les liens d'un paginator d'un CRUD |
+| crud_th | Affiche un tag TH d'un CRUD |
+| crud_td | Affiche un tag TD d'un CRUD |
+| crud_display_settings | Affiche le bouton de propriétés d'affichage d'un CRUD |
+| crud_search_form_start | Affiche le tag d'ouverture du formulaire de recherche d'un CRUD |
+| crud_search_form_submit | Affiche le boutton d'envoi du formulaire de recherche d'un CRUD |
+| crud_search_form_reset | Affiche le boutton RESET du formulaire de recherche d'un CRUD |
+| form_start_ajax | Affiche le tag d'ouverture d'un formulaire Ajax |
+| ajax_attributes | Affiche les attributs Ajax |
+
+
+La documentation de chacune de ces fonctions est disponible directement dans [le code source](../../src/Twig/CrudExtension.php) (dans l'entête de chaque fonction).
diff --git a/package.json b/package.json
index 05c4e3c..eef0373 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
     "jquery": "^3"
   },
   "devDependencies": {
+    "@ecommit/crud-bundle": "link:src/Resources/assets",
     "@symfony/webpack-encore": "^0.29.1",
     "core-js": "^3.0.0",
     "eslint": "^6.8.0",
diff --git a/src/Resources/public/js/ajax.js b/src/Resources/assets/js/ajax.js
similarity index 100%
rename from src/Resources/public/js/ajax.js
rename to src/Resources/assets/js/ajax.js
diff --git a/src/Resources/public/js/callback.js b/src/Resources/assets/js/callback.js
similarity index 100%
rename from src/Resources/public/js/callback.js
rename to src/Resources/assets/js/callback.js
diff --git a/src/Resources/public/js/crud.js b/src/Resources/assets/js/crud.js
similarity index 100%
rename from src/Resources/public/js/crud.js
rename to src/Resources/assets/js/crud.js
diff --git a/src/Resources/public/js/modal/engine/bootstrap3.js b/src/Resources/assets/js/modal/engine/bootstrap3.js
similarity index 100%
rename from src/Resources/public/js/modal/engine/bootstrap3.js
rename to src/Resources/assets/js/modal/engine/bootstrap3.js
diff --git a/src/Resources/public/js/modal/modal-manager.js b/src/Resources/assets/js/modal/modal-manager.js
similarity index 100%
rename from src/Resources/public/js/modal/modal-manager.js
rename to src/Resources/assets/js/modal/modal-manager.js
diff --git a/src/Resources/public/js/options-resolver.js b/src/Resources/assets/js/options-resolver.js
similarity index 100%
rename from src/Resources/public/js/options-resolver.js
rename to src/Resources/assets/js/options-resolver.js
diff --git a/src/Resources/public/js/scrollToFirstMessage.js b/src/Resources/assets/js/scrollToFirstMessage.js
similarity index 100%
rename from src/Resources/public/js/scrollToFirstMessage.js
rename to src/Resources/assets/js/scrollToFirstMessage.js
diff --git a/src/Resources/assets/package.json b/src/Resources/assets/package.json
new file mode 100644
index 0000000..f50c0d2
--- /dev/null
+++ b/src/Resources/assets/package.json
@@ -0,0 +1,6 @@
+{
+    "name": "@ecommit/crud-bundle",
+    "description": "ECOMMIT CRUD BUNDLE",
+    "license": "MIT",
+    "version": "3.0.0"
+}
diff --git a/tests/Functional/App/assets/js/app.js b/tests/Functional/App/assets/js/app.js
index e08caa4..5d6a910 100644
--- a/tests/Functional/App/assets/js/app.js
+++ b/tests/Functional/App/assets/js/app.js
@@ -1,5 +1,5 @@
-import '../../../../../src/Resources/public/js/crud';
-import * as modalManager from '../../../../../src/Resources/public/js/modal/modal-manager';
-var modalEngine = require('../../../../../src/Resources/public/js/modal/engine/bootstrap3');
+import '@ecommit/crud-bundle/js/crud';
+import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager';
+var modalEngine = require('@ecommit/crud-bundle/js/modal/engine/bootstrap3');
 
 modalManager.defineEngine(modalEngine);
diff --git a/tests/Functional/App/templates/user/list.html.twig b/tests/Functional/App/templates/user/list.html.twig
index d96426d..e4ad185 100644
--- a/tests/Functional/App/templates/user/list.html.twig
+++ b/tests/Functional/App/templates/user/list.html.twig
@@ -1,27 +1,27 @@
-<div>
-    <table class="result">
-        <thead>
-        <tr>
-            {{ crud_th('username', crud) }}
-            {{ crud_th('firstName', crud) }}
-            {{ crud_th('lastName', crud) }}
-        </tr>
-        </thead>
-        <tbody>
-        {% for user in crud.paginator %}
-            <tr data-username="{{ user.username }}">
-                {{ crud_td('username', crud, user.username|lower) }}
-                {{ crud_td('firstName', crud, user.firstName|capitalize) }}
-                {{ crud_td('lastName', crud, user.lastName|capitalize) }}
+{% if crud.paginator %}
+    <div>
+        <table class="result">
+            <thead>
+            <tr>
+                {{ crud_th('username', crud) }}
+                {{ crud_th('firstName', crud) }}
+                {{ crud_th('lastName', crud) }}
             </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-</div>
+            </thead>
+            <tbody>
+            {% for user in crud.paginator %}
+                <tr data-username="{{ user.username }}">
+                    {{ crud_td('username', crud, user.username|lower) }}
+                    {{ crud_td('firstName', crud, user.firstName|capitalize) }}
+                    {{ crud_td('lastName', crud, user.lastName|capitalize) }}
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
 
-{% if test_before_after_build_query is defined %}<div>TEST BEFORE AFTER BUILD QUERY {{ test_before_after_build_query }}</div>{% endif %}
+    {% if test_before_after_build_query is defined %}<div>TEST BEFORE AFTER BUILD QUERY {{ test_before_after_build_query }}</div>{% endif %}
 
-{% if crud.paginator %}
     <div class="info-pagination">
         {% trans with {'%first%': crud.paginator.firstIndice, '%last%' : crud.paginator.lastIndice} %}Results %first%-%last%{% endtrans %}  -
         {% trans with {'%page%': crud.paginator.page, '%lastPage%' : crud.paginator.lastPage} %}Page %page%/%lastPage%{% endtrans %}
diff --git a/tests/Resources/public/js/ajax.spec.js b/tests/Resources/public/js/ajax.spec.js
index 1ccff75..54af1d3 100644
--- a/tests/Resources/public/js/ajax.spec.js
+++ b/tests/Resources/public/js/ajax.spec.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import * as ajax from '../../../../src/Resources/public/js/ajax';
+import * as ajax from '@ecommit/crud-bundle/js/ajax';
 import $ from 'jquery';
 
 describe('Test Ajax.sendRequest', function () {
diff --git a/tests/Resources/public/js/callback.spec.js b/tests/Resources/public/js/callback.spec.js
index 78e3e03..df17aa2 100644
--- a/tests/Resources/public/js/callback.spec.js
+++ b/tests/Resources/public/js/callback.spec.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import runCallback from '../../../../src/Resources/public/js/callback';
+import runCallback from '@ecommit/crud-bundle/js/callback';
 
 describe('Test callback', function () {
     it('Test callback with function', function () {
diff --git a/tests/Resources/public/js/modal/engine/test.js b/tests/Resources/public/js/modal/engine/test.js
index c2660f3..f9071af 100644
--- a/tests/Resources/public/js/modal/engine/test.js
+++ b/tests/Resources/public/js/modal/engine/test.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import runCallback from '../../../../../../src/Resources/public/js/callback';
+import runCallback from '@ecommit/crud-bundle/js/callback';
 import $ from 'jquery';
 
 export function openModal (options) {
diff --git a/tests/Resources/public/js/modal/modal-manager.spec.js b/tests/Resources/public/js/modal/modal-manager.spec.js
index 28af865..3b3f582 100644
--- a/tests/Resources/public/js/modal/modal-manager.spec.js
+++ b/tests/Resources/public/js/modal/modal-manager.spec.js
@@ -7,10 +7,10 @@
  * file that was distributed with this source code.
  */
 
-import * as modalManager from '../../../../../src/Resources/public/js/modal/modal-manager';
+import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager';
 import $ from 'jquery';
 const testEngine = require('./engine/test');
-const bootstrap3Engine = require('../../../../../src/Resources/public/js/modal/engine/bootstrap3');
+const bootstrap3Engine = require('@ecommit/crud-bundle/js/modal/engine/bootstrap3');
 
 it('Get engine when not defined', function () {
     modalManager.defineEngine(null);
diff --git a/tests/Resources/public/js/options-resolver.spec.js b/tests/Resources/public/js/options-resolver.spec.js
index 5a38f2e..823f3ac 100644
--- a/tests/Resources/public/js/options-resolver.spec.js
+++ b/tests/Resources/public/js/options-resolver.spec.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import * as optionsRevolser from '../../../../src/Resources/public/js/options-resolver';
+import * as optionsRevolser from '@ecommit/crud-bundle/js/options-resolver';
 import $ from 'jquery';
 
 describe('Test options-resolver.resolve', function () {

From d0555f50b1302fecd0b86bb87b142dca5e36a30b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 12 Aug 2021 19:57:03 +0200
Subject: [PATCH 067/264] Fix Crud::changeFilterValues when sessionValues is
 null

Can be null after creating the form
---
 src/Crud/Crud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 951a780..4d904db 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -588,7 +588,7 @@ protected function changeFilterValues($value): void
         if (!$this->searchForm) {
             return;
         }
-        if (\get_class($value) === \get_class($this->searchForm->getDefaultData())) {
+        if (null !== $value && \get_class($value) === \get_class($this->searchForm->getDefaultData())) {
             $this->sessionValues->searchFormData = $value;
         } else {
             $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();

From 94c6d2322d173e73022e62bf0140063e86b20290 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 12 Aug 2021 19:59:05 +0200
Subject: [PATCH 068/264] Update php-cs-fixer config file

---
 .php_cs.dist => .php-cs-fixer.dist.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename .php_cs.dist => .php-cs-fixer.dist.php (94%)

diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php
similarity index 94%
rename from .php_cs.dist
rename to .php-cs-fixer.dist.php
index 0fb6c04..1069e36 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.dist.php
@@ -13,9 +13,9 @@
     ->in(__DIR__)
     ->exclude('tests/Functional/App/var')
 ;
+$config = new PhpCsFixer\Config();
 
-return PhpCsFixer\Config::create()
-    ->setRiskyAllowed(true)
+return $config->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,

From ae59659372f6aee3910c363d14964a690ad3211a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 12 Aug 2021 20:11:17 +0200
Subject: [PATCH 069/264] Renaming RestQueryBuilder classes

Ecommit\CrudBundle\Crud\Rest\RestQueryBuilder -> Ecommit\CrudBundle\Crud\Http\QueryBuilder
Ecommit\CrudBundle\Crud\Rest\RestQueryBuilderParameter -> Ecommit\CrudBundle\Crud\Http\QueryBuilderParameter
---
 .../{Rest/RestQueryBuilder.php => Http/QueryBuilder.php}    | 6 +++---
 .../QueryBuilderParameter.php}                              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Crud/{Rest/RestQueryBuilder.php => Http/QueryBuilder.php} (96%)
 rename src/Crud/{Rest/RestQueryBuilderParameter.php => Http/QueryBuilderParameter.php} (82%)

diff --git a/src/Crud/Rest/RestQueryBuilder.php b/src/Crud/Http/QueryBuilder.php
similarity index 96%
rename from src/Crud/Rest/RestQueryBuilder.php
rename to src/Crud/Http/QueryBuilder.php
index cad820c..d550866 100644
--- a/src/Crud/Rest/RestQueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -11,14 +11,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Crud\Rest;
+namespace Ecommit\CrudBundle\Crud\Http;
 
 use Ecommit\CrudBundle\Crud\QueryBuilderInterface;
 use Ecommit\CrudBundle\Crud\QueryBuilderParameterInterface;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
-class RestQueryBuilder implements QueryBuilderInterface
+class QueryBuilder implements QueryBuilderInterface
 {
     /**
      * @var string
@@ -85,7 +85,7 @@ public function setPaginationBuilder(\Closure $paginationBuilder): self
 
     public function addParameter(QueryBuilderParameterInterface $parameter): self
     {
-        if (!($parameter instanceof RestQueryBuilderParameter)) {
+        if (!($parameter instanceof QueryBuilderParameter)) {
             throw new \Exception('Bad class');
         }
 
diff --git a/src/Crud/Rest/RestQueryBuilderParameter.php b/src/Crud/Http/QueryBuilderParameter.php
similarity index 82%
rename from src/Crud/Rest/RestQueryBuilderParameter.php
rename to src/Crud/Http/QueryBuilderParameter.php
index 444977e..e53c047 100644
--- a/src/Crud/Rest/RestQueryBuilderParameter.php
+++ b/src/Crud/Http/QueryBuilderParameter.php
@@ -11,11 +11,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Ecommit\CrudBundle\Crud\Rest;
+namespace Ecommit\CrudBundle\Crud\Http;
 
 use Ecommit\CrudBundle\Crud\QueryBuilderParameterInterface;
 
-class RestQueryBuilderParameter implements QueryBuilderParameterInterface
+class QueryBuilderParameter implements QueryBuilderParameterInterface
 {
     public $name;
 

From e7d9275f05cfa1711d1bee82f2cf1aec5902cf0a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 12 Aug 2021 20:13:50 +0200
Subject: [PATCH 070/264] [CrudHttp] Upercase method

---
 src/Crud/Http/QueryBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index d550866..9d7949b 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -152,6 +152,6 @@ public function getResponse(int $page, int $resultsPerPage, array $options = [])
             $options['body'] = $this->bodyParameter;
         }
 
-        return $client->request($this->method, $this->url, $options);
+        return $client->request(mb_strtoupper($this->method), $this->url, $options);
     }
 }

From 6c50b79ed8931878f21aad53bf1c3d770b7e2c39 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 12 Aug 2021 20:18:10 +0200
Subject: [PATCH 071/264] [Http\QueryBuilder] Add client property

---
 src/Crud/Http/QueryBuilder.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index 9d7949b..c9d6b92 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -16,6 +16,7 @@
 use Ecommit\CrudBundle\Crud\QueryBuilderInterface;
 use Ecommit\CrudBundle\Crud\QueryBuilderParameterInterface;
 use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 class QueryBuilder implements QueryBuilderInterface
@@ -60,13 +61,17 @@ class QueryBuilder implements QueryBuilderInterface
      */
     protected $orders = [];
 
-    public function __construct(string $url, string $method, array $defaultParameters = [])
+    public function __construct(string $url, string $method, array $defaultParameters = [], ?HttpClientInterface $client = null)
     {
         $this->url = $url;
         $this->method = $method;
         foreach ($defaultParameters as $defaultParameter) {
             $this->addParameter($defaultParameter);
         }
+        $this->client = $client;
+        if (null === $this->client) {
+            $this->client = HttpClient::create();
+        }
     }
 
     public function setOrderBuilder(\Closure $orderBuilder): self
@@ -123,8 +128,6 @@ public function orderBy($sort, $sense): self
 
     public function getResponse(int $page, int $resultsPerPage, array $options = []): ResponseInterface
     {
-        $client = HttpClient::create();
-
         //Add paginator parameters
         if ($this->paginationBuilder && $this->paginationBuilder instanceof \Closure) {
             $parameters = $this->paginationBuilder->__invoke($page, $resultsPerPage);
@@ -152,6 +155,6 @@ public function getResponse(int $page, int $resultsPerPage, array $options = [])
             $options['body'] = $this->bodyParameter;
         }
 
-        return $client->request(mb_strtoupper($this->method), $this->url, $options);
+        return $this->client->request(mb_strtoupper($this->method), $this->url, $options);
     }
 }

From e852e2d4e83305db493deef7a4ec7e50feb87db3 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 12 Aug 2021 20:20:17 +0200
Subject: [PATCH 072/264] [Http\QueryBuilder] Add missing client property

---
 src/Crud/Http/QueryBuilder.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index c9d6b92..dda22dc 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -61,6 +61,11 @@ class QueryBuilder implements QueryBuilderInterface
      */
     protected $orders = [];
 
+    /**
+     * @var HttpClientInterface
+     */
+    protected $client;
+
     public function __construct(string $url, string $method, array $defaultParameters = [], ?HttpClientInterface $client = null)
     {
         $this->url = $url;

From d62f3968da28ed29547eadc9f4f324d995568f31 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 13 Aug 2021 12:16:56 +0200
Subject: [PATCH 073/264] [Http\QueryBuilder] Old sytem (CrudHttp) is deleted
 and replaced by a new system (BC break)

---
 doc/cookbook/http.md                          | 171 +++++++++++
 doc/cookbook/rest.md                          |   3 -
 doc/index.md                                  |   2 +-
 .../Http/AbstractQueryBuilderParameter.php    |  21 ++
 src/Crud/Http/QueryBuilder.php                |  99 ++++---
 src/Crud/Http/QueryBuilderBody.php            |  22 ++
 src/Crud/Http/QueryBuilderBodyParameter.php   |  19 ++
 src/Crud/Http/QueryBuilderHeaderParameter.php |  19 ++
 ...hp => QueryBuilderNamedParameterTrait.php} |  11 +-
 src/Crud/Http/QueryBuilderQueryParameter.php  |  19 ++
 tests/Crud/Http/QueryBuilderTest.php          | 265 ++++++++++++++++++
 11 files changed, 598 insertions(+), 53 deletions(-)
 create mode 100644 doc/cookbook/http.md
 delete mode 100644 doc/cookbook/rest.md
 create mode 100644 src/Crud/Http/AbstractQueryBuilderParameter.php
 create mode 100644 src/Crud/Http/QueryBuilderBody.php
 create mode 100644 src/Crud/Http/QueryBuilderBodyParameter.php
 create mode 100644 src/Crud/Http/QueryBuilderHeaderParameter.php
 rename src/Crud/Http/{QueryBuilderParameter.php => QueryBuilderNamedParameterTrait.php} (60%)
 create mode 100644 src/Crud/Http/QueryBuilderQueryParameter.php
 create mode 100644 tests/Crud/Http/QueryBuilderTest.php

diff --git a/doc/cookbook/http.md b/doc/cookbook/http.md
new file mode 100644
index 0000000..4e1b059
--- /dev/null
+++ b/doc/cookbook/http.md
@@ -0,0 +1,171 @@
+# Utilisation d'un CRUD avec une API HTTP
+
+Exemple avec [l'API Opendatasoft Correspondance Code INSEE - Code Postal](https://public.opendatasoft.com/explore/dataset/correspondance-code-insee-code-postal/api/) :
+
+```php
+<?php
+//src/Controller/MyHttpController
+namespace App\Controller;
+
+use App\Form\Searcher\CitySearcher;
+use Ecommit\CrudBundle\Controller\AbstractCrudController;
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\Http\QueryBuilder;
+use Ecommit\CrudBundle\Crud\Http\QueryBuilderQueryParameter;
+use Ecommit\CrudBundle\Paginator\ArrayPaginator;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+class MyHttpController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        /*
+         * Demo de l'API : http://public.opendatasoft.com/api/records/1.0/search?dataset=correspondance-code-insee-code-postal&q=annecy
+         *
+         * Voir https://public.opendatasoft.com/explore/dataset/correspondance-code-insee-code-postal/api/
+         *
+         * L'API REST nous retourne un JSON
+         * Propriétés qui nous intéressent :
+         *      nhits (nombre de résultats trouvés)
+         *      records (résultats trouvés)
+         *          Pour chaque résultat trouvé :
+         *              fields.nom_comm (nom de la ville)
+         *              fields.postal_code (code postal)
+         *              population (population)
+         *              record_timestamp (timestamp de l'enregistrement)
+         */
+
+        //Création du QueryBuilder
+        //Définition de l'URL REST, appelée en GET
+        $queryBuilder = new QueryBuilder('http://public.opendatasoft.com/api/records/1.0/search', 'GET', $this->get(HttpClientInterface::class));
+
+        /*
+         * Définition du paramètre "dataset" ajouté en GET à la requête.
+         *
+         * A différents moments (dans cette méthode et dans la classe du formulaire de recherche), on peut modifier l'objet $queryBuilder :
+         *
+         * Pour ajouter des éléments à la requête HTTP, on peut appeler la méthode "addParameter" en lui passant en paramètre
+         * une instance de l'une des classes suivantes :
+         *      Ecommit\CrudBundle\Crud\Http\QueryBuilderQueryParameter : Paramètre passé en GET (query)
+         *      Ecommit\CrudBundle\Crud\Http\QueryBuilderBodyParameter : Paramètre passé dans le body
+         *      Ecommit\CrudBundle\Crud\Http\QueryBuilderBody : Paramètre unique (sans nom) passé dans le body
+         *      Ecommit\CrudBundle\Crud\Http\QueryBuilderHeaderParameter : Paramètre passé dans l'entête
+         *
+         * La méthode "setBodyIsJson" peut être appelée pour définir une requête au format JSON.
+         */
+        $queryBuilder->addParameter(new QueryBuilderQueryParameter('dataset', 'correspondance-code-insee-code-postal'));
+
+        //FACULTATIF - Ajout dans la requête HTTP la gestion de la pagination
+        $queryBuilder->setPaginationBuilder(function (QueryBuilder $queryBuilder, $page, $resultsPerPage): void {
+            $start = ($page - 1) * $resultsPerPage;
+
+            $queryBuilder->addParameter(new QueryBuilderQueryParameter('rows', $resultsPerPage));
+            $queryBuilder->addParameter(new QueryBuilderQueryParameter('start', $start));
+        });
+
+        //FACULTATIF - Ajout dans la requête HTTP la gestion du tri
+        $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
+            foreach ($orders as $sort => $sense) {
+                $senseParameter = ($sense === Crud::ASC)? '-' : '';
+                $queryBuilder->addParameter(new QueryBuilderQueryParameter('sort', $senseParameter.$sort));
+            }
+        });
+
+        $crud = $this->createCrud('my_http_crud');
+        $crud->addColumn('name', 'fields.nom_comm', 'Nom', ['sortable' => false])
+            ->addColumn('postal_code', 'fields.postal_code', 'Postal code', ['sortable' => false])
+            ->addColumn('population', 'fields.population', 'Population', ['alias_sort' => 'population'])
+            ->addColumn('timestamp', 'record_timestamp', 'Timestamp', ['sortable' => false])
+            ->setQueryBuilder($queryBuilder)
+            ->setAvailableResultsPerPage([2, 5, 10], 5)
+            ->setDefaultSort('population', Crud::DESC)
+            ->setRoute('my_http_crud_ajax')
+            ->setBuildPaginator(function (QueryBuilder $queryBuilder, $page, $resultsPerPage) {
+                //Appel HTTP + décode du JSON de la réponse
+                $response = json_decode($queryBuilder->getResponse($page, $resultsPerPage)->getContent());
+
+                //Création du paginator
+                $paginator = new ArrayPaginator($resultsPerPage);
+                $paginator->setDataWithoutSlice($response->records, $response->nhits);
+                $paginator->setPage($page);
+                $paginator->init();
+
+                return $paginator;
+            })
+            ->createSearchForm(new CitySearcher())
+            ->setPersistentSettings(true)
+            ->init();
+
+        return $crud;
+    }
+
+    protected function getTemplateName(string $action): string
+    {
+        return sprintf('my_http_crud/%s.html.twig', $action);
+    }
+
+    /**
+     * @Route("/my-http-crud", name="my_http_crud")
+     */
+    public function crudAction()
+    {
+        return $this->getCrudResponse();
+    }
+
+    /**
+     * @Route("/my-http-crud/ajax", name="my_http_crud_ajax")
+     */
+    public function ajaxCrudAction()
+    {
+        return $this->getAjaxCrudResponse();
+    }
+
+    public static function getSubscribedServices()
+    {
+        return array_merge(parent::getSubscribedServices(), [
+            HttpClientInterface::class,
+        ]);
+    }
+}
+```
+
+
+```php
+<?php
+//src/Form/Searcher/CitySearcher
+namespace App\Form\Searcher;
+
+use Ecommit\CrudBundle\Crud\Http\QueryBuilderQueryParameter;
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Ecommit\CrudBundle\Form\Searcher\AbstractSearcher;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class CitySearcher extends AbstractSearcher
+{
+    /**
+     * @Assert\Length(max=50)
+     */
+    public $text;
+
+    public function buildForm(SearchFormBuilder $builder, array $options): void
+    {
+        //Ajout d'un champ de recherche
+
+        $builder->addField('text', TextType::class, [
+            'label' => 'Query',
+            'required' => false,
+        ]);
+    }
+
+    public function updateQueryBuilder($queryBuilder, array $options): void
+    {
+        //Traitement de la recherche
+
+        if (null !== $this->text && is_scalar($this->text)) {
+            $queryBuilder->addParameter(new QueryBuilderQueryParameter('q', $this->text));
+        }
+    }
+}
+```
diff --git a/doc/cookbook/rest.md b/doc/cookbook/rest.md
deleted file mode 100644
index 8787031..0000000
--- a/doc/cookbook/rest.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Utilisation d'un CRUD avec REST
-
-Documentation disponible prochainement.
diff --git a/doc/index.md b/doc/index.md
index a179a65..585415d 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -22,7 +22,7 @@
 * [Affichage des résultats uniquement si recherche envoyée](cookbook/display_results.md)
 * [Personnaliser les IDs des Divs](cookbook/div_ids.md)
 * [Création manuelle du paginator](cookbook/paginator.md)
-* [Utilisation d'un CRUD avec REST](cookbook/rest.md)
+* [Utilisation d'un CRUD avec une API HTTP](cookbook/http.md)
 * [Tri par défaut personnalisé](cookbook/sort.md)
 * [Configuration par défaut des templates des CRUD](cookbook/template_configuration.md)
 * [Colonnes virtuelles](cookbook/virtual_columns.md)
diff --git a/src/Crud/Http/AbstractQueryBuilderParameter.php b/src/Crud/Http/AbstractQueryBuilderParameter.php
new file mode 100644
index 0000000..79ab450
--- /dev/null
+++ b/src/Crud/Http/AbstractQueryBuilderParameter.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud\Http;
+
+use Ecommit\CrudBundle\Crud\QueryBuilderParameterInterface;
+
+abstract class AbstractQueryBuilderParameter implements QueryBuilderParameterInterface
+{
+    public $value;
+}
diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index dda22dc..e65a66a 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -29,7 +29,7 @@ class QueryBuilder implements QueryBuilderInterface
     /**
      * @var string
      */
-    protected $method;
+    protected $httpMethod;
 
     /**
      * @var array
@@ -39,12 +39,19 @@ class QueryBuilder implements QueryBuilderInterface
     /**
      * @var array
      */
-    protected $formParameters = [];
+    protected $bodyParameters = [];
 
     /**
-     * @var string
+     * @var QueryBuilderBody
+     */
+    protected $body;
+
+    protected $bodyIsJson = false;
+
+    /**
+     * @var array
      */
-    protected $bodyParameter;
+    protected $headerParameters = [];
 
     /**
      * @var \Closure
@@ -66,19 +73,19 @@ class QueryBuilder implements QueryBuilderInterface
      */
     protected $client;
 
-    public function __construct(string $url, string $method, array $defaultParameters = [], ?HttpClientInterface $client = null)
+    public function __construct(string $url, string $httpMethod, ?HttpClientInterface $client = null)
     {
         $this->url = $url;
-        $this->method = $method;
-        foreach ($defaultParameters as $defaultParameter) {
-            $this->addParameter($defaultParameter);
-        }
+        $this->httpMethod = $httpMethod;
         $this->client = $client;
         if (null === $this->client) {
             $this->client = HttpClient::create();
         }
     }
 
+    /**
+     * @param \Closure $orderBuilder Closure aguments: $queryBuilder, $orders
+     */
     public function setOrderBuilder(\Closure $orderBuilder): self
     {
         $this->orderBuilder = $orderBuilder;
@@ -86,6 +93,9 @@ public function setOrderBuilder(\Closure $orderBuilder): self
         return $this;
     }
 
+    /**
+     * @param \Closure $orderBuilder Closure aguments: $queryBuilder, $page, $resultsPerPage
+     */
     public function setPaginationBuilder(\Closure $paginationBuilder): self
     {
         $this->paginationBuilder = $paginationBuilder;
@@ -95,23 +105,30 @@ public function setPaginationBuilder(\Closure $paginationBuilder): self
 
     public function addParameter(QueryBuilderParameterInterface $parameter): self
     {
-        if (!($parameter instanceof QueryBuilderParameter)) {
+        if ($parameter instanceof QueryBuilderQueryParameter) {
+            $this->queryParameters[] = $parameter;
+        } elseif ($parameter instanceof QueryBuilderBodyParameter) {
+            if (null !== $this->body) {
+                throw new \Exception('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported.');
+            }
+            $this->bodyParameters[] = $parameter;
+        } elseif ($parameter instanceof QueryBuilderBody) {
+            if (\count($this->bodyParameters) > 0) {
+                throw new \Exception('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported.');
+            }
+            $this->body = $parameter;
+        } elseif ($parameter instanceof QueryBuilderHeaderParameter) {
+            $this->headerParameters[] = $parameter;
+        } else {
             throw new \Exception('Bad class');
         }
 
-        switch ($parameter->method) {
-            case 'get':
-                $this->queryParameters[$parameter->name] = $parameter->value;
-                break;
-            case 'post':
-                $this->formParameters[$parameter->name] = $parameter->value;
-                break;
-            case 'body':
-                $this->bodyParameter = $parameter->value;
-                break;
-            default:
-                throw new \Exception('Bad parameter method');
-        }
+        return $this;
+    }
+
+    public function setBodyIsJson(bool $bodyIsJson): self
+    {
+        $this->bodyIsJson = $bodyIsJson;
 
         return $this;
     }
@@ -134,32 +151,34 @@ public function orderBy($sort, $sense): self
     public function getResponse(int $page, int $resultsPerPage, array $options = []): ResponseInterface
     {
         //Add paginator parameters
-        if ($this->paginationBuilder && $this->paginationBuilder instanceof \Closure) {
-            $parameters = $this->paginationBuilder->__invoke($page, $resultsPerPage);
-            foreach ($parameters as $parameter) {
-                $this->addParameter($parameter);
-            }
+        if ($this->paginationBuilder) {
+            $this->paginationBuilder->__invoke($this, $page, $resultsPerPage);
         }
 
         //Add sort parameters
-        if (\count($this->orders) > 0 && $this->orderBuilder && $this->orderBuilder instanceof \Closure) {
-            $parameters = $this->orderBuilder->__invoke($this->orders);
-            foreach ($parameters as $parameter) {
-                $this->addParameter($parameter);
-            }
+        if (\count($this->orders) > 0 && $this->orderBuilder) {
+            $this->orderBuilder->__invoke($this, $this->orders);
         }
 
         //Add parameters to client options
-        foreach ($this->queryParameters as $parameterName => $parameterValue) {
-            $options['query'][$parameterName] = $parameterValue;
+        /** @var QueryBuilderQueryParameter $parameter */
+        foreach ($this->queryParameters as $parameter) {
+            $options['query'][$parameter->name] = $parameter->value;
+        }
+        /** @var QueryBuilderBodyParameter $parameter */
+        foreach ($this->bodyParameters as $parameter) {
+            $bodyType = ($this->bodyIsJson) ? 'json' : 'body';
+            $options[$bodyType][$parameter->name] = $parameter->value;
         }
-        foreach ($this->formParameters as $parameterName => $parameterValue) {
-            $options['body'][$parameterName] = $parameterValue;
+        if ($this->body) {
+            $bodyType = ($this->bodyIsJson) ? 'json' : 'body';
+            $options[$bodyType] = $this->body->value;
         }
-        if ($this->bodyParameter) {
-            $options['body'] = $this->bodyParameter;
+        /** @var QueryBuilderHeaderParameter $parameter */
+        foreach ($this->headerParameters as $parameter) {
+            $options['headers'][$parameter->name] = $parameter->value;
         }
 
-        return $this->client->request(mb_strtoupper($this->method), $this->url, $options);
+        return $this->client->request(mb_strtoupper($this->httpMethod), $this->url, $options);
     }
 }
diff --git a/src/Crud/Http/QueryBuilderBody.php b/src/Crud/Http/QueryBuilderBody.php
new file mode 100644
index 0000000..baf1b63
--- /dev/null
+++ b/src/Crud/Http/QueryBuilderBody.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud\Http;
+
+class QueryBuilderBody extends AbstractQueryBuilderParameter
+{
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+}
diff --git a/src/Crud/Http/QueryBuilderBodyParameter.php b/src/Crud/Http/QueryBuilderBodyParameter.php
new file mode 100644
index 0000000..a7fc21f
--- /dev/null
+++ b/src/Crud/Http/QueryBuilderBodyParameter.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud\Http;
+
+class QueryBuilderBodyParameter extends AbstractQueryBuilderParameter
+{
+    use QueryBuilderNamedParameterTrait;
+}
diff --git a/src/Crud/Http/QueryBuilderHeaderParameter.php b/src/Crud/Http/QueryBuilderHeaderParameter.php
new file mode 100644
index 0000000..992c07f
--- /dev/null
+++ b/src/Crud/Http/QueryBuilderHeaderParameter.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud\Http;
+
+class QueryBuilderHeaderParameter extends AbstractQueryBuilderParameter
+{
+    use QueryBuilderNamedParameterTrait;
+}
diff --git a/src/Crud/Http/QueryBuilderParameter.php b/src/Crud/Http/QueryBuilderNamedParameterTrait.php
similarity index 60%
rename from src/Crud/Http/QueryBuilderParameter.php
rename to src/Crud/Http/QueryBuilderNamedParameterTrait.php
index e53c047..6d589e0 100644
--- a/src/Crud/Http/QueryBuilderParameter.php
+++ b/src/Crud/Http/QueryBuilderNamedParameterTrait.php
@@ -13,20 +13,13 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-use Ecommit\CrudBundle\Crud\QueryBuilderParameterInterface;
-
-class QueryBuilderParameter implements QueryBuilderParameterInterface
+trait QueryBuilderNamedParameterTrait
 {
     public $name;
 
-    public $value;
-
-    public $method;
-
-    public function __construct($name, $value, $method)
+    public function __construct(string $name, $value)
     {
         $this->name = $name;
         $this->value = $value;
-        $this->method = $method;
     }
 }
diff --git a/src/Crud/Http/QueryBuilderQueryParameter.php b/src/Crud/Http/QueryBuilderQueryParameter.php
new file mode 100644
index 0000000..883e1a1
--- /dev/null
+++ b/src/Crud/Http/QueryBuilderQueryParameter.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud\Http;
+
+class QueryBuilderQueryParameter extends AbstractQueryBuilderParameter
+{
+    use QueryBuilderNamedParameterTrait;
+}
diff --git a/tests/Crud/Http/QueryBuilderTest.php b/tests/Crud/Http/QueryBuilderTest.php
new file mode 100644
index 0000000..35eca7a
--- /dev/null
+++ b/tests/Crud/Http/QueryBuilderTest.php
@@ -0,0 +1,265 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Crud\Http;
+
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\Http\QueryBuilder;
+use Ecommit\CrudBundle\Crud\Http\QueryBuilderBody;
+use Ecommit\CrudBundle\Crud\Http\QueryBuilderBodyParameter;
+use Ecommit\CrudBundle\Crud\Http\QueryBuilderHeaderParameter;
+use Ecommit\CrudBundle\Crud\Http\QueryBuilderQueryParameter;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+class QueryBuilderTest extends TestCase
+{
+    public function testEmptyQueryBuilder(): void
+    {
+        $queryBuilder = $this->createQueryBuider();
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, []);
+    }
+
+    public function testMethod(): void
+    {
+        $queryBuilder = $this->createQueryBuider('POST');
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, [
+            'method' => 'POST',
+        ]);
+    }
+
+    public function testMethodQLowerCase(): void
+    {
+        $queryBuilder = $this->createQueryBuider('post');
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, [
+            'method' => 'POST',
+        ]);
+    }
+
+    public function testAddQueryParameter(): void
+    {
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->addParameter(new QueryBuilderQueryParameter('param1', 'val1'));
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, [
+            'url' => 'http://test/url?param1=val1',
+        ]);
+    }
+
+    public function testAddBodyParameter(): void
+    {
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->addParameter(new QueryBuilderBodyParameter('param1', 'val1'));
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, [
+            'body' => 'param1=val1',
+        ]);
+    }
+
+    public function testAddBodyParameterNotAllowed(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported.');
+
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->addParameter(new QueryBuilderBody('val1'));
+        $queryBuilder->addParameter(new QueryBuilderBodyParameter('param1', 'val1'));
+    }
+
+    public function testAddBody(): void
+    {
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->addParameter(new QueryBuilderBody('val1'));
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, [
+            'body' => 'val1',
+        ]);
+    }
+
+    public function testAddBodyNotAllowed(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported.');
+
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->addParameter(new QueryBuilderBodyParameter('param1', 'val1'));
+        $queryBuilder->addParameter(new QueryBuilderBody('val1'));
+    }
+
+    public function testAddHeaderParameter(): void
+    {
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->addParameter(new QueryBuilderHeaderParameter('param1', 'val1'));
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, [
+            'headers' => ['param1: val1'],
+        ]);
+    }
+
+    public function testSetBodyIsJson(): void
+    {
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->addParameter(new QueryBuilderBodyParameter('param1', 'val1'));
+        $queryBuilder->setBodyIsJson(true);
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, [
+            'content_type_json' => true,
+            'body' => '{"param1":"val1"}',
+        ]);
+    }
+
+    public function testOrderBy(): void
+    {
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
+            foreach ($orders as $sort => $sense) {
+                $queryBuilder->addParameter(new QueryBuilderBodyParameter('sort', $sort));
+                $queryBuilder->addParameter(new QueryBuilderBodyParameter('sense', $sense));
+            }
+        });
+        $queryBuilder->orderBy('col1', Crud::ASC);
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, [
+            'body' => 'sort=col1&sense=ASC',
+        ]);
+    }
+
+    public function testAddOrderBy(): void
+    {
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
+            $paramSort = [];
+            $paramSense = [];
+            foreach ($orders as $sort => $sense) {
+                $paramSort[] = $sort;
+                $paramSense[] = $sense;
+            }
+            $queryBuilder->addParameter(new QueryBuilderBodyParameter('sort', implode(',', $paramSort)));
+            $queryBuilder->addParameter(new QueryBuilderBodyParameter('sense', implode(',', $paramSense)));
+        });
+        $queryBuilder->addOrderBy('col1', Crud::ASC);
+        $queryBuilder->addOrderBy('col2', Crud::DESC);
+        $response = $queryBuilder->getResponse(1, 1);
+
+        $this->checkRequest($response, [
+            'body' => 'sort=col1%2Ccol2&sense=ASC%2CDESC',
+        ]);
+    }
+
+    public function testPagination(): void
+    {
+        $queryBuilder = $this->createQueryBuider();
+        $queryBuilder->setPaginationBuilder(function (QueryBuilder $queryBuilder, $page, $resultsPerPage): void {
+            $queryBuilder->addParameter(new QueryBuilderBodyParameter('page', $page));
+            $queryBuilder->addParameter(new QueryBuilderBodyParameter('per_page', $resultsPerPage));
+        });
+        $response = $queryBuilder->getResponse(10, 100);
+
+        $this->checkRequest($response, [
+            'body' => 'page=10&per_page=100',
+        ]);
+    }
+
+    public function testFull(): void
+    {
+        $queryBuilder = $this->createQueryBuider('POST');
+        $queryBuilder->addParameter(new QueryBuilderQueryParameter('queryparam1', 'queryparamval1'));
+        $queryBuilder->addParameter(new QueryBuilderBodyParameter('bodyparam1', 'bodyparamval1'));
+        $queryBuilder->addParameter(new QueryBuilderHeaderParameter('headerparam1', 'headerparamval1'));
+        $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
+            foreach ($orders as $sort => $sense) {
+                $queryBuilder->addParameter(new QueryBuilderQueryParameter('sort', $sort));
+                $queryBuilder->addParameter(new QueryBuilderQueryParameter('sense', $sense));
+            }
+        });
+        $queryBuilder->setPaginationBuilder(function (QueryBuilder $queryBuilder, $page, $resultsPerPage): void {
+            $queryBuilder->addParameter(new QueryBuilderQueryParameter('page', $page));
+            $queryBuilder->addParameter(new QueryBuilderQueryParameter('per_page', $resultsPerPage));
+        });
+
+        $queryBuilder->orderBy('col1', Crud::ASC);
+        $response = $queryBuilder->getResponse(10, 100);
+
+        $this->checkRequest($response, [
+            'method' => 'POST',
+            'url' => 'http://test/url?queryparam1=queryparamval1&page=10&per_page=100&sort=col1&sense=ASC',
+            'body' => 'bodyparam1=bodyparamval1',
+            'headers' => ['headerparam1: headerparamval1'],
+        ]);
+    }
+
+    protected function createQueryBuider(string $method = 'GET'): QueryBuilder
+    {
+        $callback = function ($method, $url, $options): MockResponse {
+            //Result : Returns request options
+            $result = [
+                'method' => $method,
+                'url' => $url,
+                'content_type_json' => false,
+                'body' => null,
+                'headers' => [],
+            ];
+            if (isset($options['body']) && null !== $options['body']) {
+                $result['body'] = $options['body'];
+            }
+            if (isset($options['headers'])) {
+                foreach ($options['headers'] as $header) {
+                    if ('Content-Type: application/json' === $header) {
+                        $result['content_type_json'] = true;
+                    } elseif ('Accept: */*' !== $header) {
+                        $result['headers'][] = $header;
+                    }
+                }
+            }
+
+            return new MockResponse(json_encode($result));
+        };
+        $client = new MockHttpClient($callback);
+
+        return new QueryBuilder('http://test/url', $method, $client);
+    }
+
+    protected function checkRequest(ResponseInterface $response, array $options): void
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'method' => 'GET',
+            'url' => 'http://test/url',
+            'content_type_json' => false,
+            'body' => null,
+            'headers' => [],
+        ]);
+        $expectedOptions = $resolver->resolve($options);
+        $options = json_decode($response->getContent(), true);
+
+        ksort($expectedOptions);
+        ksort($options);
+
+        $this->assertSame($expectedOptions, $options);
+    }
+}

From 1e42042faa2d7d2d807241a1b6ffa9b349c36e78 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 13 Aug 2021 12:25:19 +0200
Subject: [PATCH 074/264] Add Security section

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 54bac68..3c8a1e7 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,11 @@
 
 [Read the Documentation (French documentation)](doc/index.md)
 
+## Security ##
+
+If you think that you have found a security issue, do **NOT** use the bug tracker. Instead, please email 
+contact@e-commit.fr with information about the issue.
+
 ## License ##
 
 This bundle is available under the MIT license. See the complete license in the *LICENSE* file.

From 4ab5f1484a8c399c98e7ba0e8c265f8be6f2067f Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 14 Aug 2021 15:43:09 +0200
Subject: [PATCH 075/264] Removing unused arguments

---
 src/Twig/CrudExtension.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index ea1d718..7e96da4 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -514,7 +514,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
      *                       * theme: Theme used. If null, default theme is used
      *                       * block: Twig block used. Default: search_form_submit
      */
-    public function searchFormSubmit(Environment $environment, Crud $crud, $options = [], $ajaxOptions = [], $htmlOptions = [])
+    public function searchFormSubmit(Environment $environment, Crud $crud, $options = [])
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
@@ -549,7 +549,7 @@ public function searchFormSubmit(Environment $environment, Crud $crud, $options
      *                       * theme: Theme used. If null, default theme is used
      *                       * block: Twig block used. Default: search_form_reset
      */
-    public function searchFormReset(Environment $environment, Crud $crud, $options = [], $ajaxOptions = [], $htmlOptions = [])
+    public function searchFormReset(Environment $environment, Crud $crud, $options = [])
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([

From 4bcce37685643076a81ad52b44cf597c1dfb73b8 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 15 Aug 2021 13:44:35 +0200
Subject: [PATCH 076/264] Add upgrade guide

---
 UPGRADE.md         |   3 +
 doc/index.md       |   4 +
 doc/install.md     |   2 +
 doc/upgrade/3.0.md | 286 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 295 insertions(+)
 create mode 100644 UPGRADE.md
 create mode 100644 doc/upgrade/3.0.md

diff --git a/UPGRADE.md b/UPGRADE.md
new file mode 100644
index 0000000..b3ebb23
--- /dev/null
+++ b/UPGRADE.md
@@ -0,0 +1,3 @@
+# Upgrade
+
+[Read the Documentation (French documentation)](doc/index.md#migrations)
diff --git a/doc/index.md b/doc/index.md
index 585415d..0645db1 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -26,3 +26,7 @@
 * [Tri par défaut personnalisé](cookbook/sort.md)
 * [Configuration par défaut des templates des CRUD](cookbook/template_configuration.md)
 * [Colonnes virtuelles](cookbook/virtual_columns.md)
+
+## Migrations
+
+* [Mise à jour de 2.6 vers 3.0](upgrade/3.0.md)
diff --git a/doc/install.md b/doc/install.md
index a748ebe..a01d617 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -38,12 +38,14 @@ ecommit_crud:
     #Themes disponibles :
     #@EcommitCrud/Theme/base.html.twig
     #@EcommitCrud/Theme/bootstrap3.html.twig (boostrap3 requis)
+    #Ou faire son propre terme (doit hériter de l'un des thèmes précédents)
     theme: '@EcommitCrud/Theme/bootstrap3.html.twig'
 
     #Theme pour les icones
     #Themes disponibles :
     #@EcommitCrud/IconTheme/base.html.twig
     #@EcommitCrud/IconTheme/fontawesome4.html.twig (fontawesome4 requis)
+    #Ou faire son propre terme (doit hériter de l'un des thèmes précédents)
     icon_theme: '@EcommitCrud/IconTheme/fontawesome4.html.twig'
 ```
 
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
new file mode 100644
index 0000000..2f0ec99
--- /dev/null
+++ b/doc/upgrade/3.0.md
@@ -0,0 +1,286 @@
+# Mise à jour de 2.6 vers 3.0
+
+## Généralités
+
+* Les prérequis et configuration du Bundle sont modifiés. Suivre [la procédure d'installation](../install.md) pour adapter votre projet.
+* Les dépendances suivantes sont supprimées:
+    * `doctrine/common`
+    * `ecommit/javascript-bundle`
+    * `ecommit/util-bundle`
+    * `twig/extensions`
+* La signature des méthodes a été modifiée en ajoutant le type des arguments et de retour.
+
+
+
+## Configuration
+
+* Les nouvelles options `theme` et `icon_theme` sont obligatoires. Voir [la procédure d'installation](../install.md) pour les valeurs disponibles.
+* L'option `template_configuration` est supprimée. Voir l'alternative avec [twig_functions_configuration](../cookbook/template_configuration.md).
+* L'option `images` est supprimée.
+* Les paramètres suivants sont supprimés:
+    * `ecommit_crud.template_configuration`
+    * `ecommit_crud.images`
+
+
+
+## Contrôleur
+
+**Namespace: Ecommit\CrudBundle\Controller**
+
+* La classe `AbstractCrudLegacyController` est supprimée. Utiliser à la place la classe `AbstractCrudController`.
+* La classe `AbstractCrudController` n'hérite plus de `Symfony\Component\DependencyInjection\ContainerAwareTrait` mais
+  de `Symfony\Bundle\FrameworkBundle\Controller\AbstractController`. Adapter l'utilisation des services en conséquence.
+* La méthode `getPathView` est renommée en `getTemplateName` dans `CrudControllerTrait`. Sa signature est maintenant
+  `getTemplateName(string $action): string`
+* La méthode `getTemplateName` (anciennement `getPathView`) dans `CrudControllerTrait` est maintenant abstraite. Celle-ci doit être rajouter
+  dans vos contrôleurs CRUD.
+* La méthode `createCrud` de `CrudControllerTrait` est maintenant `final`.
+* La méthode `autoListAction` de `CrudControllerTrait` est supprimée. Utiliser à la place la méthode `getCrudResponse` (signature différente).
+* La méthode `autoAjaxListAction` de `CrudControllerTrait` est supprimée. Utiliser à la place la méthode `getAjaxCrudResponse` (signature différente).
+* La méthode `autoAjaxSearchAction` de `CrudControllerTrait` est supprimée. Il n'existe plus d'action spécifique à la recherche.
+* Les méthodes `prepareList`, `processSearch`, `renderCrudView` et `renderCrud` de `CrudControllerTrait` sont supprimées.
+* La méthode `configCrud` de `CrudControllerTrait` est supprimée. Utiliser à la place la méthode `getCrud` (signature différente).
+* La méthode `addDataAfterBuildQuery` de `CrudControllerTrait` est supprimée. Voir l'alternative avec [le nouveau système](../cookbook/data-template.md).
+* La signature de la méthode `beforeBuildQuery` de `CrudControllerTrait` est modifiée:
+    * Avant: `beforeBuildQuery()`
+    * Maintenant: `beforeBuildQuery(Crud $crud, array $data): array`
+* La signature de la méthode `afterBuildQuery` de `CrudControllerTrait` est modifiée:
+    * Avant: `afterBuildQuery()`
+    * Maintenant: `afterBuildQuery(Crud $crud, array $data): array`
+* La méthode `getCrudRequiredServices` de `CrudControllerTrait` ne retourne plus les services `twig` et `request_stack`. Si
+  les contrôleurs n'hérite pas de `AbstractCrudController` ou `Symfony\Bundle\FrameworkBundle\Controller\AbstractController`,
+  ces services ne seront plus injectés au locator du contrôleur.
+* La donnée membre `$cm`de `CrudControllerTrait` est supprimée.
+
+
+
+## Crud
+
+**Namespace: Ecommit\CrudBundle\Crud**
+
+* La signature du constructeur de `Crud` est modifiée:
+    * Avant: `__construct($sessionName, RouterInterface $router, FormFactoryInterface $formFactory, Request $request, Registry $registry, $user)`
+    * Maintenant: `__construct($sessionName, ContainerInterface $container)`
+    * Utilisation d'un locator
+* Les données membres suivantes de `Crud` sont supprimées:
+    * `$formSearcher`: Elle est remplacée par la donnée membre `$searchForm` qui est une instance de `SearchFormBuilder`
+      ou `Symfony\Component\Form\FormView` ou nulle.
+    * `$defaultFormSearcherData`
+    * `$router`, `formFactory`, `$request`, `$registry`: Un locator est utilisé à la place.
+    * `$user`
+* Les méthodes suivantes de `Crud` sont supprimées:
+    * `getSearcherForm`. Elle est remplacée par la méthode `getSearchForm`
+    * `setUseDbal`
+    * `configureTemplate`, `getTemplateConfiguration` et `validateConfigureTemplateFunctionName`: Voir l'alternative avec
+      [le nouveau système](../cookbook/template_configuration.md).
+    * `setSearchRoute`: Il n'existe plus de route spécifique à la recherche.
+    * `initializeFieldsFilter`
+* La méthode `createSearcherForm` de `Crud` est renommée en `createSearchForm`. La signature est modifiée:
+    * Avant: `createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = [])`
+    * Après: `createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = [])`
+* La signature du constructeur de `CrudFactory` est modifiée:
+    * Avant: `__construct(RouterInterface $router, FormFactoryInterface $formFactory, RequestStack $requestStack, ManagerRegistry $registry, TokenStorageInterface $tokenStorage, array $templateConfiguration)`
+    * Maintenant: `__construct(ContainerInterface $container)`
+    * Utilisation d'un locator
+* Toutes les données membres de `CrudFactory` sont supprimées. Un locator est utilisé à la place.
+* La donnée membre `$formSearcherData` de `CrudSession` est supprimée. Elle est remplacée par `$searchFormData`
+  qui est une instance de `SearcherInterface` ou nulle.
+
+
+
+## Crud REST
+
+**Namespace: Ecommit\CrudBundle\Crud\Rest**
+
+* Les classes `Ecommit\CrudBundle\Crud\Rest\*` n'existent plus. Voir l'alternative avec [le nouveau système](../cookbook/http.md).
+
+
+
+## Formulaire de recherche
+
+**Namespace: Ecommit\CrudBundle\Form\Searcher**
+
+* La classe `AbstractFormSearcher`  est supprimée et remplacée par `AbstractSearcher`, avec un fonctionnement et une
+  API totalement différents. Vos formulaires de recherche doivent maintenant hériter de `AbstractSearcher`
+  ou implémenter `SearcherInterface`. Voir les liens suivants:
+    * [Création d'un formulaire de recherche](../crud.md#ajout-formulaire-de-recherche-facultatif)
+    * [Options du formulaire de recherche](../references/searcher.md)
+    * [Personnalisation avancée de la classe Searcher](../cookbook/advanced-searcher.md)
+
+
+
+## Filtres du formulaire de recherches
+
+**Namespace: Ecommit\CrudBundle\Form\Filter**
+
+* Les classes `Ecommit\CrudBundle\Form\Filter\FieldFillter*` sont supprimées et remplacées par de nouvelles
+  classes `Ecommit\CrudBundle\Form\Filter\*Filter` (dans le même namespace) mais avec un fonctionnement et une
+  API totalement différents. [Voir les nouveaux filtres](../references/filters.md)
+* La classe `AbstractFieldFilter` est supprimée et remplacée par `AbstractFilter`, avec un fonctionnement et une
+  API totalement différents. Si vous avez réalisé vos propres filtres, vous devez les adapter avec la nouvelle API.
+* Les filtres sont maintenant des services ayant le tag `ecommit_crud.filter`, hériter de `AbstractFilter`
+  ou implémenter `FilterInterface`.
+
+
+
+## DoctrineExtension
+
+**Namespace: Ecommit\CrudBundle\DoctrineExtension**
+
+* La méthode `count` de `Paginate` est supprimée. Utiliser à la place les méthodes `Doctrine\ORM\Tools\Pagination\Paginator::count` 
+  ou `Paginate::countQueryBuilder`.
+
+
+## Paginator
+
+**Namespace: Ecommit\CrudBundle\Paginator**
+
+* La méthode `setResults` de `ArrayPaginator` est supprimée. Utiliser à la place la méthode `setData`.
+* La méthode `setResultsWithoutSlice` de `ArrayPaginator` est supprimée. Utiliser à la place la méthode `setDataWithoutSlice`.
+* La méthode `setDbalQueryBuilder` et `DoctrineDBALPaginator` est supprimée. Utiliser à la place la méthode `setQueryBuilder`.
+
+
+
+## Form
+
+**Namespace: Ecommit\CrudBundle\Form\Type**
+
+* Modifications apportées sur `DisplaySettingsType`:
+    * Ajout de la validation.
+    * Ajout des champs `resultsPerPage`, `displayedColumns`, `reset`, et `save`.
+    * Ajout de l'option requise `reset_settings_url`.
+    * L'option `resultsPerPageChoices` est renommée en `results_per_page_choices`.
+    * L'option `columnsChoices` est renommée en `columns_choices`.
+
+
+
+## Twig
+
+* Les options suivantes des fonctions Twig `paginator_links` et `crud_paginator_links` sont supprimées. Surcharger le thème Twig si besoin:
+    * `buttons`
+    * `image_first`
+    * `image_previous`
+    * `image_next`
+    * `image_last`
+    * `text_first`
+    * `text_previous`
+    * `text_next`
+    * `text_last`
+    * `use_bootstrap`
+    * `bootstrap_size`
+* La signature de la fonction Twig `crud_paginator_links` est modifiée:
+    * Avant: `crud_paginator_links(Crud $crud, $options = [], $ajaxOptions = [])`
+    * Maintenant: `crud_paginator_links(Crud $crud, array $options = [])`
+    * Passer les options Ajax dans l'option `ajax_options` de `$options`
+* Pour une utilisation des fonctions Twig `paginator_links` et `crud_paginator_links`, les classes CSS ont été modifiées. Voici les nouvelles classes CSS, **quelque soit l'utilisation de BootStrap ou non** (les classes CSS propres à Bootstrap ne sont pas précisées): 
+    * Classe CSS associée au tag `nav`:
+        * Avant: `pagination_nobootstrap` (uniquement pour non BootStrap)
+        * Maintenant: `ec-crud-pagination`
+    * Classes CSS associées au tag `li` pour la 1ère page:
+        * Avant: [`text` ou `image`] + `first`
+        * Maintenant: `first`
+    * Classes CSS associées au tag `li` pour la page précédente:
+        * Avant: [`text` ou `image`] + `previous`
+        * Maintenant: `previous`
+    * Classes CSS associées au tag `li` pour la page suivante:
+        * Avant: [`text` ou `image`] + `next`
+        * Maintenant: `next`
+    * Classes CSS associées au tag `li` pour la dernière page:
+        * Avant: [`text` ou `image`] + `last`
+        * Maintenant: `last`
+    * Classes CSS associées au tag `li` pour la page courante:
+        * Avant: `pagination_current` (uniquement pour non BootStrap)
+        * Maintenant: `current`
+    * Classes CSS associées au tag `li` pour les autres pages:
+        * Avant: `pagination_no_current` (uniquement pour non BootStrap)
+        * Maintenant: Aucune
+* Les options suivantes de la fonction Twig `crud_th` sont supprimées. Surcharger le thème Twig si besoin:
+    * `image_up`
+    * `image_down`
+* La signature de la fonction Twig `crud_th` est modifiée:
+    * Avant: `crud_th($columnId, Crud $crud, $options = [], $thOptions = [], $ajaxOptions = [])`
+    * Maintenant: `crud_th(string $columnId, Crud $crud, array $options = [])`
+    * Passer les attributs th dans l'option `th_attr` de `$options`
+    * Passer les options Ajax dans l'option `ajax_options` de `$options`
+* L'option `repeated_values_add_title` de la fonction Twig `crud_td` est supprimée. Surcharger le thème Twig si besoin.
+* La signature de la fonction Twig `crud_td` est modifiée:
+    * Avant: `crud_td($columnId, Crud $crud, $value, $options = [], $tdOptions = [])`
+    * Après: `crud_td(string $columnId, Crud $crud, $value, $options = [])`
+    * Passer les attributs td dans l'option `td_attr` de `$options`
+* La fonction Twig `crud_search_form` est renommée en `crud_search_form_start`. La signature est modifiée:
+    * Avant: `crud_search_form(Crud $crud, $ajaxOptions = [], $htmlOptions = [])`
+    * Après: `crud_search_form_start(Crud $crud, array $options = [])`
+    * Passer les options Ajax dans l'option `ajax_options` de `$options`
+    * Passer les attributs HTML du tag dans l'option `form_attr` de `$options`
+* La fonction Twig `crud_search_reset`est renommée en `crud_search_form_reset`. La signature est modifiée:
+    * Avant: `crud_search_reset(Crud $crud, $options = [], $ajaxOptions = [], $htmlOptions = [])`
+    * Après `crud_search_form_reset(Crud $crud, $options = [])`
+    * Passer les options Ajax dans l'option `ajax_options` de `$options`
+    * Passer les attributs HTML du tag dans l'option `button_attr` de `$options`
+* La fonction Twig `crud_search_form_submit` doit être appelée pour l'ajout du bouton d'envoi du formulaire de recherche.
+* La signature de la fonction Twig `crud_display_settings` est modifiée:
+    * Avant: `crud_display_settings(Crud $crud, $options = [], $ajaxOptions = [])`
+    * Maintenant: `crud_display_settings(Crud $crud, array $options = [])`
+    * Passer les options Ajax dans l'option `ajax_options` de `$options`
+* Les options suivantes de la fonction Twig `crud_display_settings` sont supprimées. Surcharger le thème Twig si besoin:
+    * `image_url`
+    * `use_bootstrap`
+    * `modal_close_div_class`
+* L'option `template` des fonctions Twig suivantes est renommée en `render`:
+    * `paginator_links`
+    * `crud_paginator_links`
+    * `crud_th`
+    * `crud_td`
+    * `crud_display_settings`
+    * `crud_search_form_reset` (anciennement `crud_search_reset`)
+* Les fonctions Twig suivantes sont supprimées. Voir l'alternative avec [le nouveau système](../references/modal.md):
+    * `crud_declare_modal`
+    * `crud_remote_modal`
+    * `crud_form_modal`
+* La constructeur de la classe `CrudExtension` est modifié.
+* Les templates suivants sont supprimés:
+    * `EcommitCrud/Crud/double_search.html.twig`
+    * `EcommitCrud/Crud/form_settings_*`
+
+
+
+## Crud Helper
+
+**Namespace: Ecommit\CrudBundle\Helper**
+
+La classe `CrudHelper` est supprimée.  Utiliser à la places les fonctions Twig.
+
+
+
+## Traductions
+
+* Toutes les traductions de la version 2.x (dans le domaine `messages`) sont supprimées. Certaines de ces traductions
+  ont été migrées vers un nouveau domaine `EcommitCrudBundle`:
+
+| ID des traductions dans 2.x (domaine `messages`) | ID équivalent dans 3.0 (domaine `EcommitCrudBundle`) |
+| --- | --- |
+| Display Settings | display_settings.title |
+| Number of results per page | display_settings.results_per_page |
+| Columns to be shown | display_settings.displayed_columns |
+| You need to select at least one column to display | *Aucun équivalent* |
+| Save | display_settings.save |
+| Search | search.submit |
+| Reset | search.reset |
+| {0} No results\|{1} 1 result found\|]1,Inf] %count% results found | *Aucun équivalent* |
+| Page %firstPage%/%lastPage% | *Aucun équivalent* |
+| Results %first%-%last% | *Aucun équivalent* |
+| Page %page%/%lastPage% | *Aucun équivalent* |
+| filter.true | filter.true |
+| filter.false | filter.false |
+| filter.choices.placeholder | *Aucun équivalent* |
+| picker.add | *Aucun équivalent* |
+| picker.list | *Aucun équivalent* |
+| reset_display_settings | display_settings.reset_display_settings |
+| check_all | display_settings.check_all |
+| uncheck_all | display_settings.uncheck_all |
+
+
+## Assets
+
+* Les images `images/i16/*.png` sont supprimées.
+* Le fichier JavaScript `js/scrollToFirstMessage.js` est supprimé.

From abc1a522628ba470c7dfcfcfb1d9bbd1b7be0731 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 16 Aug 2021 14:40:21 +0200
Subject: [PATCH 077/264] Update doc

---
 doc/cookbook/advanced-searcher.md | 68 ++++++++++++++++++++++++++++++-
 doc/cookbook/create_filter.md     | 17 ++++++++
 doc/index.md                      |  1 +
 doc/references/filters.md         |  5 +++
 doc/upgrade/3.0.md                |  2 +-
 5 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 doc/cookbook/create_filter.md

diff --git a/doc/cookbook/advanced-searcher.md b/doc/cookbook/advanced-searcher.md
index 3b0fe4d..e594fb8 100644
--- a/doc/cookbook/advanced-searcher.md
+++ b/doc/cookbook/advanced-searcher.md
@@ -1,6 +1,8 @@
 # Personnalisation avancée de la classe Searcher
 
-## Solution 1: Utilisation de addField et updateQueryBuilder
+## Personnalisation des filtres de recherche
+
+### Solution 1: Utilisation de addField et updateQueryBuilder
 
 ```php
 <?php
@@ -42,7 +44,7 @@ class CarSearcher extends AbstractSearcher
 }
 ```
 
-## Solution 2: Utilisation d'une classe FormType
+### Solution 2: Utilisation d'une classe FormType
 
 ```php
 <?php
@@ -122,3 +124,65 @@ class MyCrudController extends AbstractCrudController
     }
 }
 ```
+
+### Solution 3: Création d'un filtre de recherche
+
+Voir [Création d'un filtre de recherche](create_filter.md)
+
+
+## Définir les options du formulaire de recherche
+
+La classe `configureOptions` de `SearcherInterface` peut être utilisée pour définir des options au formulaire de recherche :
+
+```php
+//src/Form/Searcher/CarSearcher
+namespace App\Form\Searcher;
+
+use Ecommit\CrudBundle\Form\Searcher\AbstractSearcher;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CarSearcher extends AbstractSearcher
+{
+    //...
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'my_option' => null,
+        ]);
+    }
+}
+```
+
+Ces options doivent être passées au 3ème argument (`$options`) de la méthode `createSearchForm` de `Crud` :
+
+```diff
+<?php
+//src/Controller/MyCrudController
+namespace App\Controller;
+
+//...
+
+class MyCrudController extends AbstractCrudController
+{
+    protected function getCrud(): Crud
+    {
+        //...
+        
+        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn('id', 'c1.id', 'Id')
+            //...
+            ->setRoute('my_crud_ajax')
+-           ->createSearchForm(new CarSearcher())
++           ->createSearchForm(new CarSearcher(), null , [
++               'my_option' => 'my_value',
++           ])
+            //...
+            ->init();
+
+        return $crud;
+    }
+}
+```
+
+Ces options peuvent être enfin récupérées dans les arguments `$options` des méthodes `buildForm` et `updateQueryBuilder` de `SearcherInterface`.
diff --git a/doc/cookbook/create_filter.md b/doc/cookbook/create_filter.md
new file mode 100644
index 0000000..97a1cd2
--- /dev/null
+++ b/doc/cookbook/create_filter.md
@@ -0,0 +1,17 @@
+# Création d'un filtre de recherche
+
+> **_ALTERNATIVES :_**
+>   
+> * [Utilisation d'un filtre existant](../references/filters.md)
+> * [Personnalisation avancée de la classe Searcher](../cookbook/advanced-searcher.md)
+
+
+Un filtre doit être une classe qui hérite de `AbstractFilter` ou implémente `FilterInterface` :
+* La méthode `buildForm` ajoute le filtre dans le fromulaire de recherche (utiliser `$builder->addField()`).
+* La méthode `updateQueryBuilder` modifie le QueryBuilder en fonction de la valeur saisie dans le filtre.
+* La méthode `configureOptions` définie les éventuelles options.
+
+> **_REMARQUE :_** Il est conseillé de regarder le code source des filtres existants.
+
+
+La classe doit être déclarée comme service ayant le [tag](https://symfony.com/doc/current/service_container/tags.html) `ecommit_crud.filter`.
diff --git a/doc/index.md b/doc/index.md
index 0645db1..d429ba4 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -18,6 +18,7 @@
 ## Fonctionnalités avancées
 
 * [Personnalisation avancée de la classe Searcher](cookbook/advanced-searcher.md)
+* [Création d'un filtre de recherche](cookbook/create_filter.md)
 * [Ajout de données aux templates](cookbook/data-template.md)
 * [Affichage des résultats uniquement si recherche envoyée](cookbook/display_results.md)
 * [Personnaliser les IDs des Divs](cookbook/div_ids.md)
diff --git a/doc/references/filters.md b/doc/references/filters.md
index a1ed941..8899c01 100644
--- a/doc/references/filters.md
+++ b/doc/references/filters.md
@@ -1,5 +1,10 @@
 # Filtres
 
+> **_A VOIR AUSSI :_**
+> 
+> * [Personnalisation avancée de la classe Searcher](../cookbook/advanced-searcher.md)
+> * [Création d'un filtre de recherche](create_filter.md)
+
 ## Options générales pour tous les filtres
 
 | Option | Description | Requis  | Valeur par défaut |
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 2f0ec99..3508a6b 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -117,7 +117,7 @@
   classes `Ecommit\CrudBundle\Form\Filter\*Filter` (dans le même namespace) mais avec un fonctionnement et une
   API totalement différents. [Voir les nouveaux filtres](../references/filters.md)
 * La classe `AbstractFieldFilter` est supprimée et remplacée par `AbstractFilter`, avec un fonctionnement et une
-  API totalement différents. Si vous avez réalisé vos propres filtres, vous devez les adapter avec la nouvelle API.
+  API totalement différents. Si vous avez réalisé vos propres filtres, vous devez les adapter avec la [nouvelle API](../cookbook/create_filter.md).
 * Les filtres sont maintenant des services ayant le tag `ecommit_crud.filter`, hériter de `AbstractFilter`
   ou implémenter `FilterInterface`.
 

From 9697a3a5d4a60350117f562e9e7d286c092bf6b8 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 16 Aug 2021 16:03:24 +0200
Subject: [PATCH 078/264] Register for autoconfiguration ("ecommit_crud.filter"
 tag)

---
 doc/cookbook/create_filter.md                 |  3 ++
 doc/upgrade/3.0.md                            |  5 +--
 .../EcommitCrudExtension.php                  |  3 ++
 .../EcommitCrudExtensionTest.php              | 33 +++++++++++++++++++
 tests/Functional/App/Form/Filter/MyFilter.php | 20 +++++++++++
 tests/Functional/App/config/services.yaml     |  4 +++
 6 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 tests/DependencyInjection/EcommitCrudExtensionTest.php
 create mode 100644 tests/Functional/App/Form/Filter/MyFilter.php

diff --git a/doc/cookbook/create_filter.md b/doc/cookbook/create_filter.md
index 97a1cd2..0a815ae 100644
--- a/doc/cookbook/create_filter.md
+++ b/doc/cookbook/create_filter.md
@@ -15,3 +15,6 @@ Un filtre doit être une classe qui hérite de `AbstractFilter` ou implémente `
 
 
 La classe doit être déclarée comme service ayant le [tag](https://symfony.com/doc/current/service_container/tags.html) `ecommit_crud.filter`.
+
+> **_REMARQUE :_** Avec l'option [autoconfigure](https://symfony.com/doc/current/service_container.html#services-autoconfigure)
+> de Symfony, le tag est automatiquement ajouté aux services.
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 3508a6b..db3a17c 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -118,8 +118,9 @@
   API totalement différents. [Voir les nouveaux filtres](../references/filters.md)
 * La classe `AbstractFieldFilter` est supprimée et remplacée par `AbstractFilter`, avec un fonctionnement et une
   API totalement différents. Si vous avez réalisé vos propres filtres, vous devez les adapter avec la [nouvelle API](../cookbook/create_filter.md).
-* Les filtres sont maintenant des services ayant le tag `ecommit_crud.filter`, hériter de `AbstractFilter`
-  ou implémenter `FilterInterface`.
+* Les filtres sont maintenant des services ayant le tag `ecommit_crud.filter`, héritant de `AbstractFilter`
+  ou implémentant `FilterInterface`. (Remarque: Avec l'option [autoconfigure](https://symfony.com/doc/current/service_container.html#services-autoconfigure)
+  de Symfony, le tag est automatiquement ajouté aux services).
 
 
 
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index af8da93..8673a5d 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -13,6 +13,7 @@
 
 namespace Ecommit\CrudBundle\DependencyInjection;
 
+use Ecommit\CrudBundle\Form\Filter\FilterInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -40,5 +41,7 @@ public function load(array $config, ContainerBuilder $container): void
         $container->setParameter('ecommit_crud.theme', $config['theme']);
         $container->setParameter('ecommit_crud.icon_theme', $config['icon_theme']);
         $container->setParameter('ecommit_crud.twig_functions_configuration', $config['twig_functions_configuration']);
+
+        $container->registerForAutoconfiguration(FilterInterface::class)->addTag('ecommit_crud.filter');
     }
 }
diff --git a/tests/DependencyInjection/EcommitCrudExtensionTest.php b/tests/DependencyInjection/EcommitCrudExtensionTest.php
new file mode 100644
index 0000000..d6c772f
--- /dev/null
+++ b/tests/DependencyInjection/EcommitCrudExtensionTest.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\DependencyInjection;
+
+use Ecommit\CrudBundle\Crud\CrudFilters;
+use Ecommit\CrudBundle\Tests\Functional\App\Form\Filter\MyFilter;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+class EcommitCrudExtensionTest extends KernelTestCase
+{
+    protected function setUp(): void
+    {
+        static::bootKernel();
+    }
+
+    public function testAutoconfigureTag(): void
+    {
+        $crudFilters = self::$container->get(CrudFilters::class);
+
+        $this->assertTrue($crudFilters->has(MyFilter::class));
+    }
+}
diff --git a/tests/Functional/App/Form/Filter/MyFilter.php b/tests/Functional/App/Form/Filter/MyFilter.php
new file mode 100644
index 0000000..07ebde5
--- /dev/null
+++ b/tests/Functional/App/Form/Filter/MyFilter.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\App\Form\Filter;
+
+use Ecommit\CrudBundle\Form\Filter\AbstractFilter;
+
+class MyFilter extends AbstractFilter
+{
+}
diff --git a/tests/Functional/App/config/services.yaml b/tests/Functional/App/config/services.yaml
index 62c19f6..d6ae84d 100644
--- a/tests/Functional/App/config/services.yaml
+++ b/tests/Functional/App/config/services.yaml
@@ -12,3 +12,7 @@ services:
     Ecommit\CrudBundle\Tests\Functional\App\Controller\:
         resource: '../Controller'
         tags: ['controller.service_arguments']
+
+    Ecommit\CrudBundle\Tests\Functional\App\Form\Filter\:
+        resource: '../Form/Filter'
+        #Do not add the tag - Autoconfigure is tested by EcommitCrudExtensionTest

From 26752688492235f47bcecd581c0760597612451c Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 20 Aug 2021 10:56:36 +0200
Subject: [PATCH 079/264] [Callback] Add registerCallback

---
 .eslintrc.js                                  |  1 -
 doc/references/js-callbacks.md                | 41 +++++---
 src/Resources/assets/js/callback-manager.js   | 47 +++++++++
 src/Resources/assets/js/callback.js           | 20 +---
 tests/Resources/public/js/ajax.spec.js        | 81 +++++++++------
 .../public/js/callback-manager.spec.js        | 98 +++++++++++++++++++
 tests/Resources/public/js/callback.spec.js    | 67 +++++++------
 7 files changed, 267 insertions(+), 88 deletions(-)
 create mode 100644 src/Resources/assets/js/callback-manager.js
 create mode 100644 tests/Resources/public/js/callback-manager.spec.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 76d8e29..994c02b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -20,7 +20,6 @@ module.exports = {
     rules: {
         'indent': ['error', 4],
         'linebreak-style': ['error', 'unix'],
-        'no-eval': 'off',
         'semi': 'off'
     }
 }
diff --git a/doc/references/js-callbacks.md b/doc/references/js-callbacks.md
index 0683180..3f661a5 100644
--- a/doc/references/js-callbacks.md
+++ b/doc/references/js-callbacks.md
@@ -2,22 +2,27 @@
 
 ## Définition des callbacks
 
+**Méthode 1 :**
+
 ```js
-//Methode 1
 var callback = function (arg) {
     alert('go');
     //...
 };
+```
+
+**Méthode 2 :**
 
-//Methode 2
-var callback = 'alert("go")';
+```js
+import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager';
 
-//Méthode 3
-var callback = 'function (arg) { alert("go"); }';
+callbackManager.registerCallback('my_callback_name', function (arg) {
+    alert('go');
+});
 ```
 
 
-Gestion de plusieurs callbacks :
+**Gestion de plusieurs callbacks :**
 
 ```js
 var callbacks = [
@@ -28,7 +33,7 @@ var callbacks = [
     },
     
     //Callback 2
-    'alert("go")'
+    'my_callback_name' //Callback enregistré par nom (voir méthode 2 plus haut)
 ];
 
 //Gestion des priorités (priorité par défaut = 0)
@@ -44,7 +49,7 @@ var callbacks = [
     
     //Callback 2
     {
-        callback: 'alert("go")',
+        callback: 'my_callback_name', //Callback enregistré par nom (voir méthode 2 plus haut)
         priority: 20
     }
 ];
@@ -53,14 +58,28 @@ var callbacks = [
 
 ## Appel des callbacks
 
+La fonction `runCallback` doit être appelée avec comme arguments :
+* Callback ou liste de callbacks
+* Argument passé à l'appel de chaque callback
+
+
+Le premier argument de la fonction `runCallback` est un callback ou liste de callbacks. Un callback (unique ou parmi le tableau) peut être :
+* 1 callback JavaScript (voir méthode 1 plus haut)
+* 1 nom de callback enregistré par par la méthode `registerCallback` (voir méthode 2 plus haut)
+* 1 objet avec les propriétés `callback` et `priority` (voir plus haut)
+
+
 ```js
 import runCallback from '@ecommit/crud-bundle/js/callback';
 
+//Exemple avec un unique callback
+//Voir paragraphe précédent
+//var callback = 
+runCallback(callback, '5');
+
+//Exemple avec un tableau de callbacks
 var callbacks = [
     //... Voir paragraphe précédent
 ];
-
-//1er argument: Callback ou liste de callbacks
-//2ème argument: Argument passé à l'appel de chaque callback
 runCallback(callbacks, '5');
 ```
diff --git a/src/Resources/assets/js/callback-manager.js b/src/Resources/assets/js/callback-manager.js
new file mode 100644
index 0000000..6caae07
--- /dev/null
+++ b/src/Resources/assets/js/callback-manager.js
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+const ENGINE_KEY = Symbol.for('ecommit.crudbundle.callbackengine');
+const globalSymbols = Object.getOwnPropertySymbols(global);
+if (globalSymbols.indexOf(ENGINE_KEY) === -1) {
+    global[ENGINE_KEY] = [];
+}
+
+export function registerCallback (name, callback) {
+    if (typeof name !== 'string' && !(name instanceof String)) {
+        console.error('Bad name');
+    }
+    if (!(callback instanceof Function)) {
+        console.error('Invalid callback ' + name);
+    }
+
+    global[ENGINE_KEY][name] = callback;
+}
+
+export function callbackIsRegistred (name) {
+    if (typeof name !== 'string' && !(name instanceof String)) {
+        console.error('Bad name');
+    }
+
+    return (undefined !== global[ENGINE_KEY][name]);
+}
+
+export function getRegistredCallback (name) {
+    if (!callbackIsRegistred(name)) {
+        console.error('Callback not found: ' + name);
+
+        return null;
+    }
+
+    return global[ENGINE_KEY][name];
+}
+
+export function clear () {
+    global[ENGINE_KEY] = [];
+}
diff --git a/src/Resources/assets/js/callback.js b/src/Resources/assets/js/callback.js
index b1b7f0e..8969d3e 100644
--- a/src/Resources/assets/js/callback.js
+++ b/src/Resources/assets/js/callback.js
@@ -8,6 +8,7 @@
  */
 
 import $ from 'jquery';
+import * as callbackManager from './callback-manager';
 
 export default function (callbacks, arg) {
     if (undefined === callbacks || callbacks === null) {
@@ -69,23 +70,8 @@ function processCallback (callback, arg) {
         return;
     }
 
-    const patternFunction = /^function\s*\(/i;
-    if (patternFunction.test(callback)) {
-        callback = eval('(' + callback + ')');
+    callback = callbackManager.getRegistredCallback(callback);
+    if (callback) {
         callback(arg);
-
-        return;
-    }
-
-    const patternFunctionContent = /^\/(.+)\/(.+)$/i;
-    const groups = callback.match(patternFunctionContent);
-    if (groups !== null && groups.length > 0) {
-        console.debug(groups);
-        callback = eval('(function(' + groups[1] + ') {' + groups[2] + '})');
-        callback(arg);
-
-        return;
     }
-
-    eval(callback);
 }
diff --git a/tests/Resources/public/js/ajax.spec.js b/tests/Resources/public/js/ajax.spec.js
index 54af1d3..1abd8de 100644
--- a/tests/Resources/public/js/ajax.spec.js
+++ b/tests/Resources/public/js/ajax.spec.js
@@ -8,6 +8,7 @@
  */
 
 import * as ajax from '@ecommit/crud-bundle/js/ajax';
+import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager';
 import $ from 'jquery';
 
 describe('Test Ajax.sendRequest', function () {
@@ -33,6 +34,7 @@ describe('Test Ajax.sendRequest', function () {
     afterEach(function () {
         jasmine.Ajax.uninstall();
         $('.html-test').remove();
+        callbackManager.clear();
     });
 
     it('Send request', function () {
@@ -268,6 +270,7 @@ describe('Test Ajax.click', function () {
     afterEach(function () {
         jasmine.Ajax.uninstall();
         $('.html-test').remove();
+        callbackManager.clear();
     });
 
     it('Send request with button', function () {
@@ -287,23 +290,31 @@ describe('Test Ajax.click', function () {
     });
 
     it('Send request with button and data-*', function () {
-        $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-success="callbackSuccess()">Go !</button>');
+        $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-success="my_callback_on_success">Go !</button>');
 
-        global.callbackSuccess = jasmine.createSpy('success');
+        const callbackSuccess = jasmine.createSpy('success');
+
+        callbackManager.registerCallback('my_callback_on_success', function (args) {
+            callbackSuccess(args);
+        });
 
         ajax.click($('#buttonToTest'));
 
         expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(global.callbackSuccess).toHaveBeenCalled();
+        expect(callbackSuccess).toHaveBeenCalled();
     });
 
     it('Send request with button and data-* and options', function () {
-        $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-on-success="callbackSuccess1()" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
+        $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
 
-        global.callbackSuccess1 = jasmine.createSpy('success1');
+        const callbackSuccess1 = jasmine.createSpy('success1');
         const callbackSuccess2 = jasmine.createSpy('success2');
         const callbackComplete = jasmine.createSpy('complete');
 
+        callbackManager.registerCallback('my_callback_on_success_1', function (args) {
+            callbackSuccess1(args);
+        });
+
         ajax.click($('#buttonToTest'), {
             url: '/badRequest', // overridden by data-ec-crud-ajax-url
             method: 'GET', // overridden by data-ec-crud-ajax-method
@@ -317,7 +328,7 @@ describe('Test Ajax.click', function () {
 
         expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
         expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
-        expect(global.callbackSuccess1).toHaveBeenCalled();
+        expect(callbackSuccess1).toHaveBeenCalled();
         expect(callbackSuccess2).not.toHaveBeenCalled();
         expect(callbackComplete).toHaveBeenCalled();
     });
@@ -343,18 +354,12 @@ describe('Test Ajax.click', function () {
         $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest');
     });
 
-    it('Send auto-request canceled by onBeforeSend option (function)', function () {
-        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="function (args) { args.stop = true; }">Go !</button>');
+    it('Send auto-request canceled by onBeforeSend option', function () {
+        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="my_callback_on_before_send">Go !</button>');
 
-        $('#clickToTest').click();
-
-        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
-
-        $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest');
-    });
-
-    it('Send auto-request canceled by onBeforeSend option (function content)', function () {
-        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="/args/args.stop = true">Go !</button>');
+        callbackManager.registerCallback('my_callback_on_before_send', function (args) {
+            args.stop = true;
+        });
 
         $('#clickToTest').click();
 
@@ -377,6 +382,7 @@ describe('Test Ajax.link', function () {
     afterEach(function () {
         jasmine.Ajax.uninstall();
         $('.html-test').remove();
+        callbackManager.clear();
     });
 
     it('Send request with link', function () {
@@ -395,24 +401,32 @@ describe('Test Ajax.link', function () {
     });
 
     it('Send request with link and data-*', function () {
-        $('body').append('<a href="/goodRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="callbackSuccess()">Go !</a>');
+        $('body').append('<a href="/goodRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success">Go !</a>');
 
-        global.callbackSuccess = jasmine.createSpy('success');
+        const callbackSuccess = jasmine.createSpy('success');
+
+        callbackManager.registerCallback('my_callback_on_success', function (args) {
+            callbackSuccess(args);
+        });
 
         ajax.link($('#linkToTest'));
 
         expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(global.callbackSuccess).toHaveBeenCalled();
+        expect(callbackSuccess).toHaveBeenCalled();
     });
 
     it('Send request with link and data-* and options', function () {
-        $('body').append('<a href="/badRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="callbackSuccess1()" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
+        $('body').append('<a href="/badRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
         // href is overridden by url option
 
-        global.callbackSuccess1 = jasmine.createSpy('success1');
+        const callbackSuccess1 = jasmine.createSpy('success1');
         const callbackSuccess2 = jasmine.createSpy('success2');
         const callbackComplete = jasmine.createSpy('complete');
 
+        callbackManager.registerCallback('my_callback_on_success_1', function (args) {
+            callbackSuccess1(args);
+        });
+
         ajax.link($('#linkToTest'), {
             url: '/badRequest', // overridden by data-ec-crud-ajax-url
             method: 'GET', // overridden by data-ec-crud-ajax-method
@@ -426,7 +440,7 @@ describe('Test Ajax.link', function () {
 
         expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
         expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
-        expect(global.callbackSuccess1).toHaveBeenCalled();
+        expect(callbackSuccess1).toHaveBeenCalled();
         expect(callbackSuccess2).not.toHaveBeenCalled();
         expect(callbackComplete).toHaveBeenCalled();
     });
@@ -466,6 +480,7 @@ describe('Test Ajax.form', function () {
     afterEach(function () {
         jasmine.Ajax.uninstall();
         $('.html-test').remove();
+        callbackManager.clear();
     });
 
     it('Send request with form', function () {
@@ -511,11 +526,14 @@ describe('Test Ajax.form', function () {
     });
 
     it('Send request with form and data-*', function () {
-        $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="callbackSuccess()"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
+        $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="my_callback_on_success"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
         $('#formToTest input[name=var1]').val('My value 1');
         $('#formToTest input[name=var2]').val('My value 2');
 
-        global.callbackSuccess = jasmine.createSpy('success');
+        const callbackSuccess = jasmine.createSpy('success');
+        callbackManager.registerCallback('my_callback_on_success', function (args) {
+            callbackSuccess(args);
+        });
 
         ajax.sendForm($('#formToTest'));
 
@@ -524,19 +542,23 @@ describe('Test Ajax.form', function () {
         expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
             var1: ['My value 1'], var2: ['My value 2']
         });
-        expect(global.callbackSuccess).toHaveBeenCalled();
+        expect(callbackSuccess).toHaveBeenCalled();
     });
 
     it('Send request with form and data-* and options', function () {
-        $('body').append('<form action="/badRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="callbackSuccess1()" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
+        $('body').append('<form action="/badRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
         // action is overridden by url option
         $('#formToTest input[name=var1]').val('My value 1');
         $('#formToTest input[name=var2]').val('My value 2');
 
-        global.callbackSuccess1 = jasmine.createSpy('success1');
+        const callbackSuccess1 = jasmine.createSpy('success1');
         const callbackSuccess2 = jasmine.createSpy('success2');
         const callbackComplete = jasmine.createSpy('complete');
 
+        callbackManager.registerCallback('my_callback_on_success_1', function (args) {
+            callbackSuccess1();
+        });
+
         ajax.sendForm($('#formToTest'), {
             url: '/badRequest', // overridden by data-ec-crud-ajax-url
             method: 'GET', // overridden by data-ec-crud-ajax-method
@@ -554,7 +576,7 @@ describe('Test Ajax.form', function () {
             var1: ['My value 1'],
             var2: ['My value 2']
         });
-        expect(global.callbackSuccess1).toHaveBeenCalled();
+        expect(callbackSuccess1).toHaveBeenCalled();
         expect(callbackSuccess2).not.toHaveBeenCalled();
         expect(callbackComplete).toHaveBeenCalled();
     });
@@ -599,6 +621,7 @@ describe('Test Ajax.updateDom', function () {
         $('.html-test').remove();
         $(document).off('ec-crud-ajax-update-dom-before');
         $(document).off('ec-crud-ajax-update-dom-after');
+        callbackManager.clear();
     });
 
     it('Update with "update" mode', function () {
diff --git a/tests/Resources/public/js/callback-manager.spec.js b/tests/Resources/public/js/callback-manager.spec.js
new file mode 100644
index 0000000..c8d716f
--- /dev/null
+++ b/tests/Resources/public/js/callback-manager.spec.js
@@ -0,0 +1,98 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager';
+
+describe('Test callback manager', function () {
+    afterEach(function () {
+        callbackManager.clear();
+    });
+
+    it('Test registerCallback with invalid name', function () {
+        spyOn(window.console, 'error');
+        callbackManager.registerCallback(function () {}, function () {});
+        expect(window.console.error).toHaveBeenCalledWith('Bad name');
+    });
+
+    it('Test registerCallback with null name', function () {
+        spyOn(window.console, 'error');
+        callbackManager.registerCallback(null, function () {});
+        expect(window.console.error).toHaveBeenCalledWith('Bad name');
+    });
+
+    it('Test registerCallback with invalid callback', function () {
+        spyOn(window.console, 'error');
+        callbackManager.registerCallback('my_callback', 'callback');
+        expect(window.console.error).toHaveBeenCalledWith('Invalid callback my_callback');
+    });
+
+    it('Test registerCallback with null callback', function () {
+        spyOn(window.console, 'error');
+        callbackManager.registerCallback('my_callback', null);
+        expect(window.console.error).toHaveBeenCalledWith('Invalid callback my_callback');
+    });
+
+    it('Test callbackIsRegistred with invalid name', function () {
+        spyOn(window.console, 'error');
+        callbackManager.callbackIsRegistred(function () {});
+        expect(window.console.error).toHaveBeenCalledWith('Bad name');
+    });
+
+    it('Test callbackIsRegistred with null name', function () {
+        spyOn(window.console, 'error');
+        callbackManager.callbackIsRegistred(null);
+        expect(window.console.error).toHaveBeenCalledWith('Bad name');
+    });
+
+    it('Test callbackIsRegistred with found callback', function () {
+        callbackManager.registerCallback('my_callback', function () {});
+        expect(callbackManager.callbackIsRegistred('my_callback')).toBeTrue();
+    });
+
+    it('Test callbackIsRegistred with not found callback', function () {
+        expect(callbackManager.callbackIsRegistred('my_callback')).toBeFalse();
+    });
+
+    it('Test getRegistredCallback with invalid name', function () {
+        spyOn(window.console, 'error');
+        callbackManager.getRegistredCallback(function () {});
+        expect(window.console.error).toHaveBeenCalledWith('Bad name');
+    });
+
+    it('Test getRegistredCallback with null name', function () {
+        spyOn(window.console, 'error');
+        callbackManager.getRegistredCallback(null);
+        expect(window.console.error).toHaveBeenCalledWith('Bad name');
+    });
+
+    it('Test getRegistredCallback with found callback', function () {
+        callbackManager.registerCallback('my_callback', function () {});
+        const callback = callbackManager.getRegistredCallback('my_callback');
+        expect(callback).toBeInstanceOf(Function);
+    });
+
+    it('Test getRegistredCallback with not found callback', function () {
+        spyOn(window.console, 'error');
+        const callback = callbackManager.getRegistredCallback('my_callback');
+        expect(window.console.error).toHaveBeenCalledWith('Callback not found: my_callback');
+        expect(callback).toBeNull();
+    });
+
+    it('Test clear', function () {
+        callbackManager.registerCallback('my_callback', function () {});
+        expect(callbackManager.getRegistredCallback('my_callback')).toBeInstanceOf(Function);
+
+        callbackManager.clear();
+
+        spyOn(window.console, 'error');
+        const callback = callbackManager.getRegistredCallback('my_callback');
+        expect(window.console.error).toHaveBeenCalledWith('Callback not found: my_callback');
+        expect(callback).toBeNull();
+    });
+});
diff --git a/tests/Resources/public/js/callback.spec.js b/tests/Resources/public/js/callback.spec.js
index df17aa2..b20601e 100644
--- a/tests/Resources/public/js/callback.spec.js
+++ b/tests/Resources/public/js/callback.spec.js
@@ -8,6 +8,7 @@
  */
 
 import runCallback from '@ecommit/crud-bundle/js/callback';
+import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager';
 
 describe('Test callback', function () {
     it('Test callback with function', function () {
@@ -21,27 +22,21 @@ describe('Test callback', function () {
     });
 
     it('Test callback with string', function () {
-        global.myCallback = jasmine.createSpy('callback');
+        const myCallback = jasmine.createSpy('callback');
+        callbackManager.registerCallback('my_callback', function (arg) {
+            myCallback(arg);
+        });
 
-        runCallback('function (arg) { myCallback(arg); }', 3);
+        runCallback('my_callback', 3);
 
-        expect(global.myCallback).toHaveBeenCalledWith(3);
+        expect(myCallback).toHaveBeenCalledWith(3);
+        callbackManager.clear();
     });
 
-    it('Test callback with function content with argument', function () {
-        global.myCallback = jasmine.createSpy('callback');
-
-        runCallback('/arg/myCallback(arg)', 5);
-
-        expect(global.myCallback).toHaveBeenCalledWith(5);
-    });
-
-    it('Test callback with function content without argument', function () {
-        global.myCallback = jasmine.createSpy('callback');
-
-        runCallback('myCallback(5)', 4);
-
-        expect(global.myCallback).toHaveBeenCalledWith(5);
+    it('Test callback with string - Callback not registred', function () {
+        spyOn(window.console, 'error');
+        runCallback('my_callback_never_registred', 3);
+        expect(window.console.error).toHaveBeenCalledWith('Callback not found: my_callback_never_registred');
     });
 
     it('Test callback with sub array', function () {
@@ -83,9 +78,19 @@ describe('Test callback', function () {
     it('Test callback with priorities', function () {
         const callback1 = jasmine.createSpy('callback1');
         const callback2 = jasmine.createSpy('callback2');
-        global.callback3 = jasmine.createSpy('callback3');
-        global.callback4 = jasmine.createSpy('callback4');
-        global.callback5 = jasmine.createSpy('callback5');
+        const callback3 = jasmine.createSpy('callback3');
+        const callback4 = jasmine.createSpy('callback4');
+        const callback5 = jasmine.createSpy('callback5');
+
+        callbackManager.registerCallback('my_callback3', function (arg) {
+            callback3(arg);
+        });
+        callbackManager.registerCallback('my_callback4', function (arg) {
+            callback4(arg);
+        });
+        callbackManager.registerCallback('my_callback5', function (arg) {
+            callback5(arg);
+        });
 
         runCallback([
             // Called third
@@ -102,28 +107,30 @@ describe('Test callback', function () {
             // Called second
             {
                 priority: 10,
-                callback: 'callback3()'
+                callback: 'my_callback3'
             },
             // Called fourth
             {
-                callback: 'callback4()'
+                callback: 'my_callback4'
             },
             // Called in fifth
-            'callback5()'
+            'my_callback5'
         ], 'myValue');
 
         expect(callback1).toHaveBeenCalledTimes(1);
         expect(callback2).toHaveBeenCalledTimes(1);
-        expect(global.callback3).toHaveBeenCalledTimes(1);
-        expect(global.callback4).toHaveBeenCalledTimes(1);
-        expect(global.callback5).toHaveBeenCalledTimes(1);
+        expect(callback3).toHaveBeenCalledTimes(1);
+        expect(callback4).toHaveBeenCalledTimes(1);
+        expect(callback5).toHaveBeenCalledTimes(1);
 
         expect(callback1).toHaveBeenCalledWith('myValue');
         expect(callback2).toHaveBeenCalledWith('myValue');
 
-        expect(callback2).toHaveBeenCalledBefore(global.callback3);
-        expect(global.callback3).toHaveBeenCalledBefore(callback1);
-        expect(callback1).toHaveBeenCalledBefore(global.callback4);
-        expect(global.callback4).toHaveBeenCalledBefore(global.callback5);
+        expect(callback2).toHaveBeenCalledBefore(callback3);
+        expect(callback3).toHaveBeenCalledBefore(callback1);
+        expect(callback1).toHaveBeenCalledBefore(callback4);
+        expect(callback4).toHaveBeenCalledBefore(callback5);
+
+        callbackManager.clear();
     });
 });

From 333c220b9db3052a2d1c8fa727bd2e5bc0f1e493 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 20 Aug 2021 11:00:29 +0200
Subject: [PATCH 080/264] Delete scrollToFirstMessage.js

---
 .eslintrc.js                                  |  1 -
 .../assets/js/scrollToFirstMessage.js         | 83 -------------------
 2 files changed, 84 deletions(-)
 delete mode 100644 src/Resources/assets/js/scrollToFirstMessage.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 994c02b..cc7768f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,7 +12,6 @@ module.exports = {
         Atomics: 'readonly',
         SharedArrayBuffer: 'readonly'
     },
-    ignorePatterns: ['/src/Resources/assets/js/scrollToFirstMessage.js'],
     parserOptions: {
         ecmaVersion: 2018,
         sourceType: 'module'
diff --git a/src/Resources/assets/js/scrollToFirstMessage.js b/src/Resources/assets/js/scrollToFirstMessage.js
deleted file mode 100644
index f3e37bb..0000000
--- a/src/Resources/assets/js/scrollToFirstMessage.js
+++ /dev/null
@@ -1,83 +0,0 @@
-function scrollToFirstMessage(scrollToError, scrollToFlashMessage, openTableIfMessage)
-{
-    if( typeof(scrollToError) == 'undefined' ){
-        scrollToError = true;
-    }
-    if( typeof(scrollToFlashMessage) == 'undefined' ){
-        scrollToFlashMessage = true;
-    }
-    if( typeof(openTableIfMessage) == 'undefined' ){
-        openTableIfMessage = true;
-    }
-
-    $(document).ready(function() {
-        if (scrollToFlashMessage) {
-            var cible = $('.flash-message:first');
-            if(cible.length > 0) {
-                if (openTableIfMessage) {
-                    openTable(cible);
-                }
-                var popupWrapper = $(cible).parents('.popup_wrapper_visible:first');
-                if (popupWrapper.length > 0) {
-                    height = getPositionTocenter(getCiblePositionInModal(cible));
-                    $(popupWrapper).animate({scrollTop:height});
-                } else {
-                    height = getPositionTocenter(cible.offset().top);
-                    $('html,body').animate({scrollTop:height});
-                }
-                return;
-            }
-        }
-
-        if (scrollToError) {
-            var cible = $('li.form_error_message:first');
-            if(cible.length > 0) {
-                if (openTableIfMessage) {
-                    openTable(cible);
-                }
-
-                var popupWrapper = $(cible).parents('.popup_wrapper_visible:first');
-                if (popupWrapper.length > 0) {
-                    height = getPositionTocenter(getCiblePositionInModal(cible));
-                    $(popupWrapper).animate({scrollTop:height});
-                } else {
-                    height = getPositionTocenter(cible.offset().top);
-                    $('html,body').animate({scrollTop:height});
-                }
-                return;
-            }
-        }
-    });
-}
-
-function openTable(cible)
-{
-    pane = cible.parents('div.pane-auto-display-first-message');
-    table = cible.parents('div.tab-auto-display-first-message');
-    if(pane.length > 0 && table.length > 0) {
-        idTable = table.attr('id');
-        indexPane = pane.prevAll("#"+idTable+" div.pane-auto-display-first-message").length;
-        api = $("#"+idTable).tabs();
-        api.click(indexPane);
-    }
-}
-
-function getCiblePositionInModal(cible)
-{
-    var divModal = $(cible).parents('.crud_modal:first');
-    var cibleOffset = parseInt(cible.offset().top);
-    var divModalOffset = parseInt(divModal.offset().top);
-    var divModalMarginTop = parseInt(divModal.css('margin-top'));
-
-    return cibleOffset - divModalOffset + divModalMarginTop;
-}
-
-function getPositionTocenter(errorPosition)
-{
-    var positionToCenter =  errorPosition - ($(window).height() / 2);
-    if (positionToCenter < 0) {
-        positionToCenter = 0;
-    }
-
-    return positionToCenter;
-}

From 91084464b90f63659ea6fc5f117300d8f1f2784b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 20 Aug 2021 11:07:24 +0200
Subject: [PATCH 081/264] Move tests/Resources/assets from
 tests/Resources/public

---
 .github/workflows/tests.yml                                   | 2 +-
 karma.conf.js                                                 | 4 ++--
 tests/Resources/{public => assets}/js/ajax.spec.js            | 0
 .../Resources/{public => assets}/js/callback-manager.spec.js  | 0
 tests/Resources/{public => assets}/js/callback.spec.js        | 0
 tests/Resources/{public => assets}/js/main.js                 | 0
 tests/Resources/{public => assets}/js/modal/engine/test.js    | 0
 .../{public => assets}/js/modal/modal-manager.spec.js         | 0
 .../Resources/{public => assets}/js/options-resolver.spec.js  | 0
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/Resources/{public => assets}/js/ajax.spec.js (100%)
 rename tests/Resources/{public => assets}/js/callback-manager.spec.js (100%)
 rename tests/Resources/{public => assets}/js/callback.spec.js (100%)
 rename tests/Resources/{public => assets}/js/main.js (100%)
 rename tests/Resources/{public => assets}/js/modal/engine/test.js (100%)
 rename tests/Resources/{public => assets}/js/modal/modal-manager.spec.js (100%)
 rename tests/Resources/{public => assets}/js/options-resolver.spec.js (100%)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bf6d29c..cf5534c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -106,4 +106,4 @@ jobs:
 
             -   name: Run ESLint
                 if: matrix.coding-standards
-                run: ./node_modules/.bin/eslint src/Resources/assets/js/* tests/Resources/public/js/*
+                run: ./node_modules/.bin/eslint src/Resources/assets/js/* tests/Resources/assets/js/*
diff --git a/karma.conf.js b/karma.conf.js
index df4f15f..3dd0689 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -28,10 +28,10 @@ module.exports = function(config) {
             terminal: false //Remove console.* logs
         },
         files: [
-            'tests/Resources/public/js/main.js'
+            'tests/Resources/assets/js/main.js'
         ],
         preprocessors: {
-            'tests/Resources/public/js/main.js': ['webpack']
+            'tests/Resources/assets/js/main.js': ['webpack']
         },
         webpackMiddleware: {
             stats: 'errors-only',
diff --git a/tests/Resources/public/js/ajax.spec.js b/tests/Resources/assets/js/ajax.spec.js
similarity index 100%
rename from tests/Resources/public/js/ajax.spec.js
rename to tests/Resources/assets/js/ajax.spec.js
diff --git a/tests/Resources/public/js/callback-manager.spec.js b/tests/Resources/assets/js/callback-manager.spec.js
similarity index 100%
rename from tests/Resources/public/js/callback-manager.spec.js
rename to tests/Resources/assets/js/callback-manager.spec.js
diff --git a/tests/Resources/public/js/callback.spec.js b/tests/Resources/assets/js/callback.spec.js
similarity index 100%
rename from tests/Resources/public/js/callback.spec.js
rename to tests/Resources/assets/js/callback.spec.js
diff --git a/tests/Resources/public/js/main.js b/tests/Resources/assets/js/main.js
similarity index 100%
rename from tests/Resources/public/js/main.js
rename to tests/Resources/assets/js/main.js
diff --git a/tests/Resources/public/js/modal/engine/test.js b/tests/Resources/assets/js/modal/engine/test.js
similarity index 100%
rename from tests/Resources/public/js/modal/engine/test.js
rename to tests/Resources/assets/js/modal/engine/test.js
diff --git a/tests/Resources/public/js/modal/modal-manager.spec.js b/tests/Resources/assets/js/modal/modal-manager.spec.js
similarity index 100%
rename from tests/Resources/public/js/modal/modal-manager.spec.js
rename to tests/Resources/assets/js/modal/modal-manager.spec.js
diff --git a/tests/Resources/public/js/options-resolver.spec.js b/tests/Resources/assets/js/options-resolver.spec.js
similarity index 100%
rename from tests/Resources/public/js/options-resolver.spec.js
rename to tests/Resources/assets/js/options-resolver.spec.js

From 47864cb936c593d02134f48ea33abbdd4bb0911a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 20 Aug 2021 13:27:47 +0200
Subject: [PATCH 082/264] Callback with multiple arguments

---
 doc/references/ajax.md                        |  8 +-
 doc/references/js-callbacks.md                | 12 +++
 src/Resources/assets/js/ajax.js               | 21 ++---
 src/Resources/assets/js/callback.js           | 18 ++--
 src/Resources/assets/js/crud.js               | 12 +--
 .../assets/js/modal/modal-manager.js          |  2 +-
 tests/Resources/assets/js/ajax.spec.js        | 86 +++++++++----------
 tests/Resources/assets/js/callback.spec.js    | 10 +++
 .../assets/js/modal/modal-manager.spec.js     |  4 +-
 9 files changed, 92 insertions(+), 81 deletions(-)

diff --git a/doc/references/ajax.md b/doc/references/ajax.md
index a44ac01..372d676 100644
--- a/doc/references/ajax.md
+++ b/doc/references/ajax.md
@@ -22,10 +22,10 @@ Options :
 | url | Url de l'action Ajax | Oui |  |
 | update | Si défini, mise à jour du DOM avec le résultat. (voir doc de la fonction `updateDom` plus bas) | Non | |
 | updateMode | Méthode à utiliser pour la mise à jour du DOM (voir doc de la fonction `updateDom` plus bas) | Non | update |
-| onBeforeSend | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant l'envoi de la requête | Non | |
-| onSuccess | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas de succès de la réponse | Non | |
-| onError | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas d'erreur lors de la réponse | Non | |
-| onComplete | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) après réponse | Non | |
+| onBeforeSend | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant l'envoi de la requête. `Function(options)`. Dans le callback peut passer `options.stop = false` pour annuler la requête. | Non | |
+| onSuccess | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas de succès de la réponse. `Function(data, textStatus, jqXHR)` | Non | |
+| onError | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas d'erreur lors de la réponse. `Function(jqXHR, textStatus, errorThrown)` | Non | |
+| onComplete | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) après réponse. `Function(jqXHR, textStatus)` | Non | |
 | dataType | Type de données attendu (html, xml, json, jsonp, text) | Non | html |
 | method | Méthode HTTP | Non | POST |
 | data | Données envoyées dans la requête | Non | |
diff --git a/doc/references/js-callbacks.md b/doc/references/js-callbacks.md
index 3f661a5..78d305b 100644
--- a/doc/references/js-callbacks.md
+++ b/doc/references/js-callbacks.md
@@ -83,3 +83,15 @@ var callbacks = [
 ];
 runCallback(callbacks, '5');
 ```
+
+Exemple avec un callback à plusieurs aguments :
+
+```js
+import runCallback from '@ecommit/crud-bundle/js/callback';
+
+var callback = function (arg1, arg2) {
+    var sum = arg1 + arg2;
+    alert(sum);
+};
+runCallback(callback, 10, 5); //Display "15"
+```
diff --git a/src/Resources/assets/js/ajax.js b/src/Resources/assets/js/ajax.js
index f5c4d0b..df97ea4 100644
--- a/src/Resources/assets/js/ajax.js
+++ b/src/Resources/assets/js/ajax.js
@@ -84,8 +84,8 @@ export function sendRequest (options) {
     if (optionsResolver.isNotBlank(options.update)) {
         callbacksSuccess.push({
             priority: 10,
-            callback: function (args) {
-                updateDom(options.update, options.updateMode, args.data);
+            callback: function (data, textStatus, jqXHR) {
+                updateDom(options.update, options.updateMode, data);
             }
         })
     }
@@ -100,24 +100,13 @@ export function sendRequest (options) {
         cache: options.cache,
         data: options.data,
         success: function (data, textStatus, jqXHR) {
-            runCallback(callbacksSuccess, {
-                data: data,
-                textStatus: textStatus,
-                jqXHR: jqXHR
-            });
+            runCallback(callbacksSuccess, data, textStatus, jqXHR);
         },
         error: function (jqXHR, textStatus, errorThrown) {
-            runCallback(options.onError, {
-                jqXHR: jqXHR,
-                textStatus: textStatus,
-                errorThrown: errorThrown
-            });
+            runCallback(options.onError, jqXHR, textStatus, errorThrown);
         },
         complete: function (jqXHR, textStatus) {
-            runCallback(options.onComplete, {
-                jqXHR: jqXHR,
-                textStatus: textStatus
-            });
+            runCallback(options.onComplete, jqXHR, textStatus);
         }
     });
 }
diff --git a/src/Resources/assets/js/callback.js b/src/Resources/assets/js/callback.js
index 8969d3e..6be0177 100644
--- a/src/Resources/assets/js/callback.js
+++ b/src/Resources/assets/js/callback.js
@@ -10,7 +10,7 @@
 import $ from 'jquery';
 import * as callbackManager from './callback-manager';
 
-export default function (callbacks, arg) {
+export default function (callbacks, ...args) {
     if (undefined === callbacks || callbacks === null) {
         return;
     }
@@ -37,7 +37,7 @@ export default function (callbacks, arg) {
     });
 
     $.each(newCallbacks, function (key, value) {
-        processCallback(value.callback, arg);
+        processCallback(value.callback, args);
     });
 }
 
@@ -59,19 +59,19 @@ function addCallbacksToStack (value, stack) {
     }
 }
 
-function processCallback (callback, arg) {
-    if (callback instanceof Function) {
-        callback(arg);
+function processCallback (subject, args) {
+    if (subject instanceof Function) {
+        subject(...args);
 
         return;
     }
 
-    if (typeof callback !== 'string' && !(callback instanceof String)) {
+    if (typeof subject !== 'string' && !(subject instanceof String)) {
         return;
     }
 
-    callback = callbackManager.getRegistredCallback(callback);
-    if (callback) {
-        callback(arg);
+    subject = callbackManager.getRegistredCallback(subject);
+    if (subject) {
+        subject(...args);
     }
 }
diff --git a/src/Resources/assets/js/crud.js b/src/Resources/assets/js/crud.js
index aca584a..14e9f5e 100644
--- a/src/Resources/assets/js/crud.js
+++ b/src/Resources/assets/js/crud.js
@@ -18,8 +18,8 @@ $(document).on('submit', 'form.ec-crud-search-form', function (event) {
     const listId = $(this).attr('data-crud-list-id');
 
     sendForm(this, {
-        onSuccess: function (args) {
-            const json = $.parseJSON(args.data);
+        onSuccess: function (data, textStatus, jqXHR) {
+            const json = $.parseJSON(data);
 
             updateDom($('#' + searchId), 'update', json.render_search);
             updateDom($('#' + listId), 'update', json.render_list);
@@ -32,8 +32,8 @@ $(document).on('click', 'button.ec-crud-search-reset', function (event) {
     const listId = $(this).attr('data-crud-list-id');
 
     click(this, {
-        onSuccess: function (args) {
-            const json = $.parseJSON(args.data);
+        onSuccess: function (data, textStatus, jqXHR) {
+            const json = $.parseJSON(data);
 
             updateDom($('#' + searchId), 'update', json.render_search);
             updateDom($('#' + listId), 'update', json.render_list);
@@ -93,8 +93,8 @@ $(document).on('submit', '.ec-crud-display-settings form', function (event) {
     closeDisplaySettings($('#' + displaySettingsContainerId));
 
     sendForm(this, {
-        onSuccess: function (args) {
-            const json = $.parseJSON(args.data);
+        onSuccess: function (data, textStatus, jqXHR) {
+            const json = $.parseJSON(data);
 
             updateDom($('#' + listId), 'update', json.render_list);
             if (!json.form_is_valid) {
diff --git a/src/Resources/assets/js/modal/modal-manager.js b/src/Resources/assets/js/modal/modal-manager.js
index caa60c0..d40d42a 100644
--- a/src/Resources/assets/js/modal/modal-manager.js
+++ b/src/Resources/assets/js/modal/modal-manager.js
@@ -130,7 +130,7 @@ export function openRemoteModal (options) {
     const callbacksSuccess = [
         {
             priority: 1,
-            callback: function (args) {
+            callback: function (data, textStatus, jqXHR) {
                 openModal(options);
             }
         }
diff --git a/tests/Resources/assets/js/ajax.spec.js b/tests/Resources/assets/js/ajax.spec.js
index 1abd8de..ff77bb2 100644
--- a/tests/Resources/assets/js/ajax.spec.js
+++ b/tests/Resources/assets/js/ajax.spec.js
@@ -44,14 +44,14 @@ describe('Test Ajax.sendRequest', function () {
 
         ajax.sendRequest({
             url: '/goodRequest',
-            onComplete: function (args) {
+            onComplete: function (jqXHR, textStatus) {
                 callbackComplete();
             },
-            onSuccess: function (args) {
-                callbackSuccess(args.data);
+            onSuccess: function (data, textStatus, jqXHR) {
+                callbackSuccess(data);
             },
-            onError: function (args) {
-                callbackError(args.jqXHR.responseText);
+            onError: function (jqXHR, textStatus, errorThrown) {
+                callbackError(jqXHR.responseText);
             }
         });
 
@@ -69,14 +69,14 @@ describe('Test Ajax.sendRequest', function () {
 
         ajax.sendRequest({
             url: '/error404',
-            onComplete: function (args) {
+            onComplete: function (jqXHR, textStatus) {
                 callbackComplete();
             },
-            onSuccess: function (args) {
-                callbackSuccess(args.data);
+            onSuccess: function (data, textStatus, jqXHR) {
+                callbackSuccess(data);
             },
-            onError: function (args) {
-                callbackError(args.jqXHR.responseText);
+            onError: function (jqXHR, textStatus, errorThrown) {
+                callbackError(jqXHR.responseText);
             }
         });
 
@@ -93,12 +93,12 @@ describe('Test Ajax.sendRequest', function () {
         ajax.sendRequest({
             url: '/goodRequest',
             onSuccess: [
-                function (args) {
+                function (data, textStatus, jqXHR) {
                     callbackSuccess1();
                 },
                 {
                     priority: 99,
-                    callback: function (args) {
+                    callback: function (data, textStatus, jqXHR) {
                         callbackSuccess2();
                     }
                 }
@@ -122,7 +122,7 @@ describe('Test Ajax.sendRequest', function () {
         ajax.sendRequest({
             url: '/goodRequest',
             onSuccess: {
-                callback: function (args) {
+                callback: function (data, textStatus, jqXHR) {
                     callbackSuccess($('#ajax-result').html());
                 },
                 priority: -99
@@ -174,10 +174,10 @@ describe('Test Ajax.sendRequest', function () {
 
         ajax.sendRequest({
             url: '/goodRequest',
-            onBeforeSend: function (args) {
+            onBeforeSend: function (options) {
                 callbackBeforeSend();
             },
-            onSuccess: function (args) {
+            onSuccess: function (data, textStatus, jqXHR) {
                 callbackSuccess();
             }
         });
@@ -192,11 +192,11 @@ describe('Test Ajax.sendRequest', function () {
 
         ajax.sendRequest({
             url: '/goodRequest',
-            onBeforeSend: function (args) {
+            onBeforeSend: function (options) {
                 callbackBeforeSend();
-                args.stop = true;
+                options.stop = true;
             },
-            onSuccess: function (args) {
+            onSuccess: function (data, textStatus, jqXHR) {
                 callbackSuccess();
             }
         });
@@ -226,7 +226,7 @@ describe('Test Ajax.sendRequest', function () {
         ajax.sendRequest({
             url: '/resultJS',
             onSuccess: {
-                callback: function (args) {
+                callback: function (data, textStatus, jqXHR) {
                     callbackSuccess($('#ajax-result').html());
                 },
                 priority: -99
@@ -244,7 +244,7 @@ describe('Test Ajax.sendRequest', function () {
         ajax.sendRequest({
             url: '/goodRequest',
             onSuccess: {
-                callback: function (args) {
+                callback: function (data, textStatus, jqXHR) {
                     callbackSuccess($('#ajax-result').html());
                 },
                 priority: -99
@@ -280,7 +280,7 @@ describe('Test Ajax.click', function () {
 
         ajax.click($('#buttonToTest'), {
             url: '/goodRequest',
-            onSuccess: function (args) {
+            onSuccess: function (data, textStatus, jqXHR) {
                 callbackSuccess();
             }
         });
@@ -294,8 +294,8 @@ describe('Test Ajax.click', function () {
 
         const callbackSuccess = jasmine.createSpy('success');
 
-        callbackManager.registerCallback('my_callback_on_success', function (args) {
-            callbackSuccess(args);
+        callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
+            callbackSuccess();
         });
 
         ajax.click($('#buttonToTest'));
@@ -311,17 +311,17 @@ describe('Test Ajax.click', function () {
         const callbackSuccess2 = jasmine.createSpy('success2');
         const callbackComplete = jasmine.createSpy('complete');
 
-        callbackManager.registerCallback('my_callback_on_success_1', function (args) {
-            callbackSuccess1(args);
+        callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
+            callbackSuccess1();
         });
 
         ajax.click($('#buttonToTest'), {
             url: '/badRequest', // overridden by data-ec-crud-ajax-url
             method: 'GET', // overridden by data-ec-crud-ajax-method
-            onSuccess: function (args) { // overridden by data-ec-crud-ajax-on-success
+            onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
                 callbackSuccess2();
             },
-            onComplete: function (args) {
+            onComplete: function (jqXHR, textStatus) {
                 callbackComplete();
             }
         });
@@ -357,8 +357,8 @@ describe('Test Ajax.click', function () {
     it('Send auto-request canceled by onBeforeSend option', function () {
         $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="my_callback_on_before_send">Go !</button>');
 
-        callbackManager.registerCallback('my_callback_on_before_send', function (args) {
-            args.stop = true;
+        callbackManager.registerCallback('my_callback_on_before_send', function (options) {
+            options.stop = true;
         });
 
         $('#clickToTest').click();
@@ -391,7 +391,7 @@ describe('Test Ajax.link', function () {
         const callbackSuccess = jasmine.createSpy('success');
 
         ajax.link($('#linkToTest'), {
-            onSuccess: function (args) {
+            onSuccess: function (data, textStatus, jqXHR) {
                 callbackSuccess();
             }
         });
@@ -405,8 +405,8 @@ describe('Test Ajax.link', function () {
 
         const callbackSuccess = jasmine.createSpy('success');
 
-        callbackManager.registerCallback('my_callback_on_success', function (args) {
-            callbackSuccess(args);
+        callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
+            callbackSuccess();
         });
 
         ajax.link($('#linkToTest'));
@@ -423,17 +423,17 @@ describe('Test Ajax.link', function () {
         const callbackSuccess2 = jasmine.createSpy('success2');
         const callbackComplete = jasmine.createSpy('complete');
 
-        callbackManager.registerCallback('my_callback_on_success_1', function (args) {
-            callbackSuccess1(args);
+        callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
+            callbackSuccess1();
         });
 
         ajax.link($('#linkToTest'), {
             url: '/badRequest', // overridden by data-ec-crud-ajax-url
             method: 'GET', // overridden by data-ec-crud-ajax-method
-            onSuccess: function (args) { // overridden by data-ec-crud-ajax-on-success
+            onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
                 callbackSuccess2();
             },
-            onComplete: function (args) {
+            onComplete: function (jqXHR, textStatus) {
                 callbackComplete();
             }
         });
@@ -491,7 +491,7 @@ describe('Test Ajax.form', function () {
         const callbackSuccess = jasmine.createSpy('success');
 
         ajax.sendForm($('#formToTest'), {
-            onSuccess: function (args) {
+            onSuccess: function (data, textStatus, jqXHR) {
                 callbackSuccess();
             }
         });
@@ -512,7 +512,7 @@ describe('Test Ajax.form', function () {
         const callbackSuccess = jasmine.createSpy('success');
 
         ajax.sendForm($('#formToTest'), {
-            onSuccess: function (args) {
+            onSuccess: function (data, textStatus, jqXHR) {
                 callbackSuccess();
             }
         });
@@ -531,8 +531,8 @@ describe('Test Ajax.form', function () {
         $('#formToTest input[name=var2]').val('My value 2');
 
         const callbackSuccess = jasmine.createSpy('success');
-        callbackManager.registerCallback('my_callback_on_success', function (args) {
-            callbackSuccess(args);
+        callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
+            callbackSuccess();
         });
 
         ajax.sendForm($('#formToTest'));
@@ -555,17 +555,17 @@ describe('Test Ajax.form', function () {
         const callbackSuccess2 = jasmine.createSpy('success2');
         const callbackComplete = jasmine.createSpy('complete');
 
-        callbackManager.registerCallback('my_callback_on_success_1', function (args) {
+        callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
             callbackSuccess1();
         });
 
         ajax.sendForm($('#formToTest'), {
             url: '/badRequest', // overridden by data-ec-crud-ajax-url
             method: 'GET', // overridden by data-ec-crud-ajax-method
-            onSuccess: function (args) { // overridden by data-ec-crud-ajax-on-success
+            onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
                 callbackSuccess2();
             },
-            onComplete: function (args) {
+            onComplete: function (jqXHR, textStatus) {
                 callbackComplete();
             }
         });
diff --git a/tests/Resources/assets/js/callback.spec.js b/tests/Resources/assets/js/callback.spec.js
index b20601e..6a8bba4 100644
--- a/tests/Resources/assets/js/callback.spec.js
+++ b/tests/Resources/assets/js/callback.spec.js
@@ -133,4 +133,14 @@ describe('Test callback', function () {
 
         callbackManager.clear();
     });
+
+    it('Test callback with many arguments', function () {
+        const callback = jasmine.createSpy('callback');
+
+        runCallback(function (arg1, arg2) {
+            callback(arg1, arg2);
+        }, 2, 4);
+
+        expect(callback).toHaveBeenCalledWith(2, 4);
+    });
 });
diff --git a/tests/Resources/assets/js/modal/modal-manager.spec.js b/tests/Resources/assets/js/modal/modal-manager.spec.js
index 3b3f582..7a6e87d 100644
--- a/tests/Resources/assets/js/modal/modal-manager.spec.js
+++ b/tests/Resources/assets/js/modal/modal-manager.spec.js
@@ -297,13 +297,13 @@ describe('Test Modal-manager with test engine', function () {
                     onSuccess: [
                         {
                             priority: 6,
-                            callback: function (args) {
+                            callback: function (data, textStatus, jqXHR) {
                                 callbackSuccess1();
                             }
                         },
                         {
                             priority: -2,
-                            callback: function (args) {
+                            callback: function (data, textStatus, jqXHR) {
                                 callbackSuccess2();
                             }
                         }

From 8c2986d04cbb4a56d569c20c26c4c552d7901c7e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 5 Sep 2021 16:08:18 +0200
Subject: [PATCH 083/264] Remove DoctrineExtension and Paginator

---
 composer.json                                |   2 +
 doc/crud.md                                  |   2 +-
 doc/upgrade/3.0.md                           |  60 ++++-
 src/Crud/Crud.php                            |   5 +-
 src/DoctrineExtension/Paginate.php           | 256 ------------------
 src/DoctrineExtension/QueryBuilderFilter.php | 246 -----------------
 src/Form/Filter/CollectionFilterTrait.php    |   2 +-
 src/Paginator/AbstractDoctrinePaginator.php  | 121 ---------
 src/Paginator/AbstractPaginator.php          | 268 -------------------
 src/Paginator/ArrayPaginator.php             |  92 -------
 src/Paginator/DoctrineDBALPaginator.php      |  54 ----
 src/Paginator/DoctrineORMPaginator.php       | 113 --------
 src/Twig/CrudExtension.php                   |   4 +-
 tests/Twig/CrudExtensionTest.php             | 115 ++++----
 14 files changed, 127 insertions(+), 1213 deletions(-)
 delete mode 100644 src/DoctrineExtension/Paginate.php
 delete mode 100644 src/DoctrineExtension/QueryBuilderFilter.php
 delete mode 100644 src/Paginator/AbstractDoctrinePaginator.php
 delete mode 100644 src/Paginator/AbstractPaginator.php
 delete mode 100644 src/Paginator/ArrayPaginator.php
 delete mode 100644 src/Paginator/DoctrineDBALPaginator.php
 delete mode 100644 src/Paginator/DoctrineORMPaginator.php

diff --git a/composer.json b/composer.json
index 9ef6e6c..451b825 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,8 @@
         "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
         "doctrine/orm": "^2.6.4",
         "doctrine/persistence": "^1.3|^2.0",
+        "ecommit/doctrine-utils": "1.0.x-dev",
+        "ecommit/paginator": "1.0.x-dev",
         "ecommit/scalar-values": "^1.0",
         "symfony/asset": "^4.4|^5.0",
         "symfony/config": "^4.4.12|^5.1.4",
diff --git a/doc/crud.md b/doc/crud.md
index c255320..8667d63 100644
--- a/doc/crud.md
+++ b/doc/crud.md
@@ -256,7 +256,7 @@ La classe Searcher représente les champs du formulaire de recherche.
 
 Si vous ne désirez pas activer le formulaire de recherche sur le CRUD, passez ce paragraphe.
 
-Note classe doit hériter de `Ecommit\CrudBundle\Form\Searcher\AbstractSearcher` (ou implémenter `Ecommit\CrudBundle\Form\Searcher\SearcherInterface`) :
+Notre classe doit hériter de `Ecommit\CrudBundle\Form\Searcher\AbstractSearcher` (ou implémenter `Ecommit\CrudBundle\Form\Searcher\SearcherInterface`) :
 
 ```php
 <?php
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index db3a17c..b7b8d9c 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -128,17 +128,64 @@
 
 **Namespace: Ecommit\CrudBundle\DoctrineExtension**
 
-* La méthode `count` de `Paginate` est supprimée. Utiliser à la place les méthodes `Doctrine\ORM\Tools\Pagination\Paginator::count` 
-  ou `Paginate::countQueryBuilder`.
+Les classes `Ecommit\CrudBundle\DoctrineExtension\*` sont supprimées. Utiliser à la place [ecommit/doctrine-utils](https://github.com/e-commit/doctrine-utils) :
+
+> **_REMARQUE:_**  Ce bundle a comme dépendances cette librairie.
+
+Si vous utilisez l'une de ces classes, voici la migration à effectuer :
+* Méthode `Paginate::count` : Pas d'équivalent
+* Méthode `Paginate::countQueryBuilder` : Utiliser `Ecommit\DoctrineUtils\Paginator\DoctrinePaginatorBuilder::countQueryBuilder`
+  avec les adaptations suivantes :
+    * La méthode contient un unique argument : Un tableau d'options (le nom des options reste inchangé). L'objet QueryBuilder 
+      est à passer dans l'option `query_builder` de ce tableau
+* Méthode `Paginate::createDoctrinePaginator` : Utiliser `Ecommit\DoctrineUtils\Paginator\DoctrinePaginatorBuilder::createDoctrinePaginator`
+  avec les adaptations suivantes :
+    * Retourne un objet de type `Ecommit\DoctrineUtils\Paginator\AbstractDoctrinePaginator`
+    * L'option `behavior` n'existe plus. Le choix du comportement est réalisé en fonction de la nouvelle option `by_identifier` (si nulle ou non).
+    * L'option `identifier` est renommée en `by_identifier`.
+    * Les options `count_manual_value` et `count_options` sont fusionnées en une unique option `count`.
 
 
 ## Paginator
 
 **Namespace: Ecommit\CrudBundle\Paginator**
 
-* La méthode `setResults` de `ArrayPaginator` est supprimée. Utiliser à la place la méthode `setData`.
-* La méthode `setResultsWithoutSlice` de `ArrayPaginator` est supprimée. Utiliser à la place la méthode `setDataWithoutSlice`.
-* La méthode `setDbalQueryBuilder` et `DoctrineDBALPaginator` est supprimée. Utiliser à la place la méthode `setQueryBuilder`.
+Les classes `Ecommit\CrudBundle\Paginator\*` sont supprimées. Utiliser à la place [ecommit/paginator](https://github.com/e-commit/paginator)
+et [ecommit/doctrine-utils](https://github.com/e-commit/doctrine-utils) :
+
+> **_REMARQUE:_**  Ce bundle a comme dépendances ces 2 librairies.
+
+Si vous utilisez l'une de ces classes, voici la migration à effectuer :
+* Pour `AbstractPaginator` (et donc `ArrayPaginator`, `AbstractDoctrinePaginator`, `DoctrineDBALPaginator` et `DoctrineORMPaginator`) :
+    * L'unique valeur du constructeur est un tableau d'options.
+    * Toutes les méthodes publiques `set*` n'existent plus. Utiliser le tableau d'options du constructeur.
+    * Ne plus appeler la fonction `init` qui est supprimée.
+    * Passez le numéro de page et le nombre résultats par page dans les options du constructeurs: options `page` (oligatoire) et `max_per_page` (facultative).
+    * Méthodes publiques ajoutées : `pageExists`, `isInitialized`, `getOptions`, `getOption`.
+    * Méthodes abstraites protégées ajoutées : `buildCount`, `buildIterator`.
+    * Méthodes publiques supprimées : `getCountResults` (utiliser méthode `count`), `setPage` (utiliser l'option `page` du constructeur),
+        `getMaxPerPage` (utiliser l'option `max_per_page`) du constructeur.
+    * Méthodes publiques abstraites supprimées : `init`, `getResults` (utiliser la méthode `getIterator`).
+    * Méthodes protégées supprimées : `setCountResults` (utiliser l'option `count` du constructeur), `initLastPage`, `isIteratorInitialized`.
+    * Données membres protégées supprimées: `page`, `maxPerPage`, `lastPage`, `countResults`, `results`.
+    * L'équivalent de `AbstractPaginator` est `Ecommit\Paginator\AbstractPaginator`.
+* Pour `ArrayPaginator`, utilisez à la pace  `Ecommit\Paginator\ArrayPaginator` avec les modifications suivantes :
+    * Les méthodes `setData` et `setResults` sont supprimées. Utiliser à la place l'option `data` du constructeur.
+    * Les méthodes `setResultsWithoutSlice` et `setDataWithoutSlice` sont supprimées. Utiliser à la place les 2 options
+        `data` et `count` du constructeur.
+    * Données membres protégées supprimées : `initialObjects`, `manualCountResults`.
+* Pour `AbstractDoctrinePaginator` (et donc `DoctrineDBALPaginator` et `DoctrineORMPaginator`) :
+    * L'objet QueryBuilder est à passer dans l'option `query_builder` du constructeur.
+    * Méthodes abstraites protégées supprimées : `getQueryBuilderClass`, `initPaginator`.
+    * Méthodes publiques supprimées : `getQueryBuilder`, `setQueryBuilder`, `getManualCountResults`, `setManualCountResults`
+        `getCountOptions`, `setCountOptions`.
+    * Données membres protégées supprimées : `query`, `manualCountResults`, `countOptions`.
+    * L'équivalent de `AbstractDoctrinePaginator` est `Ecommit\Plaginator\AbstractDoctrinePaginator`.
+* Pour `DoctrineDBALPaginator`, utilisez à la place `Ecommit\DoctrineUtils\Paginator\DoctrineDBALPaginator`.
+* Pour `DoctrineORMPaginator`, utilisez à la place `Ecommit\DoctrineUtils\Paginator\DoctrineORMPaginator` avec les modifications suivantes :
+    * La méthode `setSimplifiedRequest` est supprimée. Utiliser à la place l'option `simplified_request` du constructeur.
+    * La méthode `setFetchJoinCollection` est supprimée. Utiliser à la place l'option `fetch_join_collection` du constructeur.
+    * Méthodes publiques supprimées : `isSimplifiedRequest`, `isFetchJoinCollection`.
 
 
 
@@ -169,6 +216,9 @@
     * `text_last`
     * `use_bootstrap`
     * `bootstrap_size`
+* La signature de la fonction Twig `paginator_links` est modifiée:
+    * Avant `paginator_links(AbstractPaginator $paginator, $routeName, $routeParams, $options)`
+    * Maintenance: `paginator_links(PaginatorInterface $paginator, string $routeName, array $routeParams = [], array $options = [])`
 * La signature de la fonction Twig `crud_paginator_links` est modifiée:
     * Avant: `crud_paginator_links(Crud $crud, $options = [], $ajaxOptions = [])`
     * Maintenant: `crud_paginator_links(Crud $crud, array $options = [])`
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 4d904db..16f795b 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -13,10 +13,10 @@
 
 namespace Ecommit\CrudBundle\Crud;
 
-use Ecommit\CrudBundle\DoctrineExtension\Paginate;
 use Ecommit\CrudBundle\Entity\UserCrudSettings;
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 use Ecommit\CrudBundle\Form\Type\DisplaySettingsType;
+use Ecommit\DoctrineUtils\Paginator\DoctrinePaginatorBuilder;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Form;
@@ -777,13 +777,12 @@ public function buildQuery(): void
                     $paginatorOptions = $this->buildPaginator;
                 }
 
-                $this->paginator = Paginate::createDoctrinePaginator(
+                $this->paginator = DoctrinePaginatorBuilder::createDoctrinePaginator(
                     $this->queryBuilder,
                     $this->sessionValues->page,
                     $this->sessionValues->resultsPerPage,
                     $paginatorOptions
                 );
-                $this->paginator->init();
             }
         }
     }
diff --git a/src/DoctrineExtension/Paginate.php b/src/DoctrineExtension/Paginate.php
deleted file mode 100644
index c8f53b4..0000000
--- a/src/DoctrineExtension/Paginate.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\DoctrineExtension;
-
-use Doctrine\ORM\NativeQuery;
-use Doctrine\ORM\Query\Parameter;
-use Doctrine\ORM\Query\ResultSetMapping;
-use Doctrine\ORM\Tools\Pagination\Paginator;
-use Ecommit\CrudBundle\Paginator\AbstractPaginator;
-use Ecommit\CrudBundle\Paginator\ArrayPaginator;
-use Ecommit\CrudBundle\Paginator\DoctrineDBALPaginator;
-use Ecommit\CrudBundle\Paginator\DoctrineORMPaginator;
-use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class Paginate
-{
-    /**
-     * @param \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder $queryBuilder
-     *
-     * @throws \Exception
-     *
-     * @return int
-     */
-    public static function countQueryBuilder($queryBuilder, array $options = [])
-    {
-        if ($queryBuilder instanceof \Doctrine\ORM\QueryBuilder) {
-            $useORM = true;
-        } elseif ($queryBuilder instanceof \Doctrine\DBAL\Query\QueryBuilder) {
-            $useORM = false;
-        } else {
-            throw new \Exception('Bad QueryBuilder');
-        }
-
-        $resolver = new OptionsResolver();
-        $resolver->setDefaults([
-            //Behavior. Availabled values:
-            //  - count_by_alias: Use alias. Option "alias" is required
-            //  - count_by_sub_request: Use sub request
-            //  - orm: Use Doctrine Paginator
-            'behavior' => self::getDefaultCountBehavior($queryBuilder),
-            //Used when behavior=count_by_alias
-            'alias' => null,
-            //Used when behavior=count_by_alias
-            'distinct_alias' => true,
-        ]);
-        $resolver->setAllowedTypes('distinct_alias', ['boolean']);
-        if ($useORM) {
-            $resolver->setAllowedValues('behavior', ['count_by_alias', 'count_by_sub_request', 'orm']);
-            //Use only when ORM and behavior=orm
-            $resolver->setDefault('simplified_request', true);
-        } else {
-            $resolver->setAllowedValues('behavior', ['count_by_alias', 'count_by_sub_request']);
-        }
-        $options = $resolver->resolve($options);
-        if ('count_by_alias' === $options['behavior'] && null === $options['alias']) {
-            throw new MissingOptionsException('Option "alias" is required');
-        }
-
-        if ($useORM) {
-            if ('orm' === $options['behavior']) {
-                $cloneQueryBuilder = clone $queryBuilder;
-                $doctrinePaginator = new Paginator($cloneQueryBuilder->getQuery());
-                $doctrinePaginator->setUseOutputWalkers(!$options['simplified_request']);
-
-                return (int) $doctrinePaginator->count();
-            } elseif ('count_by_alias' === $options['behavior']) {
-                /** @var \Doctrine\ORM\QueryBuilder $countQueryBuilder */
-                $countQueryBuilder = clone $queryBuilder;
-                $distinct = ($options['distinct_alias']) ? 'DISTINCT ' : '';
-                $countQueryBuilder->select(sprintf('count(%s%s)', $distinct, $options['alias']));
-                $countQueryBuilder->resetDQLPart('orderBy');
-
-                return (int) $countQueryBuilder->getQuery()->getSingleScalarResult();
-            } elseif ('count_by_sub_request' === $options['behavior']) {
-                /** @var \Doctrine\ORM\QueryBuilder $cloneQueryBuilder */
-                $cloneQueryBuilder = clone $queryBuilder;
-                $cloneQueryBuilder->resetDQLPart('orderBy');
-                $rsm = new ResultSetMapping();
-                $rsm->addScalarResult('cnt', 'cnt');
-                $countSql = sprintf('SELECT count(*) as cnt FROM (%s) mainquery', $cloneQueryBuilder->getQuery()->getSQL());
-                /** @var NativeQuery $countQuery */
-                $countQuery = $queryBuilder->getEntityManager()->createNativeQuery($countSql, $rsm);
-                $i = 0;
-                /** @var Parameter $parameter */
-                foreach ($queryBuilder->getParameters() as $parameter) {
-                    ++$i;
-                    $countQuery->setParameter($i, $parameter->getValue(), $parameter->getType());
-                }
-
-                return (int) $countQuery->getSingleScalarResult();
-            }
-        } else {
-            if ('count_by_alias' === $options['behavior']) {
-                /** @var \Doctrine\DBAL\Query\QueryBuilder $countQueryBuilder */
-                $countQueryBuilder = clone $queryBuilder;
-                $distinct = ($options['distinct_alias']) ? 'DISTINCT ' : '';
-                $countQueryBuilder->select(sprintf('count(%s%s)', $distinct, $options['alias']));
-                $countQueryBuilder->resetQueryPart('orderBy');
-
-                return (int) $countQueryBuilder->execute()->fetchColumn(0);
-            } elseif ('count_by_sub_request' === $options['behavior']) {
-                $queryBuilderCount = clone $queryBuilder;
-                $queryBuilderClone = clone $queryBuilder;
-
-                $queryBuilderClone->resetQueryPart('orderBy'); //Disable sort (> performance)
-
-                $queryBuilderCount->resetQueryParts(); //Remove Query Parts
-                $queryBuilderCount->select('count(*)')
-                    ->from('('.$queryBuilderClone->getSql().')', 'mainquery');
-
-                return (int) $queryBuilderCount->execute()->fetchColumn(0);
-            }
-        }
-    }
-
-    /**
-     * @param \Doctrine\ORM\QueryBuilde|\Doctrine\DBAL\Query\QueryBuilder $queryBuilder
-     *
-     * @return string
-     */
-    public static function getDefaultCountBehavior($queryBuilder)
-    {
-        if ($queryBuilder instanceof \Doctrine\ORM\QueryBuilder) {
-            return 'orm';
-        } elseif ($queryBuilder instanceof \Doctrine\DBAL\Query\QueryBuilder) {
-            return 'count_by_sub_request';
-        }
-
-        return null;
-    }
-
-    /**
-     * @param \Doctrine\ORM\QueryBuilde|\Doctrine\DBAL\Query\QueryBuilder $queryBuilder
-     * @param int                                                         $page         Page number to display
-     * @param int                                                         $perPage      Results per page
-     *
-     * @throws \Exception
-     *
-     * @return AbstractPaginator
-     */
-    public static function createDoctrinePaginator($queryBuilder, $page, $perPage, array $options = [])
-    {
-        if ($queryBuilder instanceof \Doctrine\ORM\QueryBuilder) {
-            $useORM = true;
-        } elseif ($queryBuilder instanceof \Doctrine\DBAL\Query\QueryBuilder) {
-            $useORM = false;
-        } else {
-            throw new \Exception('Bad QueryBuilder');
-        }
-
-        $resolver = new OptionsResolver();
-        $resolver->setDefaults([
-            //Behavior for create paginator. Availabled values :
-            //  - doctrine_paginator: Return DoctrineORMPaginator or DoctrineDBALPaginator object
-            //  - identifier_by_sub_request: Primary keys are found by sub request. Return ArrayPaginator. Option "identifier" is required
-            'behavior' => 'doctrine_paginator',
-            //Manual value for the number of results
-            'count_manual_value' => null,
-            //Count options. See countQueryBuilder. Used only if count_manual_value = null
-            'count_options' => [],
-            //Identifier used when behavior=identifier_by_sub_request
-            'identifier' => null,
-            //Used only when ORM and behavior=doctrine_paginator
-            'simplified_request' => true,
-            'fetch_join_collection' => false,
-        ]);
-        $resolver->setAllowedValues('behavior', ['doctrine_paginator', 'identifier_by_sub_request']);
-        $options = $resolver->resolve($options);
-
-        if ('identifier_by_sub_request' === $options['behavior']) {
-            if (null === $options['identifier']) {
-                throw new MissingOptionsException('Option "identifier" is required');
-            }
-        }
-
-        if ('doctrine_paginator' === $options['behavior']) {
-            if ($useORM) {
-                $paginator = new DoctrineORMPaginator($perPage);
-                $paginator->setSimplifiedRequest($options['simplified_request']);
-                $paginator->setFetchJoinCollection($options['fetch_join_collection']);
-            } else {
-                $paginator = new DoctrineDBALPaginator($perPage);
-            }
-            $paginator->setQueryBuilder($queryBuilder);
-            $paginator->setPage($page);
-            if (null === $options['count_manual_value']) {
-                $paginator->setCountOptions($options['count_options']);
-            } else {
-                $paginator->setManualCountResults($options['count_manual_value']);
-            }
-
-            return $paginator;
-        } elseif ('identifier_by_sub_request' === $options['behavior']) {
-            $result = [];
-
-            if (null === $options['count_manual_value']) {
-                $countResults = self::countQueryBuilder($queryBuilder, $options['count_options']);
-            } else {
-                $countResults = $options['count_manual_value'];
-            }
-
-            if ($countResults) {
-                $idsQueryBuilder = clone $queryBuilder;
-                $idsQueryBuilder->select(sprintf('DISTINCT %s as pk', $options['identifier']));
-
-                if ($useORM) {
-                    $tmpPaginator = new DoctrineORMPaginator($perPage);
-                    $tmpPaginator->setSimplifiedRequest(false);
-                    $tmpPaginator->setFetchJoinCollection(false);
-                } else {
-                    $tmpPaginator = new DoctrineDBALPaginator($perPage);
-                }
-                $tmpPaginator->setQueryBuilder($idsQueryBuilder);
-                $tmpPaginator->setPage($page);
-                $tmpPaginator->setManualCountResults($countResults);
-                $tmpPaginator->init();
-
-                $ids = [];
-                foreach ($tmpPaginator->getResults() as $line) {
-                    $ids[] = $line['pk'];
-                }
-
-                $finalQueryBuilder = clone $queryBuilder;
-                if ($useORM) {
-                    $finalQueryBuilder->resetDQLPart('where');
-                    $finalQueryBuilder->setParameters([]);
-                    QueryBuilderFilter::addMultiFilter($finalQueryBuilder, QueryBuilderFilter::SELECT_IN, $ids, $options['identifier'], 'paginate_pks');
-                    $result = $finalQueryBuilder->getQuery()->getResult();
-                } else {
-                    $finalQueryBuilder->resetQueryPart('where');
-                    $finalQueryBuilder->setParameters([]);
-                    QueryBuilderFilter::addMultiFilter($finalQueryBuilder, QueryBuilderFilter::SELECT_IN, $ids, $options['identifier'], 'paginate_pks');
-                    $result = $finalQueryBuilder->execute()->fetchAll();
-                }
-            }
-
-            $paginator = new ArrayPaginator($perPage);
-            $paginator->setPage($page);
-            $paginator->setDataWithoutSlice($result, $countResults);
-
-            return $paginator;
-        }
-    }
-}
diff --git a/src/DoctrineExtension/QueryBuilderFilter.php b/src/DoctrineExtension/QueryBuilderFilter.php
deleted file mode 100644
index 02bb53a..0000000
--- a/src/DoctrineExtension/QueryBuilderFilter.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\DoctrineExtension;
-
-class QueryBuilderFilter
-{
-    public const SELECT_IN = 'IN'; //WHERE IN
-    public const SELECT_NOT_IN = 'NIN'; //WHERE NOT IN
-    public const SELECT_ALL = 'ALL'; //No Filter (all values)
-    public const SELECT_AUTO = 'AUT'; //WHERE IN. If filter values are empty, no filter (all values)
-    public const SELECT_NO = 'NO'; //Must return no result
-
-    /**
-     * Add SQL WHERE IN or WHERE NOT IN filter.
-     *
-     * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string                                                       $filterSign   ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
-     * @param array                                                        $filterValues Values
-     * @param string                                                       $sqlField     SQL field name
-     * @param string                                                       $paramName    SQL parameter name
-     *
-     * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
-     */
-    public static function addMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName)
-    {
-        if (self::SELECT_NO == $filterSign) {
-            //Must return no result
-            $queryBuilder->andWhere('0 = 1');
-
-            return $queryBuilder;
-        }
-        if (self::SELECT_IN != $filterSign && self::SELECT_NOT_IN != $filterSign && self::SELECT_AUTO != $filterSign) {
-            return $queryBuilder;
-        }
-        if (null === $filterValues || 0 === \count($filterValues)) {
-            if (self::SELECT_NOT_IN == $filterSign || self::SELECT_AUTO == $filterSign) {
-                return $queryBuilder;
-            }
-
-            //Must return no result
-            $queryBuilder->andWhere('0 = 1');
-
-            return $queryBuilder;
-        }
-
-        if (\count($filterValues) > 1000) {
-            return self::addGroupMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName);
-        }
-
-        return self::addSimpleMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName);
-    }
-
-    /**
-     * Add SQL WHERE IN or WHERE NOT IN filter without group.
-     *
-     * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string                                                       $filterSign   ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
-     * @param array                                                        $filterValues Values
-     * @param string                                                       $sqlField     SQL field name
-     * @param string                                                       $paramName    SQL parameter name
-     *
-     * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
-     */
-    protected static function addSimpleMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName)
-    {
-        $clauseSql = (self::SELECT_IN == $filterSign || self::SELECT_AUTO == $filterSign) ? 'IN' : 'NOT IN';
-
-        $queryBuilder->andWhere(sprintf('%s %s (:%s)', $sqlField, $clauseSql, $paramName));
-        $queryBuilder->setParameter($paramName, $filterValues, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
-
-        return $queryBuilder;
-    }
-
-    /**
-     * Add SQL WHERE IN or WHERE NOT IN filter with group.
-     *
-     * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string                                                       $filterSign   ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
-     * @param array                                                        $filterValues Values
-     * @param string                                                       $sqlField     SQL field name
-     * @param string                                                       $paramName    SQL parameter name
-     *
-     * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
-     */
-    protected static function addGroupMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName)
-    {
-        $clauseSql = (self::SELECT_IN == $filterSign || self::SELECT_AUTO == $filterSign) ? 'IN' : 'NOT IN';
-        $separatorClauseSql = (self::SELECT_IN == $filterSign || self::SELECT_AUTO == $filterSign) ? 'OR' : 'AND';
-
-        $groupNumber = 0;
-        $groups = [];
-        foreach (array_chunk($filterValues, 1000) as $filterValuesGroup) {
-            ++$groupNumber;
-            $groups[] = sprintf('%s %s (:%s%s)', $sqlField, $clauseSql, $paramName, $groupNumber);
-            $queryBuilder->setParameter($paramName.$groupNumber, $filterValuesGroup, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
-        }
-
-        $queryBuilder->andWhere(implode(' '.$separatorClauseSql.' ', $groups));
-
-        return $queryBuilder;
-    }
-
-    /**
-     * Add SQL WHERE IN or WHERE NOT IN filter. And result MUST BE in the whitelist (if $restrictSign=IN) or MUST NOT BE in the blacklist (if $restrictSign=NIN).
-     *
-     * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string                                                       $filterSign     ALL (no filter), IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $filterValues is not empty. No filter else), NO (no result)
-     * @param array                                                        $filterValues   Values
-     * @param string                                                       $sqlField       SQL field name
-     * @param string                                                       $paramName      SQL parameter name
-     * @param string                                                       $restrictSign   IN (WHERE IN), NIN (WHERE NOT IN), AUT (WHERE IN if $restrictValues is not empty. No filter else), NO (no result)
-     * @param array                                                        $restrictValues Whitelist (if $restrictSign=IN or AUT) or blacklist (if $restrictSign=NIN)
-     *
-     * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
-     */
-    public static function addMultiFilterWithRestrictValues($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName, $restrictSign, $restrictValues)
-    {
-        if (self::SELECT_NO == $filterSign || self::SELECT_NO == $restrictSign) {
-            //Must return no result
-            $queryBuilder->andWhere('0 = 1');
-
-            return $queryBuilder;
-        }
-
-        if (\in_array($restrictSign, [self::SELECT_IN, self::SELECT_AUTO]) && \in_array($filterSign, [self::SELECT_IN, self::SELECT_AUTO]) && \count($filterValues) > 0 && \count($restrictValues) > 0) {
-            //We can simplify the query
-
-            //Data cleaning
-            $cleanValues = [];
-            foreach ($filterValues as $value) {
-                if (\in_array($value, $restrictValues)) {
-                    $cleanValues[] = $value;
-                }
-            }
-
-            $queryBuilder = self::addMultiFilter($queryBuilder, self::SELECT_IN, $cleanValues, $sqlField, $paramName);
-        } elseif (self::SELECT_NOT_IN === $restrictSign && self::SELECT_NOT_IN === $filterSign && \count($filterValues) > 0 && \count($restrictValues) > 0) {
-            //We can simplify the query
-
-            //Data fusion
-            $cleanValues = $restrictValues;
-            foreach ($filterValues as $value) {
-                if (!\in_array($value, $restrictValues)) {
-                    $cleanValues[] = $value;
-                }
-            }
-
-            $queryBuilder = self::addMultiFilter($queryBuilder, self::SELECT_NOT_IN, $cleanValues, $sqlField, $paramName);
-        } else {
-            //Two filters
-            self::addMultiFilter($queryBuilder, $filterSign, $filterValues, $sqlField, $paramName);
-            self::addMultiFilter($queryBuilder, $restrictSign, $restrictValues, $sqlField, $paramName.'Restrict');
-        }
-
-        return $queryBuilder;
-    }
-
-    /**
-     * Add SQL "equal" or "not equal" filter.
-     *
-     * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param bool                                                         $equal        Equal or not
-     * @param string                                                       $filterValue  Value
-     * @param string                                                       $sqlField     SQL field name
-     * @param string                                                       $paramName    SQL parameter name
-     *
-     * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
-     */
-    public static function addEqualFilter($queryBuilder, $equal, $filterValue, $sqlField, $paramName)
-    {
-        if (null === $filterValue || '' === $filterValue) {
-            return $queryBuilder;
-        }
-
-        if ($equal) {
-            $queryBuilder->andWhere($sqlField.' = :'.$paramName);
-        } else {
-            $queryBuilder->andWhere($sqlField.' != :'.$paramName);
-        }
-        $queryBuilder->setParameter($paramName, $filterValue);
-
-        return $queryBuilder;
-    }
-
-    /**
-     * Add SQL comparator filter.
-     *
-     * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param string                                                       $sign         Comparator sign (< > <= >=)
-     * @param string                                                       $filterValue  Value
-     * @param string                                                       $sqlField     SQL field name
-     * @param string                                                       $paramName    SQL parameter name
-     *
-     * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
-     */
-    public static function addComparatorFilter($queryBuilder, $sign, $filterValue, $sqlField, $paramName)
-    {
-        if (null === $filterValue || '' === $filterValue) {
-            return $queryBuilder;
-        }
-
-        $queryBuilder->andWhere(sprintf('%s %s :%s', $sqlField, $sign, $paramName));
-        $queryBuilder->setParameter($paramName, $filterValue);
-
-        return $queryBuilder;
-    }
-
-    /**
-     * Add SQL "LIKE" or "NOT LIKE" filter.
-     *
-     * @param \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder $queryBuilder
-     * @param bool                                                         $contain      Contain or not
-     * @param string                                                       $filterValue  Value
-     * @param string                                                       $sqlField     SQL field name
-     * @param string                                                       $paramName    SQL parameter name
-     *
-     * @return \Doctrine\DBAL\Query\QueryBuilder|\Doctrine\ORM\QueryBuilder
-     */
-    public static function addContainFilter($queryBuilder, $contain, $filterValue, $sqlField, $paramName)
-    {
-        if (null === $filterValue || '' === $filterValue) {
-            return $queryBuilder;
-        }
-
-        $filterValue = addcslashes($filterValue, '%_');
-        if ($contain) {
-            $queryBuilder->andWhere($queryBuilder->expr()->like($sqlField, ':'.$paramName));
-        } else {
-            $queryBuilder->andWhere($queryBuilder->expr()->notLike($sqlField, ':'.$paramName));
-        }
-        $queryBuilder->setParameter($paramName, '%'.$filterValue.'%');
-
-        return $queryBuilder;
-    }
-}
diff --git a/src/Form/Filter/CollectionFilterTrait.php b/src/Form/Filter/CollectionFilterTrait.php
index 45e87bf..4359e91 100644
--- a/src/Form/Filter/CollectionFilterTrait.php
+++ b/src/Form/Filter/CollectionFilterTrait.php
@@ -13,7 +13,7 @@
 
 namespace Ecommit\CrudBundle\Form\Filter;
 
-use Ecommit\CrudBundle\DoctrineExtension\QueryBuilderFilter;
+use Ecommit\DoctrineUtils\QueryBuilderFilter;
 use Ecommit\ScalarValues\ScalarValues;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints as Assert;
diff --git a/src/Paginator/AbstractDoctrinePaginator.php b/src/Paginator/AbstractDoctrinePaginator.php
deleted file mode 100644
index 93c0be2..0000000
--- a/src/Paginator/AbstractDoctrinePaginator.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Paginator;
-
-abstract class AbstractDoctrinePaginator extends AbstractPaginator
-{
-    protected $query = null;
-    protected $manualCountResults = null;
-    protected $countOptions = [];
-
-    /**
-     * @return string
-     */
-    abstract protected function getQueryBuilderClass();
-
-    abstract protected function initPaginator();
-
-    public function init(): void
-    {
-        if (null === $this->query) {
-            throw new \Exception('QueryBuilder must be defined.');
-        }
-
-        $this->initPaginator();
-
-        $this->initLastPage();
-        $this->query->setFirstResult(0);
-        $this->query->setMaxResults(0);
-
-        if ($this->getCountResults() > 0) {
-            $offset = ($this->getPage() - 1) * $this->getMaxPerPage();
-            $this->query->setFirstResult($offset);
-            $this->query->setMaxResults($this->getMaxPerPage());
-        }
-    }
-
-    /**
-     * Returns QueryBuilder.
-     *
-     * @return mixed
-     */
-    public function getQueryBuilder()
-    {
-        return $this->query;
-    }
-
-    /**
-     * Sets the QueryBuilder.
-     *
-     * @param mixed $query
-     *
-     * @return AbstractDoctrinePaginator
-     */
-    public function setQueryBuilder($query)
-    {
-        $queryBuilderClass = $this->getQueryBuilderClass();
-        if (!($query instanceof $queryBuilderClass)) {
-            throw new \Exception('QueryBuilder must be an instance of '.$queryBuilderClass);
-        }
-        $this->query = $query;
-
-        return $this;
-    }
-
-    /**
-     * Returns manual total results.
-     *
-     * @return int
-     */
-    public function getManualCountResults()
-    {
-        return $this->manualCountResults;
-    }
-
-    /**
-     * Sets manual total results.
-     *
-     * @param int $manualCountResults
-     *
-     * @return AbstractDoctrinePaginator
-     */
-    public function setManualCountResults($manualCountResults)
-    {
-        $this->manualCountResults = $manualCountResults;
-
-        return $this;
-    }
-
-    /**
-     * Returns count options.
-     *
-     * @return array
-     */
-    public function getCountOptions()
-    {
-        return $this->countOptions;
-    }
-
-    /**
-     * Sets count options.
-     *
-     * @return AbstractDoctrinePaginator
-     */
-    public function setCountOptions(array $countOptions)
-    {
-        $this->countOptions = $countOptions;
-
-        return $this;
-    }
-}
diff --git a/src/Paginator/AbstractPaginator.php b/src/Paginator/AbstractPaginator.php
deleted file mode 100644
index 4fcc17d..0000000
--- a/src/Paginator/AbstractPaginator.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Paginator;
-
-abstract class AbstractPaginator implements \IteratorAggregate, \Countable
-{
-    protected $page = 1;
-    protected $maxPerPage = 1;
-    protected $lastPage = 1;
-    protected $countResults = 0;
-    protected $results = null;
-
-    /**
-     * Constructor.
-     *
-     * @param string $class      The model class
-     * @param int    $maxPerPage Number of records to display per page
-     *
-     * @return AbstractPaginator
-     */
-    public function __construct($maxPerPage = 10)
-    {
-        $this->setMaxPerPage($maxPerPage);
-
-        return $this;
-    }
-
-    /**
-     * Initializes the pager.
-     */
-    abstract public function init();
-
-    /**
-     * Returns an array of results on the given page.
-     *
-     * @return \ArrayIterator
-     */
-    abstract public function getResults();
-
-    /**
-     * Returns true if the current query requires pagination.
-     *
-     * @return bool
-     */
-    public function haveToPaginate()
-    {
-        return $this->getCountResults() > $this->getMaxPerPage();
-    }
-
-    /**
-     * Returns the first index on the current page.
-     *
-     * @return int
-     */
-    public function getFirstIndice()
-    {
-        if (0 == $this->getCountResults()) {
-            return 0;
-        }
-
-        return ($this->page - 1) * $this->maxPerPage + 1;
-    }
-
-    /**
-     * Returns the last index on the current page.
-     *
-     * @return int
-     */
-    public function getLastIndice()
-    {
-        if ($this->page * $this->maxPerPage >= $this->countResults) {
-            return $this->countResults;
-        }
-
-        return $this->page * $this->maxPerPage;
-    }
-
-    /**
-     * Returns the number of results.
-     *
-     * @return int
-     */
-    public function getCountResults()
-    {
-        return $this->countResults;
-    }
-
-    /**
-     * Sets the number of results.
-     *
-     * @param int $nb
-     */
-    protected function setCountResults($nb): void
-    {
-        $this->countResults = $nb;
-    }
-
-    /**
-     * Returns the first page number.
-     *
-     * @return int
-     */
-    public function getFirstPage()
-    {
-        return 1;
-    }
-
-    /**
-     * Returns the last page number.
-     *
-     * @return int
-     */
-    public function getLastPage()
-    {
-        return $this->lastPage;
-    }
-
-    /**
-     * Init the last page number.
-     */
-    protected function initLastPage(): void
-    {
-        if ($this->getCountResults() > 0) {
-            $lastPage = (int) ceil($this->getCountResults() / $this->getMaxPerPage());
-        } else {
-            $lastPage = 1;
-        }
-        $this->lastPage = $lastPage;
-
-        if ($this->getPage() > $lastPage) {
-            $this->setPage($lastPage);
-        }
-    }
-
-    /**
-     * Returns the current page.
-     *
-     * @return int
-     */
-    public function getPage()
-    {
-        return $this->page;
-    }
-
-    /**
-     * Returns the next page.
-     *
-     * @return int
-     */
-    public function getNextPage()
-    {
-        return min($this->getPage() + 1, $this->getLastPage());
-    }
-
-    /**
-     * Returns the previous page.
-     *
-     * @return int
-     */
-    public function getPreviousPage()
-    {
-        return max($this->getPage() - 1, $this->getFirstPage());
-    }
-
-    /**
-     * Sets the current page.
-     *
-     * @param int $page
-     *
-     * @return AbstractPaginator
-     */
-    public function setPage($page)
-    {
-        $this->page = (int) $page;
-
-        if ($this->page <= 0) {
-            $this->page = 1;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the maximum number of results per page.
-     *
-     * @return int
-     */
-    public function getMaxPerPage()
-    {
-        return $this->maxPerPage;
-    }
-
-    /**
-     * Sets the maximum number of results per page.
-     *
-     * @param int $max
-     *
-     * @return AbstractPaginator
-     */
-    public function setMaxPerPage($max)
-    {
-        $max = (int) $max;
-
-        if ($max <= 0) {
-            throw new \Exception('Max results value must be positive');
-        }
-        $this->maxPerPage = $max;
-
-        return $this;
-    }
-
-    /**
-     * Returns true if on the first page.
-     *
-     * @return bool
-     */
-    public function isFirstPage()
-    {
-        return 1 == $this->page;
-    }
-
-    /**
-     * Returns true if on the last page.
-     *
-     * @return bool
-     */
-    public function isLastPage()
-    {
-        return $this->page == $this->lastPage;
-    }
-
-    /**
-     * Returns true if the properties used for iteration have been initialized.
-     *
-     * @return bool
-     */
-    protected function isIteratorInitialized()
-    {
-        return null !== $this->results;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function count()
-    {
-        return $this->getCountResults();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIterator()
-    {
-        return $this->getResults();
-    }
-}
diff --git a/src/Paginator/ArrayPaginator.php b/src/Paginator/ArrayPaginator.php
deleted file mode 100644
index 2ad72c4..0000000
--- a/src/Paginator/ArrayPaginator.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Paginator;
-
-class ArrayPaginator extends AbstractPaginator
-{
-    protected $initialObjects = null;
-    protected $manualCountResults = null;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function init(): void
-    {
-        if (null === $this->initialObjects) {
-            throw new \Exception('Results are required');
-        }
-
-        if (null === $this->manualCountResults) {
-            $this->setCountResults(\count($this->initialObjects));
-            $this->initLastPage();
-
-            $offset = 0;
-            $limit = 0;
-
-            if ($this->getCountResults() > 0) {
-                $offset = ($this->getPage() - 1) * $this->getMaxPerPage();
-                $limit = $this->getMaxPerPage();
-            }
-
-            $this->results = \array_slice($this->initialObjects, $offset, $limit);
-        } else {
-            $this->setCountResults($this->manualCountResults);
-            $this->initLastPage();
-
-            $this->results = $this->initialObjects;
-        }
-    }
-
-    /**
-     * Set an array of results.
-     *
-     * @param array|ArrayIterator $results
-     *
-     * @return ArrayPaginator
-     */
-    public function setData($results)
-    {
-        if ($results instanceof \ArrayIterator) {
-            $this->initialObjects = $results->getArrayCopy();
-        } elseif (\is_array($results)) {
-            $this->initialObjects = $results;
-        } else {
-            throw new \Exception('Results must be an array');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set an array of results without slice.
-     *
-     * @param array|ArrayIterator $results
-     * @param int                 $manualCountResults
-     */
-    public function setDataWithoutSlice($results, $manualCountResults)
-    {
-        $this->setData($results);
-        $this->manualCountResults = $manualCountResults;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResults()
-    {
-        return new \ArrayIterator($this->results);
-    }
-}
diff --git a/src/Paginator/DoctrineDBALPaginator.php b/src/Paginator/DoctrineDBALPaginator.php
deleted file mode 100644
index c8e30db..0000000
--- a/src/Paginator/DoctrineDBALPaginator.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Paginator;
-
-use Ecommit\CrudBundle\DoctrineExtension\Paginate;
-
-class DoctrineDBALPaginator extends AbstractDoctrinePaginator
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function getQueryBuilderClass()
-    {
-        return 'Doctrine\DBAL\Query\QueryBuilder';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initPaginator(): void
-    {
-        //Calculation of the number of lines
-        if (null === $this->manualCountResults) {
-            $count = Paginate::countQueryBuilder($this->query, $this->countOptions);
-            $this->setCountResults($count);
-        } else {
-            $this->setCountResults($this->manualCountResults);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResults()
-    {
-        if (null === $this->results) {
-            $results = $this->query->execute()->fetchAll();
-            $this->results = new \ArrayIterator($results);
-        }
-
-        return $this->results;
-    }
-}
diff --git a/src/Paginator/DoctrineORMPaginator.php b/src/Paginator/DoctrineORMPaginator.php
deleted file mode 100644
index 312da9f..0000000
--- a/src/Paginator/DoctrineORMPaginator.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Paginator;
-
-use Doctrine\ORM\Tools\Pagination\Paginator;
-use Ecommit\CrudBundle\DoctrineExtension\Paginate;
-
-class DoctrineORMPaginator extends AbstractDoctrinePaginator
-{
-    protected $simplifiedRequest = true;
-    protected $fetchJoinCollection = false;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getQueryBuilderClass()
-    {
-        return 'Doctrine\ORM\QueryBuilder';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initPaginator(): void
-    {
-        //Calculation of the number of lines
-        if (null === $this->manualCountResults) {
-            $countOptions = $this->countOptions;
-            if (!isset($countOptions['behavior'])) {
-                $countOptions['behavior'] = Paginate::getDefaultCountBehavior($this->query);
-            }
-            if ('orm' === $countOptions['behavior'] && !isset($countOptions['simplified_request'])) {
-                $countOptions['simplified_request'] = $this->simplifiedRequest;
-            }
-
-            $count = Paginate::countQueryBuilder($this->query, $countOptions);
-            $this->setCountResults($count);
-        } else {
-            $this->setCountResults($this->manualCountResults);
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function isSimplifiedRequest()
-    {
-        return $this->simplifiedRequest;
-    }
-
-    /**
-     * Use simplified request (not subrequest and not order by) or not when count results.
-     *
-     * @param bool $simplifiedRequest
-     *
-     * @return DoctrineORMPaginator
-     */
-    public function setSimplifiedRequest($simplifiedRequest)
-    {
-        $this->simplifiedRequest = $simplifiedRequest;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isFetchJoinCollection()
-    {
-        return $this->fetchJoinCollection;
-    }
-
-    /**
-     * Set to true when fetch join a to-many collection
-     * In that case 3 instead of the 2 queries described are executed.
-     *
-     * @param bool $fetchJoinCollection
-     *
-     * @return DoctrineORMPaginator
-     */
-    public function setFetchJoinCollection($fetchJoinCollection)
-    {
-        $this->fetchJoinCollection = $fetchJoinCollection;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResults()
-    {
-        if (null === $this->results) {
-            $query = $this->query->getQuery();
-            $paginator = new Paginator($query, $this->fetchJoinCollection);
-            $paginator->setUseOutputWalkers(!$this->simplifiedRequest);
-            $this->results = $paginator->getIterator();
-        }
-
-        return $this->results;
-    }
-}
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 7e96da4..9f10065 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -14,7 +14,7 @@
 namespace Ecommit\CrudBundle\Twig;
 
 use Ecommit\CrudBundle\Crud\Crud;
-use Ecommit\CrudBundle\Paginator\AbstractPaginator;
+use Ecommit\Paginator\PaginatorInterface;
 use Symfony\Component\Form\FormRendererInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -158,7 +158,7 @@ public function getFunctions()
      *                            * theme: Theme used. If null, default theme is used
      *                            * block: Twig block used. Default: paginator_links
      */
-    public function paginatorLinks(Environment $environment, AbstractPaginator $paginator, string $routeName, array $routeParams = [], array $options = []): string
+    public function paginatorLinks(Environment $environment, PaginatorInterface $paginator, string $routeName, array $routeParams = [], array $options = []): string
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 3b3e841..faf1e60 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -16,8 +16,8 @@
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Crud\CrudColumn;
 use Ecommit\CrudBundle\Crud\CrudSession;
-use Ecommit\CrudBundle\Paginator\ArrayPaginator;
 use Ecommit\CrudBundle\Twig\CrudExtension;
+use Ecommit\Paginator\ArrayPaginator;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -157,9 +157,10 @@ public function testAjaxAttributesWithBadAjaxOptions(): void
 
     public function testPaginatorLinksWithNoResult(): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData([]);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => [],
+        ]);
 
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud');
 
@@ -168,9 +169,10 @@ public function testPaginatorLinksWithNoResult(): void
 
     public function testPaginatorLinksWithOnePage(): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(['val']);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => ['val'],
+        ]);
 
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud');
 
@@ -182,10 +184,11 @@ public function testPaginatorLinksWithOnePage(): void
      */
     public function testPaginatorWithDefaultOptions(int $page, string $expected): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage($page);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => $page,
+        ]);
 
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud');
 
@@ -208,10 +211,11 @@ public function getTestPaginatorWithDefaultOptionsProvider(): array
      */
     public function testPaginatorWithMaxPagesOptions(int $page, string $expected): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage($page);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => $page,
+        ]);
 
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'max_pages_before' => 4,
@@ -237,10 +241,11 @@ public function getTestPaginatorWithMaxPagesOptionsProvider(): array
      */
     public function testPaginatorWithTypeOption(int $page, string $type, string $expected): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage($page);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => $page,
+        ]);
 
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'type' => $type,
@@ -278,10 +283,11 @@ public function getTestPaginatorWithTypeOptionProvider(): array
 
     public function testPaginatorWithEmptyArrayAjaxOption(): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage(1);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => 1,
+        ]);
 
         $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto">»</a></li></ul></nav>';
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
@@ -295,10 +301,11 @@ public function testPaginatorWithEmptyArrayAjaxOption(): void
 
     public function testPaginatorWithAjaxOption(): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage(1);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => 1,
+        ]);
 
         $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
@@ -314,10 +321,11 @@ public function testPaginatorWithAjaxOption(): void
 
     public function testPaginatorWithAttributePageOption(): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage(1);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => 1,
+        ]);
 
         $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?p=1">1</a></li><li><a href="/user?p=2">2</a></li><li class="next"><a href="/user?p=2">›</a></li><li class="last"><a href="/user?p=20">»</a></li></ul></nav>';
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
@@ -331,10 +339,11 @@ public function testPaginatorWithAttributePageOption(): void
 
     public function testPaginatorWithAttrOptions(): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage(10);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => 10,
+        ]);
 
         $expected = '<nav class="navattr" data-nav="val"><ul class="ulattr ec-crud-pagination" data-ul="val"><li class="lifirstpageattr first" data-li-first="val"><a href="/user?page=1" class="afirstpageattr" data-a-first="val">«</a></li><li class="lipreviouspageattr previous"><a href="/user?page=9" class="apreviouspageattr">‹</a></li><li class="liotherpageattr"><a href="/user?page=9" class="aotherpageattr">9</a></li><li class="liccurentpageattr current"><a href="/user?page=10" class="accurentpageattr">10</a></li><li class="liotherpageattr"><a href="/user?page=11" class="aotherpageattr">11</a></li><li class="linextpageattr next"><a href="/user?page=11" class="anextpageattr">›</a></li><li class="lilastpageattr last"><a href="/user?page=20" class="alastpageattr">»</a></li></ul></nav>';
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
@@ -365,10 +374,11 @@ public function testPaginatorWithAttrOptions(): void
 
     public function testPaginatorWithRenderOption(): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage(1);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => 1,
+        ]);
 
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'render' => 'render.html.twig',
@@ -379,10 +389,11 @@ public function testPaginatorWithRenderOption(): void
 
     public function testPaginatorWithThemeAndBlockOptions(): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage(1);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => 1,
+        ]);
 
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'theme' => 'theme.html.twig',
@@ -395,10 +406,11 @@ public function testPaginatorWithThemeAndBlockOptions(): void
     public function testPaginatorWithBadOptions(): void
     {
         $this->expectException(UndefinedOptionsException::class);
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage(1);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => 1,
+        ]);
 
         $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'bad_option' => 'bad',
@@ -407,10 +419,11 @@ public function testPaginatorWithBadOptions(): void
 
     public function testCrudPaginatorLinks(): void
     {
-        $paginator = new ArrayPaginator(5);
-        $paginator->setData(range(1, 100));
-        $paginator->setPage(1);
-        $paginator->init();
+        $paginator = new ArrayPaginator([
+            'max_per_page' => 5,
+            'data' => range(1, 100),
+            'page' => 1,
+        ]);
 
         $crud = $this->getMockBuilder(Crud::class)
             ->disableOriginalConstructor()

From 15f7e2cdb651ab06a950f74c9f22ec316910239b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 28 Sep 2021 17:13:28 +0200
Subject: [PATCH 084/264] [SearchFormBuilder] Fix validation_groups

---
 src/Crud/SearchFormBuilder.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index 7f789fd..eee984d 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -69,11 +69,16 @@ protected function createFormBuilder(?string $type): void
     {
         $formFactory = $this->container->get('form.factory');
 
+        $formOptions = $this->options['form_options'];
+        if (!isset($formOptions['validation_groups']) && null !== $this->options['validation_groups']) {
+            $formOptions['validation_groups'] = $this->options['validation_groups'];
+        }
+
         if ($type) {
-            $this->form = $formFactory->createBuilder($type, null, $this->options['form_options']);
+            $this->form = $formFactory->createBuilder($type, null, $formOptions);
         } else {
             $formName = sprintf('crud_search_%s', $this->crud->getSessionName());
-            $this->form = $formFactory->createNamedBuilder($formName, FormSearchType::class, null, $this->options['form_options']);
+            $this->form = $formFactory->createNamedBuilder($formName, FormSearchType::class, null, $formOptions);
         }
 
         $this->defaultData->buildForm($this, $this->options);

From a5d09de2ad4bc1fc7893813dcdc1bae67425b470 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 28 Sep 2021 17:52:00 +0200
Subject: [PATCH 085/264] [Crud] Fix getTwigFunctionConfiguration

---
 src/Crud/Crud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 16f795b..b9a3112 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -938,7 +938,7 @@ public function getTwigFunctionsConfiguration(): array
     public function getTwigFunctionConfiguration(string $function): array
     {
         if (isset($this->twigFunctionsConfiguration[$function])) {
-            return $this->twigFunctionsConfiguration;
+            return $this->twigFunctionsConfiguration[$function];
         }
 
         return [];

From 039816a629de50ac025092159106efc548d1e5f0 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 28 Sep 2021 20:36:11 +0200
Subject: [PATCH 086/264] [searchFormStart] Add missing attributes

---
 src/Twig/CrudExtension.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 9f10065..f8ad589 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -485,6 +485,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
                 'data-crud-search-id' => $crud->getDivIdSearch(),
                 'data-crud-list-id' => $crud->getDivIdList(),
             ],
+            $crud->getSearchForm()->vars['attr'],
             $options['form_attr'],
             $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options']))
         );

From 81ab1e7cfacb3a90444e7629f7add04f18401cfc Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 29 Sep 2021 16:23:44 +0200
Subject: [PATCH 087/264] [CrudControllerTrait] Add getCrudOptions method

---
 src/Controller/CrudControllerTrait.php | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index 6fa539c..a2d3680 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -31,22 +31,17 @@ final protected function createCrud($sessionName): Crud
 
     public function getCrudResponse(): Response
     {
-        return $this->container->get(CrudResponseGenerator::class)->getResponse($this->getCrud(), [
-            'template_generator' => function (string $action) {
-                return $this->getTemplateName($action);
-            },
-            'before_build_query' => function (Crud $crud, $data) {
-                return $this->beforeBuildQuery($crud, $data);
-            },
-            'after_build_query' => function (Crud $crud, $data) {
-                return $this->afterBuildQuery($crud, $data);
-            },
-        ]);
+        return $this->container->get(CrudResponseGenerator::class)->getResponse($this->getCrud(), $this->getCrudOptions());
     }
 
     public function getAjaxCrudResponse(): Response
     {
-        return $this->container->get(CrudResponseGenerator::class)->getAjaxResponse($this->getCrud(), [
+        return $this->container->get(CrudResponseGenerator::class)->getAjaxResponse($this->getCrud(), $this->getCrudOptions());
+    }
+
+    protected function getCrudOptions(): array
+    {
+        return [
             'template_generator' => function (string $action) {
                 return $this->getTemplateName($action);
             },
@@ -56,7 +51,7 @@ public function getAjaxCrudResponse(): Response
             'after_build_query' => function (Crud $crud, $data) {
                 return $this->afterBuildQuery($crud, $data);
             },
-        ]);
+        ];
     }
 
     protected function beforeBuildQuery(Crud $crud, array $data): array

From 9d92cde724b0721728e75c118ac33dce24987d64 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 29 Sep 2021 16:25:29 +0200
Subject: [PATCH 088/264] [CrudResponseGenerator] Add getCrudData and
 getCrudContents methods

---
 src/Crud/CrudResponseGenerator.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index aba1d7e..4b2bc7f 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -65,6 +65,23 @@ public function getAjaxResponse(Crud $crud, array $options = []): Response
         return $this->renderCrud($this->getTemplateName($options['template_generator'], 'list'), $data);
     }
 
+    public function getCrudData(Crud $crud, array $options = []): array
+    {
+        $options = $this->getOptions($options);
+
+        return $this->processCrud($crud, $options);
+    }
+
+    public function getCrudContents(Crud $crud, array $options = []): array
+    {
+        $data = $this->getCrudData($crud, $options);
+
+        return [
+            'render_search' => $this->renderCrudView($this->getTemplateName($options['template_generator'], 'search'), $data),
+            'render_list' => $this->renderCrudView($this->getTemplateName($options['template_generator'], 'list'), $data),
+        ];
+    }
+
     protected function processCrud(Crud $crud, array $options): array
     {
         $data = [

From 95a563833cee3472051ebe6bc909267232b00710 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 29 Sep 2021 16:28:00 +0200
Subject: [PATCH 089/264] Crud::inis is now automatically called

---
 src/Crud/Crud.php                  | 12 ++++++++++++
 src/Crud/CrudResponseGenerator.php |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index b9a3112..79f5101 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -47,6 +47,7 @@ class Crud
      */
     protected $displaySettingsForm = null;
 
+    protected $isInitialized = false;
     protected $availableColumns = [];
     protected $availableVirtualColumns = [];
     protected $availableResultsPerPage = [];
@@ -96,6 +97,10 @@ public function __construct($sessionName, ContainerInterface $container)
      */
     public function init(): void
     {
+        if ($this->isInitialized) {
+            throw new \Exception('CRUD already initialized');
+        }
+
         //Cheks not empty values
         $checkValues = [
             'availableColumns',
@@ -145,6 +150,13 @@ public function init(): void
 
         //Saves
         $this->save();
+
+        $this->isInitialized = true;
+    }
+
+    public function isInitialized(): bool
+    {
+        return $this->isInitialized;
     }
 
     /**
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index 4b2bc7f..2df7c04 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -90,6 +90,9 @@ protected function processCrud(Crud $crud, array $options): array
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
 
+        if (!$crud->isInitialized()) {
+            $crud->init();
+        }
         if ($request->query->has('search')) {
             $crud->processForm();
         }

From 745b6326ee93769a0f9166c3a7aebd2e323a5751 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 29 Sep 2021 16:29:35 +0200
Subject: [PATCH 090/264] Do not display results if paginator disabled

---
 src/Crud/Crud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 79f5101..5479b60 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -374,7 +374,7 @@ public function processForm(): void
             }
             $searchForm = $this->searchForm->getForm();
             $searchForm->handleRequest($request);
-            if ($searchForm->isSubmitted() && $searchForm->isValid()) {
+            if ($searchForm->isSubmitted() && $searchForm->isValid() && false !== $this->buildPaginator) {
                 $this->displayResults = true;
                 $this->sessionValues->searchFormIsSubmittedAndValid = true;
                 $this->changeFilterValues($searchForm->getData());

From 392b837396c2a8cc30b89ee4a7c8b8207050f1a2 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 29 Sep 2021 17:25:07 +0200
Subject: [PATCH 091/264] [Theme] Add dynamic labels

---
 src/Resources/views/Theme/base.html.twig       | 18 ++++++++++++------
 src/Resources/views/Theme/bootstrap3.html.twig | 18 ++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/Resources/views/Theme/base.html.twig b/src/Resources/views/Theme/base.html.twig
index a727cee..0aa8481 100644
--- a/src/Resources/views/Theme/base.html.twig
+++ b/src/Resources/views/Theme/base.html.twig
@@ -185,9 +185,10 @@
 {% endblock %}
 
 {% block display_settings_button %}
+    {% set display_settings_text = display_settings_text|default('display_settings.title'|trans({}, 'EcommitCrudBundle')) %}
     {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' ec-crud-display-settings-button')|trim, 'data-display-settings': 'ec-crud-display-settings-'~crud.sessionName}) %}
     <button{% with { attr: button_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-        {{ crud_icon('display_settings') }} {{ 'display_settings.title'|trans({}, 'EcommitCrudBundle') }}
+        {{ crud_icon('display_settings') }} {{ display_settings_text }}
     </button>
 {% endblock %}
 
@@ -210,15 +211,18 @@
 
 {% block display_settings_content_without_modal %}
     <div>
-        <h4>{{ 'display_settings.title'|trans({}, 'EcommitCrudBundle') }}</h4>
+        {% set display_settings_text = display_settings_text|default('display_settings.title'|trans({}, 'EcommitCrudBundle')) %}
+        {% set display_settings_check_all_text = display_settings_check_all_text|default('display_settings.check_all'|trans({}, 'EcommitCrudBundle')) %}
+        {% set display_settings_uncheck_all_text = display_settings_uncheck_all_text|default('display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle')) %}
+        <h4>{{ display_settings_text }}</h4>
 
         {{ form_start(form) }}
             {{ form_row(form.resultsPerPage) }}
             {{ form_row(form.displayedColumns) }}
             <div>
-                <button type="button" class="ec-crud-display-settings-check-all-columns">{{ 'display_settings.check_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                <button type="button" class="ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
                 &nbsp;
-                <button type="button" class="ec-crud-display-settings-uncheck-all-columns">{{ 'display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                <button type="button" class="ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
             </div>
             <div style="text-align: center;">
                 {{ form_row(form.reset) }}
@@ -240,8 +244,9 @@
 
 {% block search_form_submit %}
     {% apply spaceless %}
+        {% set submit_text = submit_text|default('search.submit'|trans({}, 'EcommitCrudBundle')) %}
         <button type="submit" {% with { attr: button_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-            {{ crud_icon('search') }} {{ 'search.submit'|trans({}, 'EcommitCrudBundle') }}
+            {{ crud_icon('search') }} {{ submit_text }}
         </button>
     {% endapply %}
 {% endblock %}
@@ -250,8 +255,9 @@
 
 {% block search_form_reset %}
 {% apply spaceless %}
+    {% set reset_text = reset_text|default('search.reset'|trans({}, 'EcommitCrudBundle')) %}
     <button type="button" {% with { attr: button_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-        {{ crud_icon('reset') }} {{ 'search.reset'|trans({}, 'EcommitCrudBundle') }}
+        {{ crud_icon('reset') }} {{ reset_text }}
     </button>
 {% endapply %}
 {% endblock %}
diff --git a/src/Resources/views/Theme/bootstrap3.html.twig b/src/Resources/views/Theme/bootstrap3.html.twig
index 0bd32db..50aca24 100644
--- a/src/Resources/views/Theme/bootstrap3.html.twig
+++ b/src/Resources/views/Theme/bootstrap3.html.twig
@@ -34,10 +34,13 @@
 
 {% block display_settings_content_modal %}
     {% form_theme form 'bootstrap_3_layout.html.twig' %}
+    {% set display_settings_text = display_settings_text|default('display_settings.title'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_check_all_text = display_settings_check_all_text|default('display_settings.check_all'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_uncheck_all_text = display_settings_uncheck_all_text|default('display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle')) %}
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h4>{{ 'display_settings.title'|trans({}, 'EcommitCrudBundle') }}</h4>
+                <h4>{{ display_settings_text }}</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -47,9 +50,9 @@
                     {{ form_row(form.resultsPerPage) }}
                     {{ form_row(form.displayedColumns) }}
                     <div>
-                        <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-check-all-columns">{{ 'display_settings.check_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                        <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
                         &nbsp;
-                        <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-uncheck-all-columns">{{ 'display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                        <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -63,16 +66,19 @@
 
 {% block display_settings_content_without_modal %}
     {% form_theme form 'bootstrap_3_layout.html.twig' %}
+    {% set display_settings_text = display_settings_text|default('display_settings.title'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_check_all_text = display_settings_check_all_text|default('display_settings.check_all'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_uncheck_all_text = display_settings_uncheck_all_text|default('display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle')) %}
     <div>
-        <h4>{{ 'display_settings.title'|trans({}, 'EcommitCrudBundle') }}</h4>
+        <h4>{{ display_settings_text }}</h4>
 
         {{ form_start(form) }}
             {{ form_row(form.resultsPerPage) }}
             {{ form_row(form.displayedColumns) }}
             <div>
-                <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-check-all-columns">{{ 'display_settings.check_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
                 &nbsp;
-                <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-uncheck-all-columns">{{ 'display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle') }}</button>
+                <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
             </div>
 
             <div style="text-align: center;">

From 0aed9c58d10da7a7eb9458eb88369888c5ae8d92 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 1 Oct 2021 15:21:00 +0200
Subject: [PATCH 092/264] Fix doc

---
 doc/cookbook/advanced-searcher.md      |  7 ++++---
 doc/cookbook/display_results.md        |  1 -
 doc/cookbook/div_ids.md                |  1 -
 doc/cookbook/http.md                   | 15 ++++++++-------
 doc/cookbook/paginator.md              | 23 ++++++++++-------------
 doc/cookbook/sort.md                   |  3 ---
 doc/cookbook/template_configuration.md |  1 -
 doc/cookbook/virtual_columns.md        |  1 -
 doc/crud.md                            |  5 +----
 doc/references/modal.md                |  2 +-
 doc/upgrade/3.0.md                     |  9 +++++++--
 11 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/doc/cookbook/advanced-searcher.md b/doc/cookbook/advanced-searcher.md
index e594fb8..13b544c 100644
--- a/doc/cookbook/advanced-searcher.md
+++ b/doc/cookbook/advanced-searcher.md
@@ -115,10 +115,12 @@ class MyCrudController extends AbstractCrudController
             ->setRoute('my_crud_ajax')
 -           ->createSearchForm(new CarSearcher())
 +           ->createSearchForm(new CarSearcher(), CarSearcherType::class , [
-+               //Options
++               //Searcher options
++               'form_options' => [
++                   //Form type options
++               ],
 +           ])
             //...
-            ->init();
 
         return $crud;
     }
@@ -178,7 +180,6 @@ class MyCrudController extends AbstractCrudController
 +               'my_option' => 'my_value',
 +           ])
             //...
-            ->init();
 
         return $crud;
     }
diff --git a/doc/cookbook/display_results.md b/doc/cookbook/display_results.md
index 166f61c..cb914ef 100644
--- a/doc/cookbook/display_results.md
+++ b/doc/cookbook/display_results.md
@@ -27,7 +27,6 @@ class MyCrudController extends AbstractCrudController
             ->setRoute('my_crud_ajax')
 +           ->setDisplayResultsOnlyIfSearch(true)
             //...
-            ->init();
 
         return $crud;
     }
diff --git a/doc/cookbook/div_ids.md b/doc/cookbook/div_ids.md
index b13760b..855c7df 100644
--- a/doc/cookbook/div_ids.md
+++ b/doc/cookbook/div_ids.md
@@ -29,7 +29,6 @@ class MyCrudController extends AbstractCrudController
 +           ->setDivIdList('my_div1')
 +           ->setDivIdSearch('my_div2')
             //...
-            ->init();
 
         return $crud;
     }
diff --git a/doc/cookbook/http.md b/doc/cookbook/http.md
index 4e1b059..91dd9f1 100644
--- a/doc/cookbook/http.md
+++ b/doc/cookbook/http.md
@@ -12,7 +12,7 @@ use Ecommit\CrudBundle\Controller\AbstractCrudController;
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Crud\Http\QueryBuilder;
 use Ecommit\CrudBundle\Crud\Http\QueryBuilderQueryParameter;
-use Ecommit\CrudBundle\Paginator\ArrayPaginator;
+use Ecommit\Paginator\ArrayPaginator;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -86,16 +86,17 @@ class MyHttpController extends AbstractCrudController
                 $response = json_decode($queryBuilder->getResponse($page, $resultsPerPage)->getContent());
 
                 //Création du paginator
-                $paginator = new ArrayPaginator($resultsPerPage);
-                $paginator->setDataWithoutSlice($response->records, $response->nhits);
-                $paginator->setPage($page);
-                $paginator->init();
+                $paginator = new ArrayPaginator([
+                    'page' => $page,
+                    'max_per_page' => $resultsPerPage,
+                    'data' => $response->records,
+                    'count' => $response->nhits,
+                ]);
 
                 return $paginator;
             })
             ->createSearchForm(new CitySearcher())
-            ->setPersistentSettings(true)
-            ->init();
+            ->setPersistentSettings(true);
 
         return $crud;
     }
diff --git a/doc/cookbook/paginator.md b/doc/cookbook/paginator.md
index a80d80f..eaf99e0 100644
--- a/doc/cookbook/paginator.md
+++ b/doc/cookbook/paginator.md
@@ -1,6 +1,6 @@
 # Création manuelle du paginator
 
-Par défaut, un paginator `Ecommit\CrudBundle\Paginator\AbstractDoctrinePaginator` est automatiquement créé. Le comportement par défaut peut être modifié par
+Par défaut, un paginator `Ecommit\DoctrineUtils\Paginator\AbstractDoctrinePaginator` est automatiquement créé. Le comportement par défaut peut être modifié par
 la méthode `setBuildPaginator`.
 
 **Exemple 1 - Options de génération :**
@@ -23,16 +23,14 @@ class MyCrudController extends AbstractCrudController
             //...
             ->setRoute('my_crud_ajax')
 +           ->setBuildPaginator([
-+               //Options de Ecommit\CrudBundle\DoctrineExtension\Paginate::createDoctrinePaginator
-+               'behavior' => 'identifier_by_sub_request',
-+               'identifier' => 'c1.id',
-+               'count_options' => [
++               //Options de Ecommit\DoctrineUtils\Paginator\DoctrinePaginatorBuilder::createDoctrinePaginator
++               'by_identifier' => 'c1.id',
++               'count' => [
 +                   'behavior' => 'count_by_alias',
 +                   'alias' => 'c1.id',
 +               ],
 +           ])
             //...
-            ->init();
 
         return $crud;
     }
@@ -48,7 +46,7 @@ class MyCrudController extends AbstractCrudController
 //src/Controller/MyCrudController
 namespace App\Controller;
 
-+ use Ecommit\CrudBundle\Paginator\DoctrineORMPaginator;
++ use Ecommit\DoctrineUtils\Paginator\DoctrineORMPaginator;
 
 //...
 
@@ -63,17 +61,16 @@ class MyCrudController extends AbstractCrudController
             //...
             ->setRoute('my_crud_ajax')
 +           ->setBuildPaginator(function ($queryBuilder, $page, $resultsPerPage) {
-+               $paginator = new DoctrineORMPaginator($resultsPerPage);
-+               
 +               $queryBuilder->andWhere('c1.active = 1');
-+               $paginator->setQueryBuilder($queryBuilder);
-+               $paginator->setPage($page);
-+               $paginator->init();
++               $paginator = new DoctrineORMPaginator([
++                   'query_builder' => $queryBuilder,
++                   'page' => $page,
++                   'max_per_page' => $resultsPerPage,
++               ]);
 +
 +               return $paginator;
 +           })
             //...
-            ->init();
 
         return $crud;
     }
diff --git a/doc/cookbook/sort.md b/doc/cookbook/sort.md
index 136213f..5f6e853 100644
--- a/doc/cookbook/sort.md
+++ b/doc/cookbook/sort.md
@@ -22,7 +22,6 @@ class MyCrudController extends AbstractCrudController
             ->setRoute('my_crud_ajax')
             ->setDefaultSort('id', Crud::ASC)
             //...
-            ->init();
 
         return $crud;
     }
@@ -53,7 +52,6 @@ class MyCrudController extends AbstractCrudController
             ->setRoute('my_crud_ajax')
             ->setDefaultSort('id', Crud::ASC)
             //...
-            ->init();
 
         return $crud;
     }
@@ -87,7 +85,6 @@ class MyCrudController extends AbstractCrudController
                 'c1.id' => Crud::ASC,
             ])
             //...
-            ->init();
 
         return $crud;
     }
diff --git a/doc/cookbook/template_configuration.md b/doc/cookbook/template_configuration.md
index 3c24dd1..833bf81 100644
--- a/doc/cookbook/template_configuration.md
+++ b/doc/cookbook/template_configuration.md
@@ -60,7 +60,6 @@ class MyCrudController extends AbstractCrudController
 +               ],
 +           ])
             //...
-            ->init();
 
         return $crud;
     }
diff --git a/doc/cookbook/virtual_columns.md b/doc/cookbook/virtual_columns.md
index 97c22e6..9b7a415 100644
--- a/doc/cookbook/virtual_columns.md
+++ b/doc/cookbook/virtual_columns.md
@@ -28,7 +28,6 @@ class MyCrudController extends AbstractCrudController
 +           ->addVirtualColumn('my_virtual_column', 'c1.name')
             ->setRoute('my_crud_ajax')
             //...
-            ->init();
 
         return $crud;
     }
diff --git a/doc/crud.md b/doc/crud.md
index 8667d63..404f442 100644
--- a/doc/crud.md
+++ b/doc/crud.md
@@ -129,8 +129,7 @@ class MyCrudController extends AbstractCrudController
             ->setAvailableResultsPerPage([2, 5, 10], 5)
             ->setDefaultSort('id', Crud::ASC)
             ->setRoute('my_crud_ajax')
-            ->setPersistentSettings(true) //Enregistre les paramètres d'affichage en base de données. Par défaut: false
-            ->init();
+            ->setPersistentSettings(true); //Enregistre les paramètres d'affichage en base de données. Par défaut: false
 
         return $crud;
     }
@@ -179,7 +178,6 @@ Explications de configCrud():
     * Le sens du tri par défaut (`Crud::ASC` ou `Crud::DESC`). **Requis**
 * On définit par la fonction `setRoute` la route Ajax utilisée pour mettre à jour notre liste
 * On active par la fonction `setPersistentSettings` l'enregistrement des propriétés d'affichage des utilisateurs en base de données. Par défaut, désactivé.
-* On initialise le Crud par la méthode `init()`.
 * On retourne notre objet créé
 
 ## Ajout templates
@@ -365,7 +363,6 @@ class MyCrudController extends AbstractCrudController
             ->setRoute('my_crud_ajax')
 +           ->createSearchForm(new CarSearcher())
             //...
-            ->init();
 
         return $crud;
     }
diff --git a/doc/references/modal.md b/doc/references/modal.md
index 3b72a57..8d49146 100644
--- a/doc/references/modal.md
+++ b/doc/references/modal.md
@@ -78,7 +78,7 @@ Options disponibles :
 | onOpen | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant l'ouverture de la modale | Non | |
 | onClose | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant la fermeture de la modale | Non | |
 | method | Méthode HTTP | Non | POST |
-| ajaxOptions | Options Ajax (voir [sendRequest](ajax.md#sendrequest) | Non | { } |
+| ajaxOptions | Options Ajax (voir [sendRequest](ajax.md#sendrequest)) | Non | { } |
 
 
 ### Ouverture automatique
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 417e161..7a9036c 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -69,7 +69,9 @@
     * `$router`, `formFactory`, `$request`, `$registry`: Un locator est utilisé à la place.
     * `$user`
 * Les méthodes suivantes de `Crud` sont supprimées:
-    * `getSearcherForm`. Elle est remplacée par la méthode `getSearchForm`
+    * `getSearcherForm`. Elle est remplacée par la méthode `getSearchForm`. Cette nouvelle méthode retourne :
+        * Soit un objet `SearchFormBuilder`, avant que la méthode `clearTemplate` soit appelée
+        * Soit un objet `FormView`, après que la méthode `clearTemplate` soit appelée
     * `setUseDbal`
     * `configureTemplate`, `getTemplateConfiguration` et `validateConfigureTemplateFunctionName`: Voir l'alternative avec
       [le nouveau système](../cookbook/template_configuration.md).
@@ -78,6 +80,7 @@
 * La méthode `createSearcherForm` de `Crud` est renommée en `createSearchForm`. La signature est modifiée:
     * Avant: `createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = [])`
     * Après: `createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = [])`
+* Les options du FormType personnalisé du formulaire de recherche doivent être passées dans l'option `form_options` (3ème argument) de `createSearchForm`
 * La signature du constructeur de `CrudFactory` est modifiée:
     * Avant: `__construct(RouterInterface $router, FormFactoryInterface $formFactory, RequestStack $requestStack, ManagerRegistry $registry, TokenStorageInterface $tokenStorage, array $templateConfiguration)`
     * Maintenant: `__construct(ContainerInterface $container)`
@@ -85,6 +88,7 @@
 * Toutes les données membres de `CrudFactory` sont supprimées. Un locator est utilisé à la place.
 * La donnée membre `$formSearcherData` de `CrudSession` est supprimée. Elle est remplacée par `$searchFormData`
   qui est une instance de `SearcherInterface` ou nulle.
+* Ne plus appeler la méthode `init` de `Crud` dans a méthode `createCrud` des contrôleurs
 
 
 
@@ -218,7 +222,7 @@ Si vous utilisez l'une de ces classes, voici la migration à effectuer :
     * `bootstrap_size`
 * La signature de la fonction Twig `paginator_links` est modifiée:
     * Avant `paginator_links(AbstractPaginator $paginator, $routeName, $routeParams, $options)`
-    * Maintenance: `paginator_links(PaginatorInterface $paginator, string $routeName, array $routeParams = [], array $options = [])`
+    * Maintenant: `paginator_links(PaginatorInterface $paginator, string $routeName, array $routeParams = [], array $options = [])`
 * La signature de la fonction Twig `crud_paginator_links` est modifiée:
     * Avant: `crud_paginator_links(Crud $crud, $options = [], $ajaxOptions = [])`
     * Maintenant: `crud_paginator_links(Crud $crud, array $options = [])`
@@ -342,4 +346,5 @@ La classe `CrudHelper` est supprimée.  Utiliser à la places les fonctions Twig
 Les événements suivants sont supprimés :
 * `ec-crud-update-search-after`
 * `ec-crud-update-list-after`
+
 Utiliser à la place l'événement `ec-crud-ajax-update-dom-after`.

From 9f3548efb6e6778bf42a13addb4d6d859963477b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 1 Oct 2021 15:37:56 +0200
Subject: [PATCH 093/264] Use JS standard

---
 .editorconfig                                 |    4 +-
 .eslintrc.js                                  |    2 -
 README.md                                     |    1 +
 src/Resources/assets/js/ajax.js               |  324 ++---
 src/Resources/assets/js/callback-manager.js   |   42 +-
 src/Resources/assets/js/callback.js           |  100 +-
 src/Resources/assets/js/crud.js               |  164 +--
 .../assets/js/modal/engine/bootstrap3.js      |   32 +-
 .../assets/js/modal/modal-manager.js          |  228 +--
 src/Resources/assets/js/options-resolver.js   |   38 +-
 tests/Resources/assets/js/ajax.spec.js        | 1284 ++++++++---------
 .../assets/js/callback-manager.spec.js        |  174 +--
 tests/Resources/assets/js/callback.spec.js    |  270 ++--
 tests/Resources/assets/js/main.js             |    4 +-
 .../Resources/assets/js/modal/engine/test.js  |   16 +-
 .../assets/js/modal/modal-manager.spec.js     |  638 ++++----
 .../assets/js/options-resolver.spec.js        |  198 +--
 17 files changed, 1760 insertions(+), 1759 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 0e740ce..f2bcd34 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,11 @@
 ; top-most EditorConfig file
 root = true
 
-; Unix-style newlines
 [*]
 end_of_line = LF
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+
+[*.js]
+indent_size = 2
diff --git a/.eslintrc.js b/.eslintrc.js
index cc7768f..ee37113 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -17,8 +17,6 @@ module.exports = {
         sourceType: 'module'
     },
     rules: {
-        'indent': ['error', 4],
         'linebreak-style': ['error', 'unix'],
-        'semi': 'off'
     }
 }
diff --git a/README.md b/README.md
index 3c8a1e7..aaaeb3c 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 
 ![Tests](https://github.com/e-commit/EcommitCrudBundle/workflows/Tests/badge.svg)
+[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
 
 
 **WARNING: This branch is under development. Not use in production. You can use stable versions or 2.6 branch.**
diff --git a/src/Resources/assets/js/ajax.js b/src/Resources/assets/js/ajax.js
index df97ea4..74802a9 100644
--- a/src/Resources/assets/js/ajax.js
+++ b/src/Resources/assets/js/ajax.js
@@ -7,187 +7,187 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery';
-import * as optionsResolver from './options-resolver';
-import runCallback from './callback';
+import $ from 'jquery'
+import * as optionsResolver from './options-resolver'
+import runCallback from './callback'
 
 $(function () {
-    $(document).on('click', '.ec-crud-ajax-click-auto', function (event) {
-        event.preventDefault();
-        const eventBefore = $.Event('ec-crud-ajax-click-auto-before');
-        $(this).trigger(eventBefore);
-        if (eventBefore.isDefaultPrevented()) {
-            return;
-        }
-
-        click(this);
-    });
-
-    $(document).on('click', 'a.ec-crud-ajax-link-auto', function (event) {
-        event.preventDefault();
-        const eventBefore = $.Event('ec-crud-ajax-link-auto-before');
-        $(this).trigger(eventBefore);
-        if (eventBefore.isDefaultPrevented()) {
-            return;
-        }
-
-        link(this);
-    });
-
-    $(document).on('submit', 'form.ec-crud-ajax-form-auto', function (event) {
-        event.preventDefault();
-        const eventBefore = $.Event('ec-crud-ajax-form-auto-before');
-        $(this).trigger(eventBefore);
-        if (eventBefore.isDefaultPrevented()) {
-            return;
-        }
-
-        sendForm(this);
-    });
-});
-
-export function sendRequest (options) {
-    options = optionsResolver.resolve(
-        {
-            url: null,
-            update: null,
-            updateMode: 'update',
-            onBeforeSend: null,
-            onSuccess: null,
-            onError: null,
-            onComplete: null,
-            dataType: 'html',
-            method: 'POST',
-            data: null,
-            cache: false,
-            options: {}
-        },
-        options
-    );
-
-    options = $.extend({}, options, options.options)
-
-    if (optionsResolver.isNotBlank(options.url) === false) {
-        console.error('Value required: url');
-
-        return;
+  $(document).on('click', '.ec-crud-ajax-click-auto', function (event) {
+    event.preventDefault()
+    const eventBefore = $.Event('ec-crud-ajax-click-auto-before')
+    $(this).trigger(eventBefore)
+    if (eventBefore.isDefaultPrevented()) {
+      return
     }
 
-    if (optionsResolver.isNotBlank(options.onBeforeSend)) {
-        runCallback(options.onBeforeSend, options);
-    }
-    if (options.stop !== undefined && options.stop === true) {
-        return;
-    }
+    click(this)
+  })
 
-    const callbacksSuccess = [];
-    if (optionsResolver.isNotBlank(options.update)) {
-        callbacksSuccess.push({
-            priority: 10,
-            callback: function (data, textStatus, jqXHR) {
-                updateDom(options.update, options.updateMode, data);
-            }
-        })
+  $(document).on('click', 'a.ec-crud-ajax-link-auto', function (event) {
+    event.preventDefault()
+    const eventBefore = $.Event('ec-crud-ajax-link-auto-before')
+    $(this).trigger(eventBefore)
+    if (eventBefore.isDefaultPrevented()) {
+      return
     }
-    if (optionsResolver.isNotBlank(options.onSuccess)) {
-        callbacksSuccess.push(options.onSuccess);
+
+    link(this)
+  })
+
+  $(document).on('submit', 'form.ec-crud-ajax-form-auto', function (event) {
+    event.preventDefault()
+    const eventBefore = $.Event('ec-crud-ajax-form-auto-before')
+    $(this).trigger(eventBefore)
+    if (eventBefore.isDefaultPrevented()) {
+      return
     }
 
-    $.ajax({
-        url: options.url,
-        type: options.method,
-        dataType: options.dataType,
-        cache: options.cache,
-        data: options.data,
-        success: function (data, textStatus, jqXHR) {
-            runCallback(callbacksSuccess, data, textStatus, jqXHR);
-        },
-        error: function (jqXHR, textStatus, errorThrown) {
-            runCallback(options.onError, jqXHR, textStatus, errorThrown);
-        },
-        complete: function (jqXHR, textStatus) {
-            runCallback(options.onComplete, jqXHR, textStatus);
-        }
-    });
+    sendForm(this)
+  })
+})
+
+export function sendRequest (options) {
+  options = optionsResolver.resolve(
+    {
+      url: null,
+      update: null,
+      updateMode: 'update',
+      onBeforeSend: null,
+      onSuccess: null,
+      onError: null,
+      onComplete: null,
+      dataType: 'html',
+      method: 'POST',
+      data: null,
+      cache: false,
+      options: {}
+    },
+    options
+  )
+
+  options = $.extend({}, options, options.options)
+
+  if (optionsResolver.isNotBlank(options.url) === false) {
+    console.error('Value required: url')
+
+    return
+  }
+
+  if (optionsResolver.isNotBlank(options.onBeforeSend)) {
+    runCallback(options.onBeforeSend, options)
+  }
+  if (options.stop !== undefined && options.stop === true) {
+    return
+  }
+
+  const callbacksSuccess = []
+  if (optionsResolver.isNotBlank(options.update)) {
+    callbacksSuccess.push({
+      priority: 10,
+      callback: function (data, textStatus, jqXHR) {
+        updateDom(options.update, options.updateMode, data)
+      }
+    })
+  }
+  if (optionsResolver.isNotBlank(options.onSuccess)) {
+    callbacksSuccess.push(options.onSuccess)
+  }
+
+  $.ajax({
+    url: options.url,
+    type: options.method,
+    dataType: options.dataType,
+    cache: options.cache,
+    data: options.data,
+    success: function (data, textStatus, jqXHR) {
+      runCallback(callbacksSuccess, data, textStatus, jqXHR)
+    },
+    error: function (jqXHR, textStatus, errorThrown) {
+      runCallback(options.onError, jqXHR, textStatus, errorThrown)
+    },
+    complete: function (jqXHR, textStatus) {
+      runCallback(options.onComplete, jqXHR, textStatus)
+    }
+  })
 }
 
 export function click (element, options) {
-    // Options in data-* override options argument
-    options = optionsResolver.resolve(
-        options,
-        optionsResolver.getDataAttributes(element, 'ecCrudAjax')
-    );
+  // Options in data-* override options argument
+  options = optionsResolver.resolve(
+    options,
+    optionsResolver.getDataAttributes(element, 'ecCrudAjax')
+  )
 
-    sendRequest(options);
+  sendRequest(options)
 }
 
 export function link (link, options) {
-    // Options in data-* override options argument
-    // Option argument override href
-    options = optionsResolver.resolve(
-        {
-            url: $(link).attr('href')
-        },
-        optionsResolver.resolve(
-            options,
-            optionsResolver.getDataAttributes(link, 'ecCrudAjax')
-        )
-    );
-
-    sendRequest(options);
+  // Options in data-* override options argument
+  // Option argument override href
+  options = optionsResolver.resolve(
+    {
+      url: $(link).attr('href')
+    },
+    optionsResolver.resolve(
+      options,
+      optionsResolver.getDataAttributes(link, 'ecCrudAjax')
+    )
+  )
+
+  sendRequest(options)
 }
 
 export function sendForm (form, options) {
-    // Options in data-* override options argument
-    // Option argument override action, method and data form
-    options = optionsResolver.resolve(
-        {
-            url: $(form).attr('action'),
-            method: $(form).attr('method'),
-            data: $(form).serialize()
-        },
-        optionsResolver.resolve(
-            options,
-            optionsResolver.getDataAttributes(form, 'ecCrudAjax')
-        )
-    );
-
-    sendRequest(options);
+  // Options in data-* override options argument
+  // Option argument override action, method and data form
+  options = optionsResolver.resolve(
+    {
+      url: $(form).attr('action'),
+      method: $(form).attr('method'),
+      data: $(form).serialize()
+    },
+    optionsResolver.resolve(
+      options,
+      optionsResolver.getDataAttributes(form, 'ecCrudAjax')
+    )
+  )
+
+  sendRequest(options)
 }
 
 export function updateDom (element, updateMode, content) {
-    const eventBefore = $.Event('ec-crud-ajax-update-dom-before', {
-        element: element,
-        updateMode: updateMode,
-        content: content
-    });
-    $(element).trigger(eventBefore);
-    if (eventBefore.isDefaultPrevented()) {
-        return;
-    }
-    updateMode = eventBefore.updateMode;
-    content = eventBefore.content;
-
-    if (updateMode === 'update') {
-        $(element).html(content);
-    } else if (updateMode === 'before') {
-        $(element).before(content);
-    } else if (updateMode === 'after') {
-        $(element).after(content);
-    } else if (updateMode === 'prepend') {
-        $(element).prepend(content);
-    } else if (updateMode === 'append') {
-        $(element).append(content);
-    } else {
-        console.error('Bad updateMode: ' + updateMode);
-
-        return;
-    }
-
-    const eventAfter = $.Event('ec-crud-ajax-update-dom-after', {
-        element: element,
-        updateMode: updateMode,
-        content: content
-    });
-    $(element).trigger(eventAfter);
+  const eventBefore = $.Event('ec-crud-ajax-update-dom-before', {
+    element: element,
+    updateMode: updateMode,
+    content: content
+  })
+  $(element).trigger(eventBefore)
+  if (eventBefore.isDefaultPrevented()) {
+    return
+  }
+  updateMode = eventBefore.updateMode
+  content = eventBefore.content
+
+  if (updateMode === 'update') {
+    $(element).html(content)
+  } else if (updateMode === 'before') {
+    $(element).before(content)
+  } else if (updateMode === 'after') {
+    $(element).after(content)
+  } else if (updateMode === 'prepend') {
+    $(element).prepend(content)
+  } else if (updateMode === 'append') {
+    $(element).append(content)
+  } else {
+    console.error('Bad updateMode: ' + updateMode)
+
+    return
+  }
+
+  const eventAfter = $.Event('ec-crud-ajax-update-dom-after', {
+    element: element,
+    updateMode: updateMode,
+    content: content
+  })
+  $(element).trigger(eventAfter)
 }
diff --git a/src/Resources/assets/js/callback-manager.js b/src/Resources/assets/js/callback-manager.js
index 6caae07..034c079 100644
--- a/src/Resources/assets/js/callback-manager.js
+++ b/src/Resources/assets/js/callback-manager.js
@@ -7,41 +7,41 @@
  * file that was distributed with this source code.
  */
 
-const ENGINE_KEY = Symbol.for('ecommit.crudbundle.callbackengine');
-const globalSymbols = Object.getOwnPropertySymbols(global);
+const ENGINE_KEY = Symbol.for('ecommit.crudbundle.callbackengine')
+const globalSymbols = Object.getOwnPropertySymbols(global)
 if (globalSymbols.indexOf(ENGINE_KEY) === -1) {
-    global[ENGINE_KEY] = [];
+  global[ENGINE_KEY] = []
 }
 
 export function registerCallback (name, callback) {
-    if (typeof name !== 'string' && !(name instanceof String)) {
-        console.error('Bad name');
-    }
-    if (!(callback instanceof Function)) {
-        console.error('Invalid callback ' + name);
-    }
-
-    global[ENGINE_KEY][name] = callback;
+  if (typeof name !== 'string' && !(name instanceof String)) {
+    console.error('Bad name')
+  }
+  if (!(callback instanceof Function)) {
+    console.error('Invalid callback ' + name)
+  }
+
+  global[ENGINE_KEY][name] = callback
 }
 
 export function callbackIsRegistred (name) {
-    if (typeof name !== 'string' && !(name instanceof String)) {
-        console.error('Bad name');
-    }
+  if (typeof name !== 'string' && !(name instanceof String)) {
+    console.error('Bad name')
+  }
 
-    return (undefined !== global[ENGINE_KEY][name]);
+  return (undefined !== global[ENGINE_KEY][name])
 }
 
 export function getRegistredCallback (name) {
-    if (!callbackIsRegistred(name)) {
-        console.error('Callback not found: ' + name);
+  if (!callbackIsRegistred(name)) {
+    console.error('Callback not found: ' + name)
 
-        return null;
-    }
+    return null
+  }
 
-    return global[ENGINE_KEY][name];
+  return global[ENGINE_KEY][name]
 }
 
 export function clear () {
-    global[ENGINE_KEY] = [];
+  global[ENGINE_KEY] = []
 }
diff --git a/src/Resources/assets/js/callback.js b/src/Resources/assets/js/callback.js
index 6be0177..0b32719 100644
--- a/src/Resources/assets/js/callback.js
+++ b/src/Resources/assets/js/callback.js
@@ -7,71 +7,71 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery';
-import * as callbackManager from './callback-manager';
+import $ from 'jquery'
+import * as callbackManager from './callback-manager'
 
 export default function (callbacks, ...args) {
-    if (undefined === callbacks || callbacks === null) {
-        return;
-    }
+  if (undefined === callbacks || callbacks === null) {
+    return
+  }
 
-    if (typeof callbacks === 'string' || callbacks instanceof String || callbacks instanceof Function) {
-        callbacks = [callbacks];
-    }
+  if (typeof callbacks === 'string' || callbacks instanceof String || callbacks instanceof Function) {
+    callbacks = [callbacks]
+  }
 
-    if (Array !== callbacks.constructor) {
-        return;
-    }
+  if (Array !== callbacks.constructor) {
+    return
+  }
 
-    const newCallbacks = [];
-    $.each(callbacks, function (key, value) {
-        addCallbacksToStack(value, newCallbacks);
-    });
+  const newCallbacks = []
+  $.each(callbacks, function (key, value) {
+    addCallbacksToStack(value, newCallbacks)
+  })
 
-    newCallbacks.sort(function (a, b) {
-        if (parseInt(a.priority, 10) >= parseInt(b.priority, 10)) {
-            return -1;
-        }
+  newCallbacks.sort(function (a, b) {
+    if (parseInt(a.priority, 10) >= parseInt(b.priority, 10)) {
+      return -1
+    }
 
-        return 1;
-    });
+    return 1
+  })
 
-    $.each(newCallbacks, function (key, value) {
-        processCallback(value.callback, args);
-    });
+  $.each(newCallbacks, function (key, value) {
+    processCallback(value.callback, args)
+  })
 }
 
 function addCallbacksToStack (value, stack) {
-    if (typeof value === 'string' || value instanceof String || value instanceof Function) {
-        stack.push({
-            callback: value,
-            priority: 0
-        });
-    } else if (Array === value.constructor) {
-        $.each(value, function (key, subValue) {
-            addCallbacksToStack(subValue, stack);
-        });
-    } else if (undefined !== value.callback) {
-        stack.push({
-            callback: value.callback,
-            priority: (value.priority !== undefined) ? value.priority : 0
-        });
-    }
+  if (typeof value === 'string' || value instanceof String || value instanceof Function) {
+    stack.push({
+      callback: value,
+      priority: 0
+    })
+  } else if (Array === value.constructor) {
+    $.each(value, function (key, subValue) {
+      addCallbacksToStack(subValue, stack)
+    })
+  } else if (undefined !== value.callback) {
+    stack.push({
+      callback: value.callback,
+      priority: (value.priority !== undefined) ? value.priority : 0
+    })
+  }
 }
 
 function processCallback (subject, args) {
-    if (subject instanceof Function) {
-        subject(...args);
+  if (subject instanceof Function) {
+    subject(...args)
 
-        return;
-    }
+    return
+  }
 
-    if (typeof subject !== 'string' && !(subject instanceof String)) {
-        return;
-    }
+  if (typeof subject !== 'string' && !(subject instanceof String)) {
+    return
+  }
 
-    subject = callbackManager.getRegistredCallback(subject);
-    if (subject) {
-        subject(...args);
-    }
+  subject = callbackManager.getRegistredCallback(subject)
+  if (subject) {
+    subject(...args)
+  }
 }
diff --git a/src/Resources/assets/js/crud.js b/src/Resources/assets/js/crud.js
index 14e9f5e..fabd0a5 100644
--- a/src/Resources/assets/js/crud.js
+++ b/src/Resources/assets/js/crud.js
@@ -7,120 +7,120 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery';
-import { click, sendForm, sendRequest, updateDom } from './ajax';
-import { closeModal, openModal } from './modal/modal-manager';
+import $ from 'jquery'
+import { click, sendForm, sendRequest, updateDom } from './ajax'
+import { closeModal, openModal } from './modal/modal-manager'
 
 $(document).on('submit', 'form.ec-crud-search-form', function (event) {
-    event.preventDefault();
+  event.preventDefault()
 
-    const searchId = $(this).attr('data-crud-search-id');
-    const listId = $(this).attr('data-crud-list-id');
+  const searchId = $(this).attr('data-crud-search-id')
+  const listId = $(this).attr('data-crud-list-id')
 
-    sendForm(this, {
-        onSuccess: function (data, textStatus, jqXHR) {
-            const json = $.parseJSON(data);
+  sendForm(this, {
+    onSuccess: function (data, textStatus, jqXHR) {
+      const json = $.parseJSON(data)
 
-            updateDom($('#' + searchId), 'update', json.render_search);
-            updateDom($('#' + listId), 'update', json.render_list);
-        }
-    });
-});
+      updateDom($('#' + searchId), 'update', json.render_search)
+      updateDom($('#' + listId), 'update', json.render_list)
+    }
+  })
+})
 
 $(document).on('click', 'button.ec-crud-search-reset', function (event) {
-    const searchId = $(this).attr('data-crud-search-id');
-    const listId = $(this).attr('data-crud-list-id');
+  const searchId = $(this).attr('data-crud-search-id')
+  const listId = $(this).attr('data-crud-list-id')
 
-    click(this, {
-        onSuccess: function (data, textStatus, jqXHR) {
-            const json = $.parseJSON(data);
+  click(this, {
+    onSuccess: function (data, textStatus, jqXHR) {
+      const json = $.parseJSON(data)
 
-            updateDom($('#' + searchId), 'update', json.render_search);
-            updateDom($('#' + listId), 'update', json.render_list);
-        }
-    });
-});
+      updateDom($('#' + searchId), 'update', json.render_search)
+      updateDom($('#' + listId), 'update', json.render_list)
+    }
+  })
+})
 
 $(document).on('click', 'button.ec-crud-display-settings-button', function (event) {
-    const displaySettingsContainerId = $(this).attr('data-display-settings');
-    const isModal = $('#' + displaySettingsContainerId).attr('data-modal') === '1';
+  const displaySettingsContainerId = $(this).attr('data-display-settings')
+  const isModal = $('#' + displaySettingsContainerId).attr('data-modal') === '1'
 
-    if (isModal) {
-        openDisplaySettings($('#' + displaySettingsContainerId));
+  if (isModal) {
+    openDisplaySettings($('#' + displaySettingsContainerId))
 
-        return;
-    }
+    return
+  }
 
-    if ($('#' + displaySettingsContainerId).is(':visible')) {
-        closeDisplaySettings($('#' + displaySettingsContainerId));
-    } else {
-        openDisplaySettings($('#' + displaySettingsContainerId));
-    }
-});
+  if ($('#' + displaySettingsContainerId).is(':visible')) {
+    closeDisplaySettings($('#' + displaySettingsContainerId))
+  } else {
+    openDisplaySettings($('#' + displaySettingsContainerId))
+  }
+})
 
 $(document).on('click', 'button.ec-crud-display-settings-check-all-columns', function (event) {
-    $(this).parents('div.ec-crud-display-settings').find('input[type=checkbox]').each(function () {
-        $(this).prop('checked', true);
-    });
-});
+  $(this).parents('div.ec-crud-display-settings').find('input[type=checkbox]').each(function () {
+    $(this).prop('checked', true)
+  })
+})
 
 $(document).on('click', 'button.ec-crud-display-settings-uncheck-all-columns', function (event) {
-    $(this).parents('div.ec-crud-display-settings').find('input[type=checkbox]').each(function () {
-        $(this).prop('checked', false);
-    });
-});
+  $(this).parents('div.ec-crud-display-settings').find('input[type=checkbox]').each(function () {
+    $(this).prop('checked', false)
+  })
+})
 
 $(document).on('click', 'button.ec-crud-display-settings-raz', function (event) {
-    const displaySettingsContainer = $(this).parents('div.ec-crud-display-settings');
-    const displaySettingsContainerId = $(displaySettingsContainer).attr('id');
-    const listId = $(displaySettingsContainer).attr('data-crud-list-id');
+  const displaySettingsContainer = $(this).parents('div.ec-crud-display-settings')
+  const displaySettingsContainerId = $(displaySettingsContainer).attr('id')
+  const listId = $(displaySettingsContainer).attr('data-crud-list-id')
 
-    closeDisplaySettings($('#' + displaySettingsContainerId));
+  closeDisplaySettings($('#' + displaySettingsContainerId))
 
-    sendRequest({
-        url: $(this).attr('data-reset-url'),
-        update: $('#' + listId)
-    });
-});
+  sendRequest({
+    url: $(this).attr('data-reset-url'),
+    update: $('#' + listId)
+  })
+})
 
 $(document).on('submit', '.ec-crud-display-settings form', function (event) {
-    event.preventDefault();
+  event.preventDefault()
 
-    const displaySettingsContainer = $(this).parents('div.ec-crud-display-settings');
-    const displaySettingsContainerId = $(displaySettingsContainer).attr('id');
-    const listId = $(displaySettingsContainer).attr('data-crud-list-id');
+  const displaySettingsContainer = $(this).parents('div.ec-crud-display-settings')
+  const displaySettingsContainerId = $(displaySettingsContainer).attr('id')
+  const listId = $(displaySettingsContainer).attr('data-crud-list-id')
 
-    closeDisplaySettings($('#' + displaySettingsContainerId));
+  closeDisplaySettings($('#' + displaySettingsContainerId))
 
-    sendForm(this, {
-        onSuccess: function (data, textStatus, jqXHR) {
-            const json = $.parseJSON(data);
+  sendForm(this, {
+    onSuccess: function (data, textStatus, jqXHR) {
+      const json = $.parseJSON(data)
 
-            updateDom($('#' + listId), 'update', json.render_list);
-            if (!json.form_is_valid) {
-                openDisplaySettings($('#' + displaySettingsContainerId));
-            }
-        }
-    });
-});
+      updateDom($('#' + listId), 'update', json.render_list)
+      if (!json.form_is_valid) {
+        openDisplaySettings($('#' + displaySettingsContainerId))
+      }
+    }
+  })
+})
 
 function openDisplaySettings (displaySettingsContainer) {
-    const isModal = $(displaySettingsContainer).attr('data-modal') === '1';
-    if (isModal) {
-        openModal({
-            element: displaySettingsContainer
-        });
-    } else {
-        $(displaySettingsContainer).show();
-    }
+  const isModal = $(displaySettingsContainer).attr('data-modal') === '1'
+  if (isModal) {
+    openModal({
+      element: displaySettingsContainer
+    })
+  } else {
+    $(displaySettingsContainer).show()
+  }
 }
 
 function closeDisplaySettings (displaySettingsContainer) {
-    const isModal = $(displaySettingsContainer).attr('data-modal') === '1';
+  const isModal = $(displaySettingsContainer).attr('data-modal') === '1'
 
-    if (isModal) {
-        closeModal(displaySettingsContainer);
-    } else {
-        $(displaySettingsContainer).hide();
-    }
+  if (isModal) {
+    closeModal(displaySettingsContainer)
+  } else {
+    $(displaySettingsContainer).hide()
+  }
 }
diff --git a/src/Resources/assets/js/modal/engine/bootstrap3.js b/src/Resources/assets/js/modal/engine/bootstrap3.js
index 37cf4e3..572112f 100644
--- a/src/Resources/assets/js/modal/engine/bootstrap3.js
+++ b/src/Resources/assets/js/modal/engine/bootstrap3.js
@@ -7,28 +7,28 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery';
-import runCallback from '../../callback';
+import $ from 'jquery'
+import runCallback from '../../callback'
 
 export function openModal (options) {
-    // Suppression des événements
-    $(options.element).off('shown.bs.modal');
-    $(options.element).off('hide.bs.modal');
+  // Suppression des événements
+  $(options.element).off('shown.bs.modal')
+  $(options.element).off('hide.bs.modal')
 
-    $(options.element).on('shown.bs.modal', function (e) {
-        runCallback(options.onOpen, $(options.element));
-    });
+  $(options.element).on('shown.bs.modal', function (e) {
+    runCallback(options.onOpen, $(options.element))
+  })
 
-    $(options.element).on('hide.bs.modal', function (e) {
-        runCallback(options.onClose, $(options.element));
-    });
+  $(options.element).on('hide.bs.modal', function (e) {
+    runCallback(options.onClose, $(options.element))
+  })
 
-    $(options.element).modal({
-        show: true,
-        focus: true
-    });
+  $(options.element).modal({
+    show: true,
+    focus: true
+  })
 }
 
 export function closeModal (element) {
-    $(element).modal('hide');
+  $(element).modal('hide')
 }
diff --git a/src/Resources/assets/js/modal/modal-manager.js b/src/Resources/assets/js/modal/modal-manager.js
index d40d42a..f5f9123 100644
--- a/src/Resources/assets/js/modal/modal-manager.js
+++ b/src/Resources/assets/js/modal/modal-manager.js
@@ -7,142 +7,142 @@
  * file that was distributed with this source code.
  */
 
-import * as optionsResolver from '../options-resolver';
-import $ from 'jquery';
-import * as ajax from '../ajax';
+import * as optionsResolver from '../options-resolver'
+import $ from 'jquery'
+import * as ajax from '../ajax'
 
-const ENGINE_KEY = Symbol.for('ecommit.crudbundle.modalengine');
-const globalSymbols = Object.getOwnPropertySymbols(global);
+const ENGINE_KEY = Symbol.for('ecommit.crudbundle.modalengine')
+const globalSymbols = Object.getOwnPropertySymbols(global)
 if (globalSymbols.indexOf(ENGINE_KEY) === -1) {
-    global[ENGINE_KEY] = null;
+  global[ENGINE_KEY] = null
 }
 
 $(function () {
-    $(document).on('click', '.ec-crud-modal-auto', function (event) {
-        event.preventDefault();
-        const eventBefore = $.Event('ec-crud-modal-auto-before');
-        $(this).trigger(eventBefore);
-        if (eventBefore.isDefaultPrevented()) {
-            return;
-        }
-
-        openModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'));
-    });
-
-    $(document).on('click', 'button.ec-crud-remote-modal-auto', function (event) {
-        event.preventDefault();
-        const eventBefore = $.Event('ec-crud-remote-modal-auto-before');
-        $(this).trigger(eventBefore);
-        if (eventBefore.isDefaultPrevented()) {
-            return;
-        }
-
-        openRemoteModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'));
-    });
-
-    $(document).on('click', 'a.ec-crud-remote-modal-auto', function (event) {
-        event.preventDefault();
-        const eventBefore = $.Event('ec-crud-remote-modal-auto-before');
-        $(this).trigger(eventBefore);
-        if (eventBefore.isDefaultPrevented()) {
-            return;
-        }
-
-        // Options in data-* override href
-        const options = optionsResolver.resolve(
-            {
-                url: $(this).attr('href')
-            },
-            optionsResolver.getDataAttributes(this, 'ecCrudModal')
-        );
-
-        openRemoteModal(options);
-    });
-});
+  $(document).on('click', '.ec-crud-modal-auto', function (event) {
+    event.preventDefault()
+    const eventBefore = $.Event('ec-crud-modal-auto-before')
+    $(this).trigger(eventBefore)
+    if (eventBefore.isDefaultPrevented()) {
+      return
+    }
+
+    openModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'))
+  })
+
+  $(document).on('click', 'button.ec-crud-remote-modal-auto', function (event) {
+    event.preventDefault()
+    const eventBefore = $.Event('ec-crud-remote-modal-auto-before')
+    $(this).trigger(eventBefore)
+    if (eventBefore.isDefaultPrevented()) {
+      return
+    }
+
+    openRemoteModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'))
+  })
+
+  $(document).on('click', 'a.ec-crud-remote-modal-auto', function (event) {
+    event.preventDefault()
+    const eventBefore = $.Event('ec-crud-remote-modal-auto-before')
+    $(this).trigger(eventBefore)
+    if (eventBefore.isDefaultPrevented()) {
+      return
+    }
+
+    // Options in data-* override href
+    const options = optionsResolver.resolve(
+      {
+        url: $(this).attr('href')
+      },
+      optionsResolver.getDataAttributes(this, 'ecCrudModal')
+    )
+
+    openRemoteModal(options)
+  })
+})
 
 export function defineEngine (newEngine) {
-    global[ENGINE_KEY] = newEngine;
+  global[ENGINE_KEY] = newEngine
 }
 
 export function getEngine () {
-    if (global[ENGINE_KEY] === null) {
-        console.error('Engine not defined');
+  if (global[ENGINE_KEY] === null) {
+    console.error('Engine not defined')
 
-        return;
-    }
+    return
+  }
 
-    return global[ENGINE_KEY];
+  return global[ENGINE_KEY]
 }
 
 export function openModal (options) {
-    options = optionsResolver.resolve(
-        {
-            element: null,
-            onOpen: null,
-            onClose: null
-        },
-        options
-    );
-
-    if (optionsResolver.isNotBlank(options.element) === false) {
-        console.error('Value required: element');
-
-        return;
-    }
-
-    getEngine().openModal(options);
+  options = optionsResolver.resolve(
+    {
+      element: null,
+      onOpen: null,
+      onClose: null
+    },
+    options
+  )
+
+  if (optionsResolver.isNotBlank(options.element) === false) {
+    console.error('Value required: element')
+
+    return
+  }
+
+  getEngine().openModal(options)
 }
 
 export function openRemoteModal (options) {
-    options = optionsResolver.resolve(
-        {
-            url: null,
-            element: null,
-            elementContent: null,
-            onOpen: null,
-            onClose: null,
-            method: 'POST',
-            ajaxOptions: {}
-        },
-        options
-    );
-
-    let hasError = false;
-    $.each(['url', 'element', 'elementContent', 'method'], function (index, value) {
-        if (optionsResolver.isNotBlank(options[value]) === false) {
-            console.error('Value required: ' + value);
-            hasError = true;
-        }
-    });
-    if (hasError === true) {
-        return;
+  options = optionsResolver.resolve(
+    {
+      url: null,
+      element: null,
+      elementContent: null,
+      onOpen: null,
+      onClose: null,
+      method: 'POST',
+      ajaxOptions: {}
+    },
+    options
+  )
+
+  let hasError = false
+  $.each(['url', 'element', 'elementContent', 'method'], function (index, value) {
+    if (optionsResolver.isNotBlank(options[value]) === false) {
+      console.error('Value required: ' + value)
+      hasError = true
     }
-
-    const ajaxOptions = optionsResolver.resolve(
-        {
-            url: options.url,
-            method: options.method,
-            update: options.elementContent
-        },
-        options.ajaxOptions
-    );
-
-    const callbacksSuccess = [
-        {
-            priority: 1,
-            callback: function (data, textStatus, jqXHR) {
-                openModal(options);
-            }
-        }
-    ];
-    if (optionsResolver.isNotBlank(ajaxOptions.onSuccess)) {
-        callbacksSuccess.push(ajaxOptions.onSuccess);
+  })
+  if (hasError === true) {
+    return
+  }
+
+  const ajaxOptions = optionsResolver.resolve(
+    {
+      url: options.url,
+      method: options.method,
+      update: options.elementContent
+    },
+    options.ajaxOptions
+  )
+
+  const callbacksSuccess = [
+    {
+      priority: 1,
+      callback: function (data, textStatus, jqXHR) {
+        openModal(options)
+      }
     }
-    ajaxOptions.onSuccess = callbacksSuccess;
+  ]
+  if (optionsResolver.isNotBlank(ajaxOptions.onSuccess)) {
+    callbacksSuccess.push(ajaxOptions.onSuccess)
+  }
+  ajaxOptions.onSuccess = callbacksSuccess
 
-    ajax.sendRequest(ajaxOptions);
+  ajax.sendRequest(ajaxOptions)
 }
 
 export function closeModal (element) {
-    getEngine().closeModal(element);
+  getEngine().closeModal(element)
 }
diff --git a/src/Resources/assets/js/options-resolver.js b/src/Resources/assets/js/options-resolver.js
index f0013e5..b96e928 100644
--- a/src/Resources/assets/js/options-resolver.js
+++ b/src/Resources/assets/js/options-resolver.js
@@ -7,33 +7,33 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery';
+import $ from 'jquery'
 
 export function resolve (defaultOptions, options) {
-    Object.keys(options).forEach(key => options[key] === undefined ? delete options[key] : {});
+  Object.keys(options).forEach(key => options[key] === undefined ? delete options[key] : {})
 
-    return $.extend({}, defaultOptions, options);
+  return $.extend({}, defaultOptions, options)
 }
 
 export function getDataAttributes (element, prefix) {
-    const prefixLength = prefix.length;
-    const attributes = {};
-
-    $.each($(element).data(), function (index, value) {
-        if (index.length > prefixLength && index.substr(0, prefixLength) === prefix) {
-            let newIndex = index.substr(prefixLength);
-            newIndex = newIndex.charAt(0).toLowerCase() + newIndex.slice(1);
-            attributes[newIndex] = value;
-        }
-    });
-
-    return attributes;
+  const prefixLength = prefix.length
+  const attributes = {}
+
+  $.each($(element).data(), function (index, value) {
+    if (index.length > prefixLength && index.substr(0, prefixLength) === prefix) {
+      let newIndex = index.substr(prefixLength)
+      newIndex = newIndex.charAt(0).toLowerCase() + newIndex.slice(1)
+      attributes[newIndex] = value
+    }
+  })
+
+  return attributes
 }
 
 export function isNotBlank (value) {
-    if (undefined === value || value === null || value.length === 0) {
-        return false;
-    }
+  if (undefined === value || value === null || value.length === 0) {
+    return false
+  }
 
-    return true;
+  return true
 }
diff --git a/tests/Resources/assets/js/ajax.spec.js b/tests/Resources/assets/js/ajax.spec.js
index ff77bb2..da7b2f9 100644
--- a/tests/Resources/assets/js/ajax.spec.js
+++ b/tests/Resources/assets/js/ajax.spec.js
@@ -7,706 +7,706 @@
  * file that was distributed with this source code.
  */
 
-import * as ajax from '@ecommit/crud-bundle/js/ajax';
-import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager';
-import $ from 'jquery';
+import * as ajax from '@ecommit/crud-bundle/js/ajax'
+import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager'
+import $ from 'jquery'
 
 describe('Test Ajax.sendRequest', function () {
-    beforeEach(function () {
-        jasmine.Ajax.install();
-
-        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
-            status: 200,
-            responseText: 'OK'
-        });
-
-        jasmine.Ajax.stubRequest('/resultJS').andReturn({
-            status: 200,
-            responseText: '<div id="subcontent">BEFORE</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script>'
-        });
-
-        jasmine.Ajax.stubRequest('/error404').andReturn({
-            status: 404,
-            responseText: 'Page not found !'
-        });
-    });
-
-    afterEach(function () {
-        jasmine.Ajax.uninstall();
-        $('.html-test').remove();
-        callbackManager.clear();
-    });
-
-    it('Send request', function () {
-        const callbackSuccess = jasmine.createSpy('success');
-        const callbackError = jasmine.createSpy('error');
-        const callbackComplete = jasmine.createSpy('complete');
-
-        ajax.sendRequest({
-            url: '/goodRequest',
-            onComplete: function (jqXHR, textStatus) {
-                callbackComplete();
-            },
-            onSuccess: function (data, textStatus, jqXHR) {
-                callbackSuccess(data);
-            },
-            onError: function (jqXHR, textStatus, errorThrown) {
-                callbackError(jqXHR.responseText);
-            }
-        });
-
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-        expect(callbackSuccess).toHaveBeenCalledWith('OK');
-        expect(callbackError).not.toHaveBeenCalled();
-        expect(callbackComplete).toHaveBeenCalled();
-    });
-
-    it('Send bad request', function () {
-        const callbackSuccess = jasmine.createSpy('success');
-        const callbackError = jasmine.createSpy('error');
-        const callbackComplete = jasmine.createSpy('complete');
-
-        ajax.sendRequest({
-            url: '/error404',
-            onComplete: function (jqXHR, textStatus) {
-                callbackComplete();
-            },
-            onSuccess: function (data, textStatus, jqXHR) {
-                callbackSuccess(data);
-            },
-            onError: function (jqXHR, textStatus, errorThrown) {
-                callbackError(jqXHR.responseText);
-            }
-        });
-
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/error404');
-        expect(callbackSuccess).not.toHaveBeenCalled();
-        expect(callbackError).toHaveBeenCalledWith('Page not found !');
-        expect(callbackComplete).toHaveBeenCalled();
-    });
-
-    it('Send request with callback priorities', function () {
-        const callbackSuccess1 = jasmine.createSpy('success1');
-        const callbackSuccess2 = jasmine.createSpy('success2');
-
-        ajax.sendRequest({
-            url: '/goodRequest',
-            onSuccess: [
-                function (data, textStatus, jqXHR) {
-                    callbackSuccess1();
-                },
-                {
-                    priority: 99,
-                    callback: function (data, textStatus, jqXHR) {
-                        callbackSuccess2();
-                    }
-                }
-            ]
-        });
-
-        expect(callbackSuccess1).toHaveBeenCalled();
-        expect(callbackSuccess2).toHaveBeenCalledBefore(callbackSuccess1);
-    });
-
-    it('Send request without URL', function () {
-        spyOn(window.console, 'error');
-        ajax.sendRequest({});
-        expect(window.console.error).toHaveBeenCalledWith('Value required: url');
-    });
-
-    it('Send request and update DOM with default mode', function () {
-        $('body').append('<div id="ajax-result" class="html-test"><div class="content"></div></div>');
-        const callbackSuccess = jasmine.createSpy('success');
-
-        ajax.sendRequest({
-            url: '/goodRequest',
-            onSuccess: {
-                callback: function (data, textStatus, jqXHR) {
-                    callbackSuccess($('#ajax-result').html());
-                },
-                priority: -99
-            },
-            update: '#ajax-result .content'
-        });
-
-        expect(callbackSuccess).toHaveBeenCalledWith('<div class="content">OK</div>');
-    });
-
-    it('Send request and update DOM with "update" mode', function () {
-        testUpdate('update', '<div class="content">OK</div>');
-    });
-
-    it('Send request and update DOM with "before" mode', function () {
-        testUpdate('before', 'OK<div class="content">X</div>');
-    });
-
-    it('Send request and update DOM with "after" mode', function () {
-        testUpdate('after', '<div class="content">X</div>OK');
-    });
-
-    it('Send request and update DOM with "prepend" mode', function () {
-        testUpdate('prepend', '<div class="content">OKX</div>');
-    });
-
-    it('Send request and update DOM with "append" mode', function () {
-        testUpdate('append', '<div class="content">XOK</div>');
-    });
-
-    it('Send request and update DOM with bad mode', function () {
-        spyOn(window.console, 'error');
-        testUpdate('badMode', '<div class="content">X</div>');
-        expect(window.console.error).toHaveBeenCalledWith('Bad updateMode: badMode');
-    });
-
-    it('Send request with method option', function () {
-        ajax.sendRequest({
-            url: '/goodRequest',
-            method: 'GET'
-        });
-
-        expect(jasmine.Ajax.requests.mostRecent().method).toEqual('GET');
-    });
-
-    it('Send request with onBeforeSend option', function () {
-        const callbackSuccess = jasmine.createSpy('success');
-        const callbackBeforeSend = jasmine.createSpy('beforeSend');
-
-        ajax.sendRequest({
-            url: '/goodRequest',
-            onBeforeSend: function (options) {
-                callbackBeforeSend();
-            },
-            onSuccess: function (data, textStatus, jqXHR) {
-                callbackSuccess();
-            }
-        });
-
-        expect(callbackSuccess).toHaveBeenCalled();
-        expect(callbackBeforeSend).toHaveBeenCalledBefore(callbackSuccess);
-    });
-
-    it('Send request canceled by onBeforeSend option', function () {
-        const callbackSuccess = jasmine.createSpy('success');
-        const callbackBeforeSend = jasmine.createSpy('beforeSend');
-
-        ajax.sendRequest({
-            url: '/goodRequest',
-            onBeforeSend: function (options) {
-                callbackBeforeSend();
-                options.stop = true;
-            },
-            onSuccess: function (data, textStatus, jqXHR) {
-                callbackSuccess();
-            }
-        });
-
-        expect(callbackSuccess).not.toHaveBeenCalled();
-        expect(callbackBeforeSend).toHaveBeenCalled();
-    });
-
-    it('Send request with data option', function () {
-        ajax.sendRequest({
-            url: '/goodRequest',
-            data: {
-                var1: 'value1',
-                var2: 'value2'
-            }
-        });
-
-        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-            var1: ['value1'], var2: ['value2']
-        });
-    });
-
-    it('Send request with JS in response', function () {
-        $('body').append('<div id="ajax-result" class="html-test"><div class="content">X</div></div>');
-        const callbackSuccess = jasmine.createSpy('success');
-
-        ajax.sendRequest({
-            url: '/resultJS',
-            onSuccess: {
-                callback: function (data, textStatus, jqXHR) {
-                    callbackSuccess($('#ajax-result').html());
-                },
-                priority: -99
-            },
-            update: '#ajax-result .content'
-        });
-
-        expect(callbackSuccess).toHaveBeenCalledWith('<div class="content"><div id="subcontent">AFTER</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script></div>');
-    });
-
-    function testUpdate (updateMode, expectedContent) {
-        $('body').append('<div id="ajax-result" class="html-test"><div class="content">X</div></div>');
-        const callbackSuccess = jasmine.createSpy('success');
-
-        ajax.sendRequest({
-            url: '/goodRequest',
-            onSuccess: {
-                callback: function (data, textStatus, jqXHR) {
-                    callbackSuccess($('#ajax-result').html());
-                },
-                priority: -99
-            },
-            update: '#ajax-result .content',
-            updateMode: updateMode
-        });
-
-        expect(callbackSuccess).toHaveBeenCalledWith(expectedContent);
-    }
-});
+  beforeEach(function () {
+    jasmine.Ajax.install()
+
+    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+      status: 200,
+      responseText: 'OK'
+    })
+
+    jasmine.Ajax.stubRequest('/resultJS').andReturn({
+      status: 200,
+      responseText: '<div id="subcontent">BEFORE</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script>'
+    })
+
+    jasmine.Ajax.stubRequest('/error404').andReturn({
+      status: 404,
+      responseText: 'Page not found !'
+    })
+  })
+
+  afterEach(function () {
+    jasmine.Ajax.uninstall()
+    $('.html-test').remove()
+    callbackManager.clear()
+  })
+
+  it('Send request', function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackComplete = jasmine.createSpy('complete')
+
+    ajax.sendRequest({
+      url: '/goodRequest',
+      onComplete: function (jqXHR, textStatus) {
+        callbackComplete()
+      },
+      onSuccess: function (data, textStatus, jqXHR) {
+        callbackSuccess(data)
+      },
+      onError: function (jqXHR, textStatus, errorThrown) {
+        callbackError(jqXHR.responseText)
+      }
+    })
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+    expect(callbackSuccess).toHaveBeenCalledWith('OK')
+    expect(callbackError).not.toHaveBeenCalled()
+    expect(callbackComplete).toHaveBeenCalled()
+  })
+
+  it('Send bad request', function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackComplete = jasmine.createSpy('complete')
+
+    ajax.sendRequest({
+      url: '/error404',
+      onComplete: function (jqXHR, textStatus) {
+        callbackComplete()
+      },
+      onSuccess: function (data, textStatus, jqXHR) {
+        callbackSuccess(data)
+      },
+      onError: function (jqXHR, textStatus, errorThrown) {
+        callbackError(jqXHR.responseText)
+      }
+    })
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/error404')
+    expect(callbackSuccess).not.toHaveBeenCalled()
+    expect(callbackError).toHaveBeenCalledWith('Page not found !')
+    expect(callbackComplete).toHaveBeenCalled()
+  })
+
+  it('Send request with callback priorities', function () {
+    const callbackSuccess1 = jasmine.createSpy('success1')
+    const callbackSuccess2 = jasmine.createSpy('success2')
+
+    ajax.sendRequest({
+      url: '/goodRequest',
+      onSuccess: [
+        function (data, textStatus, jqXHR) {
+          callbackSuccess1()
+        },
+        {
+          priority: 99,
+          callback: function (data, textStatus, jqXHR) {
+            callbackSuccess2()
+          }
+        }
+      ]
+    })
+
+    expect(callbackSuccess1).toHaveBeenCalled()
+    expect(callbackSuccess2).toHaveBeenCalledBefore(callbackSuccess1)
+  })
+
+  it('Send request without URL', function () {
+    spyOn(window.console, 'error')
+    ajax.sendRequest({})
+    expect(window.console.error).toHaveBeenCalledWith('Value required: url')
+  })
+
+  it('Send request and update DOM with default mode', function () {
+    $('body').append('<div id="ajax-result" class="html-test"><div class="content"></div></div>')
+    const callbackSuccess = jasmine.createSpy('success')
+
+    ajax.sendRequest({
+      url: '/goodRequest',
+      onSuccess: {
+        callback: function (data, textStatus, jqXHR) {
+          callbackSuccess($('#ajax-result').html())
+        },
+        priority: -99
+      },
+      update: '#ajax-result .content'
+    })
+
+    expect(callbackSuccess).toHaveBeenCalledWith('<div class="content">OK</div>')
+  })
+
+  it('Send request and update DOM with "update" mode', function () {
+    testUpdate('update', '<div class="content">OK</div>')
+  })
+
+  it('Send request and update DOM with "before" mode', function () {
+    testUpdate('before', 'OK<div class="content">X</div>')
+  })
+
+  it('Send request and update DOM with "after" mode', function () {
+    testUpdate('after', '<div class="content">X</div>OK')
+  })
+
+  it('Send request and update DOM with "prepend" mode', function () {
+    testUpdate('prepend', '<div class="content">OKX</div>')
+  })
+
+  it('Send request and update DOM with "append" mode', function () {
+    testUpdate('append', '<div class="content">XOK</div>')
+  })
+
+  it('Send request and update DOM with bad mode', function () {
+    spyOn(window.console, 'error')
+    testUpdate('badMode', '<div class="content">X</div>')
+    expect(window.console.error).toHaveBeenCalledWith('Bad updateMode: badMode')
+  })
+
+  it('Send request with method option', function () {
+    ajax.sendRequest({
+      url: '/goodRequest',
+      method: 'GET'
+    })
+
+    expect(jasmine.Ajax.requests.mostRecent().method).toEqual('GET')
+  })
+
+  it('Send request with onBeforeSend option', function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackBeforeSend = jasmine.createSpy('beforeSend')
+
+    ajax.sendRequest({
+      url: '/goodRequest',
+      onBeforeSend: function (options) {
+        callbackBeforeSend()
+      },
+      onSuccess: function (data, textStatus, jqXHR) {
+        callbackSuccess()
+      }
+    })
+
+    expect(callbackSuccess).toHaveBeenCalled()
+    expect(callbackBeforeSend).toHaveBeenCalledBefore(callbackSuccess)
+  })
+
+  it('Send request canceled by onBeforeSend option', function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackBeforeSend = jasmine.createSpy('beforeSend')
+
+    ajax.sendRequest({
+      url: '/goodRequest',
+      onBeforeSend: function (options) {
+        callbackBeforeSend()
+        options.stop = true
+      },
+      onSuccess: function (data, textStatus, jqXHR) {
+        callbackSuccess()
+      }
+    })
+
+    expect(callbackSuccess).not.toHaveBeenCalled()
+    expect(callbackBeforeSend).toHaveBeenCalled()
+  })
+
+  it('Send request with data option', function () {
+    ajax.sendRequest({
+      url: '/goodRequest',
+      data: {
+        var1: 'value1',
+        var2: 'value2'
+      }
+    })
+
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+      var1: ['value1'], var2: ['value2']
+    })
+  })
+
+  it('Send request with JS in response', function () {
+    $('body').append('<div id="ajax-result" class="html-test"><div class="content">X</div></div>')
+    const callbackSuccess = jasmine.createSpy('success')
+
+    ajax.sendRequest({
+      url: '/resultJS',
+      onSuccess: {
+        callback: function (data, textStatus, jqXHR) {
+          callbackSuccess($('#ajax-result').html())
+        },
+        priority: -99
+      },
+      update: '#ajax-result .content'
+    })
+
+    expect(callbackSuccess).toHaveBeenCalledWith('<div class="content"><div id="subcontent">AFTER</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script></div>')
+  })
+
+  function testUpdate (updateMode, expectedContent) {
+    $('body').append('<div id="ajax-result" class="html-test"><div class="content">X</div></div>')
+    const callbackSuccess = jasmine.createSpy('success')
+
+    ajax.sendRequest({
+      url: '/goodRequest',
+      onSuccess: {
+        callback: function (data, textStatus, jqXHR) {
+          callbackSuccess($('#ajax-result').html())
+        },
+        priority: -99
+      },
+      update: '#ajax-result .content',
+      updateMode: updateMode
+    })
+
+    expect(callbackSuccess).toHaveBeenCalledWith(expectedContent)
+  }
+})
 
 describe('Test Ajax.click', function () {
-    beforeEach(function () {
-        jasmine.Ajax.install();
+  beforeEach(function () {
+    jasmine.Ajax.install()
 
-        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
-            status: 200,
-            responseText: 'OK'
-        });
-    });
+    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+      status: 200,
+      responseText: 'OK'
+    })
+  })
 
-    afterEach(function () {
-        jasmine.Ajax.uninstall();
-        $('.html-test').remove();
-        callbackManager.clear();
-    });
+  afterEach(function () {
+    jasmine.Ajax.uninstall()
+    $('.html-test').remove()
+    callbackManager.clear()
+  })
 
-    it('Send request with button', function () {
-        $('body').append('<button class="html-test" id="buttonToTest">Go !</button>');
+  it('Send request with button', function () {
+    $('body').append('<button class="html-test" id="buttonToTest">Go !</button>')
 
-        const callbackSuccess = jasmine.createSpy('success');
+    const callbackSuccess = jasmine.createSpy('success')
 
-        ajax.click($('#buttonToTest'), {
-            url: '/goodRequest',
-            onSuccess: function (data, textStatus, jqXHR) {
-                callbackSuccess();
-            }
-        });
+    ajax.click($('#buttonToTest'), {
+      url: '/goodRequest',
+      onSuccess: function (data, textStatus, jqXHR) {
+        callbackSuccess()
+      }
+    })
 
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(callbackSuccess).toHaveBeenCalled();
-    });
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
 
-    it('Send request with button and data-*', function () {
-        $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-success="my_callback_on_success">Go !</button>');
+  it('Send request with button and data-*', function () {
+    $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-success="my_callback_on_success">Go !</button>')
 
-        const callbackSuccess = jasmine.createSpy('success');
+    const callbackSuccess = jasmine.createSpy('success')
 
-        callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
-            callbackSuccess();
-        });
+    callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
+      callbackSuccess()
+    })
 
-        ajax.click($('#buttonToTest'));
+    ajax.click($('#buttonToTest'))
 
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(callbackSuccess).toHaveBeenCalled();
-    });
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
 
-    it('Send request with button and data-* and options', function () {
-        $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
+  it('Send request with button and data-* and options', function () {
+    $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>')
 
-        const callbackSuccess1 = jasmine.createSpy('success1');
-        const callbackSuccess2 = jasmine.createSpy('success2');
-        const callbackComplete = jasmine.createSpy('complete');
+    const callbackSuccess1 = jasmine.createSpy('success1')
+    const callbackSuccess2 = jasmine.createSpy('success2')
+    const callbackComplete = jasmine.createSpy('complete')
 
-        callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
-            callbackSuccess1();
-        });
+    callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
+      callbackSuccess1()
+    })
 
-        ajax.click($('#buttonToTest'), {
-            url: '/badRequest', // overridden by data-ec-crud-ajax-url
-            method: 'GET', // overridden by data-ec-crud-ajax-method
-            onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
-                callbackSuccess2();
-            },
-            onComplete: function (jqXHR, textStatus) {
-                callbackComplete();
-            }
-        });
+    ajax.click($('#buttonToTest'), {
+      url: '/badRequest', // overridden by data-ec-crud-ajax-url
+      method: 'GET', // overridden by data-ec-crud-ajax-method
+      onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
+        callbackSuccess2()
+      },
+      onComplete: function (jqXHR, textStatus) {
+        callbackComplete()
+      }
+    })
 
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
-        expect(callbackSuccess1).toHaveBeenCalled();
-        expect(callbackSuccess2).not.toHaveBeenCalled();
-        expect(callbackComplete).toHaveBeenCalled();
-    });
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
+    expect(callbackSuccess1).toHaveBeenCalled()
+    expect(callbackSuccess2).not.toHaveBeenCalled()
+    expect(callbackComplete).toHaveBeenCalled()
+  })
 
-    it('Send auto-request with button', function () {
-        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="buttonToTest" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
+  it('Send auto-request with button', function () {
+    $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="buttonToTest" data-ec-crud-ajax-url="/goodRequest">Go !</a>')
 
-        $('#buttonToTest').click();
+    $('#buttonToTest').click()
 
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-    });
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+  })
 
-    it('Send auto-request with button canceled', function () {
-        $(document).on('ec-crud-ajax-click-auto-before', '#clickToTest', function (event) {
-            event.preventDefault();
-        });
-        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest">Go !</button>');
+  it('Send auto-request with button canceled', function () {
+    $(document).on('ec-crud-ajax-click-auto-before', '#clickToTest', function (event) {
+      event.preventDefault()
+    })
+    $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest">Go !</button>')
 
-        $('#clickToTest').click();
+    $('#clickToTest').click()
 
-        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
 
-        $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest');
-    });
+    $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest')
+  })
 
-    it('Send auto-request canceled by onBeforeSend option', function () {
-        $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="my_callback_on_before_send">Go !</button>');
+  it('Send auto-request canceled by onBeforeSend option', function () {
+    $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="my_callback_on_before_send">Go !</button>')
 
-        callbackManager.registerCallback('my_callback_on_before_send', function (options) {
-            options.stop = true;
-        });
+    callbackManager.registerCallback('my_callback_on_before_send', function (options) {
+      options.stop = true
+    })
 
-        $('#clickToTest').click();
+    $('#clickToTest').click()
 
-        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
 
-        $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest');
-    });
-});
+    $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest')
+  })
+})
 
 describe('Test Ajax.link', function () {
-    beforeEach(function () {
-        jasmine.Ajax.install();
+  beforeEach(function () {
+    jasmine.Ajax.install()
 
-        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
-            status: 200,
-            responseText: 'OK'
-        });
-    });
+    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+      status: 200,
+      responseText: 'OK'
+    })
+  })
 
-    afterEach(function () {
-        jasmine.Ajax.uninstall();
-        $('.html-test').remove();
-        callbackManager.clear();
-    });
+  afterEach(function () {
+    jasmine.Ajax.uninstall()
+    $('.html-test').remove()
+    callbackManager.clear()
+  })
 
-    it('Send request with link', function () {
-        $('body').append('<a href="/goodRequest" class="html-test" id="linkToTest">Go !</a>');
+  it('Send request with link', function () {
+    $('body').append('<a href="/goodRequest" class="html-test" id="linkToTest">Go !</a>')
 
-        const callbackSuccess = jasmine.createSpy('success');
+    const callbackSuccess = jasmine.createSpy('success')
 
-        ajax.link($('#linkToTest'), {
-            onSuccess: function (data, textStatus, jqXHR) {
-                callbackSuccess();
-            }
-        });
+    ajax.link($('#linkToTest'), {
+      onSuccess: function (data, textStatus, jqXHR) {
+        callbackSuccess()
+      }
+    })
 
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(callbackSuccess).toHaveBeenCalled();
-    });
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
 
-    it('Send request with link and data-*', function () {
-        $('body').append('<a href="/goodRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success">Go !</a>');
+  it('Send request with link and data-*', function () {
+    $('body').append('<a href="/goodRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success">Go !</a>')
 
-        const callbackSuccess = jasmine.createSpy('success');
+    const callbackSuccess = jasmine.createSpy('success')
 
-        callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
-            callbackSuccess();
-        });
+    callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
+      callbackSuccess()
+    })
 
-        ajax.link($('#linkToTest'));
+    ajax.link($('#linkToTest'))
 
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(callbackSuccess).toHaveBeenCalled();
-    });
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
 
-    it('Send request with link and data-* and options', function () {
-        $('body').append('<a href="/badRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>');
-        // href is overridden by url option
+  it('Send request with link and data-* and options', function () {
+    $('body').append('<a href="/badRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>')
+    // href is overridden by url option
 
-        const callbackSuccess1 = jasmine.createSpy('success1');
-        const callbackSuccess2 = jasmine.createSpy('success2');
-        const callbackComplete = jasmine.createSpy('complete');
+    const callbackSuccess1 = jasmine.createSpy('success1')
+    const callbackSuccess2 = jasmine.createSpy('success2')
+    const callbackComplete = jasmine.createSpy('complete')
 
-        callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
-            callbackSuccess1();
-        });
+    callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
+      callbackSuccess1()
+    })
 
-        ajax.link($('#linkToTest'), {
-            url: '/badRequest', // overridden by data-ec-crud-ajax-url
-            method: 'GET', // overridden by data-ec-crud-ajax-method
-            onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
-                callbackSuccess2();
-            },
-            onComplete: function (jqXHR, textStatus) {
-                callbackComplete();
-            }
-        });
+    ajax.link($('#linkToTest'), {
+      url: '/badRequest', // overridden by data-ec-crud-ajax-url
+      method: 'GET', // overridden by data-ec-crud-ajax-method
+      onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
+        callbackSuccess2()
+      },
+      onComplete: function (jqXHR, textStatus) {
+        callbackComplete()
+      }
+    })
 
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
-        expect(callbackSuccess1).toHaveBeenCalled();
-        expect(callbackSuccess2).not.toHaveBeenCalled();
-        expect(callbackComplete).toHaveBeenCalled();
-    });
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
+    expect(callbackSuccess1).toHaveBeenCalled()
+    expect(callbackSuccess2).not.toHaveBeenCalled()
+    expect(callbackComplete).toHaveBeenCalled()
+  })
 
-    it('Send auto-request with link', function () {
-        $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>');
+  it('Send auto-request with link', function () {
+    $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
 
-        $('#linkToTest').click();
+    $('#linkToTest').click()
 
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-    });
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+  })
 
-    it('Send auto-request with link canceled', function () {
-        $(document).on('ec-crud-ajax-link-auto-before', '#linkToTest', function (event) {
-            event.preventDefault();
-        });
-        $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>');
+  it('Send auto-request with link canceled', function () {
+    $(document).on('ec-crud-ajax-link-auto-before', '#linkToTest', function (event) {
+      event.preventDefault()
+    })
+    $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
 
-        $('#linkToTest').click();
+    $('#linkToTest').click()
 
-        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
 
-        $(document).off('ec-crud-ajax-link-auto-before', '#linkToTest');
-    });
-});
+    $(document).off('ec-crud-ajax-link-auto-before', '#linkToTest')
+  })
+})
 
 describe('Test Ajax.form', function () {
-    beforeEach(function () {
-        jasmine.Ajax.install();
-
-        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
-            status: 200,
-            responseText: 'OK'
-        });
-    });
-
-    afterEach(function () {
-        jasmine.Ajax.uninstall();
-        $('.html-test').remove();
-        callbackManager.clear();
-    });
-
-    it('Send request with form', function () {
-        $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
-        $('#formToTest input[name=var1]').val('My value 1');
-        $('#formToTest input[name=var2]').val('My value 2');
-
-        const callbackSuccess = jasmine.createSpy('success');
-
-        ajax.sendForm($('#formToTest'), {
-            onSuccess: function (data, textStatus, jqXHR) {
-                callbackSuccess();
-            }
-        });
-
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-            var1: ['My value 1'], var2: ['My value 2']
-        });
-        expect(callbackSuccess).toHaveBeenCalled();
-    });
-
-    it('Send request with PUT form', function () {
-        $('body').append('<form action="/goodRequest" method="PUT" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
-        $('#formToTest input[name=var1]').val('My value 1');
-        $('#formToTest input[name=var2]').val('My value 2');
-
-        const callbackSuccess = jasmine.createSpy('success');
-
-        ajax.sendForm($('#formToTest'), {
-            onSuccess: function (data, textStatus, jqXHR) {
-                callbackSuccess();
-            }
-        });
-
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
-        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-            var1: ['My value 1'], var2: ['My value 2']
-        });
-        expect(callbackSuccess).toHaveBeenCalled();
-    });
-
-    it('Send request with form and data-*', function () {
-        $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="my_callback_on_success"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
-        $('#formToTest input[name=var1]').val('My value 1');
-        $('#formToTest input[name=var2]').val('My value 2');
-
-        const callbackSuccess = jasmine.createSpy('success');
-        callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
-            callbackSuccess();
-        });
-
-        ajax.sendForm($('#formToTest'));
-
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-            var1: ['My value 1'], var2: ['My value 2']
-        });
-        expect(callbackSuccess).toHaveBeenCalled();
-    });
-
-    it('Send request with form and data-* and options', function () {
-        $('body').append('<form action="/badRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
-        // action is overridden by url option
-        $('#formToTest input[name=var1]').val('My value 1');
-        $('#formToTest input[name=var2]').val('My value 2');
-
-        const callbackSuccess1 = jasmine.createSpy('success1');
-        const callbackSuccess2 = jasmine.createSpy('success2');
-        const callbackComplete = jasmine.createSpy('complete');
-
-        callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
-            callbackSuccess1();
-        });
-
-        ajax.sendForm($('#formToTest'), {
-            url: '/badRequest', // overridden by data-ec-crud-ajax-url
-            method: 'GET', // overridden by data-ec-crud-ajax-method
-            onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
-                callbackSuccess2();
-            },
-            onComplete: function (jqXHR, textStatus) {
-                callbackComplete();
-            }
-        });
-
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
-        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-            var1: ['My value 1'],
-            var2: ['My value 2']
-        });
-        expect(callbackSuccess1).toHaveBeenCalled();
-        expect(callbackSuccess2).not.toHaveBeenCalled();
-        expect(callbackComplete).toHaveBeenCalled();
-    });
-
-    it('Send auto-request with form', function () {
-        $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
-        $('#formToTest input[name=var1]').val('My value 1');
-        $('#formToTest input[name=var2]').val('My value 2');
-
-        $('#formToTest').submit();
-
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-        expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-            var1: ['My value 1'],
-            var2: ['My value 2']
-        });
-    });
-
-    it('Send auto-request with form canceled', function () {
-        $(document).on('ec-crud-ajax-form-auto-before', '#formToTest', function (event) {
-            event.preventDefault();
-        });
-        $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>');
-        $('#formToTest input[name=var1]').val('My value 1');
-        $('#formToTest input[name=var2]').val('My value 2');
-
-        $('#formToTest').submit();
-
-        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
-
-        $(document).off('ec-crud-ajax-form-auto-before', '#formToTest');
-    });
-});
+  beforeEach(function () {
+    jasmine.Ajax.install()
+
+    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+      status: 200,
+      responseText: 'OK'
+    })
+  })
+
+  afterEach(function () {
+    jasmine.Ajax.uninstall()
+    $('.html-test').remove()
+    callbackManager.clear()
+  })
+
+  it('Send request with form', function () {
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    const callbackSuccess = jasmine.createSpy('success')
+
+    ajax.sendForm($('#formToTest'), {
+      onSuccess: function (data, textStatus, jqXHR) {
+        callbackSuccess()
+      }
+    })
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+      var1: ['My value 1'], var2: ['My value 2']
+    })
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with PUT form', function () {
+    $('body').append('<form action="/goodRequest" method="PUT" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    const callbackSuccess = jasmine.createSpy('success')
+
+    ajax.sendForm($('#formToTest'), {
+      onSuccess: function (data, textStatus, jqXHR) {
+        callbackSuccess()
+      }
+    })
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+      var1: ['My value 1'], var2: ['My value 2']
+    })
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with form and data-*', function () {
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="my_callback_on_success"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    const callbackSuccess = jasmine.createSpy('success')
+    callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
+      callbackSuccess()
+    })
+
+    ajax.sendForm($('#formToTest'))
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+      var1: ['My value 1'], var2: ['My value 2']
+    })
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with form and data-* and options', function () {
+    $('body').append('<form action="/badRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    // action is overridden by url option
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    const callbackSuccess1 = jasmine.createSpy('success1')
+    const callbackSuccess2 = jasmine.createSpy('success2')
+    const callbackComplete = jasmine.createSpy('complete')
+
+    callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
+      callbackSuccess1()
+    })
+
+    ajax.sendForm($('#formToTest'), {
+      url: '/badRequest', // overridden by data-ec-crud-ajax-url
+      method: 'GET', // overridden by data-ec-crud-ajax-method
+      onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
+        callbackSuccess2()
+      },
+      onComplete: function (jqXHR, textStatus) {
+        callbackComplete()
+      }
+    })
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+      var1: ['My value 1'],
+      var2: ['My value 2']
+    })
+    expect(callbackSuccess1).toHaveBeenCalled()
+    expect(callbackSuccess2).not.toHaveBeenCalled()
+    expect(callbackComplete).toHaveBeenCalled()
+  })
+
+  it('Send auto-request with form', function () {
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    $('#formToTest').submit()
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
+      var1: ['My value 1'],
+      var2: ['My value 2']
+    })
+  })
+
+  it('Send auto-request with form canceled', function () {
+    $(document).on('ec-crud-ajax-form-auto-before', '#formToTest', function (event) {
+      event.preventDefault()
+    })
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    $('#formToTest').submit()
+
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
+
+    $(document).off('ec-crud-ajax-form-auto-before', '#formToTest')
+  })
+})
 
 describe('Test Ajax.updateDom', function () {
-    beforeEach(function () {
-        $('body').append('<div id="container" class="html-test"><div class="content">X</div></div>');
-    });
-
-    afterEach(function () {
-        $('.html-test').remove();
-        $(document).off('ec-crud-ajax-update-dom-before');
-        $(document).off('ec-crud-ajax-update-dom-after');
-        callbackManager.clear();
-    });
-
-    it('Update with "update" mode', function () {
-        testUpdateDom('update', '<div class="content">OK</div>');
-    });
-
-    it('Update with "before" mode', function () {
-        testUpdateDom('before', 'OK<div class="content">X</div>');
-    });
-
-    it('Update with "after" mode', function () {
-        testUpdateDom('after', '<div class="content">X</div>OK');
-    });
-
-    it('Update with "prepend" mode', function () {
-        testUpdateDom('prepend', '<div class="content">OKX</div>');
-    });
-
-    it('Update with "append" mode', function () {
-        testUpdateDom('append', '<div class="content">XOK</div>');
-    });
-
-    it('Update with "update" mode and ec-crud-ajax-update-dom-before event - change updateMode', function () {
-        $(document).on('ec-crud-ajax-update-dom-before', function (event) {
-            event.updateMode = 'append';
-        });
-
-        testUpdateDom('update', '<div class="content">XOK</div>');
-    });
-
-    it('Update with "update" mode and ec-crud-ajax-update-dom-before event - change content', function () {
-        $(document).on('ec-crud-ajax-update-dom-before', function (event) {
-            event.content = 'NEW OK';
-        });
-
-        testUpdateDom('update', '<div class="content">NEW OK</div>');
-    });
-
-    it('Update with "update" mode and ec-crud-ajax-update-dom-before event - preventDefault', function () {
-        $(document).on('ec-crud-ajax-update-dom-before', function (event) {
-            event.preventDefault();
-        });
-
-        testUpdateDom('update', '<div class="content">X</div>');
-    });
-
-    it('Update with "update" mode and ec-crud-ajax-update-dom-after event', function () {
-        $(document).on('ec-crud-ajax-update-dom-after', function (event) {
-            $(event.element).find('.content').html('OK');
-        });
-
-        ajax.updateDom('#container .content', 'update', '<div><span class="content"></span></div>');
-        expect($('#container').html()).toEqual('<div class="content"><div><span class="content">OK</span></div></div>');
-    });
-
-    it('Update with "update" mode and ec-crud-ajax-update-dom-after event - with scopes', function () {
-        const callbackCalled1 = jasmine.createSpy('called1');
-        const callbackCalled2 = jasmine.createSpy('called2');
-        const callbackNotCalled = jasmine.createSpy('not-called');
-
-        $(document).on('ec-crud-ajax-update-dom-before', function (event) {
-            callbackCalled1();
-        });
-        $(document).on('ec-crud-ajax-update-dom-before', '#container', function (event) {
-            callbackCalled2();
-        });
-        $(document).on('ec-crud-ajax-update-dom-before', '#id-does-not-exit', function (event) {
-            callbackNotCalled();
-        });
-
-        testUpdateDom('update', '<div class="content">OK</div>');
-        expect(callbackCalled1).toHaveBeenCalled();
-        expect(callbackCalled2).toHaveBeenCalled();
-        expect(callbackNotCalled).not.toHaveBeenCalled();
-    });
-
-    function testUpdateDom (updateMode, expected) {
-        ajax.updateDom('#container .content', updateMode, 'OK');
-        expect($('#container').html()).toEqual(expected);
-    }
-
-    it('Update with bad mode', function () {
-        spyOn(window.console, 'error');
-        ajax.updateDom('#container .content', 'badMode', 'OK');
-        expect(window.console.error).toHaveBeenCalledWith('Bad updateMode: badMode');
-        expect($('#container').html()).toEqual('<div class="content">X</div>');
-    });
-});
+  beforeEach(function () {
+    $('body').append('<div id="container" class="html-test"><div class="content">X</div></div>')
+  })
+
+  afterEach(function () {
+    $('.html-test').remove()
+    $(document).off('ec-crud-ajax-update-dom-before')
+    $(document).off('ec-crud-ajax-update-dom-after')
+    callbackManager.clear()
+  })
+
+  it('Update with "update" mode', function () {
+    testUpdateDom('update', '<div class="content">OK</div>')
+  })
+
+  it('Update with "before" mode', function () {
+    testUpdateDom('before', 'OK<div class="content">X</div>')
+  })
+
+  it('Update with "after" mode', function () {
+    testUpdateDom('after', '<div class="content">X</div>OK')
+  })
+
+  it('Update with "prepend" mode', function () {
+    testUpdateDom('prepend', '<div class="content">OKX</div>')
+  })
+
+  it('Update with "append" mode', function () {
+    testUpdateDom('append', '<div class="content">XOK</div>')
+  })
+
+  it('Update with "update" mode and ec-crud-ajax-update-dom-before event - change updateMode', function () {
+    $(document).on('ec-crud-ajax-update-dom-before', function (event) {
+      event.updateMode = 'append'
+    })
+
+    testUpdateDom('update', '<div class="content">XOK</div>')
+  })
+
+  it('Update with "update" mode and ec-crud-ajax-update-dom-before event - change content', function () {
+    $(document).on('ec-crud-ajax-update-dom-before', function (event) {
+      event.content = 'NEW OK'
+    })
+
+    testUpdateDom('update', '<div class="content">NEW OK</div>')
+  })
+
+  it('Update with "update" mode and ec-crud-ajax-update-dom-before event - preventDefault', function () {
+    $(document).on('ec-crud-ajax-update-dom-before', function (event) {
+      event.preventDefault()
+    })
+
+    testUpdateDom('update', '<div class="content">X</div>')
+  })
+
+  it('Update with "update" mode and ec-crud-ajax-update-dom-after event', function () {
+    $(document).on('ec-crud-ajax-update-dom-after', function (event) {
+      $(event.element).find('.content').html('OK')
+    })
+
+    ajax.updateDom('#container .content', 'update', '<div><span class="content"></span></div>')
+    expect($('#container').html()).toEqual('<div class="content"><div><span class="content">OK</span></div></div>')
+  })
+
+  it('Update with "update" mode and ec-crud-ajax-update-dom-after event - with scopes', function () {
+    const callbackCalled1 = jasmine.createSpy('called1')
+    const callbackCalled2 = jasmine.createSpy('called2')
+    const callbackNotCalled = jasmine.createSpy('not-called')
+
+    $(document).on('ec-crud-ajax-update-dom-before', function (event) {
+      callbackCalled1()
+    })
+    $(document).on('ec-crud-ajax-update-dom-before', '#container', function (event) {
+      callbackCalled2()
+    })
+    $(document).on('ec-crud-ajax-update-dom-before', '#id-does-not-exit', function (event) {
+      callbackNotCalled()
+    })
+
+    testUpdateDom('update', '<div class="content">OK</div>')
+    expect(callbackCalled1).toHaveBeenCalled()
+    expect(callbackCalled2).toHaveBeenCalled()
+    expect(callbackNotCalled).not.toHaveBeenCalled()
+  })
+
+  function testUpdateDom (updateMode, expected) {
+    ajax.updateDom('#container .content', updateMode, 'OK')
+    expect($('#container').html()).toEqual(expected)
+  }
+
+  it('Update with bad mode', function () {
+    spyOn(window.console, 'error')
+    ajax.updateDom('#container .content', 'badMode', 'OK')
+    expect(window.console.error).toHaveBeenCalledWith('Bad updateMode: badMode')
+    expect($('#container').html()).toEqual('<div class="content">X</div>')
+  })
+})
diff --git a/tests/Resources/assets/js/callback-manager.spec.js b/tests/Resources/assets/js/callback-manager.spec.js
index c8d716f..48242f1 100644
--- a/tests/Resources/assets/js/callback-manager.spec.js
+++ b/tests/Resources/assets/js/callback-manager.spec.js
@@ -7,92 +7,92 @@
  * file that was distributed with this source code.
  */
 
-import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager';
+import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager'
 
 describe('Test callback manager', function () {
-    afterEach(function () {
-        callbackManager.clear();
-    });
-
-    it('Test registerCallback with invalid name', function () {
-        spyOn(window.console, 'error');
-        callbackManager.registerCallback(function () {}, function () {});
-        expect(window.console.error).toHaveBeenCalledWith('Bad name');
-    });
-
-    it('Test registerCallback with null name', function () {
-        spyOn(window.console, 'error');
-        callbackManager.registerCallback(null, function () {});
-        expect(window.console.error).toHaveBeenCalledWith('Bad name');
-    });
-
-    it('Test registerCallback with invalid callback', function () {
-        spyOn(window.console, 'error');
-        callbackManager.registerCallback('my_callback', 'callback');
-        expect(window.console.error).toHaveBeenCalledWith('Invalid callback my_callback');
-    });
-
-    it('Test registerCallback with null callback', function () {
-        spyOn(window.console, 'error');
-        callbackManager.registerCallback('my_callback', null);
-        expect(window.console.error).toHaveBeenCalledWith('Invalid callback my_callback');
-    });
-
-    it('Test callbackIsRegistred with invalid name', function () {
-        spyOn(window.console, 'error');
-        callbackManager.callbackIsRegistred(function () {});
-        expect(window.console.error).toHaveBeenCalledWith('Bad name');
-    });
-
-    it('Test callbackIsRegistred with null name', function () {
-        spyOn(window.console, 'error');
-        callbackManager.callbackIsRegistred(null);
-        expect(window.console.error).toHaveBeenCalledWith('Bad name');
-    });
-
-    it('Test callbackIsRegistred with found callback', function () {
-        callbackManager.registerCallback('my_callback', function () {});
-        expect(callbackManager.callbackIsRegistred('my_callback')).toBeTrue();
-    });
-
-    it('Test callbackIsRegistred with not found callback', function () {
-        expect(callbackManager.callbackIsRegistred('my_callback')).toBeFalse();
-    });
-
-    it('Test getRegistredCallback with invalid name', function () {
-        spyOn(window.console, 'error');
-        callbackManager.getRegistredCallback(function () {});
-        expect(window.console.error).toHaveBeenCalledWith('Bad name');
-    });
-
-    it('Test getRegistredCallback with null name', function () {
-        spyOn(window.console, 'error');
-        callbackManager.getRegistredCallback(null);
-        expect(window.console.error).toHaveBeenCalledWith('Bad name');
-    });
-
-    it('Test getRegistredCallback with found callback', function () {
-        callbackManager.registerCallback('my_callback', function () {});
-        const callback = callbackManager.getRegistredCallback('my_callback');
-        expect(callback).toBeInstanceOf(Function);
-    });
-
-    it('Test getRegistredCallback with not found callback', function () {
-        spyOn(window.console, 'error');
-        const callback = callbackManager.getRegistredCallback('my_callback');
-        expect(window.console.error).toHaveBeenCalledWith('Callback not found: my_callback');
-        expect(callback).toBeNull();
-    });
-
-    it('Test clear', function () {
-        callbackManager.registerCallback('my_callback', function () {});
-        expect(callbackManager.getRegistredCallback('my_callback')).toBeInstanceOf(Function);
-
-        callbackManager.clear();
-
-        spyOn(window.console, 'error');
-        const callback = callbackManager.getRegistredCallback('my_callback');
-        expect(window.console.error).toHaveBeenCalledWith('Callback not found: my_callback');
-        expect(callback).toBeNull();
-    });
-});
+  afterEach(function () {
+    callbackManager.clear()
+  })
+
+  it('Test registerCallback with invalid name', function () {
+    spyOn(window.console, 'error')
+    callbackManager.registerCallback(function () {}, function () {})
+    expect(window.console.error).toHaveBeenCalledWith('Bad name')
+  })
+
+  it('Test registerCallback with null name', function () {
+    spyOn(window.console, 'error')
+    callbackManager.registerCallback(null, function () {})
+    expect(window.console.error).toHaveBeenCalledWith('Bad name')
+  })
+
+  it('Test registerCallback with invalid callback', function () {
+    spyOn(window.console, 'error')
+    callbackManager.registerCallback('my_callback', 'callback')
+    expect(window.console.error).toHaveBeenCalledWith('Invalid callback my_callback')
+  })
+
+  it('Test registerCallback with null callback', function () {
+    spyOn(window.console, 'error')
+    callbackManager.registerCallback('my_callback', null)
+    expect(window.console.error).toHaveBeenCalledWith('Invalid callback my_callback')
+  })
+
+  it('Test callbackIsRegistred with invalid name', function () {
+    spyOn(window.console, 'error')
+    callbackManager.callbackIsRegistred(function () {})
+    expect(window.console.error).toHaveBeenCalledWith('Bad name')
+  })
+
+  it('Test callbackIsRegistred with null name', function () {
+    spyOn(window.console, 'error')
+    callbackManager.callbackIsRegistred(null)
+    expect(window.console.error).toHaveBeenCalledWith('Bad name')
+  })
+
+  it('Test callbackIsRegistred with found callback', function () {
+    callbackManager.registerCallback('my_callback', function () {})
+    expect(callbackManager.callbackIsRegistred('my_callback')).toBeTrue()
+  })
+
+  it('Test callbackIsRegistred with not found callback', function () {
+    expect(callbackManager.callbackIsRegistred('my_callback')).toBeFalse()
+  })
+
+  it('Test getRegistredCallback with invalid name', function () {
+    spyOn(window.console, 'error')
+    callbackManager.getRegistredCallback(function () {})
+    expect(window.console.error).toHaveBeenCalledWith('Bad name')
+  })
+
+  it('Test getRegistredCallback with null name', function () {
+    spyOn(window.console, 'error')
+    callbackManager.getRegistredCallback(null)
+    expect(window.console.error).toHaveBeenCalledWith('Bad name')
+  })
+
+  it('Test getRegistredCallback with found callback', function () {
+    callbackManager.registerCallback('my_callback', function () {})
+    const callback = callbackManager.getRegistredCallback('my_callback')
+    expect(callback).toBeInstanceOf(Function)
+  })
+
+  it('Test getRegistredCallback with not found callback', function () {
+    spyOn(window.console, 'error')
+    const callback = callbackManager.getRegistredCallback('my_callback')
+    expect(window.console.error).toHaveBeenCalledWith('Callback not found: my_callback')
+    expect(callback).toBeNull()
+  })
+
+  it('Test clear', function () {
+    callbackManager.registerCallback('my_callback', function () {})
+    expect(callbackManager.getRegistredCallback('my_callback')).toBeInstanceOf(Function)
+
+    callbackManager.clear()
+
+    spyOn(window.console, 'error')
+    const callback = callbackManager.getRegistredCallback('my_callback')
+    expect(window.console.error).toHaveBeenCalledWith('Callback not found: my_callback')
+    expect(callback).toBeNull()
+  })
+})
diff --git a/tests/Resources/assets/js/callback.spec.js b/tests/Resources/assets/js/callback.spec.js
index 6a8bba4..e324db2 100644
--- a/tests/Resources/assets/js/callback.spec.js
+++ b/tests/Resources/assets/js/callback.spec.js
@@ -7,140 +7,140 @@
  * file that was distributed with this source code.
  */
 
-import runCallback from '@ecommit/crud-bundle/js/callback';
-import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager';
+import runCallback from '@ecommit/crud-bundle/js/callback'
+import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager'
 
 describe('Test callback', function () {
-    it('Test callback with function', function () {
-        const callback = jasmine.createSpy('callback');
-
-        runCallback(function (arg) {
-            callback(arg);
-        }, 2);
-
-        expect(callback).toHaveBeenCalledWith(2);
-    });
-
-    it('Test callback with string', function () {
-        const myCallback = jasmine.createSpy('callback');
-        callbackManager.registerCallback('my_callback', function (arg) {
-            myCallback(arg);
-        });
-
-        runCallback('my_callback', 3);
-
-        expect(myCallback).toHaveBeenCalledWith(3);
-        callbackManager.clear();
-    });
-
-    it('Test callback with string - Callback not registred', function () {
-        spyOn(window.console, 'error');
-        runCallback('my_callback_never_registred', 3);
-        expect(window.console.error).toHaveBeenCalledWith('Callback not found: my_callback_never_registred');
-    });
-
-    it('Test callback with sub array', function () {
-        const callback1 = jasmine.createSpy('callback1');
-        const callback2 = jasmine.createSpy('callback2');
-        const callback3 = jasmine.createSpy('callback3');
-        const callback4 = jasmine.createSpy('callback4');
-        const callback5 = jasmine.createSpy('callback5');
-
-        runCallback([
-            function () {
-                callback1();
-            },
-            [
-                [
-                    function () {
-                        callback2();
-                    },
-                    function () {
-                        callback3();
-                    }
-                ],
-                function () {
-                    callback4();
-                }
-            ],
-            function () {
-                callback5();
-            }
-        ]);
-
-        expect(callback1).toHaveBeenCalledTimes(1);
-        expect(callback2).toHaveBeenCalledTimes(1);
-        expect(callback3).toHaveBeenCalledTimes(1);
-        expect(callback4).toHaveBeenCalledTimes(1);
-        expect(callback5).toHaveBeenCalledTimes(1);
-    });
-
-    it('Test callback with priorities', function () {
-        const callback1 = jasmine.createSpy('callback1');
-        const callback2 = jasmine.createSpy('callback2');
-        const callback3 = jasmine.createSpy('callback3');
-        const callback4 = jasmine.createSpy('callback4');
-        const callback5 = jasmine.createSpy('callback5');
-
-        callbackManager.registerCallback('my_callback3', function (arg) {
-            callback3(arg);
-        });
-        callbackManager.registerCallback('my_callback4', function (arg) {
-            callback4(arg);
-        });
-        callbackManager.registerCallback('my_callback5', function (arg) {
-            callback5(arg);
-        });
-
-        runCallback([
-            // Called third
-            function (arg) {
-                callback1(arg);
-            },
-            // Called first
-            {
-                priority: '99',
-                callback: function (arg) {
-                    callback2(arg);
-                }
-            },
-            // Called second
-            {
-                priority: 10,
-                callback: 'my_callback3'
-            },
-            // Called fourth
-            {
-                callback: 'my_callback4'
-            },
-            // Called in fifth
-            'my_callback5'
-        ], 'myValue');
-
-        expect(callback1).toHaveBeenCalledTimes(1);
-        expect(callback2).toHaveBeenCalledTimes(1);
-        expect(callback3).toHaveBeenCalledTimes(1);
-        expect(callback4).toHaveBeenCalledTimes(1);
-        expect(callback5).toHaveBeenCalledTimes(1);
-
-        expect(callback1).toHaveBeenCalledWith('myValue');
-        expect(callback2).toHaveBeenCalledWith('myValue');
-
-        expect(callback2).toHaveBeenCalledBefore(callback3);
-        expect(callback3).toHaveBeenCalledBefore(callback1);
-        expect(callback1).toHaveBeenCalledBefore(callback4);
-        expect(callback4).toHaveBeenCalledBefore(callback5);
-
-        callbackManager.clear();
-    });
-
-    it('Test callback with many arguments', function () {
-        const callback = jasmine.createSpy('callback');
-
-        runCallback(function (arg1, arg2) {
-            callback(arg1, arg2);
-        }, 2, 4);
-
-        expect(callback).toHaveBeenCalledWith(2, 4);
-    });
-});
+  it('Test callback with function', function () {
+    const callback = jasmine.createSpy('callback')
+
+    runCallback(function (arg) {
+      callback(arg)
+    }, 2)
+
+    expect(callback).toHaveBeenCalledWith(2)
+  })
+
+  it('Test callback with string', function () {
+    const myCallback = jasmine.createSpy('callback')
+    callbackManager.registerCallback('my_callback', function (arg) {
+      myCallback(arg)
+    })
+
+    runCallback('my_callback', 3)
+
+    expect(myCallback).toHaveBeenCalledWith(3)
+    callbackManager.clear()
+  })
+
+  it('Test callback with string - Callback not registred', function () {
+    spyOn(window.console, 'error')
+    runCallback('my_callback_never_registred', 3)
+    expect(window.console.error).toHaveBeenCalledWith('Callback not found: my_callback_never_registred')
+  })
+
+  it('Test callback with sub array', function () {
+    const callback1 = jasmine.createSpy('callback1')
+    const callback2 = jasmine.createSpy('callback2')
+    const callback3 = jasmine.createSpy('callback3')
+    const callback4 = jasmine.createSpy('callback4')
+    const callback5 = jasmine.createSpy('callback5')
+
+    runCallback([
+      function () {
+        callback1()
+      },
+      [
+        [
+          function () {
+            callback2()
+          },
+          function () {
+            callback3()
+          }
+        ],
+        function () {
+          callback4()
+        }
+      ],
+      function () {
+        callback5()
+      }
+    ])
+
+    expect(callback1).toHaveBeenCalledTimes(1)
+    expect(callback2).toHaveBeenCalledTimes(1)
+    expect(callback3).toHaveBeenCalledTimes(1)
+    expect(callback4).toHaveBeenCalledTimes(1)
+    expect(callback5).toHaveBeenCalledTimes(1)
+  })
+
+  it('Test callback with priorities', function () {
+    const callback1 = jasmine.createSpy('callback1')
+    const callback2 = jasmine.createSpy('callback2')
+    const callback3 = jasmine.createSpy('callback3')
+    const callback4 = jasmine.createSpy('callback4')
+    const callback5 = jasmine.createSpy('callback5')
+
+    callbackManager.registerCallback('my_callback3', function (arg) {
+      callback3(arg)
+    })
+    callbackManager.registerCallback('my_callback4', function (arg) {
+      callback4(arg)
+    })
+    callbackManager.registerCallback('my_callback5', function (arg) {
+      callback5(arg)
+    })
+
+    runCallback([
+      // Called third
+      function (arg) {
+        callback1(arg)
+      },
+      // Called first
+      {
+        priority: '99',
+        callback: function (arg) {
+          callback2(arg)
+        }
+      },
+      // Called second
+      {
+        priority: 10,
+        callback: 'my_callback3'
+      },
+      // Called fourth
+      {
+        callback: 'my_callback4'
+      },
+      // Called in fifth
+      'my_callback5'
+    ], 'myValue')
+
+    expect(callback1).toHaveBeenCalledTimes(1)
+    expect(callback2).toHaveBeenCalledTimes(1)
+    expect(callback3).toHaveBeenCalledTimes(1)
+    expect(callback4).toHaveBeenCalledTimes(1)
+    expect(callback5).toHaveBeenCalledTimes(1)
+
+    expect(callback1).toHaveBeenCalledWith('myValue')
+    expect(callback2).toHaveBeenCalledWith('myValue')
+
+    expect(callback2).toHaveBeenCalledBefore(callback3)
+    expect(callback3).toHaveBeenCalledBefore(callback1)
+    expect(callback1).toHaveBeenCalledBefore(callback4)
+    expect(callback4).toHaveBeenCalledBefore(callback5)
+
+    callbackManager.clear()
+  })
+
+  it('Test callback with many arguments', function () {
+    const callback = jasmine.createSpy('callback')
+
+    runCallback(function (arg1, arg2) {
+      callback(arg1, arg2)
+    }, 2, 4)
+
+    expect(callback).toHaveBeenCalledWith(2, 4)
+  })
+})
diff --git a/tests/Resources/assets/js/main.js b/tests/Resources/assets/js/main.js
index ec28c07..5cd6ea8 100644
--- a/tests/Resources/assets/js/main.js
+++ b/tests/Resources/assets/js/main.js
@@ -7,5 +7,5 @@
  * file that was distributed with this source code.
  */
 
-const testsContext = require.context('.', true, /\.spec\.js$/);
-testsContext.keys().forEach(testsContext);
+const testsContext = require.context('.', true, /\.spec\.js$/)
+testsContext.keys().forEach(testsContext)
diff --git a/tests/Resources/assets/js/modal/engine/test.js b/tests/Resources/assets/js/modal/engine/test.js
index f9071af..08024da 100644
--- a/tests/Resources/assets/js/modal/engine/test.js
+++ b/tests/Resources/assets/js/modal/engine/test.js
@@ -7,18 +7,18 @@
  * file that was distributed with this source code.
  */
 
-import runCallback from '@ecommit/crud-bundle/js/callback';
-import $ from 'jquery';
+import runCallback from '@ecommit/crud-bundle/js/callback'
+import $ from 'jquery'
 
 export function openModal (options) {
-    runCallback(options.onOpen, $(options.element));
+  runCallback(options.onOpen, $(options.element))
 
-    $(document).on('DOMNodeRemoved', options.element + ' .content', function (event) {
-        runCallback(options.onClose, $(options.element));
-    });
+  $(document).on('DOMNodeRemoved', options.element + ' .content', function (event) {
+    runCallback(options.onClose, $(options.element))
+  })
 }
 
 export function closeModal (element) {
-    $(element + ' .content').remove();
-    $(document).off('remove', element + ' .content');
+  $(element + ' .content').remove()
+  $(document).off('remove', element + ' .content')
 }
diff --git a/tests/Resources/assets/js/modal/modal-manager.spec.js b/tests/Resources/assets/js/modal/modal-manager.spec.js
index 7a6e87d..4193966 100644
--- a/tests/Resources/assets/js/modal/modal-manager.spec.js
+++ b/tests/Resources/assets/js/modal/modal-manager.spec.js
@@ -7,364 +7,364 @@
  * file that was distributed with this source code.
  */
 
-import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager';
-import $ from 'jquery';
-const testEngine = require('./engine/test');
-const bootstrap3Engine = require('@ecommit/crud-bundle/js/modal/engine/bootstrap3');
+import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager'
+import $ from 'jquery'
+const testEngine = require('./engine/test')
+const bootstrap3Engine = require('@ecommit/crud-bundle/js/modal/engine/bootstrap3')
 
 it('Get engine when not defined', function () {
-    modalManager.defineEngine(null);
+  modalManager.defineEngine(null)
 
-    spyOn(window.console, 'error');
+  spyOn(window.console, 'error')
 
-    const engine = modalManager.getEngine();
-    expect(window.console.error).toHaveBeenCalledWith('Engine not defined');
+  const engine = modalManager.getEngine()
+  expect(window.console.error).toHaveBeenCalledWith('Engine not defined')
 
-    expect(engine).toBeUndefined();
-});
+  expect(engine).toBeUndefined()
+})
 
 describe('Test Modal-manager with spy engine', function () {
-    beforeEach(function () {
-        this.spyEngine = {
-            openModal: function (options) {
-            },
-            closeModal: function (element) {
-            }
-        }
-        spyOn(this.spyEngine, 'openModal');
-        spyOn(this.spyEngine, 'closeModal');
+  beforeEach(function () {
+    this.spyEngine = {
+      openModal: function (options) {
+      },
+      closeModal: function (element) {
+      }
+    }
+    spyOn(this.spyEngine, 'openModal')
+    spyOn(this.spyEngine, 'closeModal')
 
-        modalManager.defineEngine(this.spyEngine);
+    modalManager.defineEngine(this.spyEngine)
+
+    jasmine.Ajax.install()
+    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+      status: 200,
+      responseText: 'OK'
+    })
+  })
 
-        jasmine.Ajax.install();
-        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
-            status: 200,
-            responseText: 'OK'
-        });
-    });
+  afterEach(function () {
+    $('.html-test').remove()
+    jasmine.Ajax.uninstall()
+  })
 
-    afterEach(function () {
-        $('.html-test').remove();
-        jasmine.Ajax.uninstall();
-    });
+  it('Test openModal', function () {
+    modalManager.openModal({
+      element: '#myId'
+    })
 
-    it('Test openModal', function () {
-        modalManager.openModal({
-            element: '#myId'
-        });
+    expect(this.spyEngine.openModal).toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+  })
+
+  it('Test openModal without element option', function () {
+    spyOn(window.console, 'error')
+    modalManager.openModal({})
+    expect(window.console.error).toHaveBeenCalledWith('Value required: element')
+  })
 
-        expect(this.spyEngine.openModal).toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
-    });
+  it('Test closeModal', function () {
+    modalManager.closeModal('#myId')
 
-    it('Test openModal without element option', function () {
-        spyOn(window.console, 'error');
-        modalManager.openModal({});
-        expect(window.console.error).toHaveBeenCalledWith('Value required: element');
-    });
+    expect(this.spyEngine.openModal).not.toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).toHaveBeenCalled()
+  })
 
-    it('Test closeModal', function () {
-        modalManager.closeModal('#myId');
+  it('Test auto openModal', function () {
+    $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId">Go !</a>')
 
-        expect(this.spyEngine.openModal).not.toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).toHaveBeenCalled();
-    });
+    $('#linkToTest').click()
 
-    it('Test auto openModal', function () {
-        $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId">Go !</a>');
+    expect(this.spyEngine.openModal).toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+  })
 
-        $('#linkToTest').click();
+  it('Test auto openModal canceled', function () {
+    $(document).on('ec-crud-modal-auto-before', '#linkToTest', function (event) {
+      event.preventDefault()
+    })
+    $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId">Go !</a>')
 
-        expect(this.spyEngine.openModal).toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
-    });
+    $('#linkToTest').click()
 
-    it('Test auto openModal canceled', function () {
-        $(document).on('ec-crud-modal-auto-before', '#linkToTest', function (event) {
-            event.preventDefault();
-        });
-        $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId">Go !</a>');
+    expect(this.spyEngine.openModal).not.toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
 
-        $('#linkToTest').click();
+    $(document).off('ec-crud-modal-auto-before', '#linkToTest')
+  })
 
-        expect(this.spyEngine.openModal).not.toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
+  it('Test auto openRemoteModal - link', function () {
+    $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
-        $(document).off('ec-crud-modal-auto-before', '#linkToTest');
-    });
+    $('#linkToTest').click()
 
-    it('Test auto openRemoteModal - link', function () {
-        $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>');
+    expect(this.spyEngine.openModal).toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+  })
 
-        $('#linkToTest').click();
+  it('Test auto openRemoteModal - link with href', function () {
+    $('body').append('<a href="/goodRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content">Go !</a>')
 
-        expect(this.spyEngine.openModal).toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-    });
+    $('#linkToTest').click()
 
-    it('Test auto openRemoteModal - link with href', function () {
-        $('body').append('<a href="/goodRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content">Go !</a>');
+    expect(this.spyEngine.openModal).toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+  })
 
-        $('#linkToTest').click();
+  it('Test auto openRemoteModal - link - prioriry url attr', function () {
+    $('body').append('<a href="/badRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
-        expect(this.spyEngine.openModal).toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-    });
+    $('#linkToTest').click()
 
-    it('Test auto openRemoteModal - link - prioriry url attr', function () {
-        $('body').append('<a href="/badRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>');
+    expect(this.spyEngine.openModal).toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+  })
 
-        $('#linkToTest').click();
+  it('Test auto openRemoteModal - link - canceled', function () {
+    $(document).on('ec-crud-remote-modal-auto-before', '#linkToTest', function (event) {
+      event.preventDefault()
+    })
+    $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
-        expect(this.spyEngine.openModal).toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-    });
+    $('#linkToTest').click()
 
-    it('Test auto openRemoteModal - link - canceled', function () {
-        $(document).on('ec-crud-remote-modal-auto-before', '#linkToTest', function (event) {
-            event.preventDefault();
-        });
-        $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>');
+    expect(this.spyEngine.openModal).not.toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
 
-        $('#linkToTest').click();
+    $(document).off('ec-crud-remote-modal-auto-before', '#linkToTest')
+  })
 
-        expect(this.spyEngine.openModal).not.toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
-        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
+  it('Test auto openRemoteModal - button', function () {
+    $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
 
-        $(document).off('ec-crud-remote-modal-auto-before', '#linkToTest');
-    });
+    $('#buttonToTest').click()
 
-    it('Test auto openRemoteModal - button', function () {
-        $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>');
+    expect(this.spyEngine.openModal).toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+  })
 
-        $('#buttonToTest').click();
+  it('Test auto openRemoteModal - button - canceled', function () {
+    $(document).on('ec-crud-remote-modal-auto-before', '#buttonToTest', function (event) {
+      event.preventDefault()
+    })
+    $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
 
-        expect(this.spyEngine.openModal).toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
-        expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-        expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-    });
+    $('#buttonToTest').click()
 
-    it('Test auto openRemoteModal - button - canceled', function () {
-        $(document).on('ec-crud-remote-modal-auto-before', '#buttonToTest', function (event) {
-            event.preventDefault();
-        });
-        $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>');
+    expect(this.spyEngine.openModal).not.toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
 
-        $('#buttonToTest').click();
-
-        expect(this.spyEngine.openModal).not.toHaveBeenCalled();
-        expect(this.spyEngine.closeModal).not.toHaveBeenCalled();
-        expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
-
-        $(document).off('ec-crud-remote-modal-auto-before', '#buttonToTest');
-    });
-});
+    $(document).off('ec-crud-remote-modal-auto-before', '#buttonToTest')
+  })
+})
 
 describe('Test Modal-manager with test engine', function () {
-    beforeEach(function () {
-        modalManager.defineEngine(testEngine);
-        $('body').append('<div id="test-modal"><div class="content"></div></div>');
-
-        jasmine.Ajax.install();
-        jasmine.Ajax.stubRequest('/goodRequest').andReturn({
-            status: 200,
-            responseText: 'OK'
-        });
-        jasmine.Ajax.stubRequest('/error404').andReturn({
-            status: 404,
-            responseText: 'Page not found !'
-        });
-    });
-
-    afterEach(function () {
-        $('#test-modal').remove();
-        jasmine.Ajax.uninstall();
-    });
-
-    describe('Test Modal-manager.defineEngine/getEngine', function () {
-        it('getEngine is testEngine', function () {
-            expect(modalManager.getEngine()).toEqual(testEngine);
-        });
-
-        it('Define bootstrap3 engine', function () {
-            modalManager.defineEngine(bootstrap3Engine);
-            expect(modalManager.getEngine()).toEqual(bootstrap3Engine);
-        });
-
-        it('Test openModal with onOpen and onClose options', function () {
-            const callbackOpen = jasmine.createSpy('open');
-            const callbackClose = jasmine.createSpy('close');
-
-            modalManager.openModal({
-                element: '#test-modal',
-                onOpen: function (element) {
-                    callbackOpen(element);
-                },
-                onClose: function (element) {
-                    callbackClose(element);
-                }
-            });
-
-            expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'));
-            expect(callbackClose).not.toHaveBeenCalled();
-
-            modalManager.closeModal('#test-modal');
-
-            expect(callbackOpen).toHaveBeenCalledTimes(1);
-            expect(callbackClose).toHaveBeenCalledWith($('#test-modal'));
-        });
-    });
-
-    describe('Test Modal-manager.openRemoteModal', function () {
-        it('Test openRemoteModal', function () {
-            const callbackOpen = jasmine.createSpy('open');
-            const callbackClose = jasmine.createSpy('close');
-
-            modalManager.openRemoteModal({
-                url: '/goodRequest',
-                element: '#test-modal',
-                elementContent: '#test-modal .content',
-                onOpen: function (element) {
-                    callbackOpen(element);
-                },
-                onClose: function (element) {
-                    callbackClose(element);
-                }
-            });
-
-            expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'));
-            expect(callbackClose).not.toHaveBeenCalled();
-            expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-            expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-            expect($('#test-modal .content').html()).toBe('OK');
-        });
-
-        it('Test openRemoteModal without option', function () {
-            spyOn(window.console, 'error');
-            modalManager.openRemoteModal({});
-            expect(window.console.error).toHaveBeenCalledWith('Value required: url');
-            expect(window.console.error).toHaveBeenCalledWith('Value required: element');
-            expect(window.console.error).toHaveBeenCalledWith('Value required: elementContent');
-        });
-
-        it('Test openRemoteModal without element option', function () {
-            spyOn(window.console, 'error');
-            const callbackOpen = jasmine.createSpy('open');
-            const callbackClose = jasmine.createSpy('close');
-
-            modalManager.openRemoteModal({
-                url: '/goodRequest',
-                elementContent: '#test-modal .content',
-                onOpen: function (element) {
-                    callbackOpen(element);
-                },
-                onClose: function (element) {
-                    callbackClose(element);
-                }
-            });
-
-            expect(window.console.error).toHaveBeenCalledWith('Value required: element');
-            expect(callbackOpen).not.toHaveBeenCalled();
-            expect(callbackClose).not.toHaveBeenCalled();
-            expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined();
-        });
-
-        it('Test openRemoteModal with ajaxOptions.onSuccess', function () {
-            const callbackOpen = jasmine.createSpy('open');
-            const callbackClose = jasmine.createSpy('close');
-            const callbackSuccess1 = jasmine.createSpy('success1');
-            const callbackSuccess2 = jasmine.createSpy('success2');
-
-            modalManager.openRemoteModal({
-                url: '/goodRequest',
-                element: '#test-modal',
-                elementContent: '#test-modal .content',
-                onOpen: function (element) {
-                    callbackOpen(element);
-                },
-                onClose: function (element) {
-                    callbackClose(element);
-                },
-                ajaxOptions: {
-                    onSuccess: [
-                        {
-                            priority: 6,
-                            callback: function (data, textStatus, jqXHR) {
-                                callbackSuccess1();
-                            }
-                        },
-                        {
-                            priority: -2,
-                            callback: function (data, textStatus, jqXHR) {
-                                callbackSuccess2();
-                            }
-                        }
-                    ]
-                }
-            });
-
-            expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'));
-            expect(callbackSuccess1).toHaveBeenCalledBefore(callbackOpen);
-            expect(callbackOpen).toHaveBeenCalledBefore(callbackSuccess2);
-            expect(callbackClose).not.toHaveBeenCalled();
-            expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-            expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-            expect($('#test-modal .content').html()).toBe('OK');
-        });
-
-        it('Test openRemoteModal with method option', function () {
-            const callbackOpen = jasmine.createSpy('open');
-            const callbackClose = jasmine.createSpy('close');
-
-            modalManager.openRemoteModal({
-                url: '/goodRequest',
-                element: '#test-modal',
-                elementContent: '#test-modal .content',
-                onOpen: function (element) {
-                    callbackOpen(element);
-                },
-                onClose: function (element) {
-                    callbackClose(element);
-                },
-                method: 'PUT'
-            });
-
-            expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'));
-            expect(callbackClose).not.toHaveBeenCalled();
-            expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest');
-            expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT');
-            expect($('#test-modal .content').html()).toBe('OK');
-        });
-
-        it('Test openRemoteModal with bad request', function () {
-            const callbackOpen = jasmine.createSpy('open');
-            const callbackClose = jasmine.createSpy('close');
-
-            modalManager.openRemoteModal({
-                url: '/error404',
-                element: '#test-modal',
-                elementContent: '#test-modal .content',
-                onOpen: function (element) {
-                    callbackOpen(element);
-                },
-                onClose: function (element) {
-                    callbackClose(element);
-                }
-            });
-
-            expect(callbackOpen).not.toHaveBeenCalled();
-            expect(callbackClose).not.toHaveBeenCalled();
-            expect(jasmine.Ajax.requests.mostRecent().url).toBe('/error404');
-            expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST');
-            expect($('#test-modal .content').html()).toBe('');
-        });
-    });
-});
+  beforeEach(function () {
+    modalManager.defineEngine(testEngine)
+    $('body').append('<div id="test-modal"><div class="content"></div></div>')
+
+    jasmine.Ajax.install()
+    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+      status: 200,
+      responseText: 'OK'
+    })
+    jasmine.Ajax.stubRequest('/error404').andReturn({
+      status: 404,
+      responseText: 'Page not found !'
+    })
+  })
+
+  afterEach(function () {
+    $('#test-modal').remove()
+    jasmine.Ajax.uninstall()
+  })
+
+  describe('Test Modal-manager.defineEngine/getEngine', function () {
+    it('getEngine is testEngine', function () {
+      expect(modalManager.getEngine()).toEqual(testEngine)
+    })
+
+    it('Define bootstrap3 engine', function () {
+      modalManager.defineEngine(bootstrap3Engine)
+      expect(modalManager.getEngine()).toEqual(bootstrap3Engine)
+    })
+
+    it('Test openModal with onOpen and onClose options', function () {
+      const callbackOpen = jasmine.createSpy('open')
+      const callbackClose = jasmine.createSpy('close')
+
+      modalManager.openModal({
+        element: '#test-modal',
+        onOpen: function (element) {
+          callbackOpen(element)
+        },
+        onClose: function (element) {
+          callbackClose(element)
+        }
+      })
+
+      expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'))
+      expect(callbackClose).not.toHaveBeenCalled()
+
+      modalManager.closeModal('#test-modal')
+
+      expect(callbackOpen).toHaveBeenCalledTimes(1)
+      expect(callbackClose).toHaveBeenCalledWith($('#test-modal'))
+    })
+  })
+
+  describe('Test Modal-manager.openRemoteModal', function () {
+    it('Test openRemoteModal', function () {
+      const callbackOpen = jasmine.createSpy('open')
+      const callbackClose = jasmine.createSpy('close')
+
+      modalManager.openRemoteModal({
+        url: '/goodRequest',
+        element: '#test-modal',
+        elementContent: '#test-modal .content',
+        onOpen: function (element) {
+          callbackOpen(element)
+        },
+        onClose: function (element) {
+          callbackClose(element)
+        }
+      })
+
+      expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'))
+      expect(callbackClose).not.toHaveBeenCalled()
+      expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+      expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+      expect($('#test-modal .content').html()).toBe('OK')
+    })
+
+    it('Test openRemoteModal without option', function () {
+      spyOn(window.console, 'error')
+      modalManager.openRemoteModal({})
+      expect(window.console.error).toHaveBeenCalledWith('Value required: url')
+      expect(window.console.error).toHaveBeenCalledWith('Value required: element')
+      expect(window.console.error).toHaveBeenCalledWith('Value required: elementContent')
+    })
+
+    it('Test openRemoteModal without element option', function () {
+      spyOn(window.console, 'error')
+      const callbackOpen = jasmine.createSpy('open')
+      const callbackClose = jasmine.createSpy('close')
+
+      modalManager.openRemoteModal({
+        url: '/goodRequest',
+        elementContent: '#test-modal .content',
+        onOpen: function (element) {
+          callbackOpen(element)
+        },
+        onClose: function (element) {
+          callbackClose(element)
+        }
+      })
+
+      expect(window.console.error).toHaveBeenCalledWith('Value required: element')
+      expect(callbackOpen).not.toHaveBeenCalled()
+      expect(callbackClose).not.toHaveBeenCalled()
+      expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
+    })
+
+    it('Test openRemoteModal with ajaxOptions.onSuccess', function () {
+      const callbackOpen = jasmine.createSpy('open')
+      const callbackClose = jasmine.createSpy('close')
+      const callbackSuccess1 = jasmine.createSpy('success1')
+      const callbackSuccess2 = jasmine.createSpy('success2')
+
+      modalManager.openRemoteModal({
+        url: '/goodRequest',
+        element: '#test-modal',
+        elementContent: '#test-modal .content',
+        onOpen: function (element) {
+          callbackOpen(element)
+        },
+        onClose: function (element) {
+          callbackClose(element)
+        },
+        ajaxOptions: {
+          onSuccess: [
+            {
+              priority: 6,
+              callback: function (data, textStatus, jqXHR) {
+                callbackSuccess1()
+              }
+            },
+            {
+              priority: -2,
+              callback: function (data, textStatus, jqXHR) {
+                callbackSuccess2()
+              }
+            }
+          ]
+        }
+      })
+
+      expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'))
+      expect(callbackSuccess1).toHaveBeenCalledBefore(callbackOpen)
+      expect(callbackOpen).toHaveBeenCalledBefore(callbackSuccess2)
+      expect(callbackClose).not.toHaveBeenCalled()
+      expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+      expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+      expect($('#test-modal .content').html()).toBe('OK')
+    })
+
+    it('Test openRemoteModal with method option', function () {
+      const callbackOpen = jasmine.createSpy('open')
+      const callbackClose = jasmine.createSpy('close')
+
+      modalManager.openRemoteModal({
+        url: '/goodRequest',
+        element: '#test-modal',
+        elementContent: '#test-modal .content',
+        onOpen: function (element) {
+          callbackOpen(element)
+        },
+        onClose: function (element) {
+          callbackClose(element)
+        },
+        method: 'PUT'
+      })
+
+      expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'))
+      expect(callbackClose).not.toHaveBeenCalled()
+      expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+      expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
+      expect($('#test-modal .content').html()).toBe('OK')
+    })
+
+    it('Test openRemoteModal with bad request', function () {
+      const callbackOpen = jasmine.createSpy('open')
+      const callbackClose = jasmine.createSpy('close')
+
+      modalManager.openRemoteModal({
+        url: '/error404',
+        element: '#test-modal',
+        elementContent: '#test-modal .content',
+        onOpen: function (element) {
+          callbackOpen(element)
+        },
+        onClose: function (element) {
+          callbackClose(element)
+        }
+      })
+
+      expect(callbackOpen).not.toHaveBeenCalled()
+      expect(callbackClose).not.toHaveBeenCalled()
+      expect(jasmine.Ajax.requests.mostRecent().url).toBe('/error404')
+      expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+      expect($('#test-modal .content').html()).toBe('')
+    })
+  })
+})
diff --git a/tests/Resources/assets/js/options-resolver.spec.js b/tests/Resources/assets/js/options-resolver.spec.js
index 823f3ac..dd2dbb6 100644
--- a/tests/Resources/assets/js/options-resolver.spec.js
+++ b/tests/Resources/assets/js/options-resolver.spec.js
@@ -7,117 +7,117 @@
  * file that was distributed with this source code.
  */
 
-import * as optionsRevolser from '@ecommit/crud-bundle/js/options-resolver';
-import $ from 'jquery';
+import * as optionsRevolser from '@ecommit/crud-bundle/js/options-resolver'
+import $ from 'jquery'
 
 describe('Test options-resolver.resolve', function () {
-    const defaultOptions = {
-        var1: 'hello',
-        var2: null,
-        var3: true,
-        var4: 1,
-        var5: 'world',
-        var6: null
-    };
-
-    it('Empty options', function () {
-        expect(optionsRevolser.resolve(defaultOptions, {})).toEqual(defaultOptions);
-    });
-
-    it('Options with values', function () {
-        const options = {
-            var3: null,
-            var5: 'world',
-            var6: 'hello',
-            var7: 'extra',
-            var8: null
-        };
-
-        const expected = {
-            var1: 'hello',
-            var2: null,
-            var3: null,
-            var4: 1,
-            var5: 'world',
-            var6: 'hello',
-            var7: 'extra',
-            var8: null
-        }
-
-        expect(optionsRevolser.resolve(defaultOptions, options)).toEqual(expected);
-    });
-});
+  const defaultOptions = {
+    var1: 'hello',
+    var2: null,
+    var3: true,
+    var4: 1,
+    var5: 'world',
+    var6: null
+  }
+
+  it('Empty options', function () {
+    expect(optionsRevolser.resolve(defaultOptions, {})).toEqual(defaultOptions)
+  })
+
+  it('Options with values', function () {
+    const options = {
+      var3: null,
+      var5: 'world',
+      var6: 'hello',
+      var7: 'extra',
+      var8: null
+    }
+
+    const expected = {
+      var1: 'hello',
+      var2: null,
+      var3: null,
+      var4: 1,
+      var5: 'world',
+      var6: 'hello',
+      var7: 'extra',
+      var8: null
+    }
+
+    expect(optionsRevolser.resolve(defaultOptions, options)).toEqual(expected)
+  })
+})
 
 describe('Test options-resolver.getDataAttributes', function () {
-    afterEach(function () {
-        $('.html-test').remove();
-    });
+  afterEach(function () {
+    $('.html-test').remove()
+  })
 
-    it('Element doesn\'t exist', function () {
-        expect(optionsRevolser.getDataAttributes('#badId', 'myPrefix')).toEqual({});
-    });
+  it('Element doesn\'t exist', function () {
+    expect(optionsRevolser.getDataAttributes('#badId', 'myPrefix')).toEqual({})
+  })
 
-    it('Element exists', function () {
-        $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1" data-badprefix="1" data-my-prefix-var2="value2"></div>');
+  it('Element exists', function () {
+    $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1" data-badprefix="1" data-my-prefix-var2="value2"></div>')
 
-        const expected = {
-            var1: 'value1',
-            var2: 'value2'
-        };
+    const expected = {
+      var1: 'value1',
+      var2: 'value2'
+    }
 
-        expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual(expected);
-    });
+    expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual(expected)
+  })
 
-    it('Element without attribute', function () {
-        $('body').append('<div id="myDiv" class="html-test"></div>');
+  it('Element without attribute', function () {
+    $('body').append('<div id="myDiv" class="html-test"></div>')
 
-        expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual({});
-    });
+    expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual({})
+  })
 
-    it('Element with different data types', function () {
-        $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1" data-badprefix="1" data-my-prefix-var2="16" data-my-prefix-var3="false" data-my-prefix-var4="[8]" data-my-prefix-var5="{&quot;result&quot;:true, &quot;count&quot;:100}"></div>');
+  it('Element with different data types', function () {
+    $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1" data-badprefix="1" data-my-prefix-var2="16" data-my-prefix-var3="false" data-my-prefix-var4="[8]" data-my-prefix-var5="{&quot;result&quot;:true, &quot;count&quot;:100}"></div>')
 
-        const expected = {
-            var1: 'value1',
-            var2: 16,
-            var3: false,
-            var4: [8],
-            var5: {
-                result: true,
-                count: 100
-            }
-        };
+    const expected = {
+      var1: 'value1',
+      var2: 16,
+      var3: false,
+      var4: [8],
+      var5: {
+        result: true,
+        count: 100
+      }
+    }
 
-        expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual(expected);
-    });
-});
+    expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual(expected)
+  })
+})
 
 describe('Test options-resolver.isNotBlank', function () {
-    it('Undefined is blank', function () {
-        expect(optionsRevolser.isNotBlank(undefined)).toBe(false);
-    });
-
-    it('Null is blank', function () {
-        expect(optionsRevolser.isNotBlank(null)).toBe(false);
-    });
-
-    it('Empty string is blank', function () {
-        expect(optionsRevolser.isNotBlank('')).toBe(false);
-    });
-
-    it('String is not blank', function () {
-        expect(optionsRevolser.isNotBlank('string')).toBe(true);
-    });
-
-    it('Int is not blank', function () {
-        expect(optionsRevolser.isNotBlank(8)).toBe(true);
-    });
-
-    it('Empty array is blank', function () {
-        expect(optionsRevolser.isNotBlank([])).toBe(false);
-    });
-
-    it('Array is not blank', function () {
-        expect(optionsRevolser.isNotBlank(['val'])).toBe(true);
-    });
-});
+  it('Undefined is blank', function () {
+    expect(optionsRevolser.isNotBlank(undefined)).toBe(false)
+  })
+
+  it('Null is blank', function () {
+    expect(optionsRevolser.isNotBlank(null)).toBe(false)
+  })
+
+  it('Empty string is blank', function () {
+    expect(optionsRevolser.isNotBlank('')).toBe(false)
+  })
+
+  it('String is not blank', function () {
+    expect(optionsRevolser.isNotBlank('string')).toBe(true)
+  })
+
+  it('Int is not blank', function () {
+    expect(optionsRevolser.isNotBlank(8)).toBe(true)
+  })
+
+  it('Empty array is blank', function () {
+    expect(optionsRevolser.isNotBlank([])).toBe(false)
+  })
+
+  it('Array is not blank', function () {
+    expect(optionsRevolser.isNotBlank(['val'])).toBe(true)
+  })
+})

From c8adf92421495cccd9c20b302c1dcaa1d91b73c9 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 1 Oct 2021 15:43:31 +0200
Subject: [PATCH 094/264] Upgrade eslint dependencies

---
 package.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index eef0373..c8fb4c6 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,11 @@
     "@ecommit/crud-bundle": "link:src/Resources/assets",
     "@symfony/webpack-encore": "^0.29.1",
     "core-js": "^3.0.0",
-    "eslint": "^6.8.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint": "^7.32.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
+    "eslint-plugin-promise": "^5.1.0",
     "install": "^0.13.0",
     "jasmine": "^3.0",
     "karma": "^4.0",

From bb15c620d0345584ea291c90ca3eecd2b96e5836 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 1 Oct 2021 15:52:26 +0200
Subject: [PATCH 095/264] [PHP-CS-Fixer] Exclude node_modules

---
 .php-cs-fixer.dist.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 1069e36..d529d82 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -11,6 +11,7 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
+    ->exclude('node_modules')
     ->exclude('tests/Functional/App/var')
 ;
 $config = new PhpCsFixer\Config();

From 7185695dd76aabadd73aeb23959dc0faf4888d04 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 18 Nov 2021 11:31:36 +0100
Subject: [PATCH 096/264] Fix the call of raz/razSort when CRUD is not
 initialized

Add initIfNecessary method
---
 src/Crud/Crud.php                             | 12 ++++
 src/Crud/CrudResponseGenerator.php            |  4 +-
 .../App/Controller/UserController.php         | 11 ++-
 .../Controller/UserWithoutTraitController.php | 11 ++-
 .../Controller/TestCrudControllerTest.php     | 70 +++++++++++++++++++
 5 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 5479b60..c1dca9c 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -48,6 +48,7 @@ class Crud
     protected $displaySettingsForm = null;
 
     protected $isInitialized = false;
+    protected $initializationInProgress = false;
     protected $availableColumns = [];
     protected $availableVirtualColumns = [];
     protected $availableResultsPerPage = [];
@@ -100,6 +101,7 @@ public function init(): void
         if ($this->isInitialized) {
             throw new \Exception('CRUD already initialized');
         }
+        $this->initializationInProgress = true;
 
         //Cheks not empty values
         $checkValues = [
@@ -151,6 +153,7 @@ public function init(): void
         //Saves
         $this->save();
 
+        $this->initializationInProgress = false;
         $this->isInitialized = true;
     }
 
@@ -159,6 +162,13 @@ public function isInitialized(): bool
         return $this->isInitialized;
     }
 
+    public function initIfNecessary(): void
+    {
+        if (!$this->isInitialized && !$this->initializationInProgress) {
+            $this->init();
+        }
+    }
+
     /**
      * Add a column inside the crud.
      *
@@ -709,6 +719,7 @@ protected function razDisplaySettings(): void
      */
     public function raz(): void
     {
+        $this->initIfNecessary();
         if ($this->searchForm) {
             $newValue = clone $this->searchForm->getDefaultData();
             $this->changeFilterValues($newValue);
@@ -727,6 +738,7 @@ public function raz(): void
      */
     public function razSort(): void
     {
+        $this->initIfNecessary();
         $this->sessionValues->sense = $this->defaultSense;
         $this->sessionValues->sort = $this->defaultSort;
         $this->save();
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index 2df7c04..f2b32df 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -90,9 +90,7 @@ protected function processCrud(Crud $crud, array $options): array
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
 
-        if (!$crud->isInitialized()) {
-            $crud->init();
-        }
+        $crud->initIfNecessary();
         if ($request->query->has('search')) {
             $crud->processForm();
         }
diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index 848dfa1..2baa1f8 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -37,8 +37,15 @@ protected function getCrud(): Crud
             ->setDefaultSort('firstName', Crud::ASC)
             ->createSearchForm(new UserSearcher())
             ->setRoute('user_ajax_crud')
-            ->setPersistentSettings(true)
-            ->init();
+            ->setPersistentSettings(true);
+
+        $request = $this->get('request_stack')->getCurrentRequest();
+        if ($request->query->has('manual-reset')) {
+            $crud->raz();
+        }
+        if ($request->query->has('manual-reset-sort')) {
+            $crud->razSort();
+        }
 
         return $crud;
     }
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index c1ef676..106c5ed 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -40,8 +40,15 @@ protected function getCrud(string $sessionName, array $routeParams = []): Crud
             ->setDefaultSort('firstName', Crud::ASC)
             ->createSearchForm(new UserSearcher())
             ->setRoute('user_without_trait_ajax_crud', $routeParams)
-            ->setPersistentSettings(true)
-            ->init();
+            ->setPersistentSettings(true);
+
+        $request = $this->get('request_stack')->getCurrentRequest();
+        if ($request->query->has('manual-reset')) {
+            $crud->raz();
+        }
+        if ($request->query->has('manual-reset-sort')) {
+            $crud->razSort();
+        }
 
         return $crud;
     }
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index d4e8904..937f426 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -299,6 +299,76 @@ public function testPersistentValuesAfterResetSettings(Client $client): Client
         return $client;
     }
 
+    /**
+     * @depends testPersistentValuesAfterResetSettings
+     */
+    public function testManualRaz(Client $client): Client
+    {
+        $client->request('GET', static::URL);
+
+        //Display username column
+        $button = $client->getCrawler()->filterXPath('//button[contains(.,"Display Settings")]');
+        $button->first()->click();
+        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::input[@value="username"]')->click();
+        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[@type="submit"]')->click();
+        $this->waitForAjax($client);
+        $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler()));
+
+        //Search
+        $form = $client->getCrawler()->filterXPath('//div[@id="crud_search"]/descendant::button[@type="submit" and contains(text(), "Search")]')->form();
+        $form['crud_search_'.static::SESSION_NAME.'[firstName]'] = 'Henri';
+        $client->submit($form);
+        $this->waitForAjax($client);
+        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
+
+        //Manuel RAZ (before CRUD initialization)
+        if (parse_url(static::URL, \PHP_URL_QUERY)) {
+            $resetUrl = static::URL.'&manual-reset=1';
+        } else {
+            $resetUrl = static::URL.'?manual-reset=1';
+        }
+        $client->request('GET', $resetUrl);
+
+        $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler())); //Reset rows but not columns
+
+        return $client;
+    }
+
+    /**
+     * @depends testManualRaz
+     */
+    public function testManualRazSort(Client $client): Client
+    {
+        $client->request('GET', static::URL);
+
+        //Search
+        $form = $client->getCrawler()->filterXPath('//div[@id="crud_search"]/descendant::button[@type="submit" and contains(text(), "Search")]')->form();
+        $form['crud_search_'.static::SESSION_NAME.'[firstName]'] = 'Henri';
+        $client->submit($form);
+        $this->waitForAjax($client);
+        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
+
+        //Sort
+        $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[text()="last_name"]');
+        $link->click();
+        $this->waitForAjax($client);
+        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::ASC], $this->getSort($client->getCrawler()));
+
+        //Manuel RAZ (before CRUD initialization)
+        if (parse_url(static::URL, \PHP_URL_QUERY)) {
+            $resetUrl = static::URL.'&manual-reset-sort=1';
+        } else {
+            $resetUrl = static::URL.'?manual-reset-sort=1';
+        }
+        $client->request('GET', $resetUrl);
+
+        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler())); //Not reset display settings and search
+        $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
+
+        return $client;
+    }
+
     protected function checkBeforeAndAfterBuildQuery(Crawler $crawler): void
     {
         if (null === static::SEARCH_IN_LIST) {

From 319d86e0feaba45e8023ba0590b1efafe3a5a8ff Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 5 Mar 2022 14:20:12 +0100
Subject: [PATCH 097/264] [Tests] Update PHP versions

---
 .github/workflows/tests.yml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cf5534c..544a358 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,22 +13,26 @@ jobs:
             fail-fast: false
             matrix:
                 include:
+                    #Mini
                     -   php-version: '7.4'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with lowest'
+
+                    #Symfony versions
+                    -   php-version: '8.1'
+                        symfony-version: '^4.4'
+                        description: 'with SF ^4.4'
+                    -   php-version: '8.1'
+                        symfony-version: '^5.4'
+                        description: 'with SF ^5.4'
+
+                    #PHP versions
                     -   php-version: '7.4'
-                        symfony-version: '^4'
-                        description: 'with SF ^4'
-                    -   php-version: '7.4'
-                        symfony-version: '^5'
-                        description: 'with SF ^5'
-                    -   php-version: '8.0'
-                        symfony-version: '^4'
-                        description: 'with SF ^4'
-                    -   php-version: '8.0'
-                        symfony-version: '^5'
-                        description: 'with SF ^5'
                     -   php-version: '8.0'
+                    -   php-version: '8.1'
+
+                    #CS
+                    -   php-version: '8.1'
                         description: 'with Coding Standards'
                         coding-standards: true
 

From d8bab4c46d07b7c7ec620a875ea6d9808cc1cd44 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 5 Mar 2022 14:28:54 +0100
Subject: [PATCH 098/264] [Tests] Remove Content-Length header

---
 tests/Crud/Http/QueryBuilderTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/Crud/Http/QueryBuilderTest.php b/tests/Crud/Http/QueryBuilderTest.php
index 35eca7a..2f9224d 100644
--- a/tests/Crud/Http/QueryBuilderTest.php
+++ b/tests/Crud/Http/QueryBuilderTest.php
@@ -260,6 +260,13 @@ protected function checkRequest(ResponseInterface $response, array $options): vo
         ksort($expectedOptions);
         ksort($options);
 
+        //Remove Content-Length header
+        foreach ($options['headers'] as $index => $header) {
+            if (preg_match('/^Content-Length/', $header)) {
+                unset($options['headers'][$index]);
+            }
+        }
+
         $this->assertSame($expectedOptions, $options);
     }
 }

From 5f3dbf63d84b3f2c37c7e176e05d78025646537d Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 5 Mar 2022 14:44:59 +0100
Subject: [PATCH 099/264] Fix symfony/security-csrf version

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 451b825..993af91 100644
--- a/composer.json
+++ b/composer.json
@@ -32,6 +32,7 @@
         "symfony/property-access": "^4.4|^5.0",
         "symfony/routing": "^4.4|^5.0",
         "symfony/security-bundle": "^4.4|^5.0",
+        "symfony/security-csrf" : "^4.4|^5.0",
         "symfony/translation": "^4.4|^5.0",
         "symfony/twig-bridge": "^4.4|^5.0",
         "symfony/twig-bundle": "^4.4|^5.0",

From 27bc48e19481f5d4d022b8c4561686c5f2c68236 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 5 Mar 2022 14:53:16 +0100
Subject: [PATCH 100/264] Upgrade php-cs-fixer

---
 .github/workflows/tests.yml                         | 2 --
 .gitignore                                          | 2 +-
 composer.json                                       | 2 +-
 tests/Functional/App/Form/Searcher/UserSearcher.php | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 544a358..1a6bb48 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -104,8 +104,6 @@ jobs:
 
             -   name: Run PHP CS Fixer
                 if: matrix.coding-standards
-                env:
-                    PHP_CS_FIXER_IGNORE_ENV: 1
                 run: php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
 
             -   name: Run ESLint
diff --git a/.gitignore b/.gitignore
index dd5f9e6..0fdf336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 composer.lock
 /drivers/
diff --git a/composer.json b/composer.json
index 993af91..6731e00 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "dbrekelmans/bdi": "^0.3.0",
         "doctrine/annotations": "^1.7",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "friendsofphp/php-cs-fixer": "^2.18.0",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^8.4.1",
         "symfony/dom-crawler": "^4.4|^5.0",
         "symfony/panther": "^1.0",
diff --git a/tests/Functional/App/Form/Searcher/UserSearcher.php b/tests/Functional/App/Form/Searcher/UserSearcher.php
index d115659..ecf6a5e 100644
--- a/tests/Functional/App/Form/Searcher/UserSearcher.php
+++ b/tests/Functional/App/Form/Searcher/UserSearcher.php
@@ -14,7 +14,7 @@
 namespace Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher;
 
 use Ecommit\CrudBundle\Crud\SearchFormBuilder;
-use Ecommit\CrudBundle\Form\Filter as Filter;
+use Ecommit\CrudBundle\Form\Filter;
 use Ecommit\CrudBundle\Form\Searcher\AbstractSearcher;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 

From 46dd67582b8ea341518092e1d845692b81aa9d60 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 8 Mar 2022 16:02:19 +0100
Subject: [PATCH 101/264] Add Symfony 6 support

---
 .github/workflows/tests.yml                   | 12 +++--
 composer.json                                 | 49 +++++++++----------
 src/Controller/AbstractCrudController.php     |  2 +-
 src/Crud/Crud.php                             |  2 +-
 src/Crud/CrudResponseGenerator.php            |  2 +-
 .../EcommitCrudExtensionTest.php              |  2 +-
 .../AbstractEntityTransformerTest.php         |  2 +-
 tests/Form/Filter/AbstractFilterTest.php      |  6 +--
 tests/Form/Type/EntityAjaxTypeTest.php        |  4 +-
 .../App/Controller/UserController.php         | 12 ++++-
 .../Controller/UserWithoutTraitController.php | 10 ++--
 tests/Functional/App/Kernel.php               |  8 +--
 tests/Functional/App/config/framework.yaml    |  3 +-
 tests/Functional/App/config/security.yaml     |  3 +-
 tests/Twig/CrudExtensionTest.php              |  7 +--
 15 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1a6bb48..86d8b8f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,20 +14,22 @@ jobs:
             matrix:
                 include:
                     #Mini
-                    -   php-version: '7.4'
+                    -   php-version: '8.0'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with lowest'
 
                     #Symfony versions
-                    -   php-version: '8.1'
-                        symfony-version: '^4.4'
-                        description: 'with SF ^4.4'
                     -   php-version: '8.1'
                         symfony-version: '^5.4'
                         description: 'with SF ^5.4'
+                    -   php-version: '8.1'
+                        symfony-version: '~6.0'
+                        description: 'with SF ~6.0'
+                    -   php-version: '8.1'
+                        symfony-version: '^6.0'
+                        description: 'with SF ^6.0'
 
                     #PHP versions
-                    -   php-version: '7.4'
                     -   php-version: '8.0'
                     -   php-version: '8.1'
 
diff --git a/composer.json b/composer.json
index 6731e00..c20f123 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.0",
         "ext-mbstring": "*",
         "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
         "doctrine/orm": "^2.6.4",
@@ -18,25 +18,25 @@
         "ecommit/doctrine-utils": "1.0.x-dev",
         "ecommit/paginator": "1.0.x-dev",
         "ecommit/scalar-values": "^1.0",
-        "symfony/asset": "^4.4|^5.0",
-        "symfony/config": "^4.4.12|^5.1.4",
-        "symfony/dependency-injection": "^4.4.12|^5.1.4",
-        "symfony/doctrine-bridge": "^4.4|^5.0",
-        "symfony/form": "^4.4|^5.0",
-        "symfony/framework-bundle": "^4.4|^5.0",
-        "symfony/http-client": "^4.4.11|^5.1.3",
-        "symfony/http-foundation": "^4.4|^5.0",
-        "symfony/http-kernel": "^4.4|^5.0",
-        "symfony/intl": "^4.4|^5.0",
-        "symfony/options-resolver": "^4.4|^5.0",
-        "symfony/property-access": "^4.4|^5.0",
-        "symfony/routing": "^4.4|^5.0",
-        "symfony/security-bundle": "^4.4|^5.0",
-        "symfony/security-csrf" : "^4.4|^5.0",
-        "symfony/translation": "^4.4|^5.0",
-        "symfony/twig-bridge": "^4.4|^5.0",
-        "symfony/twig-bundle": "^4.4|^5.0",
-        "symfony/validator": "^4.4|^5.0",
+        "symfony/asset": "^5.4|^6.0",
+        "symfony/config": "^5.4|^6.0",
+        "symfony/dependency-injection": "^5.4|^6.0",
+        "symfony/doctrine-bridge": "^5.4|^6.0",
+        "symfony/form": "^5.4|^6.0",
+        "symfony/framework-bundle": "^5.4|^6.0",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/http-foundation": "^5.4|^6.0",
+        "symfony/http-kernel": "^5.4|^6.0",
+        "symfony/intl": "^5.4|^6.0",
+        "symfony/options-resolver": "^5.4|^6.0",
+        "symfony/property-access": "^5.4|^6.0",
+        "symfony/routing": "^5.4|^6.0",
+        "symfony/security-bundle": "^5.4|^6.0",
+        "symfony/security-csrf" : "^5.4|^6.0",
+        "symfony/translation": "^5.4|^6.0",
+        "symfony/twig-bridge": "^5.4|^6.0",
+        "symfony/twig-bundle": "^5.4|^6.0",
+        "symfony/validator": "^5.4|^6.0",
         "twig/twig": "^2.12.0|^3.0"
     },
     "require-dev": {
@@ -45,13 +45,10 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^8.4.1",
-        "symfony/dom-crawler": "^4.4|^5.0",
-        "symfony/panther": "^1.0",
+        "symfony/dom-crawler": "^5.4|^6.0",
+        "symfony/panther": "^2.0.1",
         "symfony/webpack-encore-bundle": "^1.7.3",
-        "symfony/yaml": "^4.4|^5.0"
-    },
-    "conflict": {
-        "symfony/doctrine-bridge": "4.4.19|5.2.2|5.2.3"
+        "symfony/yaml": "^5.4|^6.0"
     },
     "autoload": {
         "psr-4": { "Ecommit\\CrudBundle\\": "src/" }
diff --git a/src/Controller/AbstractCrudController.php b/src/Controller/AbstractCrudController.php
index c437d26..0719d43 100644
--- a/src/Controller/AbstractCrudController.php
+++ b/src/Controller/AbstractCrudController.php
@@ -19,7 +19,7 @@ abstract class AbstractCrudController extends AbstractController
 {
     use CrudControllerTrait;
 
-    public static function getSubscribedServices()
+    public static function getSubscribedServices(): array
     {
         return array_merge(
             parent::getSubscribedServices(),
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index c1dca9c..de4d152 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -350,7 +350,7 @@ public function setBuildPaginator($value): self
      */
     public function setPersistentSettings(bool $value): self
     {
-        if ($value && !($this->container->get('security.token_storage')->getToken()->getUser() instanceof UserInterface)) {
+        if ($value && (null === $this->container->get('security.token_storage')->getToken() || !($this->container->get('security.token_storage')->getToken()->getUser() instanceof UserInterface))) {
             $value = false;
         }
         $this->persistentSettings = $value;
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index f2b32df..de61a4d 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -41,7 +41,7 @@ public function getResponse(Crud $crud, array $options = []): Response
 
     public function getAjaxResponse(Crud $crud, array $options = []): Response
     {
-        $masterRequest = $this->container->get('request_stack')->getMasterRequest();
+        $masterRequest = $this->container->get('request_stack')->getMainRequest();
         if (!$masterRequest->isXmlHttpRequest()) {
             throw new NotFoundHttpException('Ajax is required');
         }
diff --git a/tests/DependencyInjection/EcommitCrudExtensionTest.php b/tests/DependencyInjection/EcommitCrudExtensionTest.php
index d6c772f..3966fc0 100644
--- a/tests/DependencyInjection/EcommitCrudExtensionTest.php
+++ b/tests/DependencyInjection/EcommitCrudExtensionTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
 
     public function testAutoconfigureTag(): void
     {
-        $crudFilters = self::$container->get(CrudFilters::class);
+        $crudFilters = self::getContainer()->get(CrudFilters::class);
 
         $this->assertTrue($crudFilters->has(MyFilter::class));
     }
diff --git a/tests/Form/DataTransformer/AbstractEntityTransformerTest.php b/tests/Form/DataTransformer/AbstractEntityTransformerTest.php
index eb250b2..1215c40 100644
--- a/tests/Form/DataTransformer/AbstractEntityTransformerTest.php
+++ b/tests/Form/DataTransformer/AbstractEntityTransformerTest.php
@@ -28,7 +28,7 @@ abstract class AbstractEntityTransformerTest extends KernelTestCase
     protected function setUp(): void
     {
         static::bootKernel();
-        $this->em = static::$container->get(ManagerRegistry::class)->getManager();
+        $this->em = static::getContainer()->get(ManagerRegistry::class)->getManager();
     }
 
     protected function tearDown(): void
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTest.php
index 533e8b1..b3941e8 100644
--- a/tests/Form/Filter/AbstractFilterTest.php
+++ b/tests/Form/Filter/AbstractFilterTest.php
@@ -50,8 +50,8 @@ protected function setUp(): void
     {
         static::bootKernel();
 
-        $this->em = static::$container->get(ManagerRegistry::class)->getManager();
-        $this->factory = static::$container->get(FormFactoryInterface::class);
+        $this->em = static::getContainer()->get(ManagerRegistry::class)->getManager();
+        $this->factory = static::getContainer()->get(FormFactoryInterface::class);
 
         $session = $this->createMock(SessionInterface::class);
         $session->expects($this->any())
@@ -75,7 +75,7 @@ protected function setUp(): void
                     return $requestStack;
                 }
 
-                return static::$container->get('ecommit_crud.locator')->get($name);
+                return static::getContainer()->get('ecommit_crud.locator')->get($name);
             });
 
         $this->crudFactory = new CrudFactory($container);
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index 321a3ef..bdcb75f 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -39,8 +39,8 @@ protected function setUp(): void
     {
         static::bootKernel();
 
-        $this->em = static::$container->get(ManagerRegistry::class)->getManager();
-        $this->factory = static::$container->get(FormFactoryInterface::class);
+        $this->em = static::getContainer()->get(ManagerRegistry::class)->getManager();
+        $this->factory = static::getContainer()->get(FormFactoryInterface::class);
     }
 
     protected function tearDown(): void
diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index 2baa1f8..a979c41 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -13,6 +13,7 @@
 
 namespace Ecommit\CrudBundle\Tests\Functional\App\Controller;
 
+use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Controller\AbstractCrudController;
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
@@ -22,7 +23,7 @@ class UserController extends AbstractCrudController
 {
     protected function getCrud(): Crud
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->container->get('doctrine')->getManager();
 
         $queryBuilder = $em->getRepository(TestUser::class)
             ->createQueryBuilder('u')
@@ -39,7 +40,7 @@ protected function getCrud(): Crud
             ->setRoute('user_ajax_crud')
             ->setPersistentSettings(true);
 
-        $request = $this->get('request_stack')->getCurrentRequest();
+        $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('manual-reset')) {
             $crud->raz();
         }
@@ -64,4 +65,11 @@ public function ajaxCrudAction()
     {
         return $this->getAjaxCrudResponse();
     }
+
+    public static function getSubscribedServices(): array
+    {
+        return array_merge(parent::getSubscribedServices(), [
+            'doctrine' => ManagerRegistry::class,
+        ]);
+    }
 }
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index 106c5ed..7b3c38c 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -13,6 +13,7 @@
 
 namespace Ecommit\CrudBundle\Tests\Functional\App\Controller;
 
+use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Crud\CrudFactory;
 use Ecommit\CrudBundle\Crud\CrudResponseGenerator;
@@ -25,13 +26,13 @@ class UserWithoutTraitController extends AbstractController
 {
     protected function getCrud(string $sessionName, array $routeParams = []): Crud
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->container->get('doctrine')->getManager();
 
         $queryBuilder = $em->getRepository(TestUser::class)
             ->createQueryBuilder('u')
             ->select('u');
 
-        $crud = $this->get(CrudFactory::class)->create($sessionName);
+        $crud = $this->container->get(CrudFactory::class)->create($sessionName);
         $crud->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
             ->addColumn('firstName', 'u.firstName', 'first_name')
             ->addColumn('lastName', 'u.lastName', 'last_name')
@@ -42,7 +43,7 @@ protected function getCrud(string $sessionName, array $routeParams = []): Crud
             ->setRoute('user_without_trait_ajax_crud', $routeParams)
             ->setPersistentSettings(true);
 
-        $request = $this->get('request_stack')->getCurrentRequest();
+        $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('manual-reset')) {
             $crud->raz();
         }
@@ -107,10 +108,11 @@ public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResp
         ]);
     }
 
-    public static function getSubscribedServices()
+    public static function getSubscribedServices(): array
     {
         return array_merge(parent::getSubscribedServices(), [
             CrudFactory::class,
+            'doctrine' => ManagerRegistry::class,
         ]);
     }
 }
diff --git a/tests/Functional/App/Kernel.php b/tests/Functional/App/Kernel.php
index a8009fe..f640e52 100644
--- a/tests/Functional/App/Kernel.php
+++ b/tests/Functional/App/Kernel.php
@@ -24,7 +24,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 use Symfony\WebpackEncoreBundle\WebpackEncoreBundle;
 
 class Kernel extends BaseKernel implements CompilerPassInterface
@@ -49,7 +49,7 @@ public function process(ContainerBuilder $container): void
         $container->removeDefinition('debug.argument_resolver');
     }
 
-    public function registerBundles()
+    public function registerBundles(): array
     {
         return [
             new TwigBundle(),
@@ -62,12 +62,12 @@ public function registerBundles()
         ];
     }
 
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
+    protected function configureRoutes(RoutingConfigurator $routes): void
     {
         $routes->import($this->getProjectDir().'/config/routes.yaml');
     }
 
-    public function getProjectDir()
+    public function getProjectDir(): string
     {
         return __DIR__;
     }
diff --git a/tests/Functional/App/config/framework.yaml b/tests/Functional/App/config/framework.yaml
index 5b380ad..b6b17c2 100644
--- a/tests/Functional/App/config/framework.yaml
+++ b/tests/Functional/App/config/framework.yaml
@@ -2,4 +2,5 @@ framework:
     secret: test
     test: true
     session:
-        storage_id: session.storage.mock_file
+        handler_id: null
+        storage_factory_id: session.storage.factory.mock_file
diff --git a/tests/Functional/App/config/security.yaml b/tests/Functional/App/config/security.yaml
index bd0f9e0..31fded0 100644
--- a/tests/Functional/App/config/security.yaml
+++ b/tests/Functional/App/config/security.yaml
@@ -1,5 +1,6 @@
 security:
+    enable_authenticator_manager: true
+
     firewalls:
         main:
             pattern: ^/
-            anonymous: true
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index faf1e60..cd0d540 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -48,9 +48,9 @@ protected function setUp(): void
     {
         self::bootKernel();
 
-        $this->crudExtension = self::$container->get(CrudExtension::class);
-        $this->formFactory = self::$container->get(FormFactoryInterface::class);
-        $this->environment = self::$container->get(Environment::class);
+        $this->crudExtension = self::getContainer()->get(CrudExtension::class);
+        $this->formFactory = self::getContainer()->get(FormFactoryInterface::class);
+        $this->environment = self::getContainer()->get(Environment::class);
     }
 
     public function testFormStartAjax(): void
@@ -758,6 +758,7 @@ protected function createFormView(): FormView
         $builder = $this->formFactory->createBuilder(FormType::class, null, [
             'action' => '/url',
             'method' => 'POST',
+            'csrf_protection' => false,
         ]);
 
         return $builder->getForm()->createView();

From 532f7510e3118282d20031bc8163e0aaa04ac75b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 8 Mar 2022 16:36:11 +0100
Subject: [PATCH 102/264] Fix CS

---
 src/Crud/Crud.php                             | 72 +++++++++----------
 src/Crud/Http/QueryBuilder.php                |  6 +-
 src/Crud/SearchFormBuilder.php                |  4 +-
 .../Entity/AbstractEntityTransformer.php      |  2 +-
 .../Entity/EntitiesToChoicesTransformer.php   |  4 +-
 .../Entity/EntityToChoiceTransformer.php      |  6 +-
 src/Form/Filter/BooleanFilter.php             |  2 +-
 src/Form/Filter/CollectionFilterTrait.php     |  2 +-
 src/Form/Filter/IntegerFilter.php             |  2 +-
 src/Form/Filter/TextFilter.php                |  2 +-
 src/Form/Type/EntityAjaxType.php              |  2 +-
 src/Twig/CrudExtension.php                    | 12 ++--
 tests/Crud/Http/QueryBuilderTest.php          |  4 +-
 .../EntitiesToChoicesTransformerTest.php      |  6 +-
 .../EntitiesToIdsTransformerTest.php          |  8 +--
 .../EntityToChoiceTransformerTest.php         |  6 +-
 .../EntityToIdTransformerTest.php             |  8 +--
 tests/Form/Filter/ChoiceFilterTest.php        | 16 ++---
 tests/Form/Filter/DateFilterTest.php          | 18 ++---
 tests/Form/Filter/EntityAjaxFilterTest.php    | 42 +++++------
 tests/Form/Filter/EntityFilterTest.php        | 34 ++++-----
 tests/Form/Filter/IntegerFilterTest.php       |  6 +-
 tests/Form/Filter/NotNullFilterTest.php       |  6 +-
 tests/Form/Filter/NullFilterTest.php          |  6 +-
 tests/Form/Filter/NumberFilterTest.php        |  6 +-
 tests/Form/Filter/TextFilterTest.php          |  8 +--
 tests/Form/Type/EntityAjaxTypeTest.php        | 28 ++++----
 tests/Functional/App/Kernel.php               |  2 +-
 .../Controller/TestCrudControllerTest.php     | 16 ++---
 29 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index de4d152..12615f0 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -103,7 +103,7 @@ public function init(): void
         }
         $this->initializationInProgress = true;
 
-        //Cheks not empty values
+        // Cheks not empty values
         $checkValues = [
             'availableColumns',
             'availableResultsPerPage',
@@ -123,34 +123,34 @@ public function init(): void
             $this->searchForm->createForm();
         }
 
-        //Loads user values inside this object
+        // Loads user values inside this object
         $this->load();
 
-        //Display or not results
+        // Display or not results
         if ($this->searchForm && $this->displayResultsOnlyIfSearch) {
             $this->displayResults = $this->sessionValues->searchFormIsSubmittedAndValid;
         }
 
         $this->createDisplaySettingsForm();
 
-        //Process request (resultsPerPage, sort, sense, change_columns)
+        // Process request (resultsPerPage, sort, sense, change_columns)
         $this->processRequest();
 
-        //Searcher form: Allocates object
+        // Searcher form: Allocates object
         if ($this->searchForm && !$this->container->get('request_stack')->getCurrentRequest()->query->has('raz')) {
-            //IMPORTANT
-            //We have not to allocate directelly the "$this->sessionValues->searchFormData" object
-            //because otherwise it will be linked to form, and will be updated when the "bind" function will
-            //be called (If form is not valid, the session values will still be updated: Undesirable behavior)
+            // IMPORTANT
+            // We have not to allocate directelly the "$this->sessionValues->searchFormData" object
+            // because otherwise it will be linked to form, and will be updated when the "bind" function will
+            // be called (If form is not valid, the session values will still be updated: Undesirable behavior)
             $values = clone $this->sessionValues->searchFormData;
             try {
                 $this->searchForm->getForm()->setData($values);
             } catch (TransformationFailedException $exception) {
-                //Avoid error if data stored in session is invalid
+                // Avoid error if data stored in session is invalid
             }
         }
 
-        //Saves
+        // Saves
         $this->save();
 
         $this->initializationInProgress = false;
@@ -284,7 +284,7 @@ public function setDefaultPersonalizedSort(array $criterias): self
         $this->defaultPersonalizedSort = $criterias;
 
         $this->defaultSort = 'defaultPersonalizedSort';
-        $this->defaultSense = self::ASC; //Used if not defined in criterias
+        $this->defaultSense = self::ASC; // Used if not defined in criterias
 
         return $this;
     }
@@ -406,7 +406,7 @@ protected function testIfDatabaseMustMeUpdated($oldValue, $new_value): void
      */
     protected function save(): void
     {
-        //Save in session
+        // Save in session
         $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
         $sessionValues = clone $this->sessionValues;
         if (\is_object($this->sessionValues->searchFormData)) {
@@ -414,7 +414,7 @@ protected function save(): void
         }
         $session->set($this->sessionName, $sessionValues);
 
-        //Save in database
+        // Save in database
         if ($this->persistentSettings && $this->updateDatabase) {
             $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
                 [
@@ -425,11 +425,11 @@ protected function save(): void
             $em = $this->container->get('doctrine')->getManager();
 
             if ($objectDatabase) {
-                //Update object in database
+                // Update object in database
                 $objectDatabase->updateFromSessionManager($this->sessionValues);
                 $em->flush();
             } else {
-                //Create object in database only if not default values
+                // Create object in database only if not default values
                 if ($this->sessionValues->displayedColumns != $this->getDefaultDisplayedColumns() ||
                     $this->sessionValues->resultsPerPage != $this->defaultResultsPerPage ||
                     $this->sessionValues->sense != $this->defaultSense ||
@@ -470,7 +470,7 @@ public function getDefaultDisplayedColumns(): array
     protected function load(): void
     {
         $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
-        $object = $session->get($this->sessionName); //Load from session
+        $object = $session->get($this->sessionName); // Load from session
 
         if (!empty($object)) {
             $this->sessionValues = $object;
@@ -479,8 +479,8 @@ protected function load(): void
             return;
         }
 
-        //If session is null => Retrieve from database
-        //Only if persistent settings is enabled
+        // If session is null => Retrieve from database
+        // Only if persistent settings is enabled
         if ($this->persistentSettings) {
             $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
                 [
@@ -499,7 +499,7 @@ protected function load(): void
             }
         }
 
-        //Session and database values are null: Default values;
+        // Session and database values are null: Default values;
         $this->sessionValues->displayedColumns = $this->getDefaultDisplayedColumns();
         $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
         $this->sessionValues->sense = $this->defaultSense;
@@ -514,7 +514,7 @@ protected function load(): void
      */
     protected function checkCrudSession(): void
     {
-        //Forces change => checks
+        // Forces change => checks
         $this->changeNumberResultsDisplayed($this->sessionValues->resultsPerPage);
         $this->changeColumnsDisplayed($this->sessionValues->displayedColumns);
         $this->changeSort($this->sessionValues->sort);
@@ -573,8 +573,8 @@ protected function changeSort($value): void
     {
         $oldValue = $this->sessionValues->sort;
         $availableColumns = $this->availableColumns;
-        if ((is_scalar($value) && \array_key_exists($value, $availableColumns) && $availableColumns[$value]->sortable)
-            || (is_scalar($value) && 'defaultPersonalizedSort' === $value && $this->defaultPersonalizedSort)) {
+        if ((\is_scalar($value) && \array_key_exists($value, $availableColumns) && $availableColumns[$value]->sortable)
+            || (\is_scalar($value) && 'defaultPersonalizedSort' === $value && $this->defaultPersonalizedSort)) {
             $this->sessionValues->sort = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
@@ -591,7 +591,7 @@ protected function changeSort($value): void
     protected function changeSense($value): void
     {
         $oldValue = $this->sessionValues->sense;
-        if (is_scalar($value) && (self::ASC === $value || self::DESC === $value)) {
+        if (\is_scalar($value) && (self::ASC === $value || self::DESC === $value)) {
             $this->sessionValues->sense = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
@@ -624,7 +624,7 @@ protected function changeFilterValues($value): void
      */
     protected function changePage($value): void
     {
-        if (!is_scalar($value)) {
+        if (!\is_scalar($value)) {
             $value = 1;
         }
         $value = (int) $value;
@@ -641,7 +641,7 @@ protected function processRequest(): void
     {
         $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('razsettings')) {
-            //Reset display settings
+            // Reset display settings
             $this->razDisplaySettings();
 
             return;
@@ -704,7 +704,7 @@ protected function razDisplaySettings(): void
         $this->sessionValues->sort = $this->defaultSort;
 
         if ($this->persistentSettings) {
-            //Remove settings in database
+            // Remove settings in database
             $qb = $this->container->get('doctrine')->getManager()->createQueryBuilder();
             $qb->delete('EcommitCrudBundle:UserCrudSettings', 's')
                 ->andWhere('s.user = :user AND s.crudName = :crud_name')
@@ -749,10 +749,10 @@ public function razSort(): void
      */
     public function buildQuery(): void
     {
-        //Builds query
+        // Builds query
         $columnSortId = $this->sessionValues->sort;
         if ('defaultPersonalizedSort' == $columnSortId) {
-            //Default personalised sort is used
+            // Default personalised sort is used
             foreach ($this->defaultPersonalizedSort as $key => $value) {
                 if (\is_int($key)) {
                     $sort = $value;
@@ -766,36 +766,36 @@ public function buildQuery(): void
         } else {
             $columnSortAlias = $this->availableColumns[$columnSortId]->aliasSort;
             if (empty($columnSortAlias)) {
-                //Sort alias is not defined. Alias is used
+                // Sort alias is not defined. Alias is used
                 $columnSortAlias = $this->availableColumns[$columnSortId]->alias;
                 $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
             } elseif (\is_array($columnSortAlias)) {
-                //Sort alias is defined in many columns
+                // Sort alias is defined in many columns
                 foreach ($columnSortAlias as $oneColumnSortAlias) {
                     $this->queryBuilder->addOrderBy($oneColumnSortAlias, $this->sessionValues->sense);
                 }
             } else {
-                //Sort alias is defined in one column
+                // Sort alias is defined in one column
                 $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
             }
         }
 
-        //Adds form searcher filters
+        // Adds form searcher filters
         if ($this->searchForm) {
             $this->searchForm->updateQueryBuilder($this->queryBuilder, $this->sessionValues->searchFormData);
         }
 
-        //Builds paginator
+        // Builds paginator
         if ($this->displayResults) {
             if (\is_object($this->buildPaginator) && $this->buildPaginator instanceof \Closure) {
-                //Case: Manual paginator (by closure) is enabled
+                // Case: Manual paginator (by closure) is enabled
                 $this->paginator = $this->buildPaginator->__invoke(
                     $this->queryBuilder,
                     $this->sessionValues->page,
                     $this->sessionValues->resultsPerPage
                 );
             } elseif (true === $this->buildPaginator || \is_array($this->buildPaginator)) {
-                //Case: Auto paginator is enabled
+                // Case: Auto paginator is enabled
                 $paginatorOptions = [];
                 if (\is_array($this->buildPaginator)) {
                     $paginatorOptions = $this->buildPaginator;
diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index e65a66a..dcb4f7a 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -150,17 +150,17 @@ public function orderBy($sort, $sense): self
 
     public function getResponse(int $page, int $resultsPerPage, array $options = []): ResponseInterface
     {
-        //Add paginator parameters
+        // Add paginator parameters
         if ($this->paginationBuilder) {
             $this->paginationBuilder->__invoke($this, $page, $resultsPerPage);
         }
 
-        //Add sort parameters
+        // Add sort parameters
         if (\count($this->orders) > 0 && $this->orderBuilder) {
             $this->orderBuilder->__invoke($this, $this->orders);
         }
 
-        //Add parameters to client options
+        // Add parameters to client options
         /** @var QueryBuilderQueryParameter $parameter */
         foreach ($this->queryParameters as $parameter) {
             $options['query'][$parameter->name] = $parameter->value;
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index eee984d..dd7c908 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -151,9 +151,9 @@ public function getField(string $property)
 
     public function createForm(): void
     {
-        //Add filters
+        // Add filters
         foreach ($this->filters as $property => $filter) {
-            //Check if column exists
+            // Check if column exists
             $columnId = $filter['options']['column_id'];
             if (!\array_key_exists($columnId, $this->crud->getColumns()) && !\array_key_exists($columnId, $this->crud->getVirtualColumns())) {
                 throw new \Exception(sprintf('Column "%s" not found', $columnId));
diff --git a/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php b/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
index d6fd82b..8558d04 100644
--- a/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
+++ b/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
@@ -46,7 +46,7 @@ protected function getCacheHash($id): string
         if (\is_array($id)) {
             $id = ScalarValues::filterScalarValues($id);
             $id = array_map(function ($child) {
-                return (string) $child; //Converts ids from integer to string => Parameters for transform and reverse functions must be identicals
+                return (string) $child; // Converts ids from integer to string => Parameters for transform and reverse functions must be identicals
             }, $id);
             sort($id);
         } else {
diff --git a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
index 5297ae2..54df04d 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
@@ -77,7 +77,7 @@ public function reverseTransform($identifiers)
         if (\array_key_exists($hash, $this->cachedResults)) {
             $collection = $this->cachedResults[$hash];
         } else {
-            //Result not in cache
+            // Result not in cache
 
             try {
                 $queryBuilderLoader = new ORMQueryBuilderLoader($this->queryBuilder);
@@ -93,7 +93,7 @@ public function reverseTransform($identifiers)
                 throw new TransformationFailedException('Entities not found');
             }
 
-            $this->cachedResults[$hash] = $collection; //Saves result in cache
+            $this->cachedResults[$hash] = $collection; // Saves result in cache
         }
 
         return $collection;
diff --git a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
index b06124e..769ed3c 100644
--- a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
@@ -43,7 +43,7 @@ public function reverseTransform($identifier)
             return null;
         }
 
-        if (!is_scalar($identifier)) {
+        if (!\is_scalar($identifier)) {
             throw new TransformationFailedException('Value is not scalar');
         }
 
@@ -51,7 +51,7 @@ public function reverseTransform($identifier)
         if (\array_key_exists($hash, $this->cachedResults)) {
             $entity = $this->cachedResults[$hash];
         } else {
-            //Result not in cache
+            // Result not in cache
 
             try {
                 $queryBuilderLoader = new ORMQueryBuilderLoader($this->queryBuilder);
@@ -68,7 +68,7 @@ public function reverseTransform($identifier)
             }
 
             $entity = $entities[0];
-            $this->cachedResults[$hash] = $entity; //Saves result in cache
+            $this->cachedResults[$hash] = $entity; // Saves result in cache
         }
 
         return $entity;
diff --git a/src/Form/Filter/BooleanFilter.php b/src/Form/Filter/BooleanFilter.php
index fbd2394..6dfb9cf 100644
--- a/src/Form/Filter/BooleanFilter.php
+++ b/src/Form/Filter/BooleanFilter.php
@@ -36,7 +36,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
 
     public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
     {
-        if (null === $value || '' === $value || !is_scalar($value)) {
+        if (null === $value || '' === $value || !\is_scalar($value)) {
             return;
         }
 
diff --git a/src/Form/Filter/CollectionFilterTrait.php b/src/Form/Filter/CollectionFilterTrait.php
index 4359e91..e73d3f1 100644
--- a/src/Form/Filter/CollectionFilterTrait.php
+++ b/src/Form/Filter/CollectionFilterTrait.php
@@ -59,7 +59,7 @@ protected function updateCollectionQueryBuilder($queryBuilder, string $property,
             }
             QueryBuilderFilter::addMultiFilter($queryBuilder, QueryBuilderFilter::SELECT_IN, $value, $options['alias_search'], $parameterName);
         } else {
-            if (!is_scalar($value)) {
+            if (!\is_scalar($value)) {
                 return;
             }
             $queryBuilder->andWhere(sprintf('%s = :%s', $options['alias_search'], $parameterName))
diff --git a/src/Form/Filter/IntegerFilter.php b/src/Form/Filter/IntegerFilter.php
index 37af333..dd4b8b3 100644
--- a/src/Form/Filter/IntegerFilter.php
+++ b/src/Form/Filter/IntegerFilter.php
@@ -33,7 +33,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
 
     public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
     {
-        if (null === $value || '' === $value || !is_scalar($value) || !$this->testNumberValue($value)) {
+        if (null === $value || '' === $value || !\is_scalar($value) || !$this->testNumberValue($value)) {
             return;
         }
 
diff --git a/src/Form/Filter/TextFilter.php b/src/Form/Filter/TextFilter.php
index a4a8ee1..f23d240 100644
--- a/src/Form/Filter/TextFilter.php
+++ b/src/Form/Filter/TextFilter.php
@@ -35,7 +35,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
 
     public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
     {
-        if (null === $value || '' === $value || !is_scalar($value)) {
+        if (null === $value || '' === $value || !\is_scalar($value)) {
             return;
         }
 
diff --git a/src/Form/Type/EntityAjaxType.php b/src/Form/Type/EntityAjaxType.php
index a899d5d..76b08c6 100644
--- a/src/Form/Type/EntityAjaxType.php
+++ b/src/Form/Type/EntityAjaxType.php
@@ -81,7 +81,7 @@ public function configureOptions(OptionsResolver $resolver): void
             'choice_label' => null,
             'route_params' => [],
             'max_elements' => 10000,
-            'identifier' => null, //Internal
+            'identifier' => null, // Internal
         ]);
 
         $emNormalizer = function (Options $options, $em) {
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index f8ad589..49c24fe 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -224,7 +224,7 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
             'last' => ($paginator->getPage() !== $paginator->getLastPage()) ? $paginator->getLastPage() : null,
         ];
 
-        //Pages before the current page
+        // Pages before the current page
         $limit = ('sliding' == $options['type']) ? $paginator->getPage() - $options['max_pages_before'] : 1;
         for ($page = $limit; $page < $paginator->getPage(); ++$page) {
             if ($page <= $paginator->getLastPage() && $page >= $paginator->getFirstPage()) {
@@ -232,7 +232,7 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
             }
         }
 
-        //Pages after the current page
+        // Pages after the current page
         $limit = ('sliding' == $options['type']) ? $paginator->getPage() + $options['max_pages_after'] : $paginator->getLastPage();
         for ($page = $paginator->getPage() + 1; $page <= $limit; ++$page) {
             if ($page <= $paginator->getLastPage() && $page >= $paginator->getFirstPage()) {
@@ -313,7 +313,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
         $resolver->setAllowedTypes('label', ['null', 'string']);
         $options = $resolver->resolve($this->buildOptions('crud_th', $options, $crud));
 
-        //If the column is not to be shown, returns empty
+        // If the column is not to be shown, returns empty
         $sessionValues = $crud->getSessionValues();
         if (!\in_array($columnId, $sessionValues->displayedColumns)) {
             return '';
@@ -332,7 +332,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
             $options['ajax_options']['update'] = '#'.$crud->getDivIdList();
         }
 
-        //If the label was not defined, we take default label
+        // If the label was not defined, we take default label
         $label = $options['label'];
         if (null === $label) {
             $label = $column->label;
@@ -374,7 +374,7 @@ public function td(Environment $environment, string $columnId, Crud $crud, $valu
         $resolver->setAllowedTypes('td_attr', ['null', 'array']);
         $options = $resolver->resolve($this->buildOptions('crud_td', $options, $crud));
 
-        //If the column is not to be shown, returns empty
+        // If the column is not to be shown, returns empty
         $sessionValues = $crud->getSessionValues();
         if (!\in_array($columnId, $sessionValues->displayedColumns)) {
             return '';
@@ -392,7 +392,7 @@ public function td(Environment $environment, string $columnId, Crud $crud, $valu
 
         $repeatedValue = false;
         if (null !== $options['repeated_values_string']) {
-            $value = (string) $value; //transform to string is important : eg: Twig Markup
+            $value = (string) $value; // transform to string is important : eg: Twig Markup
             if (isset($this->lastTdValues[$crud->getSessionName()][$columnId]) && $this->lastTdValues[$crud->getSessionName()][$columnId] === $value) {
                 if ('' !== $value) {
                     $repeatedValue = true;
diff --git a/tests/Crud/Http/QueryBuilderTest.php b/tests/Crud/Http/QueryBuilderTest.php
index 2f9224d..f56dab7 100644
--- a/tests/Crud/Http/QueryBuilderTest.php
+++ b/tests/Crud/Http/QueryBuilderTest.php
@@ -216,7 +216,7 @@ public function testFull(): void
     protected function createQueryBuider(string $method = 'GET'): QueryBuilder
     {
         $callback = function ($method, $url, $options): MockResponse {
-            //Result : Returns request options
+            // Result : Returns request options
             $result = [
                 'method' => $method,
                 'url' => $url,
@@ -260,7 +260,7 @@ protected function checkRequest(ResponseInterface $response, array $options): vo
         ksort($expectedOptions);
         ksort($options);
 
-        //Remove Content-Length header
+        // Remove Content-Length header
         foreach ($options['headers'] as $index => $header) {
             if (preg_match('/^Content-Length/', $header)) {
                 unset($options['headers'][$index]);
diff --git a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
index a4ba25f..4b5d9c1 100644
--- a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
@@ -50,9 +50,9 @@ public function getTestTransformProvider(): array
         };
 
         return [
-            [null, ['1' => 'tag1', '3' => '3']], //Choice label: null
-            ['name', ['1' => 'tag1', '3' => '3']], //Choice label: property
-            [$closure, [1 => 'name: tag1', '3' => 'name: 3']], //Choice label: closure
+            [null, ['1' => 'tag1', '3' => '3']], // Choice label: null
+            ['name', ['1' => 'tag1', '3' => '3']], // Choice label: property
+            [$closure, [1 => 'name: tag1', '3' => 'name: 3']], // Choice label: closure
         ];
     }
 
diff --git a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
index 91c938d..18f0d7a 100644
--- a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
@@ -33,9 +33,9 @@ public function getTestTransformProvider(): array
         };
 
         return [
-            [null, ['1', '3']], //Choice label: null
-            ['name', ['1', '3']], //Choice label: property
-            [$closure, ['1', '3']], //Choice label: closure
+            [null, ['1', '3']], // Choice label: null
+            ['name', ['1', '3']], // Choice label: property
+            [$closure, ['1', '3']], // Choice label: closure
         ];
     }
 
@@ -49,7 +49,7 @@ public function testTransformWithChoiceLabelError(): void
         $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')->select('e');
         $transformer = $this->createTransformer($queryBuilder, 'id', null, false, 10);
 
-        //No throws exception
+        // No throws exception
         $this->assertSame(['1'], $transformer->transform($collection));
     }
 }
diff --git a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
index 7f625e4..b25b9de 100644
--- a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
@@ -48,9 +48,9 @@ public function getTestTransformProvider(): array
         };
 
         return [
-            [null, ['3' => '3']], //Choice label: null
-            ['name', ['3' => '3']], //Choice label: property
-            [$closure, ['3' => 'name: 3']], //Choice label: closure
+            [null, ['3' => '3']], // Choice label: null
+            ['name', ['3' => '3']], // Choice label: property
+            [$closure, ['3' => 'name: 3']], // Choice label: closure
         ];
     }
 
diff --git a/tests/Form/DataTransformer/EntityToIdTransformerTest.php b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
index ea3a879..2ddd257 100644
--- a/tests/Form/DataTransformer/EntityToIdTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
@@ -32,9 +32,9 @@ public function getTestTransformProvider(): array
         };
 
         return [
-            [null, '3'], //Choice label: null
-            ['name', '3'], //Choice label: property
-            [$closure, '3'], //Choice label: closure
+            [null, '3'], // Choice label: null
+            ['name', '3'], // Choice label: property
+            [$closure, '3'], // Choice label: closure
         ];
     }
 
@@ -45,7 +45,7 @@ public function testTransformWithChoiceLabelError(): void
         $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e')->select('e');
         $transformer = $this->createTransformer($queryBuilder, 'id', null, false);
 
-        //No throws exception
+        // No throws exception
         $this->assertSame('1', $transformer->transform($entity));
     }
 }
diff --git a/tests/Form/Filter/ChoiceFilterTest.php b/tests/Form/Filter/ChoiceFilterTest.php
index c5a9a3e..5180f7d 100644
--- a/tests/Form/Filter/ChoiceFilterTest.php
+++ b/tests/Form/Filter/ChoiceFilterTest.php
@@ -38,17 +38,17 @@ public function testViewAndQueryBuilder($modelData, bool $multiple, $expectedVie
     public function getTestViewAndQueryBuilderProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [null, false, '', null, []],
             ['', false, '', null, []],
             ['2', false, '2', 'e.tag = :value_collectionpropertyName', ['value_collectionpropertyName' => '2']],
-            ['5', false, '', 'e.tag = :value_collectionpropertyName', ['value_collectionpropertyName' => '5']], //Not exists
+            ['5', false, '', 'e.tag = :value_collectionpropertyName', ['value_collectionpropertyName' => '5']], // Not exists
 
-            //Multiple
+            // Multiple
             [null, true, [], null, []],
             [[], true, [], null, []],
             [['2'], true, ['2'], 'e.tag IN (:value_collectionpropertyName)', ['value_collectionpropertyName' => ['2']]],
-            [['5'], true, [], 'e.tag IN (:value_collectionpropertyName)', ['value_collectionpropertyName' => ['5']]], //Not exists
+            [['5'], true, [], 'e.tag IN (:value_collectionpropertyName)', ['value_collectionpropertyName' => ['5']]], // Not exists
         ];
     }
 
@@ -104,12 +104,12 @@ public function testSubmit($submittedData, bool $multiple, $expectedModelData, $
     public function getTestSubmitProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [null, false, null, ''],
             ['', false, null, ''],
             ['1', false, '1', '1'],
 
-            //Multiple
+            // Multiple
             [null, true, [], []],
             [[], true, [], []],
             [['1'], true, ['1'], ['1']],
@@ -141,10 +141,10 @@ public function testSubmitInvalidFormat($submittedData, bool $multiple): void
     public function getTestSubmitInvalidFormatProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [['not-scalar'], false],
 
-            //Multiple
+            // Multiple
             ['not-array', true],
         ];
     }
diff --git a/tests/Form/Filter/DateFilterTest.php b/tests/Form/Filter/DateFilterTest.php
index c6cdc8e..e4cdc40 100644
--- a/tests/Form/Filter/DateFilterTest.php
+++ b/tests/Form/Filter/DateFilterTest.php
@@ -46,7 +46,7 @@ public function testViewAndQueryBuilder($modelData, bool $withTime, string $comp
     public function getTestViewAndQueryBuilderProvider(): array
     {
         $data = [
-            //Null value
+            // Null value
             [null, false, DateFilter::GREATER_THAN, ['year' => '', 'month' => '', 'day' => ''], null, []],
             [null, false, DateFilter::GREATER_EQUAL, ['year' => '', 'month' => '', 'day' => ''], null, []],
             [null, false, DateFilter::SMALLER_THAN, ['year' => '', 'month' => '', 'day' => ''], null, []],
@@ -60,7 +60,7 @@ public function getTestViewAndQueryBuilderProvider(): array
             [null, true, DateFilter::EQUAL, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']], null, []],
         ];
 
-        //Not empty value
+        // Not empty value
         foreach ([new \DateTimeImmutable('2021-04-01 13:10:20'), new \DateTime('2021-04-01 13:10:20')] as $inputDate) {
             $data = array_merge($data, [
                 [$inputDate, false, DateFilter::GREATER_THAN, ['year' => '2021', 'month' => '4', 'day' => '1'], 'e.createdAt > :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 23:59:59']],
@@ -129,12 +129,12 @@ public function testSubmit($withTime, $submittedData, $expectedModelData, $expec
     public function getTestSubmitProvider(): array
     {
         return [
-            //Without time
+            // Without time
             [false, null, null, ['year' => '', 'month' => '', 'day' => '']],
             [false, ['year' => '', 'month' => '', 'day' => ''], null, ['year' => '', 'month' => '', 'day' => '']],
             [false, ['year' => '2021', 'month' => '4', 'day' => '1'], new \DateTime('2021-04-01 00:00:00'), ['year' => '2021', 'month' => '4', 'day' => '1']],
 
-            //With time
+            // With time
             [true, null, null, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']]],
             [true, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']], null, ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']]],
             [true, ['date' => ['year' => '2021', 'month' => '4', 'day' => '1'], 'time' => ['hour' => '13', 'minute' => '10']], new \DateTime('2021-04-01 13:10:00'), ['date' => ['year' => '2021', 'month' => '4', 'day' => '1'], 'time' => ['hour' => '13', 'minute' => '10']]],
@@ -166,7 +166,7 @@ public function getTestSubmitInvalidFormatProvider(): array
     {
         return [
             ['bad-value'],
-            [['year' => '2021', 'month' => '2', 'day' => '31']], //the date does not exist
+            [['year' => '2021', 'month' => '2', 'day' => '31']], // the date does not exist
         ];
     }
 
@@ -197,11 +197,11 @@ public function getTestViewAndQueryBuilderWithSingleTextWidgetProvider(): array
         $inputValue = new \DateTime('2021-04-01 13:10:20');
 
         return [
-            //Null value
+            // Null value
             [null, false, DateFilter::GREATER_THAN, '', null, []],
             [null, true, DateFilter::GREATER_THAN, '', null, []],
 
-            //Not empty value
+            // Not empty value
             [$inputValue, false, DateFilter::GREATER_THAN, '01/04/2021', 'e.createdAt > :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 23:59:59']],
             [$inputValue, true, DateFilter::GREATER_THAN, '01/04/2021 13:10', 'e.createdAt > :value_date_propertyName', ['value_date_propertyName' => '2021-04-01 13:10:20']],
         ];
@@ -238,12 +238,12 @@ public function testSubmitWithSingleTextWidget($withTime, $submittedData, $expec
     public function getTestSubmitWithSingleTextWidgetProvider(): array
     {
         return [
-            //Without time
+            // Without time
             [false, null, null, ''],
             [false, '', null, ''],
             [false, '01/04/2021', new \DateTime('2021-04-01 00:00:00'), '01/04/2021'],
 
-            //With time
+            // With time
             [true, null, null, ''],
             [true, '', null, ''],
             [true, '01/04/2021 13:10', new \DateTime('2021-04-01 13:10:00'), '01/04/2021 13:10'],
diff --git a/tests/Form/Filter/EntityAjaxFilterTest.php b/tests/Form/Filter/EntityAjaxFilterTest.php
index 9aa6049..e7f33e7 100644
--- a/tests/Form/Filter/EntityAjaxFilterTest.php
+++ b/tests/Form/Filter/EntityAjaxFilterTest.php
@@ -54,18 +54,18 @@ public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedVie
     public function getTestViewAndQueryBuilderProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [false, null, null, [1, 2, 3, 4, 5]],
             [false, 2, ['2' => 'tag2'], [1]],
             [false, 5, ['5' => 'tag_name'], [4, 5]],
-            [false, 9999, null, []], //9999 : Entity not found
+            [false, 9999, null, []], // 9999 : Entity not found
 
-            //Multiple
+            // Multiple
             [true, [], [], [1, 2, 3, 4, 5]],
             [true, [2], ['2' => 'tag2'], [1]],
             [true, [2, 3], ['2' => 'tag2', '3' => '3'], [1, 2]],
-            [true, [2, 9999], ['2' => 'tag2'], [1]], //9999 : Entity not found
-            [true, [9999], [], []], //9999 : Entity not found
+            [true, [2, 9999], ['2' => 'tag2'], [1]], // 9999 : Entity not found
+            [true, [9999], [], []], // 9999 : Entity not found
         ];
     }
 
@@ -96,16 +96,16 @@ public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $
     public function getTestSubmitProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [false, null, null, null],
             [false, '', null, null],
             [false, '2', '2', ['2' => 'tag2']],
 
-            //Multiple
+            // Multiple
             [true, [], [], []],
             [true, ['2'], ['2'], ['2' => 'tag2']],
             [true, ['2', '3'], ['2', '3'], ['2' => 'tag2', '3' => '3']],
-            [true, ['2', ['1']], ['2'], ['2' => 'tag2']], //Ignore not scalar
+            [true, ['2', ['1']], ['2'], ['2' => 'tag2']], // Ignore not scalar
         ];
     }
 
@@ -136,15 +136,15 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
     public function getTestSubmitInvalidProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [false, []],
             [false, '99999'],
 
-            //Multiple
+            // Multiple
             [true, '1'],
             [true, ['99999']],
             [true, ['1', '99999']],
-            [true, ['1', '2', '3']], //max elements
+            [true, ['1', '2', '3']], // max elements
         ];
     }
 
@@ -176,7 +176,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
         ]);
         $view = $this->initCrudAndGetFormView($crud);
 
-        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']); //Twig doesn't display invalid list
+        $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']); // Twig doesn't display invalid list
 
         $crud->buildQuery();
         $idsFound = [];
@@ -189,19 +189,19 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
     public function getTestViewWithQueryBuilderProvider(): array
     {
         return [
-            //No multiple - Valid
+            // No multiple - Valid
             [false, false, '4', ['4' => 'tag_name'], [3]],
             [true, false, '4', ['4' => 'tag_name'], [3]],
 
-            //No multiple - Invalid but display results
+            // No multiple - Invalid but display results
             [false, false, '2', null, [1]],
             [true, false, '2', null, [1]],
 
-            //Mutiple - valid
+            // Mutiple - valid
             [false, true, ['4'], ['4' => 'tag_name'], [3]],
             [true, true, ['4'], ['4' => 'tag_name'], [3]],
 
-            //Multiple - Invalid but display results
+            // Multiple - Invalid but display results
             [false, true, ['2'], [], [1]],
             [true, true, ['2'], [], [1]],
         ];
@@ -243,25 +243,25 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
         $this->assertSame($expectedValid, $field->isSynchronized());
         $this->assertSame($expectedValid, $field->isValid());
         $this->assertSame($expectedModelData, $field->getData());
-        $this->assertSame($expectedViewData, $field->getViewData()); //Twig doesn't display invalid list
+        $this->assertSame($expectedViewData, $field->getViewData()); // Twig doesn't display invalid list
     }
 
     public function getTestSubmitWithQueryBuilderProvider(): array
     {
         return [
-            //No multiple - Valid
+            // No multiple - Valid
             [false, false, '4', true, '4', ['4' => 'tag_name']],
             [true, false, '4', true, '4', ['4' => 'tag_name']],
 
-            //No multiple - Invalid
+            // No multiple - Invalid
             [false, false, '2', false, null, '2'],
             [true, false, '2', false, null, '2'],
 
-            //Multiple - Valid
+            // Multiple - Valid
             [false, true, ['4'], true, ['4'], ['4' => 'tag_name']],
             [true, true, ['4'], true, ['4'], ['4' => 'tag_name']],
 
-            //Multiple - Valid
+            // Multiple - Valid
             [false, true, ['2'], false, null, ['2']],
             [true, true, ['2'], false, null, ['2']],
         ];
diff --git a/tests/Form/Filter/EntityFilterTest.php b/tests/Form/Filter/EntityFilterTest.php
index bf1b294..995fa07 100644
--- a/tests/Form/Filter/EntityFilterTest.php
+++ b/tests/Form/Filter/EntityFilterTest.php
@@ -53,18 +53,18 @@ public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedVie
     public function getTestViewAndQueryBuilderProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [false, null, '', [1, 2, 3, 4, 5]],
             [false, 2, '2', [1]],
             [false, 5, '5', [4, 5]],
-            [false, 9999, '', []], //9999 : Entity not found
+            [false, 9999, '', []], // 9999 : Entity not found
 
-            //Multiple
+            // Multiple
             [true, [], [], [1, 2, 3, 4, 5]],
             [true, [2], ['2'], [1]],
             [true, [2, 3], ['2', '3'], [1, 2]],
-            [true, [2, 9999], ['2'], [1]], //9999 : Entity not found
-            [true, [9999], [], []], //9999 : Entity not found
+            [true, [2, 9999], ['2'], [1]], // 9999 : Entity not found
+            [true, [9999], [], []], // 9999 : Entity not found
         ];
     }
 
@@ -94,12 +94,12 @@ public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $
     public function getTestSubmitProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [false, null, null, ''],
             [false, '', null, ''],
             [false, '2', '2', '2'],
 
-            //Multiple
+            // Multiple
             [true, [], [], []],
             [true, ['2'], ['2'], ['2']],
             [true, ['2', '3'], ['2', '3'], ['2', '3']],
@@ -129,11 +129,11 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
     public function getTestSubmitInvalidProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [false, []],
             [false, '99999'],
 
-            //Multiple
+            // Multiple
             [true, '1'],
             [true, ['99999']],
             [true, ['1', '99999']],
@@ -199,19 +199,19 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
     public function getTestViewWithQueryBuilderProvider(): array
     {
         return [
-            //No multiple - Valid
+            // No multiple - Valid
             [false, false, '4', '4', [3]],
             [true, false, '4', '4', [3]],
 
-            //No multiple - Invalid
+            // No multiple - Invalid
             [false, false, '2', '', [1]],
             [true, false, '2', '', [1]],
 
-            //Mutiple - valid
+            // Mutiple - valid
             [false, true, ['4'], ['4'], [3]],
             [true, true, ['4'], ['4'], [3]],
 
-            //Multiple - Invalid
+            // Multiple - Invalid
             [false, true, ['2'], [], [1]],
             [true, true, ['2'], [], [1]],
         ];
@@ -259,19 +259,19 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
     public function getTestSubmitWithQueryBuilderProvider(): array
     {
         return [
-            //No multiple - Valid
+            // No multiple - Valid
             [false, false, '4', true, '4', '4'],
             [true, false, '4', true, '4', '4'],
 
-            //No multiple - Invalid
+            // No multiple - Invalid
             [false, false, '2', false, null, '2'],
             [true, false, '2', false, null, '2'],
 
-            //Multiple - Valid
+            // Multiple - Valid
             [false, true, ['4'], true, ['4'], ['4']],
             [true, true, ['4'], true, ['4'], ['4']],
 
-            //Multiple - Invalid
+            // Multiple - Invalid
             [false, true, ['2'], false, [], []],
             [true, true, ['2'], false, [], []],
         ];
diff --git a/tests/Form/Filter/IntegerFilterTest.php b/tests/Form/Filter/IntegerFilterTest.php
index 098dbec..51d5283 100644
--- a/tests/Form/Filter/IntegerFilterTest.php
+++ b/tests/Form/Filter/IntegerFilterTest.php
@@ -47,21 +47,21 @@ public function testViewAndQueryBuilder($modelData, string $comparator, $expecte
     public function getTestViewAndQueryBuilderProvider(): array
     {
         return [
-            //Null value
+            // Null value
             [null, IntegerFilter::GREATER_THAN, '', null, []],
             [null, IntegerFilter::GREATER_EQUAL, '', null, []],
             [null, IntegerFilter::SMALLER_THAN, '', null, []],
             [null, IntegerFilter::SMALLER_EQUAL, '', null, []],
             [null, IntegerFilter::EQUAL, '', null, []],
 
-            //String value
+            // String value
             ['5', IntegerFilter::GREATER_THAN, '5', 'e.name > :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5', IntegerFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5', IntegerFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5', IntegerFilter::SMALLER_EQUAL, '5', 'e.name <= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5', IntegerFilter::EQUAL, '5', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5']],
 
-            //Int value
+            // Int value
             [5, IntegerFilter::GREATER_THAN, '5', 'e.name > :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             [5, IntegerFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             [5, IntegerFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
diff --git a/tests/Form/Filter/NotNullFilterTest.php b/tests/Form/Filter/NotNullFilterTest.php
index 3118f70..25002b3 100644
--- a/tests/Form/Filter/NotNullFilterTest.php
+++ b/tests/Form/Filter/NotNullFilterTest.php
@@ -22,13 +22,13 @@ class NotNullFilterTest extends NullFilterTest
     public function getTestViewAndQueryBuilderProvider(): array
     {
         return [
-            //Null value
+            // Null value
             [null, false, null, []],
 
-            //Not checked
+            // Not checked
             [false, false, null, []],
 
-            //Checked
+            // Checked
             [true, true, 'e.name IS NOT NULL', []],
         ];
     }
diff --git a/tests/Form/Filter/NullFilterTest.php b/tests/Form/Filter/NullFilterTest.php
index 4567411..ee11e86 100644
--- a/tests/Form/Filter/NullFilterTest.php
+++ b/tests/Form/Filter/NullFilterTest.php
@@ -37,13 +37,13 @@ public function testViewAndQueryBuilder($modelData, $expectedChecked, ?string $w
     public function getTestViewAndQueryBuilderProvider(): array
     {
         return [
-            //Null value
+            // Null value
             [null, false, null, []],
 
-            //Not checked
+            // Not checked
             [false, false, null, []],
 
-            //Checked
+            // Checked
             [true, true, 'e.name IS NULL', []],
         ];
     }
diff --git a/tests/Form/Filter/NumberFilterTest.php b/tests/Form/Filter/NumberFilterTest.php
index 5c22882..68f24e9 100644
--- a/tests/Form/Filter/NumberFilterTest.php
+++ b/tests/Form/Filter/NumberFilterTest.php
@@ -22,21 +22,21 @@ class NumberFilterTest extends IntegerFilterTest
     public function getTestViewAndQueryBuilderProvider(): array
     {
         return [
-            //Null value
+            // Null value
             [null, NumberFilter::GREATER_THAN, '', null, []],
             [null, NumberFilter::GREATER_EQUAL, '', null, []],
             [null, NumberFilter::SMALLER_THAN, '', null, []],
             [null, NumberFilter::SMALLER_EQUAL, '', null, []],
             [null, NumberFilter::EQUAL, '', null, []],
 
-            //String value
+            // String value
             ['5', NumberFilter::GREATER_THAN, '5', 'e.name > :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5', NumberFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5', NumberFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5', NumberFilter::SMALLER_EQUAL, '5', 'e.name <= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5.25', NumberFilter::EQUAL, '5,25', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5.25']],
 
-            //Int value
+            // Int value
             [5, NumberFilter::GREATER_THAN, '5', 'e.name > :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             [5, NumberFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             [5, NumberFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
diff --git a/tests/Form/Filter/TextFilterTest.php b/tests/Form/Filter/TextFilterTest.php
index 38fb5f0..4e7cd92 100644
--- a/tests/Form/Filter/TextFilterTest.php
+++ b/tests/Form/Filter/TextFilterTest.php
@@ -38,25 +38,25 @@ public function testViewAndQueryBuilder($modelData, bool $mustBegin, bool $mustE
     public function getTestViewAndQueryBuilderProvider(): array
     {
         return [
-            //Null value
+            // Null value
             [null, false, false, '', null, []],
             [null, false, true, '', null, []],
             [null, true, false, '', null, []],
             [null, true, true, '', null, []],
 
-            //Empty value
+            // Empty value
             ['', false, false, '', null, []],
             ['', false, true, '', null, []],
             ['', true, false, '', null, []],
             ['', true, true, '', null, []],
 
-            //Not empty value
+            // Not empty value
             ['val', false, false, 'val', 'e.name LIKE :value_text_propertyName', ['value_text_propertyName' => '%val%']],
             ['val', false, true, 'val', 'e.name LIKE :value_text_propertyName', ['value_text_propertyName' => '%val']],
             ['val', true, false, 'val', 'e.name LIKE :value_text_propertyName', ['value_text_propertyName' => 'val%']],
             ['val', true, true, 'val', 'e.name = :value_text_propertyName', ['value_text_propertyName' => 'val']],
 
-            //Escape
+            // Escape
             ['v%a_l', false, false, 'v%a_l', 'e.name LIKE :value_text_propertyName', ['value_text_propertyName' => '%v\%a\_l%']],
         ];
     }
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index bdcb75f..6394f9a 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -87,11 +87,11 @@ public function testView(bool $multiple, $modelData, $dataBuilderName, $expected
     public function getTestViewProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [false, null, 'no-transformation', null],
             [false, 2, 'entity', ['2' => 'tag2']],
 
-            //Multiple
+            // Multiple
             [true, [], 'collection', []],
             [true, [2], 'collection', ['2' => 'tag2']],
             [true, [2, 3], 'collection', ['2' => 'tag2', '3' => '3']],
@@ -121,16 +121,16 @@ public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $
     public function getTestSubmitProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [false, null, null, 'no-transformation', null],
             [false, '', null, 'no-transformation', null],
             [false, '2', 2, 'entity', ['2' => 'tag2']],
 
-            //Multiple
+            // Multiple
             [true, [], [], 'collection', []],
             [true, ['2'], [2], 'collection', ['2' => 'tag2']],
             [true, ['2', '3'], [2, 3], 'collection', ['2' => 'tag2', '3' => '3']],
-            [true, ['2', ['1']], [2], 'collection', ['2' => 'tag2']], //Ignore not scalar
+            [true, ['2', ['1']], [2], 'collection', ['2' => 'tag2']], // Ignore not scalar
         ];
     }
 
@@ -151,21 +151,21 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
         $this->assertFalse($field->isSynchronized());
         $this->assertFalse($field->isValid());
         $this->assertNull($field->getData());
-        $this->assertSame($submittedData, $field->getViewData()); //Twig doesn't display invalid list
+        $this->assertSame($submittedData, $field->getViewData()); // Twig doesn't display invalid list
     }
 
     public function getTestSubmitInvalidProvider(): array
     {
         return [
-            //No multiple
+            // No multiple
             [false, []],
             [false, '99999'],
 
-            //Multiple
+            // Multiple
             [true, '1'],
             [true, ['99999']],
             [true, ['1', '99999']],
-            [true, ['1', '2', '3']], //max elements
+            [true, ['1', '2', '3']], // max elements
         ];
     }
 
@@ -199,25 +199,25 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
         $this->assertSame($expectedValid, $field->isValid());
         $expectedModelData = $this->buildData($this->em, $expectedModelData, $expectedDataBuilderName);
         $this->assertEquals($expectedModelData, $field->getData());
-        $this->assertEquals($expectedViewData, $field->getViewData()); //Twig doesn't display invalid list
+        $this->assertEquals($expectedViewData, $field->getViewData()); // Twig doesn't display invalid list
     }
 
     public function getTestSubmitWithQueryBuilderProvider(): array
     {
         return [
-            //No multiple - Valid
+            // No multiple - Valid
             [false, false, '4', true, 4, 'entity', ['4' => 'tag_name']],
             [true, false, '4', true, 4, 'entity', ['4' => 'tag_name']],
 
-            //No multiple - Invalid
+            // No multiple - Invalid
             [false, false, '2', false, null, 'no-transformation', '2'],
             [true, false, '2', false, null, 'no-transformation', '2'],
 
-            //Multiple - Valid
+            // Multiple - Valid
             [false, true, ['4', '5'], true, [4, 5], 'collection', ['4' => 'tag_name', '5' => 'tag_name']],
             [true, true, ['4', '5'], true, [4, 5], 'collection', ['4' => 'tag_name', '5' => 'tag_name']],
 
-            //Multiple - Invalid
+            // Multiple - Invalid
             [false, true, ['2', '5'], false, null, 'no-transformation', ['2', '5']],
             [true, true, ['2', '5'], false, null, 'no-transformation', ['2', '5']],
         ];
diff --git a/tests/Functional/App/Kernel.php b/tests/Functional/App/Kernel.php
index f640e52..3484386 100644
--- a/tests/Functional/App/Kernel.php
+++ b/tests/Functional/App/Kernel.php
@@ -43,7 +43,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
 
     public function process(ContainerBuilder $container): void
     {
-        //Bug with tests and symfony/stopwatch
+        // Bug with tests and symfony/stopwatch
         $container->removeDefinition('debug.event_dispatcher');
         $container->removeDefinition('debug.controller_resolver');
         $container->removeDefinition('debug.argument_resolver');
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 937f426..bfcfcbd 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -306,7 +306,7 @@ public function testManualRaz(Client $client): Client
     {
         $client->request('GET', static::URL);
 
-        //Display username column
+        // Display username column
         $button = $client->getCrawler()->filterXPath('//button[contains(.,"Display Settings")]');
         $button->first()->click();
         $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::input[@value="username"]')->click();
@@ -314,14 +314,14 @@ public function testManualRaz(Client $client): Client
         $this->waitForAjax($client);
         $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler()));
 
-        //Search
+        // Search
         $form = $client->getCrawler()->filterXPath('//div[@id="crud_search"]/descendant::button[@type="submit" and contains(text(), "Search")]')->form();
         $form['crud_search_'.static::SESSION_NAME.'[firstName]'] = 'Henri';
         $client->submit($form);
         $this->waitForAjax($client);
         $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
 
-        //Manuel RAZ (before CRUD initialization)
+        // Manuel RAZ (before CRUD initialization)
         if (parse_url(static::URL, \PHP_URL_QUERY)) {
             $resetUrl = static::URL.'&manual-reset=1';
         } else {
@@ -329,7 +329,7 @@ public function testManualRaz(Client $client): Client
         }
         $client->request('GET', $resetUrl);
 
-        $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler())); //Reset rows but not columns
+        $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler())); // Reset rows but not columns
 
         return $client;
     }
@@ -341,21 +341,21 @@ public function testManualRazSort(Client $client): Client
     {
         $client->request('GET', static::URL);
 
-        //Search
+        // Search
         $form = $client->getCrawler()->filterXPath('//div[@id="crud_search"]/descendant::button[@type="submit" and contains(text(), "Search")]')->form();
         $form['crud_search_'.static::SESSION_NAME.'[firstName]'] = 'Henri';
         $client->submit($form);
         $this->waitForAjax($client);
         $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
 
-        //Sort
+        // Sort
         $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[text()="last_name"]');
         $link->click();
         $this->waitForAjax($client);
         $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame(['last_name', Crud::ASC], $this->getSort($client->getCrawler()));
 
-        //Manuel RAZ (before CRUD initialization)
+        // Manuel RAZ (before CRUD initialization)
         if (parse_url(static::URL, \PHP_URL_QUERY)) {
             $resetUrl = static::URL.'&manual-reset-sort=1';
         } else {
@@ -363,7 +363,7 @@ public function testManualRazSort(Client $client): Client
         }
         $client->request('GET', $resetUrl);
 
-        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler())); //Not reset display settings and search
+        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler())); // Not reset display settings and search
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
 
         return $client;

From 17511cf3fff5689184f488c90b7f59f7f160b000 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 14 Mar 2022 17:30:02 +0100
Subject: [PATCH 103/264] Upgrade JS dev dependencies

---
 .github/workflows/tests.yml |  2 +-
 karma.conf.js               |  2 +-
 package.json                | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 86d8b8f..b230f1c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -48,7 +48,7 @@ jobs:
 
             -   name: Install system dependencies
                 run: |
-                    sudo rm -rf ~/.nvm && curl -sL "https://deb.nodesource.com/setup_14.x" | sudo -E bash -
+                    sudo rm -rf ~/.nvm && curl -sL "https://deb.nodesource.com/setup_16.x" | sudo -E bash -
                     sudo apt-get install -y nodejs
                     sudo npm install -g yarn
                     sudo apt-get install xvfb
diff --git a/karma.conf.js b/karma.conf.js
index 3dd0689..1d8efa4 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -22,7 +22,7 @@ for (const rule of webpackConfig.module.rules) {
 // Karma options
 module.exports = function(config) {
     config.set({
-        frameworks: ['jasmine-ajax', 'jasmine'],
+        frameworks: ['jasmine-ajax', 'jasmine', 'webpack'],
         browserConsoleLogOptions: {
             level: 'log',
             terminal: false //Remove console.* logs
diff --git a/package.json b/package.json
index c8fb4c6..6ba6bd3 100644
--- a/package.json
+++ b/package.json
@@ -4,21 +4,21 @@
   },
   "devDependencies": {
     "@ecommit/crud-bundle": "link:src/Resources/assets",
-    "@symfony/webpack-encore": "^0.29.1",
+    "@symfony/webpack-encore": "^1.8",
     "core-js": "^3.0.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-promise": "^6.0",
     "install": "^0.13.0",
-    "jasmine": "^3.0",
-    "karma": "^4.0",
-    "karma-firefox-launcher": "^1.3",
-    "karma-jasmine": "^3.0",
+    "jasmine": "^4.0",
+    "karma": "^6.0",
+    "karma-firefox-launcher": "^2.0",
+    "karma-jasmine": "^4.0",
     "karma-jasmine-ajax": "^0.1.13",
     "karma-spec-reporter": "^0.0.32",
-    "karma-webpack": "^4.0",
+    "karma-webpack": "^5.0",
     "webpack-notifier": "^1.6.0"
   },
   "private": true

From 736172ede22e47e4d09ba469384f76b9ef689f67 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 27 Mar 2022 20:43:17 +0200
Subject: [PATCH 104/264] [UserCrudSettings] Edit sort length to 100

---
 doc/upgrade/3.0.md              | 7 +++++++
 src/Crud/Crud.php               | 2 +-
 src/Entity/UserCrudSettings.php | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 7a9036c..211064d 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -23,6 +23,13 @@
 
 
 
+## UserCrudSettings
+
+* La colonne `sort` de la table `user_crud_settings` a maintenant une longueur de 100 caractères (30 avant). Mettre à jour
+  la base de données
+
+
+
 ## Contrôleur
 
 **Namespace: Ecommit\CrudBundle\Controller**
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 12615f0..5874bfc 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -183,7 +183,7 @@ public function initIfNecessary(): void
      */
     public function addColumn(string $id, string $alias, string $label, array $options = []): self
     {
-        if (mb_strlen($id) > 30) {
+        if (mb_strlen($id) > 100) {
             throw new \Exception('Column id is too long');
         }
 
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index 8edb7ff..a8cbc13 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -45,7 +45,7 @@ class UserCrudSettings
     protected $displayedColumns = [];
 
     /**
-     * @ORM\Column(type="string", length=30)
+     * @ORM\Column(type="string", length=100)
      */
     protected $sort;
 

From 6434337b45f5bb1f2a94d0bf0296fb6761ab4889 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 30 Mar 2022 09:40:02 +0200
Subject: [PATCH 105/264] Upgrade annotations to attributes

---
 composer.json                                 |  5 ++-
 src/Entity/UserCrudSettings.php               | 34 ++++++-------------
 .../Functional/App/Entity/EntityManyToOne.php | 22 ++++--------
 tests/Functional/App/Entity/Tag.php           | 14 +++-----
 tests/Functional/App/Entity/TestUser.php      | 26 +++++---------
 tests/Functional/App/config/doctrine.yaml     |  1 -
 6 files changed, 30 insertions(+), 72 deletions(-)

diff --git a/composer.json b/composer.json
index c20f123..ffd68c8 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,8 @@
     "require": {
         "php": "^8.0",
         "ext-mbstring": "*",
-        "doctrine/doctrine-bundle": "^1.12.3|^2.0.3",
-        "doctrine/orm": "^2.6.4",
+        "doctrine/doctrine-bundle": "^2.4",
+        "doctrine/orm": "^2.9",
         "doctrine/persistence": "^1.3|^2.0",
         "ecommit/doctrine-utils": "1.0.x-dev",
         "ecommit/paginator": "1.0.x-dev",
@@ -41,7 +41,6 @@
     },
     "require-dev": {
         "dbrekelmans/bdi": "^0.3.0",
-        "doctrine/annotations": "^1.7",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^8.4.1",
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index a8cbc13..3f5215d 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -16,42 +16,28 @@
 use Doctrine\ORM\Mapping as ORM;
 use Ecommit\CrudBundle\Crud\CrudSession;
 
-/**
- * @ORM\Entity
- * @ORM\Table(name="user_crud_settings")
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'user_crud_settings')]
 class UserCrudSettings
 {
-    /**
-     * @ORM\Id
-     * @ORM\ManyToOne(targetEntity="Ecommit\CrudBundle\Entity\UserCrudInterface")
-     */
+    #[ORM\Id]
+    #[ORM\ManyToOne(targetEntity: 'Ecommit\CrudBundle\Entity\UserCrudInterface')]
     protected $user;
 
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="string", length=255, name="crud_name")
-     */
+    #[ORM\Id]
+    #[ORM\Column(type: 'string', length: 255, name: 'crud_name')]
     protected $crudName;
 
-    /**
-     * @ORM\Column(type="integer", name="results_displayed")
-     */
+    #[ORM\Column(type: 'integer', name: 'results_displayed')]
     protected $resultsDisplayed;
 
-    /**
-     * @ORM\Column(type="array", name="displayed_columns")
-     */
+    #[ORM\Column(type: 'array', name: 'displayed_columns')]
     protected $displayedColumns = [];
 
-    /**
-     * @ORM\Column(type="string", length=100)
-     */
+    #[ORM\Column(type: 'string', length: 100)]
     protected $sort;
 
-    /**
-     * @ORM\Column(type="string", length=4)
-     */
+    #[ORM\Column(type: 'string', length: 4)]
     protected $sense;
 
     /**
diff --git a/tests/Functional/App/Entity/EntityManyToOne.php b/tests/Functional/App/Entity/EntityManyToOne.php
index 664fc6a..4325c33 100644
--- a/tests/Functional/App/Entity/EntityManyToOne.php
+++ b/tests/Functional/App/Entity/EntityManyToOne.php
@@ -15,30 +15,20 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity
- */
+#[ORM\Entity]
 class EntityManyToOne
 {
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
     protected $id;
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
+    #[ORM\Column(type: 'string', length: 255)]
     protected $name;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Tag")
-     */
+    #[ORM\ManyToOne(targetEntity: 'Tag')]
     protected $tag;
 
-    /**
-     * @ORM\Column(type="datetime")
-     */
+    #[ORM\Column(type: 'datetime')]
     protected $createdAt;
 
     public function __construct(int $id, string $name, Tag $tag)
diff --git a/tests/Functional/App/Entity/Tag.php b/tests/Functional/App/Entity/Tag.php
index f6eb856..8451c58 100644
--- a/tests/Functional/App/Entity/Tag.php
+++ b/tests/Functional/App/Entity/Tag.php
@@ -15,20 +15,14 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity
- */
+#[ORM\Entity]
 class Tag
 {
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
     protected $id;
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
+    #[ORM\Column(type: 'string', length: 255)]
     protected $name;
 
     public function __construct(int $id, string $name)
diff --git a/tests/Functional/App/Entity/TestUser.php b/tests/Functional/App/Entity/TestUser.php
index 71f88f0..0ed6c51 100644
--- a/tests/Functional/App/Entity/TestUser.php
+++ b/tests/Functional/App/Entity/TestUser.php
@@ -16,32 +16,22 @@
 use Doctrine\ORM\Mapping as ORM;
 use Ecommit\CrudBundle\Entity\UserCrudInterface;
 
-/**
- * @ORM\Entity
- * @ORM\Table(name="user")
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'user')]
 class TestUser implements UserCrudInterface
 {
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
     protected $userId;
 
-    /**
-     * @ORM\Column(type="string", length=180, unique=true)
-     */
+    #[ORM\Column(type: 'string', length: 180, unique: true)]
     protected $username;
 
-    /**
-     * @ORM\Column(type="string", length=30)
-     */
+    #[ORM\Column(type: 'string', length: 30)]
     protected $firstName;
 
-    /**
-     * @ORM\Column(type="string", length=30)
-     */
+    #[ORM\Column(type: 'string', length: 30)]
     protected $lastName;
 
     /*
diff --git a/tests/Functional/App/config/doctrine.yaml b/tests/Functional/App/config/doctrine.yaml
index b868db7..0f4e29d 100644
--- a/tests/Functional/App/config/doctrine.yaml
+++ b/tests/Functional/App/config/doctrine.yaml
@@ -14,7 +14,6 @@ doctrine:
                 mappings:
                     App:
                         is_bundle: false
-                        type: annotation
                         dir: '%kernel.project_dir%/Entity'
                         prefix: 'Ecommit\CrudBundle\Tests\Functional\App\Entity'
                 naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware

From a6504f2f19b9988829964b8b769106fdab893290 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 31 Mar 2022 15:37:33 +0200
Subject: [PATCH 106/264] Add Fontawesome 5&6

---
 doc/install.md                                |  6 +++-
 .../IconTheme/fontawesome5_solid.html.twig    | 31 +++++++++++++++++++
 .../IconTheme/fontawesome6_solid.html.twig    | 31 +++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/Resources/views/IconTheme/fontawesome5_solid.html.twig
 create mode 100644 src/Resources/views/IconTheme/fontawesome6_solid.html.twig

diff --git a/doc/install.md b/doc/install.md
index a01d617..12ff0d7 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -11,6 +11,8 @@ Prérequis :
     * Votre thème personnalisé (créer un thème Twig qui hérite `@EcommitCrud/Theme/base.html.twig`)
 * Un gestionnaire d'icones chargé par Webpack Encore parmi :
     * Fontawesome 4
+    * Fontawesome 5 Solid
+    * Fontawesome 6 Solid
     * Votre thème personnalisé (créer un thème Twig qui hérite `@EcommitCrud/IconTheme/base.html.twig`)
 
 Installez le bundle avec Composer : A la racine de votre projet Symfony, éxécutez la commande suivante :
@@ -45,8 +47,10 @@ ecommit_crud:
     #Themes disponibles :
     #@EcommitCrud/IconTheme/base.html.twig
     #@EcommitCrud/IconTheme/fontawesome4.html.twig (fontawesome4 requis)
+    #@EcommitCrud/IconTheme/fontawesome5_solid.html.twig (fontawesome5 Solid requis)
+    #@EcommitCrud/IconTheme/fontawesome6_solid.html.twig (fontawesome5 Solid requis)
     #Ou faire son propre terme (doit hériter de l'un des thèmes précédents)
-    icon_theme: '@EcommitCrud/IconTheme/fontawesome4.html.twig'
+    icon_theme: '@EcommitCrud/IconTheme/fontawesome6_solid.html.twig'
 ```
 
 Votre entité Doctrine "utilisateur" doit implémenter l'interface `Ecommit\CrudBundle\Entity\UserCrudInterface`. Exemple :
diff --git a/src/Resources/views/IconTheme/fontawesome5_solid.html.twig b/src/Resources/views/IconTheme/fontawesome5_solid.html.twig
new file mode 100644
index 0000000..6465194
--- /dev/null
+++ b/src/Resources/views/IconTheme/fontawesome5_solid.html.twig
@@ -0,0 +1,31 @@
+{% use '@EcommitCrud/IconTheme/base.html.twig' %}
+
+{% block asc %}
+    {% apply spaceless %}
+        <i class="fas fa-sort-alpha-down"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block desc %}
+    {% apply spaceless %}
+        <i class="fas fa-sort-alpha-down-alt"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block display_settings %}
+    {% apply spaceless %}
+        <i class="fas fa-cog" aria-hidden="true"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block search %}
+    {% apply spaceless %}
+        <i class="fas fa-search" aria-hidden="true"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block reset %}
+    {% apply spaceless %}
+        <i class="fas fa-fire" aria-hidden="true"></i>
+    {% endapply %}
+{% endblock %}
diff --git a/src/Resources/views/IconTheme/fontawesome6_solid.html.twig b/src/Resources/views/IconTheme/fontawesome6_solid.html.twig
new file mode 100644
index 0000000..c0720fd
--- /dev/null
+++ b/src/Resources/views/IconTheme/fontawesome6_solid.html.twig
@@ -0,0 +1,31 @@
+{% use '@EcommitCrud/IconTheme/base.html.twig' %}
+
+{% block asc %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-arrow-down-a-z"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block desc %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-arrow-down-z-a"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block display_settings %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-gear" aria-hidden="true"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block search %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block reset %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-fire" aria-hidden="true"></i>
+    {% endapply %}
+{% endblock %}

From e5f52c7aa63416f34d99424e2e66f42074385e38 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 31 Mar 2022 15:45:57 +0200
Subject: [PATCH 107/264] Add Bootstrap 4&5

---
 doc/install.md                                |   9 +-
 .../assets/js/modal/engine/bootstrap4.js      |  18 +++
 .../assets/js/modal/engine/bootstrap5.js      |  36 ++++++
 .../views/Theme/bootstrap4.html.twig          | 116 ++++++++++++++++++
 .../views/Theme/bootstrap5.html.twig          | 114 +++++++++++++++++
 5 files changed, 290 insertions(+), 3 deletions(-)
 create mode 100644 src/Resources/assets/js/modal/engine/bootstrap4.js
 create mode 100644 src/Resources/assets/js/modal/engine/bootstrap5.js
 create mode 100644 src/Resources/views/Theme/bootstrap4.html.twig
 create mode 100644 src/Resources/views/Theme/bootstrap5.html.twig

diff --git a/doc/install.md b/doc/install.md
index 12ff0d7..63ef8d6 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -40,8 +40,10 @@ ecommit_crud:
     #Themes disponibles :
     #@EcommitCrud/Theme/base.html.twig
     #@EcommitCrud/Theme/bootstrap3.html.twig (boostrap3 requis)
+    #@EcommitCrud/Theme/bootstrap4.html.twig (boostrap4 requis)
+    #@EcommitCrud/Theme/bootstrap5.html.twig (boostrap5 requis)
     #Ou faire son propre terme (doit hériter de l'un des thèmes précédents)
-    theme: '@EcommitCrud/Theme/bootstrap3.html.twig'
+    theme: '@EcommitCrud/Theme/bootstrap5.html.twig'
 
     #Theme pour les icones
     #Themes disponibles :
@@ -87,8 +89,9 @@ Dans votre entrée principale [Webpack Encore](https://symfony.com/doc/current/f
 //Exemple dans assets/js/app.js
 import '@ecommit/crud-bundle/js/crud';
 import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager';
-//Bootstrap3 requis (et chargé via Webpack Encore)
-var modalEngine = require('@ecommit/crud-bundle/js/modal/engine/bootstrap3');
+//Choix du moteur de modal (exemple avec Boostrap5)
+//Bootstrap5 requis (et chargé via Webpack Encore)
+var modalEngine = require('@ecommit/crud-bundle/js/modal/engine/bootstrap5');
 modalManager.defineEngine(modalEngine);
 ```
 
diff --git a/src/Resources/assets/js/modal/engine/bootstrap4.js b/src/Resources/assets/js/modal/engine/bootstrap4.js
new file mode 100644
index 0000000..804ab3c
--- /dev/null
+++ b/src/Resources/assets/js/modal/engine/bootstrap4.js
@@ -0,0 +1,18 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import * as bootstrap3 from './bootstrap3'
+
+export function openModal (options) {
+  bootstrap3.openModal(options)
+}
+
+export function closeModal (element) {
+  bootstrap3.closeModal(element)
+}
diff --git a/src/Resources/assets/js/modal/engine/bootstrap5.js b/src/Resources/assets/js/modal/engine/bootstrap5.js
new file mode 100644
index 0000000..01c0c39
--- /dev/null
+++ b/src/Resources/assets/js/modal/engine/bootstrap5.js
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import $ from 'jquery'
+import { Modal } from 'bootstrap'
+import runCallback from '../../callback'
+
+export function openModal (options) {
+  // Suppression des événements
+  $(options.element).off('shown.bs.modal')
+  $(options.element).off('hide.bs.modal')
+
+  $(options.element).on('shown.bs.modal', function (e) {
+    runCallback(options.onOpen, $(options.element))
+  })
+
+  $(options.element).on('hide.bs.modal', function (e) {
+    runCallback(options.onClose, $(options.element))
+  })
+
+  const modal = new Modal($(options.element), {
+    focus: true
+  })
+  modal.show()
+}
+
+export function closeModal (element) {
+  const modal = Modal.getInstance($(element))
+  modal.hide()
+}
diff --git a/src/Resources/views/Theme/bootstrap4.html.twig b/src/Resources/views/Theme/bootstrap4.html.twig
new file mode 100644
index 0000000..9b70c40
--- /dev/null
+++ b/src/Resources/views/Theme/bootstrap4.html.twig
@@ -0,0 +1,116 @@
+{% use '@EcommitCrud/Theme/base.html.twig' %}
+
+{# paginator_links / crud_paginator_links #}
+
+{% block paginator_links %}
+    {% set ul_attr = ul_attr|merge({class: (ul_attr.class|default('') ~ ' pagination')|trim}) %}
+    {{ parent() }}
+{% endblock %}
+
+{% block paginator_links_current_page %}
+    {% set li_attr_child = li_attr.current_page|merge({class: (li_attr.current_page.class|default('') ~ ' active')|trim}) %}
+    {% set li_attr = li_attr|merge({current_page: li_attr_child}) %}
+    {{ parent() }}
+{% endblock %}
+
+{% block paginator_links_page %}
+    {% if page %}
+        {% set li_attr_child = li_attr_child|default([])|merge({class: (li_attr_child.class|default('') ~ ' page-item')|trim}) %}
+        {% set a_attr_child = a_attr_child|default([])|merge({class: (a_attr_child.class|default('') ~ ' page-link')|trim}) %}
+        {{ parent() }}
+    {% endif %}
+{% endblock %}
+
+{# Display settings #}
+
+{% block display_settings_button %}
+    {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-secondary btn-sm')|trim}) %}
+    {{ parent() }}
+{% endblock %}
+
+{% block display_settings_button_modal %}
+    {% set button_attr = {'data-modal': '1'} %}
+    {{ block('display_settings_button', template_name) }}
+{% endblock %}
+
+{% block display_settings_container_modal %}
+    {% set display_settings_container_attributes = display_settings_container_attributes|default({})|merge({class: (display_settings_container_attributes.class|default('') ~ ' modal fade')|trim, 'data-modal': '1', 'style': 'display: none;', 'role': 'dialog'}) %}
+    <div{% with { attr: display_settings_container_attributes } %}{{ block('attributes', template_name) }}{% endwith %}>
+        {{ block('display_settings_content_modal', template_name) }}
+    </div>
+{% endblock %}
+
+{% block display_settings_content_modal %}
+    {% form_theme form 'bootstrap_4_layout.html.twig' %}
+    {% set display_settings_text = display_settings_text|default('display_settings.title'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_check_all_text = display_settings_check_all_text|default('display_settings.check_all'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_uncheck_all_text = display_settings_uncheck_all_text|default('display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle')) %}
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4>{{ display_settings_text }}</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            {{ form_start(form) }}
+            <div class="modal-body">
+                {{ form_row(form.resultsPerPage) }}
+                {{ form_row(form.displayedColumns) }}
+                <div>
+                    <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+                    &nbsp;
+                    <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+                </div>
+            </div>
+            <div class="modal-footer">
+                {{ form_widget(form.reset, {'attr': {'class': 'btn-outline-secondary'}}) }}
+                {{ form_widget(form.save, {'attr': {'class': 'btn-success'}}) }}
+            </div>
+            {{ form_end(form) }}
+        </div>
+    </div>
+{% endblock %}
+
+{% block display_settings_content_without_modal %}
+    {% form_theme form 'bootstrap_4_layout.html.twig' %}
+    {% set display_settings_text = display_settings_text|default('display_settings.title'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_check_all_text = display_settings_check_all_text|default('display_settings.check_all'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_uncheck_all_text = display_settings_uncheck_all_text|default('display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle')) %}
+    <div>
+        <h4>{{ display_settings_text }}</h4>
+
+        {{ form_start(form) }}
+        {{ form_row(form.resultsPerPage) }}
+        {{ form_row(form.displayedColumns) }}
+        <div>
+            <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+            &nbsp;
+            <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+        </div>
+
+        <div style="text-align: center;">
+            {{ form_row(form.reset, {'attr': {'class': 'btn-outline-secondary'}}) }}
+            {{ form_row(form.save, {'attr': {'class': 'btn-success'}}) }}
+        </div>
+        {{ form_end(form) }}
+    </div>
+{% endblock %}
+
+{# search_form_submit #}
+
+{% block search_form_submit %}
+    {% apply spaceless %}
+        {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-outline-secondary btn-sm')|trim}) %}
+        {{ parent() }}
+    {% endapply %}
+{% endblock %}
+
+{# search_form_reset #}
+
+{% block search_form_reset %}
+    {% apply spaceless %}
+        {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-outline-secondary btn-sm')|trim}) %}
+        {{ parent() }}
+    {% endapply %}
+{% endblock %}
diff --git a/src/Resources/views/Theme/bootstrap5.html.twig b/src/Resources/views/Theme/bootstrap5.html.twig
new file mode 100644
index 0000000..46c657d
--- /dev/null
+++ b/src/Resources/views/Theme/bootstrap5.html.twig
@@ -0,0 +1,114 @@
+{% use '@EcommitCrud/Theme/base.html.twig' %}
+
+{# paginator_links / crud_paginator_links #}
+
+{% block paginator_links %}
+    {% set ul_attr = ul_attr|merge({class: (ul_attr.class|default('') ~ ' pagination')|trim}) %}
+    {{ parent() }}
+{% endblock %}
+
+{% block paginator_links_current_page %}
+    {% set li_attr_child = li_attr.current_page|merge({class: (li_attr.current_page.class|default('') ~ ' active')|trim}) %}
+    {% set li_attr = li_attr|merge({current_page: li_attr_child}) %}
+    {{ parent() }}
+{% endblock %}
+
+{% block paginator_links_page %}
+    {% if page %}
+        {% set li_attr_child = li_attr_child|default([])|merge({class: (li_attr_child.class|default('') ~ ' page-item')|trim}) %}
+        {% set a_attr_child = a_attr_child|default([])|merge({class: (a_attr_child.class|default('') ~ ' page-link')|trim}) %}
+        {{ parent() }}
+    {% endif %}
+{% endblock %}
+
+{# Display settings #}
+
+{% block display_settings_button %}
+    {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-secondary btn-sm')|trim}) %}
+    {{ parent() }}
+{% endblock %}
+
+{% block display_settings_button_modal %}
+    {% set button_attr = {'data-modal': '1'} %}
+    {{ block('display_settings_button', template_name) }}
+{% endblock %}
+
+{% block display_settings_container_modal %}
+    {% set display_settings_container_attributes = display_settings_container_attributes|default({})|merge({class: (display_settings_container_attributes.class|default('') ~ ' modal fade')|trim, 'data-modal': '1', 'style': 'display: none;', 'role': 'dialog'}) %}
+    <div{% with { attr: display_settings_container_attributes } %}{{ block('attributes', template_name) }}{% endwith %}>
+        {{ block('display_settings_content_modal', template_name) }}
+    </div>
+{% endblock %}
+
+{% block display_settings_content_modal %}
+    {% form_theme form 'bootstrap_5_layout.html.twig' %}
+    {% set display_settings_text = display_settings_text|default('display_settings.title'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_check_all_text = display_settings_check_all_text|default('display_settings.check_all'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_uncheck_all_text = display_settings_uncheck_all_text|default('display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle')) %}
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4>{{ display_settings_text }}</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            {{ form_start(form) }}
+            <div class="modal-body">
+                {{ form_row(form.resultsPerPage) }}
+                {{ form_row(form.displayedColumns) }}
+                <div>
+                    <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+                    &nbsp;
+                    <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+                </div>
+            </div>
+            <div class="modal-footer">
+                {{ form_widget(form.reset, {'attr': {'class': 'btn-outline-secondary'}}) }}
+                {{ form_widget(form.save, {'attr': {'class': 'btn-success'}}) }}
+            </div>
+            {{ form_end(form) }}
+        </div>
+    </div>
+{% endblock %}
+
+{% block display_settings_content_without_modal %}
+    {% form_theme form 'bootstrap_5_layout.html.twig' %}
+    {% set display_settings_text = display_settings_text|default('display_settings.title'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_check_all_text = display_settings_check_all_text|default('display_settings.check_all'|trans({}, 'EcommitCrudBundle')) %}
+    {% set display_settings_uncheck_all_text = display_settings_uncheck_all_text|default('display_settings.uncheck_all'|trans({}, 'EcommitCrudBundle')) %}
+    <div>
+        <h4>{{ display_settings_text }}</h4>
+
+        {{ form_start(form) }}
+        {{ form_row(form.resultsPerPage) }}
+        {{ form_row(form.displayedColumns) }}
+        <div>
+            <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+            &nbsp;
+            <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+        </div>
+
+        <div style="text-align: center;">
+            {{ form_row(form.reset, {'attr': {'class': 'btn-outline-secondary'}}) }}
+            {{ form_row(form.save, {'attr': {'class': 'btn-success'}}) }}
+        </div>
+        {{ form_end(form) }}
+    </div>
+{% endblock %}
+
+{# search_form_submit #}
+
+{% block search_form_submit %}
+    {% apply spaceless %}
+        {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-outline-secondary btn-sm')|trim}) %}
+        {{ parent() }}
+    {% endapply %}
+{% endblock %}
+
+{# search_form_reset #}
+
+{% block search_form_reset %}
+    {% apply spaceless %}
+        {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' btn btn-outline-secondary btn-sm')|trim}) %}
+        {{ parent() }}
+    {% endapply %}
+{% endblock %}

From 6ff5a142181a76334dc841338d4476811c89ba4c Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 4 Apr 2022 10:20:02 +0200
Subject: [PATCH 108/264] Keep queryBuilder after clearTemplate

---
 src/Crud/Crud.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 5874bfc..bf3ac9b 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -824,7 +824,6 @@ public function getDefaultResultsPerPage(): ?int
      */
     public function clearTemplate(): void
     {
-        $this->queryBuilder = null;
         if ($this->searchForm) {
             $this->searchForm->createFormView();
             $this->searchForm = $this->searchForm->getForm();

From 135396cbe3ebc1fb379ffd89ca5567355f9621ed Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 4 Apr 2022 10:24:42 +0200
Subject: [PATCH 109/264] Fix searchFormIsSubmittedAndValid after raz

---
 src/Crud/Crud.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index bf3ac9b..2e40f4d 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -724,6 +724,7 @@ public function raz(): void
             $newValue = clone $this->searchForm->getDefaultData();
             $this->changeFilterValues($newValue);
             $this->searchForm->getForm()->setData(clone $newValue);
+            $this->sessionValues->searchFormIsSubmittedAndValid = false;
         }
         $this->changePage(1);
         $this->save();

From 1773e3fea0e972b6d6861ae5305cba204588f53e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 4 Apr 2022 15:30:46 +0200
Subject: [PATCH 110/264] [Filters] Add update_query_builder option

---
 doc/references/filters.md      | 3 ++-
 src/Crud/SearchFormBuilder.php | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/references/filters.md b/doc/references/filters.md
index 8899c01..ab3a724 100644
--- a/doc/references/filters.md
+++ b/doc/references/filters.md
@@ -9,11 +9,12 @@
 
 | Option | Description | Requis  | Valeur par défaut |
 | ------ | ----------- | --------| ----------------- |
-| column_id | ID de la colonne du CRUD associée | Non | Nom du filtre 
+| column_id | ID de la colonne du CRUD associée | Non | Nom du filtre |
 | autovalidate | Si `true`, active la validation automatique (en fonction du filtre utilisé) | Non | [Valeur de autovalidate du formulaire](searcher.md) |
 | validation_groups | Groupe de validation | Non | [Valeur de validation_groups du formulaire](searcher.md) |
 | required | Si `true`, filtre obligatoire | Non | Non |
 | type_options | Options du champs du formulaire Symfony généré | Non | [ ] |
+| update_query_builder | Si non nul, surchage la méthode `updateQueryBuilder` du filtre | Non | Null |
 
 
 ## BooleanFilter
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index dd7c908..f440b6e 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -99,6 +99,7 @@ public function addFilter(string $property, string $filter, array $options = [])
             'validation_groups' => $this->options['validation_groups'],
             'required' => false,
             'type_options' => [],
+            'update_query_builder' => null,
             'alias_search' => function (Options $options) {
                 $columns = $this->crud->getColumns();
                 if (\array_key_exists($options['column_id'], $columns)) {
@@ -126,6 +127,7 @@ public function addFilter(string $property, string $filter, array $options = [])
                 return null;
             },
         ]);
+        $resolver->setAllowedTypes('update_query_builder', ['null', 'callable']);
         $filterService->configureOptions($resolver);
         $resolvedOptions = $resolver->resolve($options);
 
@@ -199,7 +201,11 @@ public function updateQueryBuilder($queryBuilder, SearcherInterface $searcher):
             if (!$filterService->supportsQueryBuilder($queryBuilder)) {
                 throw new \Exception('"%s" filter does not support "%s" query builder', $filter['name'], \get_class($queryBuilder));
             }
-            $filterService->updateQueryBuilder($queryBuilder, $property, $value, $filter['options']);
+            if ($filter['options']['update_query_builder']) {
+                $filter['options']['update_query_builder']($queryBuilder, $property, $value, $filter['options']);
+            } else {
+                $filterService->updateQueryBuilder($queryBuilder, $property, $value, $filter['options']);
+            }
         }
     }
 }

From f3f91c7a47884bdcfaff088a9e7a430efe392a17 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 4 Apr 2022 21:57:09 +0200
Subject: [PATCH 111/264] Add french flag

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aaaeb3c..b058385 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 ## Documentation ##
 
-[Read the Documentation (French documentation)](doc/index.md)
+[Read the Documentation (French documentation 🇫🇷)](doc/index.md)
 
 ## Security ##
 

From 6a81661ef45f6148cb95f0c1a2784621e5918b02 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 10 Apr 2022 14:05:19 +0200
Subject: [PATCH 112/264] New bundle structure

---
 .github/workflows/tests.yml                                  | 2 +-
 {src/Resources/assets => assets}/js/ajax.js                  | 0
 {src/Resources/assets => assets}/js/callback-manager.js      | 0
 {src/Resources/assets => assets}/js/callback.js              | 0
 {src/Resources/assets => assets}/js/crud.js                  | 0
 .../assets => assets}/js/modal/engine/bootstrap3.js          | 0
 .../assets => assets}/js/modal/engine/bootstrap4.js          | 0
 .../assets => assets}/js/modal/engine/bootstrap5.js          | 0
 {src/Resources/assets => assets}/js/modal/modal-manager.js   | 0
 {src/Resources/assets => assets}/js/options-resolver.js      | 0
 {src/Resources/assets => assets}/package.json                | 0
 composer.json                                                | 2 +-
 {src/Resources/config => config}/filters.xml                 | 0
 {src/Resources/config => config}/services.xml                | 0
 doc/install.md                                               | 2 +-
 karma.conf.js                                                | 4 ++--
 package.json                                                 | 2 +-
 src/DependencyInjection/EcommitCrudExtension.php             | 2 +-
 src/EcommitCrudBundle.php                                    | 5 +++++
 .../Form/bootstrap_3_horizontal_layout.html.twig             | 0
 .../views => templates}/Form/bootstrap_3_layout.html.twig    | 0
 {src/Resources/views => templates}/Form/div_layout.html.twig | 0
 .../Resources/views => templates}/Form/entity_ajax.html.twig | 0
 {src/Resources/views => templates}/IconTheme/base.html.twig  | 0
 .../views => templates}/IconTheme/fontawesome4.html.twig     | 0
 .../IconTheme/fontawesome5_solid.html.twig                   | 0
 .../IconTheme/fontawesome6_solid.html.twig                   | 0
 {src/Resources/views => templates}/Theme/base.html.twig      | 0
 .../Resources/views => templates}/Theme/bootstrap3.html.twig | 0
 .../Resources/views => templates}/Theme/bootstrap4.html.twig | 0
 .../Resources/views => templates}/Theme/bootstrap5.html.twig | 0
 tests/{Resources => }/assets/js/ajax.spec.js                 | 0
 tests/{Resources => }/assets/js/callback-manager.spec.js     | 0
 tests/{Resources => }/assets/js/callback.spec.js             | 0
 tests/{Resources => }/assets/js/main.js                      | 0
 tests/{Resources => }/assets/js/modal/engine/test.js         | 0
 tests/{Resources => }/assets/js/modal/modal-manager.spec.js  | 0
 tests/{Resources => }/assets/js/options-resolver.spec.js     | 0
 .../translations => translations}/EcommitCrudBundle.en.yml   | 0
 .../translations => translations}/EcommitCrudBundle.fr.yml   | 0
 40 files changed, 12 insertions(+), 7 deletions(-)
 rename {src/Resources/assets => assets}/js/ajax.js (100%)
 rename {src/Resources/assets => assets}/js/callback-manager.js (100%)
 rename {src/Resources/assets => assets}/js/callback.js (100%)
 rename {src/Resources/assets => assets}/js/crud.js (100%)
 rename {src/Resources/assets => assets}/js/modal/engine/bootstrap3.js (100%)
 rename {src/Resources/assets => assets}/js/modal/engine/bootstrap4.js (100%)
 rename {src/Resources/assets => assets}/js/modal/engine/bootstrap5.js (100%)
 rename {src/Resources/assets => assets}/js/modal/modal-manager.js (100%)
 rename {src/Resources/assets => assets}/js/options-resolver.js (100%)
 rename {src/Resources/assets => assets}/package.json (100%)
 rename {src/Resources/config => config}/filters.xml (100%)
 rename {src/Resources/config => config}/services.xml (100%)
 rename {src/Resources/views => templates}/Form/bootstrap_3_horizontal_layout.html.twig (100%)
 rename {src/Resources/views => templates}/Form/bootstrap_3_layout.html.twig (100%)
 rename {src/Resources/views => templates}/Form/div_layout.html.twig (100%)
 rename {src/Resources/views => templates}/Form/entity_ajax.html.twig (100%)
 rename {src/Resources/views => templates}/IconTheme/base.html.twig (100%)
 rename {src/Resources/views => templates}/IconTheme/fontawesome4.html.twig (100%)
 rename {src/Resources/views => templates}/IconTheme/fontawesome5_solid.html.twig (100%)
 rename {src/Resources/views => templates}/IconTheme/fontawesome6_solid.html.twig (100%)
 rename {src/Resources/views => templates}/Theme/base.html.twig (100%)
 rename {src/Resources/views => templates}/Theme/bootstrap3.html.twig (100%)
 rename {src/Resources/views => templates}/Theme/bootstrap4.html.twig (100%)
 rename {src/Resources/views => templates}/Theme/bootstrap5.html.twig (100%)
 rename tests/{Resources => }/assets/js/ajax.spec.js (100%)
 rename tests/{Resources => }/assets/js/callback-manager.spec.js (100%)
 rename tests/{Resources => }/assets/js/callback.spec.js (100%)
 rename tests/{Resources => }/assets/js/main.js (100%)
 rename tests/{Resources => }/assets/js/modal/engine/test.js (100%)
 rename tests/{Resources => }/assets/js/modal/modal-manager.spec.js (100%)
 rename tests/{Resources => }/assets/js/options-resolver.spec.js (100%)
 rename {src/Resources/translations => translations}/EcommitCrudBundle.en.yml (100%)
 rename {src/Resources/translations => translations}/EcommitCrudBundle.fr.yml (100%)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b230f1c..7d3f0a0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -110,4 +110,4 @@ jobs:
 
             -   name: Run ESLint
                 if: matrix.coding-standards
-                run: ./node_modules/.bin/eslint src/Resources/assets/js/* tests/Resources/assets/js/*
+                run: ./node_modules/.bin/eslint assets/js/* tests/assets/js/*
diff --git a/src/Resources/assets/js/ajax.js b/assets/js/ajax.js
similarity index 100%
rename from src/Resources/assets/js/ajax.js
rename to assets/js/ajax.js
diff --git a/src/Resources/assets/js/callback-manager.js b/assets/js/callback-manager.js
similarity index 100%
rename from src/Resources/assets/js/callback-manager.js
rename to assets/js/callback-manager.js
diff --git a/src/Resources/assets/js/callback.js b/assets/js/callback.js
similarity index 100%
rename from src/Resources/assets/js/callback.js
rename to assets/js/callback.js
diff --git a/src/Resources/assets/js/crud.js b/assets/js/crud.js
similarity index 100%
rename from src/Resources/assets/js/crud.js
rename to assets/js/crud.js
diff --git a/src/Resources/assets/js/modal/engine/bootstrap3.js b/assets/js/modal/engine/bootstrap3.js
similarity index 100%
rename from src/Resources/assets/js/modal/engine/bootstrap3.js
rename to assets/js/modal/engine/bootstrap3.js
diff --git a/src/Resources/assets/js/modal/engine/bootstrap4.js b/assets/js/modal/engine/bootstrap4.js
similarity index 100%
rename from src/Resources/assets/js/modal/engine/bootstrap4.js
rename to assets/js/modal/engine/bootstrap4.js
diff --git a/src/Resources/assets/js/modal/engine/bootstrap5.js b/assets/js/modal/engine/bootstrap5.js
similarity index 100%
rename from src/Resources/assets/js/modal/engine/bootstrap5.js
rename to assets/js/modal/engine/bootstrap5.js
diff --git a/src/Resources/assets/js/modal/modal-manager.js b/assets/js/modal/modal-manager.js
similarity index 100%
rename from src/Resources/assets/js/modal/modal-manager.js
rename to assets/js/modal/modal-manager.js
diff --git a/src/Resources/assets/js/options-resolver.js b/assets/js/options-resolver.js
similarity index 100%
rename from src/Resources/assets/js/options-resolver.js
rename to assets/js/options-resolver.js
diff --git a/src/Resources/assets/package.json b/assets/package.json
similarity index 100%
rename from src/Resources/assets/package.json
rename to assets/package.json
diff --git a/composer.json b/composer.json
index ffd68c8..0223c03 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "symfony/asset": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/doctrine-bridge": "^5.4|^6.0",
+        "symfony/doctrine-bridge": "^5.4.3|^6.0",
         "symfony/form": "^5.4|^6.0",
         "symfony/framework-bundle": "^5.4|^6.0",
         "symfony/http-client": "^5.4|^6.0",
diff --git a/src/Resources/config/filters.xml b/config/filters.xml
similarity index 100%
rename from src/Resources/config/filters.xml
rename to config/filters.xml
diff --git a/src/Resources/config/services.xml b/config/services.xml
similarity index 100%
rename from src/Resources/config/services.xml
rename to config/services.xml
diff --git a/doc/install.md b/doc/install.md
index 63ef8d6..a8a9256 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -19,7 +19,7 @@ Installez le bundle avec Composer : A la racine de votre projet Symfony, éxécu
 
 ```bash
 $ composer require ecommit/crud-bundle:3.*@dev
-$ yarn add --dev @ecommit/crud-bundle@link:vendor/ecommit/crud-bundle/src/Resources/assets
+$ yarn add --dev @ecommit/crud-bundle@link:vendor/ecommit/crud-bundle/assets
 ```
 
 Activez le bundle dans le fichier de configuration `config/bundles.php` de votre projet :
diff --git a/karma.conf.js b/karma.conf.js
index 1d8efa4..962b93a 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -28,10 +28,10 @@ module.exports = function(config) {
             terminal: false //Remove console.* logs
         },
         files: [
-            'tests/Resources/assets/js/main.js'
+            'tests/assets/js/main.js'
         ],
         preprocessors: {
-            'tests/Resources/assets/js/main.js': ['webpack']
+            'tests/assets/js/main.js': ['webpack']
         },
         webpackMiddleware: {
             stats: 'errors-only',
diff --git a/package.json b/package.json
index 6ba6bd3..8ad83ae 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
     "jquery": "^3"
   },
   "devDependencies": {
-    "@ecommit/crud-bundle": "link:src/Resources/assets",
+    "@ecommit/crud-bundle": "link:assets",
     "@symfony/webpack-encore": "^1.8",
     "core-js": "^3.0.0",
     "eslint": "^8.0",
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index 8673a5d..9ac8b37 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -34,7 +34,7 @@ public function load(array $config, ContainerBuilder $container): void
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $config);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
         $loader->load('services.xml');
         $loader->load('filters.xml');
 
diff --git a/src/EcommitCrudBundle.php b/src/EcommitCrudBundle.php
index b08b895..1916bf1 100644
--- a/src/EcommitCrudBundle.php
+++ b/src/EcommitCrudBundle.php
@@ -27,4 +27,9 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new TwigFormPass());
         $container->addCompilerPass(new FiltersPass());
     }
+
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
 }
diff --git a/src/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/templates/Form/bootstrap_3_horizontal_layout.html.twig
similarity index 100%
rename from src/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
rename to templates/Form/bootstrap_3_horizontal_layout.html.twig
diff --git a/src/Resources/views/Form/bootstrap_3_layout.html.twig b/templates/Form/bootstrap_3_layout.html.twig
similarity index 100%
rename from src/Resources/views/Form/bootstrap_3_layout.html.twig
rename to templates/Form/bootstrap_3_layout.html.twig
diff --git a/src/Resources/views/Form/div_layout.html.twig b/templates/Form/div_layout.html.twig
similarity index 100%
rename from src/Resources/views/Form/div_layout.html.twig
rename to templates/Form/div_layout.html.twig
diff --git a/src/Resources/views/Form/entity_ajax.html.twig b/templates/Form/entity_ajax.html.twig
similarity index 100%
rename from src/Resources/views/Form/entity_ajax.html.twig
rename to templates/Form/entity_ajax.html.twig
diff --git a/src/Resources/views/IconTheme/base.html.twig b/templates/IconTheme/base.html.twig
similarity index 100%
rename from src/Resources/views/IconTheme/base.html.twig
rename to templates/IconTheme/base.html.twig
diff --git a/src/Resources/views/IconTheme/fontawesome4.html.twig b/templates/IconTheme/fontawesome4.html.twig
similarity index 100%
rename from src/Resources/views/IconTheme/fontawesome4.html.twig
rename to templates/IconTheme/fontawesome4.html.twig
diff --git a/src/Resources/views/IconTheme/fontawesome5_solid.html.twig b/templates/IconTheme/fontawesome5_solid.html.twig
similarity index 100%
rename from src/Resources/views/IconTheme/fontawesome5_solid.html.twig
rename to templates/IconTheme/fontawesome5_solid.html.twig
diff --git a/src/Resources/views/IconTheme/fontawesome6_solid.html.twig b/templates/IconTheme/fontawesome6_solid.html.twig
similarity index 100%
rename from src/Resources/views/IconTheme/fontawesome6_solid.html.twig
rename to templates/IconTheme/fontawesome6_solid.html.twig
diff --git a/src/Resources/views/Theme/base.html.twig b/templates/Theme/base.html.twig
similarity index 100%
rename from src/Resources/views/Theme/base.html.twig
rename to templates/Theme/base.html.twig
diff --git a/src/Resources/views/Theme/bootstrap3.html.twig b/templates/Theme/bootstrap3.html.twig
similarity index 100%
rename from src/Resources/views/Theme/bootstrap3.html.twig
rename to templates/Theme/bootstrap3.html.twig
diff --git a/src/Resources/views/Theme/bootstrap4.html.twig b/templates/Theme/bootstrap4.html.twig
similarity index 100%
rename from src/Resources/views/Theme/bootstrap4.html.twig
rename to templates/Theme/bootstrap4.html.twig
diff --git a/src/Resources/views/Theme/bootstrap5.html.twig b/templates/Theme/bootstrap5.html.twig
similarity index 100%
rename from src/Resources/views/Theme/bootstrap5.html.twig
rename to templates/Theme/bootstrap5.html.twig
diff --git a/tests/Resources/assets/js/ajax.spec.js b/tests/assets/js/ajax.spec.js
similarity index 100%
rename from tests/Resources/assets/js/ajax.spec.js
rename to tests/assets/js/ajax.spec.js
diff --git a/tests/Resources/assets/js/callback-manager.spec.js b/tests/assets/js/callback-manager.spec.js
similarity index 100%
rename from tests/Resources/assets/js/callback-manager.spec.js
rename to tests/assets/js/callback-manager.spec.js
diff --git a/tests/Resources/assets/js/callback.spec.js b/tests/assets/js/callback.spec.js
similarity index 100%
rename from tests/Resources/assets/js/callback.spec.js
rename to tests/assets/js/callback.spec.js
diff --git a/tests/Resources/assets/js/main.js b/tests/assets/js/main.js
similarity index 100%
rename from tests/Resources/assets/js/main.js
rename to tests/assets/js/main.js
diff --git a/tests/Resources/assets/js/modal/engine/test.js b/tests/assets/js/modal/engine/test.js
similarity index 100%
rename from tests/Resources/assets/js/modal/engine/test.js
rename to tests/assets/js/modal/engine/test.js
diff --git a/tests/Resources/assets/js/modal/modal-manager.spec.js b/tests/assets/js/modal/modal-manager.spec.js
similarity index 100%
rename from tests/Resources/assets/js/modal/modal-manager.spec.js
rename to tests/assets/js/modal/modal-manager.spec.js
diff --git a/tests/Resources/assets/js/options-resolver.spec.js b/tests/assets/js/options-resolver.spec.js
similarity index 100%
rename from tests/Resources/assets/js/options-resolver.spec.js
rename to tests/assets/js/options-resolver.spec.js
diff --git a/src/Resources/translations/EcommitCrudBundle.en.yml b/translations/EcommitCrudBundle.en.yml
similarity index 100%
rename from src/Resources/translations/EcommitCrudBundle.en.yml
rename to translations/EcommitCrudBundle.en.yml
diff --git a/src/Resources/translations/EcommitCrudBundle.fr.yml b/translations/EcommitCrudBundle.fr.yml
similarity index 100%
rename from src/Resources/translations/EcommitCrudBundle.fr.yml
rename to translations/EcommitCrudBundle.fr.yml

From 285b372296db12f4d2a53c74854a47bacd48baf6 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 10 Apr 2022 14:59:36 +0200
Subject: [PATCH 113/264] Update CI

---
 .github/workflows/tests.yml | 20 +++++++++++---------
 composer.json               |  8 ++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7d3f0a0..b8000e2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,21 +13,23 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    #Mini
+                    #Mini (for each Symfony version)
                     -   php-version: '8.0'
+                        symfony-version: '5.4.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with lowest'
+                        description: 'with SF 5.4.* lowest'
+                    -   php-version: '8.0'
+                        symfony-version: '6.0.*'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with SF 6.0.* lowest'
 
                     #Symfony versions
                     -   php-version: '8.1'
-                        symfony-version: '^5.4'
-                        description: 'with SF ^5.4'
-                    -   php-version: '8.1'
-                        symfony-version: '~6.0'
-                        description: 'with SF ~6.0'
+                        symfony-version: '5.4.*'
+                        description: 'with SF 5.4.*'
                     -   php-version: '8.1'
-                        symfony-version: '^6.0'
-                        description: 'with SF ^6.0'
+                        symfony-version: '6.0.*'
+                        description: 'with SF 6.0.*'
 
                     #PHP versions
                     -   php-version: '8.0'
diff --git a/composer.json b/composer.json
index 0223c03..a420fd0 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": "^8.0",
         "ext-mbstring": "*",
-        "doctrine/doctrine-bundle": "^2.4",
+        "doctrine/doctrine-bundle": "^2.4.5",
         "doctrine/orm": "^2.9",
         "doctrine/persistence": "^1.3|^2.0",
         "ecommit/doctrine-utils": "1.0.x-dev",
@@ -21,7 +21,7 @@
         "symfony/asset": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/doctrine-bridge": "^5.4.3|^6.0",
+        "symfony/doctrine-bridge": "^5.4.3|^6.0.3",
         "symfony/form": "^5.4|^6.0",
         "symfony/framework-bundle": "^5.4|^6.0",
         "symfony/http-client": "^5.4|^6.0",
@@ -32,7 +32,7 @@
         "symfony/property-access": "^5.4|^6.0",
         "symfony/routing": "^5.4|^6.0",
         "symfony/security-bundle": "^5.4|^6.0",
-        "symfony/security-csrf" : "^5.4|^6.0",
+        "symfony/security-csrf": "^5.4|^6.0",
         "symfony/translation": "^5.4|^6.0",
         "symfony/twig-bridge": "^5.4|^6.0",
         "symfony/twig-bundle": "^5.4|^6.0",
@@ -43,7 +43,7 @@
         "dbrekelmans/bdi": "^0.3.0",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "phpunit/phpunit": "^8.4.1",
+        "phpunit/phpunit": "^8.5.16",
         "symfony/dom-crawler": "^5.4|^6.0",
         "symfony/panther": "^2.0.1",
         "symfony/webpack-encore-bundle": "^1.7.3",

From 6ffa9c41565de9816602e0e00aaf38a4c39e4cc1 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 10 Apr 2022 15:42:51 +0200
Subject: [PATCH 114/264] Update CS

---
 .php-cs-fixer.dist.php                           |  4 ++--
 src/Controller/CrudControllerTrait.php           | 12 +++---------
 src/Crud/Crud.php                                |  2 +-
 src/Crud/SearchFormBuilder.php                   |  2 +-
 src/Form/Filter/EntityFilter.php                 |  4 +---
 .../EntitiesToChoicesTransformerTest.php         |  4 +---
 .../EntitiesToIdsTransformerTest.php             |  4 +---
 .../EntityToChoiceTransformerTest.php            |  4 +---
 .../EntityToIdTransformerTest.php                |  4 +---
 tests/Form/Type/EntityAjaxTypeTest.php           |  4 +---
 .../Controller/UserWithoutTraitController.php    | 16 ++++------------
 tests/Functional/App/config/bootstrap.php        |  2 +-
 .../Controller/TestCrudControllerTest.php        |  4 +---
 tests/Twig/CrudExtensionTest.php                 |  4 +---
 14 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index d529d82..70910b3 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -21,8 +21,8 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         '@DoctrineAnnotation' => true,
-        '@PHP71Migration' => true,
-        '@PHP71Migration:risky' => true,
+        '@PHP80Migration' => true,
+        '@PHP80Migration:risky' => true,
         '@PHPUnit84Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'fopen_flags' => true,
diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index a2d3680..4903c6c 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -42,15 +42,9 @@ public function getAjaxCrudResponse(): Response
     protected function getCrudOptions(): array
     {
         return [
-            'template_generator' => function (string $action) {
-                return $this->getTemplateName($action);
-            },
-            'before_build_query' => function (Crud $crud, $data) {
-                return $this->beforeBuildQuery($crud, $data);
-            },
-            'after_build_query' => function (Crud $crud, $data) {
-                return $this->afterBuildQuery($crud, $data);
-            },
+            'template_generator' => fn (string $action) => $this->getTemplateName($action),
+            'before_build_query' => fn (Crud $crud, $data) => $this->beforeBuildQuery($crud, $data),
+            'after_build_query' => fn (Crud $crud, $data) => $this->afterBuildQuery($crud, $data),
         ];
     }
 
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 2e40f4d..b557887 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -610,7 +610,7 @@ protected function changeFilterValues($value): void
         if (!$this->searchForm) {
             return;
         }
-        if (null !== $value && \get_class($value) === \get_class($this->searchForm->getDefaultData())) {
+        if (null !== $value && $value::class === \get_class($this->searchForm->getDefaultData())) {
             $this->sessionValues->searchFormData = $value;
         } else {
             $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index f440b6e..d83407f 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -199,7 +199,7 @@ public function updateQueryBuilder($queryBuilder, SearcherInterface $searcher):
             /** @var FilterInterface $filterService */
             $filterService = $this->container->get('ecommit_crud.filters')->get($filter['name']);
             if (!$filterService->supportsQueryBuilder($queryBuilder)) {
-                throw new \Exception('"%s" filter does not support "%s" query builder', $filter['name'], \get_class($queryBuilder));
+                throw new \Exception('"%s" filter does not support "%s" query builder', $filter['name'], $queryBuilder::class);
             }
             if ($filter['options']['update_query_builder']) {
                 $filter['options']['update_query_builder']($queryBuilder, $property, $value, $filter['options']);
diff --git a/src/Form/Filter/EntityFilter.php b/src/Form/Filter/EntityFilter.php
index 302f2d5..3c4f24f 100644
--- a/src/Form/Filter/EntityFilter.php
+++ b/src/Form/Filter/EntityFilter.php
@@ -30,9 +30,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
     {
         $typeOptions = $this->getTypeOptions($options, array_merge($this->getCollectionTypeOptions($options), [
             'class' => $options['class'],
-            'query_builder' => function (EntityRepository $er) {
-                return $er->createQueryBuilder('e');
-            },
+            'query_builder' => fn (EntityRepository $er) => $er->createQueryBuilder('e'),
         ]));
 
         if (isset($typeOptions['choices'])) {
diff --git a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
index 4b5d9c1..ce3f3a5 100644
--- a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
@@ -45,9 +45,7 @@ public function testTransform($choiceLabel, array $expected): void
 
     public function getTestTransformProvider(): array
     {
-        $closure = function (Tag $tag) {
-            return sprintf('name: %s', $tag->getName());
-        };
+        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
 
         return [
             [null, ['1' => 'tag1', '3' => '3']], // Choice label: null
diff --git a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
index 18f0d7a..1f2b7c3 100644
--- a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
@@ -28,9 +28,7 @@ protected function createTransformer(...$args): DataTransformerInterface
 
     public function getTestTransformProvider(): array
     {
-        $closure = function (Tag $tag) {
-            return sprintf('name: %s', $tag->getName());
-        };
+        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
 
         return [
             [null, ['1', '3']], // Choice label: null
diff --git a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
index b25b9de..be28a50 100644
--- a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
@@ -43,9 +43,7 @@ public function testTransform($choiceLabel, $expected): void
 
     public function getTestTransformProvider(): array
     {
-        $closure = function (Tag $tag) {
-            return sprintf('name: %s', $tag->getName());
-        };
+        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
 
         return [
             [null, ['3' => '3']], // Choice label: null
diff --git a/tests/Form/DataTransformer/EntityToIdTransformerTest.php b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
index 2ddd257..49fb7a4 100644
--- a/tests/Form/DataTransformer/EntityToIdTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
@@ -27,9 +27,7 @@ protected function createTransformer(...$args): DataTransformerInterface
 
     public function getTestTransformProvider(): array
     {
-        $closure = function (Tag $tag) {
-            return sprintf('name: %s', $tag->getName());
-        };
+        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
 
         return [
             [null, '3'], // Choice label: null
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index 6394f9a..1348e56 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -243,9 +243,7 @@ public function testViewWithChoiceLabel($choiceLabel, $expectedViewValue): void
 
     public function getTestViewWithChoiceLabelProvider(): array
     {
-        $closure = function (Tag $tag) {
-            return sprintf('name: %s', $tag->getName());
-        };
+        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
 
         return [
             ['name', ['2' => 'tag2']],
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index 7b3c38c..eb5519a 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -58,9 +58,7 @@ public function crudAction(Request $request, CrudResponseGenerator $crudResponse
     {
         if ($request->query->has('test-before-and-after-build-query')) {
             return $crudResponseGenerator->getResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
-                'template_generator' => function (string $action) {
-                    return sprintf('user/%s.html.twig', $action);
-                },
+                'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
                 'before_build_query' => function (Crud $crud, array $data) {
                     $data['test_before_after_build_query'] = 'BEFORE';
 
@@ -75,9 +73,7 @@ public function crudAction(Request $request, CrudResponseGenerator $crudResponse
         }
 
         return $crudResponseGenerator->getResponse($this->getCrud('user_without_trait'), [
-            'template_generator' => function (string $action) {
-                return sprintf('user/%s.html.twig', $action);
-            },
+            'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
         ]);
     }
 
@@ -85,9 +81,7 @@ public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResp
     {
         if ($request->query->has('test-before-and-after-build-query')) {
             return $crudResponseGenerator->getAjaxResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
-                'template_generator' => function (string $action) {
-                    return sprintf('user/%s.html.twig', $action);
-                },
+                'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
                 'before_build_query' => function (Crud $crud, array $data) {
                     $data['test_before_after_build_query'] = 'BEFORE';
 
@@ -102,9 +96,7 @@ public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResp
         }
 
         return $crudResponseGenerator->getAjaxResponse($this->getCrud('user_without_trait'), [
-            'template_generator' => function (string $action) {
-                return sprintf('user/%s.html.twig', $action);
-            },
+            'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
         ]);
     }
 
diff --git a/tests/Functional/App/config/bootstrap.php b/tests/Functional/App/config/bootstrap.php
index 7f686f7..491205f 100644
--- a/tests/Functional/App/config/bootstrap.php
+++ b/tests/Functional/App/config/bootstrap.php
@@ -15,5 +15,5 @@
 
 $_SERVER += $_ENV;
 $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
-$_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
+$_SERVER['APP_DEBUG'] ??= $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
 $_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], \FILTER_VALIDATE_BOOLEAN) ? '1' : '0';
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index bfcfcbd..8b049b1 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -441,9 +441,7 @@ protected function waitForAjax(Client $client, int $timeout = 5): void
     {
         $driver = $client->getWebDriver();
 
-        $driver->wait($timeout, 500)->until(static function ($driver) {
-            return !$driver->executeScript('return (typeof jQuery !== "undefined" && jQuery.active);');
-        });
+        $driver->wait($timeout, 500)->until(static fn ($driver) => !$driver->executeScript('return (typeof jQuery !== "undefined" && jQuery.active);'));
 
         usleep(500000);
     }
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index cd0d540..72ba833 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -746,9 +746,7 @@ protected function createCrud(string $sort = 'column1', string $sense = Crud::AS
         $crud->expects($this->any())->method('getRouteName')->willReturn('user_crud');
         $crud->expects($this->any())->method('getRouteParams')->willReturn([]);
         $crud->expects($this->any())->method('getSessionValues')->willReturn($crudSession);
-        $crud->expects($this->any())->method('getColumn')->willReturnCallback(function ($columnId) use ($columns) {
-            return $columns[$columnId];
-        });
+        $crud->expects($this->any())->method('getColumn')->willReturnCallback(fn ($columnId) => $columns[$columnId]);
 
         return $crud;
     }

From aeacb068efee952e7ed59c1707df97cc7b97e8f1 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 10 Apr 2022 15:50:35 +0200
Subject: [PATCH 115/264] Upgrade PHPUnit 9

---
 composer.json                            |  2 +-
 tests/Form/Filter/AbstractFilterTest.php |  4 ++--
 tests/Twig/CrudExtensionTest.php         | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index a420fd0..13835c8 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "dbrekelmans/bdi": "^0.3.0",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "phpunit/phpunit": "^8.5.16",
+        "phpunit/phpunit": "^9.0",
         "symfony/dom-crawler": "^5.4|^6.0",
         "symfony/panther": "^2.0.1",
         "symfony/webpack-encore-bundle": "^1.7.3",
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTest.php
index b3941e8..acd3b40 100644
--- a/tests/Form/Filter/AbstractFilterTest.php
+++ b/tests/Form/Filter/AbstractFilterTest.php
@@ -128,10 +128,10 @@ protected function checkQueryBuilder(Crud $crud, ?string $whereExpected, array $
 
         $queryBuilder = $crud->getQueryBuilder();
         if (null === $whereExpected) {
-            $this->assertNotRegExp('/WHERE/', $queryBuilder->getDql());
+            $this->assertDoesNotMatchRegularExpression('/WHERE/', $queryBuilder->getDql());
         } else {
             $pattern = '/WHERE '.preg_quote($whereExpected, '/').' ORDER BY/i';
-            $this->assertRegExp($pattern, $queryBuilder->getDql());
+            $this->assertMatchesRegularExpression($pattern, $queryBuilder->getDql());
         }
 
         $parameters = [];
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 72ba833..8ec24a6 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -384,7 +384,7 @@ public function testPaginatorWithRenderOption(): void
             'render' => 'render.html.twig',
         ]);
 
-        $this->assertRegExp('/OK/', $result);
+        $this->assertMatchesRegularExpression('/OK/', $result);
     }
 
     public function testPaginatorWithThemeAndBlockOptions(): void
@@ -400,7 +400,7 @@ public function testPaginatorWithThemeAndBlockOptions(): void
             'block' => 'hello_world',
         ]);
 
-        $this->assertRegExp('/Hello world/', $result);
+        $this->assertMatchesRegularExpression('/Hello world/', $result);
     }
 
     public function testPaginatorWithBadOptions(): void
@@ -529,7 +529,7 @@ public function testThWithRenderOption(): void
             'render' => 'render.html.twig',
         ]);
 
-        $this->assertRegExp('/OK/', $html);
+        $this->assertMatchesRegularExpression('/OK/', $html);
     }
 
     public function testThWithThemeAndBlockOptions(): void
@@ -539,7 +539,7 @@ public function testThWithThemeAndBlockOptions(): void
             'block' => 'hello_world',
         ]);
 
-        $this->assertRegExp('/Hello world/', $html);
+        $this->assertMatchesRegularExpression('/Hello world/', $html);
     }
 
     public function testThWithBadOptions(): void
@@ -700,7 +700,7 @@ public function testTdWithRenderOption(): void
             'render' => 'render.html.twig',
         ]);
 
-        $this->assertRegExp('/OK/', $html);
+        $this->assertMatchesRegularExpression('/OK/', $html);
     }
 
     public function testTdWithThemeAndBlockOptions(): void
@@ -710,7 +710,7 @@ public function testTdWithThemeAndBlockOptions(): void
             'block' => 'hello_world',
         ]);
 
-        $this->assertRegExp('/Hello world/', $html);
+        $this->assertMatchesRegularExpression('/Hello world/', $html);
     }
 
     public function testTdWithBadOptions(): void

From 579143544f3fdb734d2c43b85ae18e2546a8a992 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 10 Apr 2022 17:02:43 +0200
Subject: [PATCH 116/264] Reverse aliases

---
 config/services.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/services.xml b/config/services.xml
index f17e875..7b4d2ce 100644
--- a/config/services.xml
+++ b/config/services.xml
@@ -15,15 +15,15 @@
             <tag name="container.service_locator"/>
         </service>
 
-        <service id="Ecommit\CrudBundle\Crud\CrudFactory" class="Ecommit\CrudBundle\Crud\CrudFactory" public="true">
+        <service id="ecommit_crud.factory" class="Ecommit\CrudBundle\Crud\CrudFactory" public="true">
             <argument type="service" id="ecommit_crud.locator"/>
         </service>
-        <service id="ecommit_crud.factory" alias="Ecommit\CrudBundle\Crud\CrudFactory" public="true" />
+        <service id="Ecommit\CrudBundle\Crud\CrudFactory" alias="ecommit_crud.factory" public="true" />
 
-        <service id="Ecommit\CrudBundle\Crud\CrudResponseGenerator" class="Ecommit\CrudBundle\Crud\CrudResponseGenerator" public="true">
+        <service id="ecommit_crud.response_generatror" class="Ecommit\CrudBundle\Crud\CrudResponseGenerator" public="true">
             <tag name="container.service_subscriber" />
         </service>
-        <service id="ecommit_crud.response_generatror" alias="Ecommit\CrudBundle\Crud\CrudResponseGenerator" public="true" />
+        <service id="Ecommit\CrudBundle\Crud\CrudResponseGenerator" alias="ecommit_crud.response_generatror" public="true" />
 
         <service id="Ecommit\CrudBundle\Twig\CrudExtension" class="Ecommit\CrudBundle\Twig\CrudExtension">
             <argument type="service" id="twig.form.renderer" />

From 15b442a235160fd498c745a1175368a32a4234d3 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 10 Apr 2022 17:10:59 +0200
Subject: [PATCH 117/264] Rename services

---
 config/filters.xml               | 20 ++++++++++----------
 config/services.xml              |  6 +++---
 doc/upgrade/3.0.md               | 11 +++++++++++
 tests/Twig/CrudExtensionTest.php |  2 +-
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/config/filters.xml b/config/filters.xml
index e59211d..86a28e0 100644
--- a/config/filters.xml
+++ b/config/filters.xml
@@ -3,43 +3,43 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="Ecommit\CrudBundle\Form\Filter\BooleanFilter" class="Ecommit\CrudBundle\Form\Filter\BooleanFilter">
+        <service id="ecommit_crud.filter.boolean" class="Ecommit\CrudBundle\Form\Filter\BooleanFilter">
             <tag name="ecommit_crud.filter" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Filter\ChoiceFilter" class="Ecommit\CrudBundle\Form\Filter\ChoiceFilter">
+        <service id="ecommit_crud.filter.choice" class="Ecommit\CrudBundle\Form\Filter\ChoiceFilter">
             <tag name="ecommit_crud.filter" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Filter\DateFilter" class="Ecommit\CrudBundle\Form\Filter\DateFilter">
+        <service id="ecommit_crud.filter.date" class="Ecommit\CrudBundle\Form\Filter\DateFilter">
             <tag name="ecommit_crud.filter" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Filter\EntityAjaxFilter" class="Ecommit\CrudBundle\Form\Filter\EntityAjaxFilter">
+        <service id="ecommit_crud.filter.entity_ajax" class="Ecommit\CrudBundle\Form\Filter\EntityAjaxFilter">
             <tag name="ecommit_crud.filter" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Filter\EntityFilter" class="Ecommit\CrudBundle\Form\Filter\EntityFilter">
+        <service id="ecommit_crud.filter.entity" class="Ecommit\CrudBundle\Form\Filter\EntityFilter">
             <tag name="ecommit_crud.filter" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Filter\IntegerFilter" class="Ecommit\CrudBundle\Form\Filter\IntegerFilter">
+        <service id="ecommit_crud.filter.integer" class="Ecommit\CrudBundle\Form\Filter\IntegerFilter">
             <tag name="ecommit_crud.filter" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Filter\NotNullFilter" class="Ecommit\CrudBundle\Form\Filter\NotNullFilter">
+        <service id="ecommit_crud.filter.not_null" class="Ecommit\CrudBundle\Form\Filter\NotNullFilter">
             <tag name="ecommit_crud.filter" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Filter\NullFilter" class="Ecommit\CrudBundle\Form\Filter\NullFilter">
+        <service id="ecommit_crud.filter.null" class="Ecommit\CrudBundle\Form\Filter\NullFilter">
             <tag name="ecommit_crud.filter" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Filter\NumberFilter" class="Ecommit\CrudBundle\Form\Filter\NumberFilter">
+        <service id="ecommit_crud.filter.number" class="Ecommit\CrudBundle\Form\Filter\NumberFilter">
             <tag name="ecommit_crud.filter" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Filter\TextFilter" class="Ecommit\CrudBundle\Form\Filter\TextFilter">
+        <service id="ecommit_crud.filter.text" class="Ecommit\CrudBundle\Form\Filter\TextFilter">
             <tag name="ecommit_crud.filter" />
         </service>
     </services>
diff --git a/config/services.xml b/config/services.xml
index 7b4d2ce..204d5cb 100644
--- a/config/services.xml
+++ b/config/services.xml
@@ -25,7 +25,7 @@
         </service>
         <service id="Ecommit\CrudBundle\Crud\CrudResponseGenerator" alias="ecommit_crud.response_generatror" public="true" />
 
-        <service id="Ecommit\CrudBundle\Twig\CrudExtension" class="Ecommit\CrudBundle\Twig\CrudExtension">
+        <service id="ecommit_crud.twig.crud_extension" class="Ecommit\CrudBundle\Twig\CrudExtension">
             <argument type="service" id="twig.form.renderer" />
             <argument>%ecommit_crud.theme%</argument>
             <argument>%ecommit_crud.icon_theme%</argument>
@@ -33,11 +33,11 @@
             <tag name="twig.extension"/>
         </service>
 
-        <service id="Ecommit\CrudBundle\EventListener\MappingEntities" class="Ecommit\CrudBundle\EventListener\MappingEntities">
+        <service id="ecommit_crud.event_listener.mapping_entities" class="Ecommit\CrudBundle\EventListener\MappingEntities">
             <tag name="doctrine.event_listener" event="loadClassMetadata" />
         </service>
 
-        <service id="Ecommit\CrudBundle\Form\Type\EntityAjaxType" class="Ecommit\CrudBundle\Form\Type\EntityAjaxType">
+        <service id="ecommit_crud.type.entity_ajax" class="Ecommit\CrudBundle\Form\Type\EntityAjaxType">
             <argument type="service" id="Doctrine\Persistence\ManagerRegistry" />
             <argument type="service" id="Symfony\Component\Routing\RouterInterface" />
             <tag name="form.type" />
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 211064d..2cedcef 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -355,3 +355,14 @@ Les événements suivants sont supprimés :
 * `ec-crud-update-list-after`
 
 Utiliser à la place l'événement `ec-crud-ajax-update-dom-after`.
+
+
+
+## Services
+
+* Les services suivants sont renommés :
+
+| Ancien nom | Nouveau nom |
+|------------|-------------|
+| `Ecommit\CrudBundle\Twig\CrudExtension` | `ecommit_crud.twig.crud_extension` |
+| `Ecommit\CrudBundle\EventListener\MappingEntities` | `ecommit_crud.event_listener.mapping_entities` |
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 8ec24a6..e8131cf 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -48,7 +48,7 @@ protected function setUp(): void
     {
         self::bootKernel();
 
-        $this->crudExtension = self::getContainer()->get(CrudExtension::class);
+        $this->crudExtension = self::getContainer()->get('ecommit_crud.twig.crud_extension');
         $this->formFactory = self::getContainer()->get(FormFactoryInterface::class);
         $this->environment = self::getContainer()->get(Environment::class);
     }

From caad4b1ddb3cec3bf2714f3764d3ddca1c0b5268 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 10 Apr 2022 17:37:38 +0200
Subject: [PATCH 118/264] Remove public services

---
 config/services.xml | 8 ++++----
 doc/upgrade/3.0.md  | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/services.xml b/config/services.xml
index 204d5cb..1fa8c75 100644
--- a/config/services.xml
+++ b/config/services.xml
@@ -15,15 +15,15 @@
             <tag name="container.service_locator"/>
         </service>
 
-        <service id="ecommit_crud.factory" class="Ecommit\CrudBundle\Crud\CrudFactory" public="true">
+        <service id="ecommit_crud.factory" class="Ecommit\CrudBundle\Crud\CrudFactory">
             <argument type="service" id="ecommit_crud.locator"/>
         </service>
-        <service id="Ecommit\CrudBundle\Crud\CrudFactory" alias="ecommit_crud.factory" public="true" />
+        <service id="Ecommit\CrudBundle\Crud\CrudFactory" alias="ecommit_crud.factory" />
 
-        <service id="ecommit_crud.response_generatror" class="Ecommit\CrudBundle\Crud\CrudResponseGenerator" public="true">
+        <service id="ecommit_crud.response_generatror" class="Ecommit\CrudBundle\Crud\CrudResponseGenerator">
             <tag name="container.service_subscriber" />
         </service>
-        <service id="Ecommit\CrudBundle\Crud\CrudResponseGenerator" alias="ecommit_crud.response_generatror" public="true" />
+        <service id="Ecommit\CrudBundle\Crud\CrudResponseGenerator" alias="ecommit_crud.response_generatror" />
 
         <service id="ecommit_crud.twig.crud_extension" class="Ecommit\CrudBundle\Twig\CrudExtension">
             <argument type="service" id="twig.form.renderer" />
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 2cedcef..ba11927 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -366,3 +366,7 @@ Utiliser à la place l'événement `ec-crud-ajax-update-dom-after`.
 |------------|-------------|
 | `Ecommit\CrudBundle\Twig\CrudExtension` | `ecommit_crud.twig.crud_extension` |
 | `Ecommit\CrudBundle\EventListener\MappingEntities` | `ecommit_crud.event_listener.mapping_entities` |
+
+* Les services suivant sont maintenant privés :
+    * `ecommit_crud.factory`
+    * `Ecommit\CrudBundle\Crud\CrudFactory`

From bafb3a4fe2f9283724e5c400660005d7afe6064d Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 10 Apr 2022 21:50:33 +0200
Subject: [PATCH 119/264] Replace QueryBuilderNamedParameterTrait by
 AbstractQueryBuilderNamedParameter

---
 ...rTrait.php => AbstractQueryBuilderNamedParameter.php} | 9 +++------
 src/Crud/Http/AbstractQueryBuilderParameter.php          | 4 +++-
 src/Crud/Http/QueryBuilderBody.php                       | 4 ----
 src/Crud/Http/QueryBuilderBodyParameter.php              | 3 +--
 src/Crud/Http/QueryBuilderHeaderParameter.php            | 3 +--
 src/Crud/Http/QueryBuilderQueryParameter.php             | 3 +--
 6 files changed, 9 insertions(+), 17 deletions(-)
 rename src/Crud/Http/{QueryBuilderNamedParameterTrait.php => AbstractQueryBuilderNamedParameter.php} (62%)

diff --git a/src/Crud/Http/QueryBuilderNamedParameterTrait.php b/src/Crud/Http/AbstractQueryBuilderNamedParameter.php
similarity index 62%
rename from src/Crud/Http/QueryBuilderNamedParameterTrait.php
rename to src/Crud/Http/AbstractQueryBuilderNamedParameter.php
index 6d589e0..24024ad 100644
--- a/src/Crud/Http/QueryBuilderNamedParameterTrait.php
+++ b/src/Crud/Http/AbstractQueryBuilderNamedParameter.php
@@ -13,13 +13,10 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-trait QueryBuilderNamedParameterTrait
+abstract class AbstractQueryBuilderNamedParameter extends AbstractQueryBuilderParameter
 {
-    public $name;
-
-    public function __construct(string $name, $value)
+    public function __construct(public string $name, mixed $value)
     {
-        $this->name = $name;
-        $this->value = $value;
+        parent::__construct($value);
     }
 }
diff --git a/src/Crud/Http/AbstractQueryBuilderParameter.php b/src/Crud/Http/AbstractQueryBuilderParameter.php
index 79ab450..68516a0 100644
--- a/src/Crud/Http/AbstractQueryBuilderParameter.php
+++ b/src/Crud/Http/AbstractQueryBuilderParameter.php
@@ -17,5 +17,7 @@
 
 abstract class AbstractQueryBuilderParameter implements QueryBuilderParameterInterface
 {
-    public $value;
+    public function __construct(public mixed $value)
+    {
+    }
 }
diff --git a/src/Crud/Http/QueryBuilderBody.php b/src/Crud/Http/QueryBuilderBody.php
index baf1b63..d537b43 100644
--- a/src/Crud/Http/QueryBuilderBody.php
+++ b/src/Crud/Http/QueryBuilderBody.php
@@ -15,8 +15,4 @@
 
 class QueryBuilderBody extends AbstractQueryBuilderParameter
 {
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
 }
diff --git a/src/Crud/Http/QueryBuilderBodyParameter.php b/src/Crud/Http/QueryBuilderBodyParameter.php
index a7fc21f..44f348b 100644
--- a/src/Crud/Http/QueryBuilderBodyParameter.php
+++ b/src/Crud/Http/QueryBuilderBodyParameter.php
@@ -13,7 +13,6 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-class QueryBuilderBodyParameter extends AbstractQueryBuilderParameter
+class QueryBuilderBodyParameter extends AbstractQueryBuilderNamedParameter
 {
-    use QueryBuilderNamedParameterTrait;
 }
diff --git a/src/Crud/Http/QueryBuilderHeaderParameter.php b/src/Crud/Http/QueryBuilderHeaderParameter.php
index 992c07f..ab649fd 100644
--- a/src/Crud/Http/QueryBuilderHeaderParameter.php
+++ b/src/Crud/Http/QueryBuilderHeaderParameter.php
@@ -13,7 +13,6 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-class QueryBuilderHeaderParameter extends AbstractQueryBuilderParameter
+class QueryBuilderHeaderParameter extends AbstractQueryBuilderNamedParameter
 {
-    use QueryBuilderNamedParameterTrait;
 }
diff --git a/src/Crud/Http/QueryBuilderQueryParameter.php b/src/Crud/Http/QueryBuilderQueryParameter.php
index 883e1a1..25dee77 100644
--- a/src/Crud/Http/QueryBuilderQueryParameter.php
+++ b/src/Crud/Http/QueryBuilderQueryParameter.php
@@ -13,7 +13,6 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-class QueryBuilderQueryParameter extends AbstractQueryBuilderParameter
+class QueryBuilderQueryParameter extends AbstractQueryBuilderNamedParameter
 {
-    use QueryBuilderNamedParameterTrait;
 }

From 56ce4b47f5dfa4ee631ad4af6b4a34f21d4caac8 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 11 Apr 2022 13:23:46 +0200
Subject: [PATCH 120/264] Add missing types

---
 src/Controller/CrudControllerTrait.php        |   4 +-
 src/Crud/Crud.php                             | 141 ++++++------------
 src/Crud/CrudColumn.php                       |  16 +-
 src/Crud/CrudFactory.php                      |   8 +-
 src/Crud/CrudFilters.php                      |   9 +-
 src/Crud/CrudResponseGenerator.php            |   5 +-
 src/Crud/CrudSession.php                      |  48 +-----
 src/Crud/Http/QueryBuilder.php                |  68 ++-------
 src/Crud/SearchFormBuilder.php                |  40 +----
 src/Entity/UserCrudSettings.php               |  98 ++----------
 .../Entity/AbstractEntityTransformer.php      |  24 +--
 .../Entity/EntitiesToChoicesTransformer.php   |  11 +-
 .../Entity/EntitiesToIdsTransformer.php       |   2 +-
 .../Entity/EntityToChoiceTransformer.php      |   4 +-
 .../Entity/EntityToIdTransformer.php          |   2 +-
 src/Twig/CrudExtension.php                    |  23 +--
 tests/Twig/CrudExtensionTest.php              |   4 +
 17 files changed, 117 insertions(+), 390 deletions(-)

diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index 4903c6c..56cb2a4 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -24,7 +24,7 @@ abstract protected function getCrud(): Crud;
 
     abstract protected function getTemplateName(string $action): string;
 
-    final protected function createCrud($sessionName): Crud
+    final protected function createCrud(string $sessionName): Crud
     {
         return $this->container->get(CrudFactory::class)->create($sessionName);
     }
@@ -58,7 +58,7 @@ protected function afterBuildQuery(Crud $crud, array $data): array
         return $data;
     }
 
-    protected static function getCrudRequiredServices()
+    protected static function getCrudRequiredServices(): array
     {
         return [
             CrudFactory::class,
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index b557887..5b0673d 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -17,6 +17,7 @@
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 use Ecommit\CrudBundle\Form\Type\DisplaySettingsType;
 use Ecommit\DoctrineUtils\Paginator\DoctrinePaginatorBuilder;
+use Ecommit\Paginator\PaginatorInterface;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Form;
@@ -30,64 +31,36 @@ class Crud
     public const DESC = 'DESC';
     public const ASC = 'ASC';
 
-    protected $sessionName;
-
-    /**
-     * @var CrudSession
-     */
-    protected $sessionValues;
-
-    /**
-     * @var SearchFormBuilder|FormView
-     */
-    protected $searchForm;
-
-    /**
-     * @var Form
-     */
-    protected $displaySettingsForm = null;
-
-    protected $isInitialized = false;
-    protected $initializationInProgress = false;
-    protected $availableColumns = [];
-    protected $availableVirtualColumns = [];
-    protected $availableResultsPerPage = [];
-    protected $defaultSort = null;
-    protected $defaultPersonalizedSort = [];
-    protected $defaultSense = null;
-    protected $defaultResultsPerPage = null;
-
-    protected $queryBuilder = null;
-    protected $persistentSettings = false;
-    protected $updateDatabase = false;
-    protected $paginator = null;
-    protected $buildPaginator = true;
-    protected $displayResultsOnlyIfSearch = false;
-    protected $displayResults = true;
-
-    protected $twigFunctionsConfiguration = [];
-
-    /*
-     * Router
-     */
-    protected $routeName = null;
-    protected $routeParams = [];
-
-    protected $divIdSearch = 'crud_search';
-    protected $divIdList = 'crud_list';
-
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    public function __construct($sessionName, ContainerInterface $container)
+    protected CrudSession $sessionValues;
+    protected SearchFormBuilder|FormView|null $searchForm;
+    protected Form|FormView|null $displaySettingsForm;
+    protected bool $isInitialized = false;
+    protected bool $initializationInProgress = false;
+    protected array $availableColumns = [];
+    protected array $availableVirtualColumns = [];
+    protected array $availableResultsPerPage = [];
+    protected ?string $defaultSort;
+    protected array $defaultPersonalizedSort = [];
+    protected ?string $defaultSense;
+    protected ?int $defaultResultsPerPage;
+    protected \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface|null $queryBuilder;
+    protected bool $persistentSettings = false;
+    protected bool $updateDatabase = false;
+    protected ?PaginatorInterface $paginator;
+    protected bool|\Closure|array $buildPaginator = true;
+    protected bool $displayResultsOnlyIfSearch = false;
+    protected bool $displayResults = true;
+    protected array $twigFunctionsConfiguration = [];
+    protected ?string $routeName;
+    protected array $routeParams = [];
+    protected string $divIdSearch = 'crud_search';
+    protected string $divIdList = 'crud_list';
+
+    public function __construct(protected string $sessionName, protected ContainerInterface $container)
     {
         if (!preg_match('/^[a-zA-Z0-9_]{1,50}$/', $sessionName)) {
             throw new \Exception('Variable sessionName is not given or is invalid');
         }
-        $this->sessionName = $sessionName;
-        $this->container = $container;
         $this->sessionValues = new CrudSession();
 
         return $this;
@@ -228,18 +201,13 @@ public function addVirtualColumn(string $id, string $aliasSearch): self
         return $this;
     }
 
-    public function getQueryBuilder()
+    public function getQueryBuilder(): \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface|null
     {
         return $this->queryBuilder;
     }
 
-    public function setQueryBuilder($queryBuilder): self
+    public function setQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface $queryBuilder): self
     {
-        if (!($queryBuilder instanceof \Doctrine\ORM\QueryBuilder) &&
-            !($queryBuilder instanceof \Doctrine\DBAL\Query\QueryBuilder) &&
-            !($queryBuilder instanceof QueryBuilderInterface)) {
-            throw new \Exception('Bad query builder');
-        }
         $this->queryBuilder = $queryBuilder;
 
         return $this;
@@ -309,10 +277,8 @@ public function getRouteParams(): array
 
     /**
      * Returns the list url.
-     *
-     * @param array $parameters Additional parameters
      */
-    public function getUrl($parameters = []): string
+    public function getUrl(array $parameters = []): string
     {
         $parameters = array_merge($this->routeParams, $parameters);
 
@@ -321,10 +287,8 @@ public function getUrl($parameters = []): string
 
     /**
      * Returns the search url.
-     *
-     * @param array $parameters Additional parameters
      */
-    public function getSearchUrl($parameters = []): string
+    public function getSearchUrl(array $parameters = []): string
     {
         $parameters = array_merge($this->routeParams, ['search' => 1], $parameters);
 
@@ -333,10 +297,8 @@ public function getSearchUrl($parameters = []): string
 
     /**
      * Enables (or not) the auto build paginator.
-     *
-     * @param bool|closure|array $value
      */
-    public function setBuildPaginator($value): self
+    public function setBuildPaginator(bool|\Closure|array $value): self
     {
         $this->buildPaginator = $value;
 
@@ -344,9 +306,7 @@ public function setBuildPaginator($value): self
     }
 
     /*
-     * Use (or not) persistent settings
-     *
-     * @param bool $value
+     * Use (or not) persistent settings.
      */
     public function setPersistentSettings(bool $value): self
     {
@@ -394,7 +354,7 @@ public function processForm(): void
         }
     }
 
-    protected function testIfDatabaseMustMeUpdated($oldValue, $new_value): void
+    protected function testIfDatabaseMustMeUpdated(mixed $oldValue, mixed $new_value): void
     {
         if ($oldValue != $new_value) {
             $this->updateDatabase = true;
@@ -525,10 +485,8 @@ protected function checkCrudSession(): void
 
     /**
      * User Action: Changes number of displayed results.
-     *
-     * @param int $value
      */
-    protected function changeNumberResultsDisplayed($value): void
+    protected function changeNumberResultsDisplayed(int $value): void
     {
         $oldValue = $this->sessionValues->resultsPerPage;
         if (\in_array($value, $this->availableResultsPerPage)) {
@@ -541,15 +499,10 @@ protected function changeNumberResultsDisplayed($value): void
 
     /**
      * User Action: Changes displayed columns.
-     *
-     * @param array $value (columns id)
      */
-    protected function changeColumnsDisplayed($value): void
+    protected function changeColumnsDisplayed(array $value): void
     {
         $oldValue = $this->sessionValues->displayedColumns;
-        if (!\is_array($value)) {
-            $value = $this->getDefaultDisplayedColumns();
-        }
         $newDisplayedColumns = [];
         $availableColumns = $this->availableColumns;
         foreach ($value as $column_name) {
@@ -569,7 +522,7 @@ protected function changeColumnsDisplayed($value): void
      *
      * @param string $value Column id
      */
-    protected function changeSort($value): void
+    protected function changeSort(mixed $value): void
     {
         $oldValue = $this->sessionValues->sort;
         $availableColumns = $this->availableColumns;
@@ -585,10 +538,8 @@ protected function changeSort($value): void
 
     /**
      * User action: Changes sense.
-     *
-     * @param const $value Sens (ASC / DESC)
      */
-    protected function changeSense($value): void
+    protected function changeSense(mixed $value): void
     {
         $oldValue = $this->sessionValues->sense;
         if (\is_scalar($value) && (self::ASC === $value || self::DESC === $value)) {
@@ -602,10 +553,8 @@ protected function changeSense($value): void
 
     /**
      * User action: Changes search form values.
-     *
-     * @param object $value
      */
-    protected function changeFilterValues($value): void
+    protected function changeFilterValues(SearcherInterface $value): void
     {
         if (!$this->searchForm) {
             return;
@@ -619,10 +568,8 @@ protected function changeFilterValues($value): void
 
     /**
      * User action: Changes page number.
-     *
-     * @param string $value Page number
      */
-    protected function changePage($value): void
+    protected function changePage(mixed $value): void
     {
         if (!\is_scalar($value)) {
             $value = 1;
@@ -869,12 +816,12 @@ public function getSessionValues(): CrudSession
         return $this->sessionValues;
     }
 
-    public function getPaginator()
+    public function getPaginator(): ?PaginatorInterface
     {
         return $this->paginator;
     }
 
-    public function setPaginator($value)
+    public function setPaginator(PaginatorInterface $value)
     {
         $this->paginator = $value;
 
@@ -886,7 +833,7 @@ public function setPaginator($value)
      *
      * @return SearchFormBuilder (before clearTemplate) or FormView (after clearTemplate)
      */
-    public function getSearchForm()
+    public function getSearchForm(): SearchFormBuilder|FormView|null
     {
         return $this->searchForm;
     }
@@ -896,7 +843,7 @@ public function getSearchForm()
      *
      * @return Form (before clearTemplate) or FormView (after clearTemplate)
      */
-    public function getDisplaySettingsForm()
+    public function getDisplaySettingsForm(): Form|FormView|null
     {
         return $this->displaySettingsForm;
     }
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index d2f8d14..94a59e1 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -15,13 +15,8 @@
 
 class CrudColumn
 {
-    public $id;
-    public $alias;
-    public $aliasSearch;
-    public $aliasSort;
-    public $label;
-    public $sortable;
-    public $defaultDisplayed;
+    public string $aliasSearch;
+    public string $aliasSort;
 
     /**
      * Constructor.
@@ -34,13 +29,8 @@ class CrudColumn
      * @param string $aliasSearch      Column SQL alias, used during searchs
      * @param string $aliasSort        Column(s) SQL alias (string or array of strings), used during sorting
      */
-    public function __construct(string $id, string $alias, ?string $label, bool $sortable, bool $defaultDisplayed, ?string $aliasSearch, ?string $aliasSort)
+    public function __construct(public string $id, public string $alias, public ?string $label, public bool $sortable, public bool $defaultDisplayed, ?string $aliasSearch, ?string $aliasSort)
     {
-        $this->id = $id;
-        $this->alias = $alias;
-        $this->label = $label;
-        $this->sortable = $sortable;
-        $this->defaultDisplayed = $defaultDisplayed;
         $this->aliasSearch = $aliasSearch ?: $alias;
         $this->aliasSort = $aliasSort ?: $alias;
     }
diff --git a/src/Crud/CrudFactory.php b/src/Crud/CrudFactory.php
index 3b49567..4c64528 100644
--- a/src/Crud/CrudFactory.php
+++ b/src/Crud/CrudFactory.php
@@ -17,14 +17,8 @@
 
 class CrudFactory
 {
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    public function __construct(ContainerInterface $container)
+    public function __construct(protected ContainerInterface $container)
     {
-        $this->container = $container;
     }
 
     public function create(string $sessionName): Crud
diff --git a/src/Crud/CrudFilters.php b/src/Crud/CrudFilters.php
index 5c45518..0c94396 100644
--- a/src/Crud/CrudFilters.php
+++ b/src/Crud/CrudFilters.php
@@ -18,19 +18,16 @@
 
 final class CrudFilters
 {
-    protected $container;
-
-    public function __construct(ContainerInterface $container)
+    public function __construct(protected ContainerInterface $container)
     {
-        $this->container = $container;
     }
 
-    public function has($filter): bool
+    public function has(string $filter): bool
     {
         return $this->container->has($filter);
     }
 
-    public function get($filter): FilterInterface
+    public function get(string $filter): FilterInterface
     {
         return $this->container->get($filter);
     }
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index de61a4d..aba9dcc 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -24,11 +24,8 @@
 
 class CrudResponseGenerator implements ServiceSubscriberInterface
 {
-    protected $container;
-
-    public function __construct(ContainerInterface $container)
+    public function __construct(protected ContainerInterface $container)
     {
-        $this->container = $container;
     }
 
     public function getResponse(Crud $crud, array $options = []): Response
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index 6585b39..94a5e36 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -20,45 +20,13 @@ class CrudSession
     /**
      * Search's object (used by "setData" inside the form). Used to
      * save the data of the search form.
-     *
-     * @var SearcherInterface
      */
-    public $searchFormData = null;
-
-    public $searchFormIsSubmittedAndValid = false;
-
-    /**
-     * Number of results, in one page.
-     *
-     * @var int
-     */
-    public $resultsPerPage = null;
-
-    /**
-     * Displayed colums.
-     *
-     * @var type
-     */
-    public $displayedColumns = [];
-
-    /**
-     * Sortable: Sort (Column id).
-     *
-     * @var type
-     */
-    public $sort = null;
-
-    /**
-     * Sortable: Sens (ASC / DESC).
-     *
-     * @var type
-     */
-    public $sense = null;
-
-    /**
-     * Page number.
-     *
-     * @var int
-     */
-    public $page = 1;
+    public ?SearcherInterface $searchFormData;
+
+    public int $resultsPerPage;
+    public array $displayedColumns = [];
+    public string $sort;
+    public string $sense;
+    public int $page = 1;
+    public bool $searchFormIsSubmittedAndValid = false;
 }
diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index dcb4f7a..6a17640 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -21,63 +21,17 @@
 
 class QueryBuilder implements QueryBuilderInterface
 {
-    /**
-     * @var string
-     */
-    protected $url;
-
-    /**
-     * @var string
-     */
-    protected $httpMethod;
-
-    /**
-     * @var array
-     */
-    protected $queryParameters = [];
-
-    /**
-     * @var array
-     */
-    protected $bodyParameters = [];
-
-    /**
-     * @var QueryBuilderBody
-     */
-    protected $body;
-
-    protected $bodyIsJson = false;
-
-    /**
-     * @var array
-     */
-    protected $headerParameters = [];
-
-    /**
-     * @var \Closure
-     */
-    protected $orderBuilder;
-
-    /**
-     * @var \Closure
-     */
-    protected $paginationBuilder;
-
-    /**
-     * @var array
-     */
-    protected $orders = [];
-
-    /**
-     * @var HttpClientInterface
-     */
-    protected $client;
-
-    public function __construct(string $url, string $httpMethod, ?HttpClientInterface $client = null)
+    protected array $queryParameters = [];
+    protected array $bodyParameters = [];
+    protected mixed $body = null;
+    protected bool $bodyIsJson = false;
+    protected array $headerParameters = [];
+    protected ?\Closure $orderBuilder = null;
+    protected ?\Closure $paginationBuilder = null;
+    protected array $orders = [];
+
+    public function __construct(protected string $url, protected string $httpMethod, protected ?HttpClientInterface $client = null)
     {
-        $this->url = $url;
-        $this->httpMethod = $httpMethod;
-        $this->client = $client;
         if (null === $this->client) {
             $this->client = HttpClient::create();
         }
@@ -140,7 +94,7 @@ public function addOrderBy(string $sort, string $sense): self
         return $this;
     }
 
-    public function orderBy($sort, $sense): self
+    public function orderBy(string $sort, string $sense): self
     {
         $this->orders = [];
         $this->addOrderBy($sort, $sense);
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index d83407f..acb4923 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -18,7 +18,7 @@
 use Ecommit\CrudBundle\Form\Type\FormSearchType;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -26,33 +26,12 @@
 
 final class SearchFormBuilder
 {
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
+    protected array $options;
+    protected FormBuilderInterface|Form|FormView $form;
+    protected array $filters = [];
 
-    /**
-     * @var Crud
-     */
-    protected $crud;
-
-    /**
-     * @var SearcherInterface
-     */
-    protected $defaultData;
-
-    protected $options;
-
-    protected $form;
-
-    protected $filters = [];
-
-    public function __construct(ContainerInterface $container, Crud $crud, SearcherInterface $defaultData, ?string $type, array $options)
+    public function __construct(protected ContainerInterface $container, protected Crud $crud, protected SearcherInterface $defaultData, ?string $type, array $options)
     {
-        $this->container = $container;
-        $this->crud = $crud;
-        $this->defaultData = $defaultData;
-
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
             'autovalidate' => true,
@@ -146,7 +125,7 @@ public function addField(string $property, string $type, array $options = []): s
         return $this;
     }
 
-    public function getField(string $property)
+    public function getField(string $property): FormBuilderInterface|Form|FormView
     {
         return $this->form->get($property);
     }
@@ -175,10 +154,7 @@ public function createFormView(): void
         $this->form = $this->form->createView();
     }
 
-    /**
-     * @return FormBuilder|Form|FormView
-     */
-    public function getForm()
+    public function getForm(): FormBuilderInterface|Form|FormView
     {
         return $this->form;
     }
@@ -188,7 +164,7 @@ public function getDefaultData(): SearcherInterface
         return $this->defaultData;
     }
 
-    public function updateQueryBuilder($queryBuilder, SearcherInterface $searcher): void
+    public function updateQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface $queryBuilder, SearcherInterface $searcher): void
     {
         $searcher->updateQueryBuilder($queryBuilder, $this->options);
 
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index 3f5215d..b3b0d8d 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -40,154 +40,82 @@ class UserCrudSettings
     #[ORM\Column(type: 'string', length: 4)]
     protected $sense;
 
-    /**
-     * Set crudName.
-     *
-     * @param string $crudName
-     *
-     * @return UserCrudSettings
-     */
-    public function setCrudName($crudName)
+    public function setCrudName(string $crudName): self
     {
         $this->crudName = $crudName;
 
         return $this;
     }
 
-    /**
-     * Get crudName.
-     *
-     * @return string
-     */
-    public function getCrudName()
+    public function getCrudName(): string
     {
         return $this->crudName;
     }
 
-    /**
-     * Set resultsDisplayed.
-     *
-     * @param int $resultsDisplayed
-     *
-     * @return UserCrudSettings
-     */
-    public function setResultsDisplayed($resultsDisplayed)
+    public function setResultsDisplayed(int $resultsDisplayed): self
     {
         $this->resultsDisplayed = $resultsDisplayed;
 
         return $this;
     }
 
-    /**
-     * Get resultsDisplayed.
-     *
-     * @return int
-     */
-    public function getResultsDisplayed()
+    public function getResultsDisplayed(): int
     {
         return $this->resultsDisplayed;
     }
 
-    /**
-     * Set displayedColumns.
-     *
-     * @param array $displayedColumns
-     *
-     * @return UserCrudSettings
-     */
-    public function setDisplayedColumns($displayedColumns)
+    public function setDisplayedColumns(array $displayedColumns): self
     {
         $this->displayedColumns = $displayedColumns;
 
         return $this;
     }
 
-    /**
-     * Get displayedColumns.
-     *
-     * @return array
-     */
-    public function getDisplayedColumns()
+    public function getDisplayedColumns(): array
     {
         return $this->displayedColumns;
     }
 
-    /**
-     * Set sort.
-     *
-     * @param string $sort
-     *
-     * @return UserCrudSettings
-     */
-    public function setSort($sort)
+    public function setSort(string $sort): self
     {
         $this->sort = $sort;
 
         return $this;
     }
 
-    /**
-     * Get sort.
-     *
-     * @return string
-     */
-    public function getSort()
+    public function getSort(): string
     {
         return $this->sort;
     }
 
-    /**
-     * Set sense.
-     *
-     * @param string $sense
-     *
-     * @return UserCrudSettings
-     */
-    public function setSense($sense)
+    public function setSense(string $sense): self
     {
         $this->sense = $sense;
 
         return $this;
     }
 
-    /**
-     * Get sense.
-     *
-     * @return string
-     */
-    public function getSense()
+    public function getSense(): string
     {
         return $this->sense;
     }
 
-    /**
-     * Set user.
-     *
-     * @return UserCrudSettings
-     */
-    public function setUser(\Ecommit\CrudBundle\Entity\UserCrudInterface $user)
+    public function setUser(\Ecommit\CrudBundle\Entity\UserCrudInterface $user): self
     {
         $this->user = $user;
 
         return $this;
     }
 
-    /**
-     * Get user.
-     *
-     * @return \Ecommit\CrudBundle\Entity\UserCrudInterface
-     */
-    public function getUser()
+    public function getUser(): \Ecommit\CrudBundle\Entity\UserCrudInterface
     {
         return $this->user;
     }
 
     /**
      * Create CrudSession from this object.
-     *
-     * @return \Ecommit\CrudBundle\Crud\CrudSession
      */
-    public function transformToCrudSession(CrudSession $crudSessionManager)
+    public function transformToCrudSession(CrudSession $crudSessionManager): self
     {
         $crudSessionManager->displayedColumns = $this->displayedColumns;
         $crudSessionManager->resultsPerPage = $this->resultsDisplayed;
diff --git a/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php b/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
index 8558d04..70ce4e4 100644
--- a/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
+++ b/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
@@ -13,6 +13,7 @@
 
 namespace Ecommit\CrudBundle\Form\DataTransformer\Entity;
 
+use Doctrine\ORM\QueryBuilder;
 use Ecommit\ScalarValues\ScalarValues;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;
@@ -20,28 +21,15 @@
 
 abstract class AbstractEntityTransformer implements DataTransformerInterface
 {
-    protected $queryBuilder;
-    protected $identifier;
-    protected $choiceLabel;
-    protected $throwExceptionIfValueNotFoundInReverse;
+    protected PropertyAccessor $accessor;
+    protected array $cachedResults = [];
 
-    /**
-     * @var PropertyAccessor
-     */
-    protected $accessor;
-
-    protected $cachedResults = [];
-
-    public function __construct($queryBuilder, $identifier, $choiceLabel, bool $throwExceptionIfValueNotFoundInReverse)
+    public function __construct(protected QueryBuilder $queryBuilder, protected string $identifier, protected mixed $choiceLabel, protected bool $throwExceptionIfValueNotFoundInReverse)
     {
-        $this->queryBuilder = $queryBuilder;
-        $this->identifier = $identifier;
-        $this->choiceLabel = $choiceLabel;
-        $this->throwExceptionIfValueNotFoundInReverse = $throwExceptionIfValueNotFoundInReverse;
         $this->accessor = PropertyAccess::createPropertyAccessor();
     }
 
-    protected function getCacheHash($id): string
+    protected function getCacheHash(mixed $id): string
     {
         if (\is_array($id)) {
             $id = ScalarValues::filterScalarValues($id);
@@ -60,7 +48,7 @@ protected function getCacheHash($id): string
         ]));
     }
 
-    protected function extractLabel($entity): string
+    protected function extractLabel(object $entity): string
     {
         if ($this->choiceLabel) {
             if ($this->choiceLabel instanceof \Closure) {
diff --git a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
index 54df04d..80dbf04 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
@@ -15,6 +15,7 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\QueryBuilder;
 use Ecommit\ScalarValues\ScalarValues;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
 use Symfony\Component\Form\Exception\TransformationFailedException;
@@ -22,16 +23,12 @@
 
 class EntitiesToChoicesTransformer extends AbstractEntityTransformer
 {
-    protected $maxResults;
-
-    public function __construct($queryBuilder, $identifier, $choiceLabel, bool $throwExceptionIfValueNotFoundInReverse, int $maxResults)
+    public function __construct(QueryBuilder $queryBuilder, string $identifier, mixed $choiceLabel, bool $throwExceptionIfValueNotFoundInReverse, protected int $maxResults)
     {
         parent::__construct($queryBuilder, $identifier, $choiceLabel, $throwExceptionIfValueNotFoundInReverse);
-
-        $this->maxResults = $maxResults;
     }
 
-    public function transform($collection)
+    public function transform(mixed $collection)
     {
         if (null === $collection) {
             return [];
@@ -52,7 +49,7 @@ public function transform($collection)
         return $results;
     }
 
-    public function reverseTransform($identifiers)
+    public function reverseTransform(mixed $identifiers)
     {
         $collection = new ArrayCollection();
 
diff --git a/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
index 19433b2..90dbe36 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
@@ -18,7 +18,7 @@
 
 class EntitiesToIdsTransformer extends EntitiesToChoicesTransformer
 {
-    public function transform($collection)
+    public function transform(mixed $collection)
     {
         if (null === $collection) {
             return [];
diff --git a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
index 769ed3c..4563022 100644
--- a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
@@ -19,7 +19,7 @@
 
 class EntityToChoiceTransformer extends AbstractEntityTransformer
 {
-    public function transform($entity)
+    public function transform(mixed $entity)
     {
         if (null === $entity || '' === $entity) {
             return null;
@@ -37,7 +37,7 @@ public function transform($entity)
         return $results;
     }
 
-    public function reverseTransform($identifier)
+    public function reverseTransform(mixed $identifier)
     {
         if ('' === $identifier || null === $identifier) {
             return null;
diff --git a/src/Form/DataTransformer/Entity/EntityToIdTransformer.php b/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
index 5bee247..1874fca 100644
--- a/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
@@ -17,7 +17,7 @@
 
 class EntityToIdTransformer extends EntityToChoiceTransformer
 {
-    public function transform($entity)
+    public function transform(mixed $entity)
     {
         if (null === $entity || '' === $entity) {
             return null;
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 49c24fe..96dbb85 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -24,23 +24,10 @@
 
 class CrudExtension extends AbstractExtension
 {
-    /**
-     * @var FormRendererInterface
-     */
-    protected $formRenderer;
-
-    protected $theme;
-    protected $iconTheme;
-    protected $configuration;
-
     protected $lastTdValues = [];
 
-    public function __construct(FormRendererInterface $formRenderer, string $theme, string $iconTheme, array $configuration)
+    public function __construct(protected FormRendererInterface $formRenderer, protected string $theme, protected string $iconTheme, protected array $configuration)
     {
-        $this->formRenderer = $formRenderer;
-        $this->theme = $theme;
-        $this->iconTheme = $iconTheme;
-        $this->configuration = $configuration;
     }
 
     public function getName()
@@ -358,7 +345,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
      *                         * theme: Theme used. If null, default theme is used
      *                         * block: Twig block used. Default: td
      */
-    public function td(Environment $environment, string $columnId, Crud $crud, $value, $options = []): string
+    public function td(Environment $environment, string $columnId, Crud $crud, mixed $value, array $options = []): string
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
@@ -459,7 +446,7 @@ public function displaySettings(Environment $environment, Crud $crud, array $opt
      *                       * theme: Theme used. If null, default theme is used
      *                       * block: Twig block used. Default: search_form_start
      */
-    public function searchFormStart(Environment $environment, Crud $crud, array $options = [])
+    public function searchFormStart(Environment $environment, Crud $crud, array $options = []): string
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
@@ -515,7 +502,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
      *                       * theme: Theme used. If null, default theme is used
      *                       * block: Twig block used. Default: search_form_submit
      */
-    public function searchFormSubmit(Environment $environment, Crud $crud, $options = [])
+    public function searchFormSubmit(Environment $environment, Crud $crud, array $options = []): string
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
@@ -550,7 +537,7 @@ public function searchFormSubmit(Environment $environment, Crud $crud, $options
      *                       * theme: Theme used. If null, default theme is used
      *                       * block: Twig block used. Default: search_form_reset
      */
-    public function searchFormReset(Environment $environment, Crud $crud, $options = [])
+    public function searchFormReset(Environment $environment, Crud $crud, array $options = []): string
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index e8131cf..0380029 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -742,6 +742,10 @@ protected function createCrud(string $sort = 'column1', string $sense = Crud::AS
             ->disableOriginalConstructor()
             ->onlyMethods(['getDivIdList', 'getRouteName', 'getRouteParams', 'getSessionValues', 'getColumn'])
             ->getMock();
+        $reflection = new \ReflectionClass($crud);
+        $reflectionProperty = $reflection->getProperty('sessionName');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($crud, 'session_name');
         $crud->expects($this->any())->method('getDivIdList')->willReturn('myId');
         $crud->expects($this->any())->method('getRouteName')->willReturn('user_crud');
         $crud->expects($this->any())->method('getRouteParams')->willReturn([]);

From 416dd648f733c15f800264c719850959a9d5405a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 11 Apr 2022 14:04:22 +0200
Subject: [PATCH 121/264] Add CrudSession constructor

---
 src/Crud/Crud.php                | 27 +++++++++++----------------
 src/Crud/CrudSession.php         | 17 +++++++----------
 src/Entity/UserCrudSettings.php  |  2 +-
 tests/Twig/CrudExtensionTest.php | 18 ++++++++++--------
 4 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 5b0673d..8e50f10 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -61,7 +61,6 @@ public function __construct(protected string $sessionName, protected ContainerIn
         if (!preg_match('/^[a-zA-Z0-9_]{1,50}$/', $sessionName)) {
             throw new \Exception('Variable sessionName is not given or is invalid');
         }
-        $this->sessionValues = new CrudSession();
 
         return $this;
     }
@@ -439,8 +438,16 @@ protected function load(): void
             return;
         }
 
-        // If session is null => Retrieve from database
-        // Only if persistent settings is enabled
+        // If session is null => Assign default value
+        $this->sessionValues = new CrudSession(
+            $this->defaultResultsPerPage,
+            $this->getDefaultDisplayedColumns(),
+            $this->defaultSort,
+            $this->defaultSense,
+            ($this->searchForm) ? $this->searchForm->getDefaultData() : null,
+        );
+
+        // If persistent settings is enabled -> Retrieve from database
         if ($this->persistentSettings) {
             $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
                 [
@@ -449,24 +456,12 @@ protected function load(): void
                 ]
             );
             if ($objectDatabase) {
-                $this->sessionValues = $objectDatabase->transformToCrudSession(new CrudSession());
-                if ($this->searchForm) {
-                    $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();
-                }
+                $this->sessionValues = $objectDatabase->transformToCrudSession($this->sessionValues);
                 $this->checkCrudSession();
 
                 return;
             }
         }
-
-        // Session and database values are null: Default values;
-        $this->sessionValues->displayedColumns = $this->getDefaultDisplayedColumns();
-        $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
-        $this->sessionValues->sense = $this->defaultSense;
-        $this->sessionValues->sort = $this->defaultSort;
-        if ($this->searchForm) {
-            $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();
-        }
     }
 
     /**
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index 94a5e36..ed40b19 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -15,18 +15,15 @@
 
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 
+/**
+ * $searchFormData: Search's object (used by "setData" inside the form). Used to save the data of the search form.
+ */
 class CrudSession
 {
-    /**
-     * Search's object (used by "setData" inside the form). Used to
-     * save the data of the search form.
-     */
-    public ?SearcherInterface $searchFormData;
-
-    public int $resultsPerPage;
-    public array $displayedColumns = [];
-    public string $sort;
-    public string $sense;
     public int $page = 1;
     public bool $searchFormIsSubmittedAndValid = false;
+
+    public function __construct(public int $resultsPerPage, public array $displayedColumns, public string $sort, public string $sense, public ?SearcherInterface $searchFormData = null)
+    {
+    }
 }
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index b3b0d8d..3885608 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -115,7 +115,7 @@ public function getUser(): \Ecommit\CrudBundle\Entity\UserCrudInterface
     /**
      * Create CrudSession from this object.
      */
-    public function transformToCrudSession(CrudSession $crudSessionManager): self
+    public function transformToCrudSession(CrudSession $crudSessionManager): CrudSession
     {
         $crudSessionManager->displayedColumns = $this->displayedColumns;
         $crudSessionManager->resultsPerPage = $this->resultsDisplayed;
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 0380029..7c21b9e 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -729,14 +729,16 @@ protected function createCrud(string $sort = 'column1', string $sense = Crud::AS
             'column3' => new CrudColumn('column3', 'alias3', 'label3', false, true, 'alias3', 'alias3'),
             'column4' => new CrudColumn('column4', 'alias4', 'label4', true, true, 'alias4', 'alias4'),
         ];
-        $crudSession = new CrudSession();
-        $crudSession->displayedColumns = [
-            'column1',
-            'column2',
-            'column3',
-        ];
-        $crudSession->sort = $sort;
-        $crudSession->sense = $sense;
+        $crudSession = new CrudSession(
+            10,
+            [
+                'column1',
+                'column2',
+                'column3',
+            ],
+            $sort,
+            $sense,
+        );
 
         $crud = $this->getMockBuilder(Crud::class)
             ->disableOriginalConstructor()

From e7e9eb176e28de849e65d9e9d06b73ab5fce743a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 11 Apr 2022 15:35:39 +0200
Subject: [PATCH 122/264] Add final classes

---
 composer.json                                        | 1 +
 doc/upgrade/3.0.md                                   | 1 +
 src/Crud/Crud.php                                    | 2 +-
 src/Crud/CrudColumn.php                              | 2 +-
 src/Crud/CrudFactory.php                             | 2 +-
 src/Crud/CrudResponseGenerator.php                   | 2 +-
 src/Crud/CrudSession.php                             | 2 +-
 src/Crud/Http/AbstractQueryBuilderNamedParameter.php | 3 +++
 src/Crud/Http/AbstractQueryBuilderParameter.php      | 3 +++
 src/Crud/Http/QueryBuilder.php                       | 2 +-
 src/Crud/Http/QueryBuilderBody.php                   | 2 +-
 src/Crud/Http/QueryBuilderBodyParameter.php          | 2 +-
 src/Crud/Http/QueryBuilderHeaderParameter.php        | 2 +-
 src/Crud/Http/QueryBuilderQueryParameter.php         | 2 +-
 src/EventListener/MappingEntities.php                | 2 +-
 src/Twig/CrudExtension.php                           | 2 +-
 tests/bootstrap.php                                  | 4 ++++
 17 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 13835c8..c445dea 100644
--- a/composer.json
+++ b/composer.json
@@ -41,6 +41,7 @@
     },
     "require-dev": {
         "dbrekelmans/bdi": "^0.3.0",
+        "dg/bypass-finals": "^1.3",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^9.0",
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index ba11927..57340f0 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -65,6 +65,7 @@
 
 **Namespace: Ecommit\CrudBundle\Crud**
 
+* Les classes `Crud`, `CrudColumn`, `CrudFactory` et `CrudSession` sont maintenant finales.
 * La signature du constructeur de `Crud` est modifiée:
     * Avant: `__construct($sessionName, RouterInterface $router, FormFactoryInterface $formFactory, Request $request, Registry $registry, $user)`
     * Maintenant: `__construct($sessionName, ContainerInterface $container)`
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 8e50f10..378e30c 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -26,7 +26,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\User\UserInterface;
 
-class Crud
+final class Crud
 {
     public const DESC = 'DESC';
     public const ASC = 'ASC';
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index 94a59e1..4f55518 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -13,7 +13,7 @@
 
 namespace Ecommit\CrudBundle\Crud;
 
-class CrudColumn
+final class CrudColumn
 {
     public string $aliasSearch;
     public string $aliasSort;
diff --git a/src/Crud/CrudFactory.php b/src/Crud/CrudFactory.php
index 4c64528..ae2c3de 100644
--- a/src/Crud/CrudFactory.php
+++ b/src/Crud/CrudFactory.php
@@ -15,7 +15,7 @@
 
 use Psr\Container\ContainerInterface;
 
-class CrudFactory
+final class CrudFactory
 {
     public function __construct(protected ContainerInterface $container)
     {
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index aba9dcc..f792aeb 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -22,7 +22,7 @@
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 use Twig\Environment;
 
-class CrudResponseGenerator implements ServiceSubscriberInterface
+final class CrudResponseGenerator implements ServiceSubscriberInterface
 {
     public function __construct(protected ContainerInterface $container)
     {
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index ed40b19..7c61074 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -18,7 +18,7 @@
 /**
  * $searchFormData: Search's object (used by "setData" inside the form). Used to save the data of the search form.
  */
-class CrudSession
+final class CrudSession
 {
     public int $page = 1;
     public bool $searchFormIsSubmittedAndValid = false;
diff --git a/src/Crud/Http/AbstractQueryBuilderNamedParameter.php b/src/Crud/Http/AbstractQueryBuilderNamedParameter.php
index 24024ad..2a0f429 100644
--- a/src/Crud/Http/AbstractQueryBuilderNamedParameter.php
+++ b/src/Crud/Http/AbstractQueryBuilderNamedParameter.php
@@ -13,6 +13,9 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
+/**
+ * @internal
+ */
 abstract class AbstractQueryBuilderNamedParameter extends AbstractQueryBuilderParameter
 {
     public function __construct(public string $name, mixed $value)
diff --git a/src/Crud/Http/AbstractQueryBuilderParameter.php b/src/Crud/Http/AbstractQueryBuilderParameter.php
index 68516a0..20b3c62 100644
--- a/src/Crud/Http/AbstractQueryBuilderParameter.php
+++ b/src/Crud/Http/AbstractQueryBuilderParameter.php
@@ -15,6 +15,9 @@
 
 use Ecommit\CrudBundle\Crud\QueryBuilderParameterInterface;
 
+/**
+ * @internal
+ */
 abstract class AbstractQueryBuilderParameter implements QueryBuilderParameterInterface
 {
     public function __construct(public mixed $value)
diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index 6a17640..ff4898f 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -19,7 +19,7 @@
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
-class QueryBuilder implements QueryBuilderInterface
+final class QueryBuilder implements QueryBuilderInterface
 {
     protected array $queryParameters = [];
     protected array $bodyParameters = [];
diff --git a/src/Crud/Http/QueryBuilderBody.php b/src/Crud/Http/QueryBuilderBody.php
index d537b43..7a62b13 100644
--- a/src/Crud/Http/QueryBuilderBody.php
+++ b/src/Crud/Http/QueryBuilderBody.php
@@ -13,6 +13,6 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-class QueryBuilderBody extends AbstractQueryBuilderParameter
+final class QueryBuilderBody extends AbstractQueryBuilderParameter
 {
 }
diff --git a/src/Crud/Http/QueryBuilderBodyParameter.php b/src/Crud/Http/QueryBuilderBodyParameter.php
index 44f348b..c7eb3b8 100644
--- a/src/Crud/Http/QueryBuilderBodyParameter.php
+++ b/src/Crud/Http/QueryBuilderBodyParameter.php
@@ -13,6 +13,6 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-class QueryBuilderBodyParameter extends AbstractQueryBuilderNamedParameter
+final class QueryBuilderBodyParameter extends AbstractQueryBuilderNamedParameter
 {
 }
diff --git a/src/Crud/Http/QueryBuilderHeaderParameter.php b/src/Crud/Http/QueryBuilderHeaderParameter.php
index ab649fd..700eea4 100644
--- a/src/Crud/Http/QueryBuilderHeaderParameter.php
+++ b/src/Crud/Http/QueryBuilderHeaderParameter.php
@@ -13,6 +13,6 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-class QueryBuilderHeaderParameter extends AbstractQueryBuilderNamedParameter
+final class QueryBuilderHeaderParameter extends AbstractQueryBuilderNamedParameter
 {
 }
diff --git a/src/Crud/Http/QueryBuilderQueryParameter.php b/src/Crud/Http/QueryBuilderQueryParameter.php
index 25dee77..80398ce 100644
--- a/src/Crud/Http/QueryBuilderQueryParameter.php
+++ b/src/Crud/Http/QueryBuilderQueryParameter.php
@@ -13,6 +13,6 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-class QueryBuilderQueryParameter extends AbstractQueryBuilderNamedParameter
+final class QueryBuilderQueryParameter extends AbstractQueryBuilderNamedParameter
 {
 }
diff --git a/src/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
index cfafe2e..ed6316e 100644
--- a/src/EventListener/MappingEntities.php
+++ b/src/EventListener/MappingEntities.php
@@ -16,7 +16,7 @@
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-class MappingEntities
+final class MappingEntities
 {
     protected $isLoad = false;
 
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 96dbb85..bb9a194 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -22,7 +22,7 @@
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
-class CrudExtension extends AbstractExtension
+final class CrudExtension extends AbstractExtension
 {
     protected $lastTdValues = [];
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 8c06c92..a684089 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -11,10 +11,14 @@
  * file that was distributed with this source code.
  */
 
+use DG\BypassFinals;
+
 require __DIR__.'/Functional/App/config/bootstrap.php';
 
 function bootstrap(): void
 {
+    BypassFinals::enable();
+
     $kernel = new \Ecommit\CrudBundle\Tests\Functional\App\Kernel('test', true);
     $kernel->boot();
 

From 8c81eef97ad752a486318203cc3a807b8d3bb8f2 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 11 Apr 2022 15:40:43 +0200
Subject: [PATCH 123/264] [CrudControllerTrait] Add doctrine service

---
 src/Controller/CrudControllerTrait.php             | 2 ++
 tests/Functional/App/Controller/UserController.php | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index 56cb2a4..55bad04 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -13,6 +13,7 @@
 
 namespace Ecommit\CrudBundle\Controller;
 
+use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Crud\CrudFactory;
 use Ecommit\CrudBundle\Crud\CrudResponseGenerator;
@@ -63,6 +64,7 @@ protected static function getCrudRequiredServices(): array
         return [
             CrudFactory::class,
             CrudResponseGenerator::class,
+            'doctrine' => '?'.ManagerRegistry::class,
         ];
     }
 }
diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index a979c41..61a744c 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -13,7 +13,6 @@
 
 namespace Ecommit\CrudBundle\Tests\Functional\App\Controller;
 
-use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Controller\AbstractCrudController;
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
@@ -65,11 +64,4 @@ public function ajaxCrudAction()
     {
         return $this->getAjaxCrudResponse();
     }
-
-    public static function getSubscribedServices(): array
-    {
-        return array_merge(parent::getSubscribedServices(), [
-            'doctrine' => ManagerRegistry::class,
-        ]);
-    }
 }

From 047ea7380f9088bc2d05cb9c0416f845d7aa7f54 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 11 Apr 2022 15:57:32 +0200
Subject: [PATCH 124/264] Delete unused templates

---
 doc/upgrade/3.0.md                            |  3 +-
 .../bootstrap_3_horizontal_layout.html.twig   | 47 -------------------
 templates/Form/bootstrap_3_layout.html.twig   | 45 ------------------
 templates/Form/div_layout.html.twig           | 23 ---------
 4 files changed, 2 insertions(+), 116 deletions(-)
 delete mode 100644 templates/Form/bootstrap_3_horizontal_layout.html.twig
 delete mode 100644 templates/Form/bootstrap_3_layout.html.twig
 delete mode 100644 templates/Form/div_layout.html.twig

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 57340f0..57e107f 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -304,7 +304,8 @@ Si vous utilisez l'une de ces classes, voici la migration à effectuer :
 * Les templates suivants sont supprimés:
     * `EcommitCrud/Crud/double_search.html.twig`
     * `EcommitCrud/Crud/form_settings_*`
-
+    * `EcommitCrud/Form/bootstrap_3_*`
+    * `EcommitCrud/Form/div_layout.html.twig`
 
 
 ## Crud Helper
diff --git a/templates/Form/bootstrap_3_horizontal_layout.html.twig b/templates/Form/bootstrap_3_horizontal_layout.html.twig
deleted file mode 100644
index d27af82..0000000
--- a/templates/Form/bootstrap_3_horizontal_layout.html.twig
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends 'bootstrap_3_horizontal_layout.html.twig' %}
-
-{% block form_row -%}
-    {% apply spaceless %}
-        <div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}">
-            {{ form_label(form) }}
-            <div class="{{ block('form_group_class') }}">
-                {{ form_errors(form) }}
-                {{ form_widget(form) }}
-            </div>
-        </div>
-    {% endapply %}
-{%- endblock form_row %}
-
-{% block form_errors %}
-    {% apply spaceless %}
-        {% if errors|length > 0 %}
-            {% if form.parent %}
-                <span class="help-block">
-                    <ul class="form_error_bootstrap list-unstyled">
-                        {% for error in errors %}
-                            <li class="form_error_message">
-                                {% if 'data-display-in-errors' in form.vars.label_attr|keys and form.vars.label_attr['data-display-in-errors'] == '1' %}
-                                    {% if 'label-in-errors' in form.vars.label_attr|keys %}
-                                        {% set labelDisplayed = form.vars.label_attr['label-in-errors'] %}
-                                    {% else %}
-                                        {% set labelDisplayed = form.vars.label %}
-                                    {% endif %}
-                                    <span class="glyphicon glyphicon-exclamation-sign"></span> {{ labelDisplayed|trans }} : {{ error.message }}
-                                {% else %}
-                                    <span class="glyphicon glyphicon-exclamation-sign"></span> {{ error.message }}
-                                {% endif %}
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </span>
-            {% else %}
-                {% for error in errors %}
-                    <div class="alert flash-message alert-success alert-danger">
-                        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                        {{ error.message }}
-                    </div>
-                {% endfor %}
-            {% endif %}
-        {% endif %}
-    {% endapply %}
-{% endblock form_errors %}
diff --git a/templates/Form/bootstrap_3_layout.html.twig b/templates/Form/bootstrap_3_layout.html.twig
deleted file mode 100644
index 4ef3bfb..0000000
--- a/templates/Form/bootstrap_3_layout.html.twig
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends 'bootstrap_3_layout.html.twig' %}
-
-{% block form_row -%}
-    {% apply spaceless %}
-        <div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}">
-            {{ form_label(form) }}
-            {{ form_errors(form) }}
-            {{ form_widget(form) }}
-        </div>
-    {% endapply %}
-{%- endblock form_row %}
-
-{% block form_errors %}
-    {% apply spaceless %}
-        {% if errors|length > 0 %}
-            {% if form.parent %}
-                <span class="help-block">
-                    <ul class="form_error_bootstrap list-unstyled">
-                        {% for error in errors %}
-                            <li class="form_error_message">
-                                {% if 'data-display-in-errors' in form.vars.label_attr|keys and form.vars.label_attr['data-display-in-errors'] == '1' %}
-                                    {% if 'label-in-errors' in form.vars.label_attr|keys %}
-                                        {% set labelDisplayed = form.vars.label_attr['label-in-errors'] %}
-                                    {% else %}
-                                        {% set labelDisplayed = form.vars.label %}
-                                    {% endif %}
-                                    <span class="glyphicon glyphicon-exclamation-sign"></span> {{ labelDisplayed|trans }} : {{ error.message }}
-                                {% else %}
-                                    <span class="glyphicon glyphicon-exclamation-sign"></span> {{ error.message }}
-                                {% endif %}
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </span>
-            {% else %}
-                {% for error in errors %}
-                    <div class="alert flash-message alert-success alert-danger">
-                        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                        {{ error.message }}
-                    </div>
-                {% endfor %}
-            {% endif %}
-        {% endif %}
-    {% endapply %}
-{% endblock form_errors %}
diff --git a/templates/Form/div_layout.html.twig b/templates/Form/div_layout.html.twig
deleted file mode 100644
index 05740e2..0000000
--- a/templates/Form/div_layout.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends 'form_div_layout.html.twig' %}
-{% block form_errors %}
-{% apply spaceless %}
-    {% if errors|length > 0 %}
-    <ul class="form_error">
-        {% for error in errors %}
-            <li class="form_error_message">
-                {% if 'data-display-in-errors' in form.vars.label_attr|keys and form.vars.label_attr['data-display-in-errors'] == '1' %}
-                    {% if 'label-in-errors' in form.vars.label_attr|keys %}
-                        {% set labelDisplayed = form.vars.label_attr['label-in-errors'] %}
-                    {% else %}
-                        {% set labelDisplayed = form.vars.label %}
-                    {% endif %}
-                    <span>{{ labelDisplayed|trans }} : {{ error.message }}</span>
-                {% else %}
-                    <span>{{ error.message }}</span>
-                {% endif %}
-            </li>
-        {% endfor %}
-    </ul>
-    {% endif %}
-{% endapply %}
-{% endblock form_errors %}

From 554a6b23d284d9ed19879143868b1891c44ece46 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 15:26:29 +0200
Subject: [PATCH 125/264] Fix signatures

---
 src/Controller/CrudControllerTrait.php |  4 ++--
 src/Crud/Crud.php                      | 20 ++++++++++----------
 src/Crud/CrudColumn.php                |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index 55bad04..dd3b033 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -44,8 +44,8 @@ protected function getCrudOptions(): array
     {
         return [
             'template_generator' => fn (string $action) => $this->getTemplateName($action),
-            'before_build_query' => fn (Crud $crud, $data) => $this->beforeBuildQuery($crud, $data),
-            'after_build_query' => fn (Crud $crud, $data) => $this->afterBuildQuery($crud, $data),
+            'before_build_query' => fn (Crud $crud, array $data) => $this->beforeBuildQuery($crud, $data),
+            'after_build_query' => fn (Crud $crud, array $data) => $this->afterBuildQuery($crud, $data),
         ];
     }
 
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 378e30c..843abae 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -32,26 +32,26 @@ final class Crud
     public const ASC = 'ASC';
 
     protected CrudSession $sessionValues;
-    protected SearchFormBuilder|FormView|null $searchForm;
-    protected Form|FormView|null $displaySettingsForm;
+    protected SearchFormBuilder|FormView|null $searchForm = null;
+    protected Form|FormView|null $displaySettingsForm = null;
     protected bool $isInitialized = false;
     protected bool $initializationInProgress = false;
     protected array $availableColumns = [];
     protected array $availableVirtualColumns = [];
     protected array $availableResultsPerPage = [];
-    protected ?string $defaultSort;
+    protected ?string $defaultSort = null;
     protected array $defaultPersonalizedSort = [];
-    protected ?string $defaultSense;
-    protected ?int $defaultResultsPerPage;
-    protected \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface|null $queryBuilder;
+    protected ?string $defaultSense = null;
+    protected ?int $defaultResultsPerPage = null;
+    protected \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface|null $queryBuilder = null;
     protected bool $persistentSettings = false;
     protected bool $updateDatabase = false;
-    protected ?PaginatorInterface $paginator;
+    protected ?PaginatorInterface $paginator = null;
     protected bool|\Closure|array $buildPaginator = true;
     protected bool $displayResultsOnlyIfSearch = false;
     protected bool $displayResults = true;
     protected array $twigFunctionsConfiguration = [];
-    protected ?string $routeName;
+    protected ?string $routeName = null;
     protected array $routeParams = [];
     protected string $divIdSearch = 'crud_search';
     protected string $divIdList = 'crud_list';
@@ -816,7 +816,7 @@ public function getPaginator(): ?PaginatorInterface
         return $this->paginator;
     }
 
-    public function setPaginator(PaginatorInterface $value)
+    public function setPaginator(?PaginatorInterface $value): self
     {
         $this->paginator = $value;
 
@@ -867,7 +867,7 @@ public function setDivIdList(string $divIdList): self
         return $this;
     }
 
-    public function getSessionName(): ?string
+    public function getSessionName(): string
     {
         return $this->sessionName;
     }
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index 4f55518..c6b9cc9 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -29,7 +29,7 @@ final class CrudColumn
      * @param string $aliasSearch      Column SQL alias, used during searchs
      * @param string $aliasSort        Column(s) SQL alias (string or array of strings), used during sorting
      */
-    public function __construct(public string $id, public string $alias, public ?string $label, public bool $sortable, public bool $defaultDisplayed, ?string $aliasSearch, ?string $aliasSort)
+    public function __construct(public string $id, public string $alias, public ?string $label, public bool $sortable, public bool $defaultDisplayed, ?string $aliasSearch = null, ?string $aliasSort = null)
     {
         $this->aliasSearch = $aliasSearch ?: $alias;
         $this->aliasSort = $aliasSort ?: $alias;

From 4ed48b378997d3312f9dcdd33a2afdc3803b0f4e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 15:27:32 +0200
Subject: [PATCH 126/264] Add getDefaultSort, getDefaultSense and
 getDefaultPersonalizedSort methods

---
 src/Crud/Crud.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 843abae..142d5eb 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -225,6 +225,16 @@ public function setAvailableResultsPerPage(array $availableResultsPerPage, int $
         return $this;
     }
 
+    public function getDefaultSort(): ?string
+    {
+        return $this->defaultSort;
+    }
+
+    public function getDefaultSense(): ?string
+    {
+        return $this->defaultSense;
+    }
+
     /**
      * Set the default sort.
      *
@@ -239,6 +249,11 @@ public function setDefaultSort(string $sort, string $sense): self
         return $this;
     }
 
+    public function getDefaultPersonalizedSort(): array
+    {
+        return $this->defaultPersonalizedSort;
+    }
+
     /**
      * Set the default personalized sort.
      *

From f25baaee84431eead34275d2faf6519a2eae7b4d Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 15:28:33 +0200
Subject: [PATCH 127/264] createDisplaySettingsForm is now protected

---
 doc/upgrade/3.0.md | 1 +
 src/Crud/Crud.php  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 57e107f..b27e55b 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -88,6 +88,7 @@
 * La méthode `createSearcherForm` de `Crud` est renommée en `createSearchForm`. La signature est modifiée:
     * Avant: `createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = [])`
     * Après: `createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = [])`
+* La méthode `createDisplaySettingsForm` est maintenant protégée.
 * Les options du FormType personnalisé du formulaire de recherche doivent être passées dans l'option `form_options` (3ème argument) de `createSearchForm`
 * La signature du constructeur de `CrudFactory` est modifiée:
     * Avant: `__construct(RouterInterface $router, FormFactoryInterface $formFactory, RequestStack $requestStack, ManagerRegistry $registry, TokenStorageInterface $tokenStorage, array $templateConfiguration)`
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 142d5eb..f1d1903 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -626,7 +626,7 @@ protected function processRequest(): void
         }
     }
 
-    public function createDisplaySettingsForm(): void
+    protected function createDisplaySettingsForm(): void
     {
         $resultsPerPageChoices = [];
         foreach ($this->getAvailableResultsPerPage() as $number) {

From 78483aebf6c940463443fd3e48193d1b0b004a1c Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 15:29:04 +0200
Subject: [PATCH 128/264] Set paginator = null when displayResults = false

---
 src/Crud/Crud.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index f1d1903..a2567c0 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -907,6 +907,9 @@ public function getDisplayResults(): bool
     public function setDisplayResults(bool $displayResults): self
     {
         $this->displayResults = $displayResults;
+        if (false === $displayResults && $this->paginator) {
+            $this->paginator = null;
+        }
 
         return $this;
     }

From 84ef162f49cb59f54635d213a549da52ead3b98d Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 16:42:09 +0200
Subject: [PATCH 129/264] Change the order of methods

---
 src/Crud/Crud.php | 688 +++++++++++++++++++++++-----------------------
 1 file changed, 344 insertions(+), 344 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index a2567c0..0c6c0d4 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -186,6 +186,40 @@ public function addColumn(string $id, string $alias, string $label, array $optio
         return $this;
     }
 
+    /**
+     * Returns availabled columns.
+     */
+    public function getColumns(): array
+    {
+        return $this->availableColumns;
+    }
+
+    public function getColumn(string $columnId): CrudColumn
+    {
+        if (isset($this->availableColumns[$columnId])) {
+            return $this->availableColumns[$columnId];
+        }
+        throw new \Exception('Crud: Column '.$columnId.' does not exist');
+    }
+
+    /**
+     * Return default displayed columns.
+     */
+    public function getDefaultDisplayedColumns(): array
+    {
+        $columns = [];
+        foreach ($this->availableColumns as $column) {
+            if ($column->defaultDisplayed) {
+                $columns[] = $column->id;
+            }
+        }
+        if (0 == \count($columns)) {
+            throw new \Exception('Config Crud: One column displayed is required');
+        }
+
+        return $columns;
+    }
+
     /**
      * Add a virtual column inside the crud.
      *
@@ -200,6 +234,22 @@ public function addVirtualColumn(string $id, string $aliasSearch): self
         return $this;
     }
 
+    /**
+     * Returns availabled virtual columns.
+     */
+    public function getVirtualColumns(): array
+    {
+        return $this->availableVirtualColumns;
+    }
+
+    public function getVirtualColumn(string $columnId): CrudColumn
+    {
+        if (isset($this->availableVirtualColumns[$columnId])) {
+            return $this->availableVirtualColumns[$columnId];
+        }
+        throw new \Exception('Crud: Column '.$columnId.' does not exist');
+    }
+
     public function getQueryBuilder(): \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface|null
     {
         return $this->queryBuilder;
@@ -217,6 +267,14 @@ public function getAvailableResultsPerPage(): array
         return $this->availableResultsPerPage;
     }
 
+    /**
+     * Return default results per page.
+     */
+    public function getDefaultResultsPerPage(): ?int
+    {
+        return $this->defaultResultsPerPage;
+    }
+
     public function setAvailableResultsPerPage(array $availableResultsPerPage, int $defaultValue): self
     {
         $this->availableResultsPerPage = $availableResultsPerPage;
@@ -309,6 +367,38 @@ public function getSearchUrl(array $parameters = []): string
         return $this->container->get('router')->generate($this->routeName, $parameters);
     }
 
+    public function getSessionName(): string
+    {
+        return $this->sessionName;
+    }
+
+    public function getDisplayResultsOnlyIfSearch(): bool
+    {
+        return $this->displayResultsOnlyIfSearch;
+    }
+
+    public function setDisplayResultsOnlyIfSearch(bool $displayResultsOnlyIfSearch): self
+    {
+        $this->displayResultsOnlyIfSearch = $displayResultsOnlyIfSearch;
+
+        return $this;
+    }
+
+    public function getDisplayResults(): bool
+    {
+        return $this->displayResults;
+    }
+
+    public function setDisplayResults(bool $displayResults): self
+    {
+        $this->displayResults = $displayResults;
+        if (false === $displayResults && $this->paginator) {
+            $this->paginator = null;
+        }
+
+        return $this;
+    }
+
     /**
      * Enables (or not) the auto build paginator.
      */
@@ -319,6 +409,18 @@ public function setBuildPaginator(bool|\Closure|array $value): self
         return $this;
     }
 
+    public function getPaginator(): ?PaginatorInterface
+    {
+        return $this->paginator;
+    }
+
+    public function setPaginator(?PaginatorInterface $value): self
+    {
+        $this->paginator = $value;
+
+        return $this;
+    }
+
     /*
      * Use (or not) persistent settings.
      */
@@ -332,6 +434,21 @@ public function setPersistentSettings(bool $value): self
         return $this;
     }
 
+    public function getSessionValues(): CrudSession
+    {
+        return $this->sessionValues;
+    }
+
+    /**
+     * Returns the search form.
+     *
+     * @return SearchFormBuilder (before clearTemplate) or FormView (after clearTemplate)
+     */
+    public function getSearchForm(): SearchFormBuilder|FormView|null
+    {
+        return $this->searchForm;
+    }
+
     public function createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = []): self
     {
         $this->searchForm = new SearchFormBuilder($this->container, $this, $defaultData, $type, $options);
@@ -339,6 +456,30 @@ public function createSearchForm(SearcherInterface $defaultData, ?string $type =
         return $this;
     }
 
+    public function getDivIdSearch(): string
+    {
+        return $this->divIdSearch;
+    }
+
+    public function setDivIdSearch(string $divIdSearch): self
+    {
+        $this->divIdSearch = $divIdSearch;
+
+        return $this;
+    }
+
+    public function getDivIdList(): string
+    {
+        return $this->divIdList;
+    }
+
+    public function setDivIdList(string $divIdList): self
+    {
+        $this->divIdList = $divIdList;
+
+        return $this;
+    }
+
     /**
      * Process search form.
      */
@@ -368,114 +509,162 @@ public function processForm(): void
         }
     }
 
-    protected function testIfDatabaseMustMeUpdated(mixed $oldValue, mixed $new_value): void
-    {
-        if ($oldValue != $new_value) {
-            $this->updateDatabase = true;
-        }
-    }
-
     /**
-     * Saves user value.
+     * Builds the query.
      */
-    protected function save(): void
+    public function buildQuery(): void
     {
-        // Save in session
-        $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
-        $sessionValues = clone $this->sessionValues;
-        if (\is_object($this->sessionValues->searchFormData)) {
-            $sessionValues->searchFormData = clone $this->sessionValues->searchFormData;
+        // Builds query
+        $columnSortId = $this->sessionValues->sort;
+        if ('defaultPersonalizedSort' == $columnSortId) {
+            // Default personalised sort is used
+            foreach ($this->defaultPersonalizedSort as $key => $value) {
+                if (\is_int($key)) {
+                    $sort = $value;
+                    $sense = $this->defaultSense;
+                } else {
+                    $sort = $key;
+                    $sense = $value;
+                }
+                $this->queryBuilder->addOrderBy($sort, $sense);
+            }
+        } else {
+            $columnSortAlias = $this->availableColumns[$columnSortId]->aliasSort;
+            if (empty($columnSortAlias)) {
+                // Sort alias is not defined. Alias is used
+                $columnSortAlias = $this->availableColumns[$columnSortId]->alias;
+                $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
+            } elseif (\is_array($columnSortAlias)) {
+                // Sort alias is defined in many columns
+                foreach ($columnSortAlias as $oneColumnSortAlias) {
+                    $this->queryBuilder->addOrderBy($oneColumnSortAlias, $this->sessionValues->sense);
+                }
+            } else {
+                // Sort alias is defined in one column
+                $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
+            }
         }
-        $session->set($this->sessionName, $sessionValues);
 
-        // Save in database
-        if ($this->persistentSettings && $this->updateDatabase) {
-            $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
-                [
-                    'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
-                    'crudName' => $this->sessionName,
-                ]
-            );
-            $em = $this->container->get('doctrine')->getManager();
+        // Adds form searcher filters
+        if ($this->searchForm) {
+            $this->searchForm->updateQueryBuilder($this->queryBuilder, $this->sessionValues->searchFormData);
+        }
 
-            if ($objectDatabase) {
-                // Update object in database
-                $objectDatabase->updateFromSessionManager($this->sessionValues);
-                $em->flush();
-            } else {
-                // Create object in database only if not default values
-                if ($this->sessionValues->displayedColumns != $this->getDefaultDisplayedColumns() ||
-                    $this->sessionValues->resultsPerPage != $this->defaultResultsPerPage ||
-                    $this->sessionValues->sense != $this->defaultSense ||
-                    $this->sessionValues->sort != $this->defaultSort
-                ) {
-                    $objectDatabase = new UserCrudSettings();
-                    $objectDatabase->setUser($this->container->get('security.token_storage')->getToken()->getUser());
-                    $objectDatabase->setCrudName($this->sessionName);
-                    $objectDatabase->updateFromSessionManager($this->sessionValues);
-                    $em->persist($objectDatabase);
-                    $em->flush();
+        // Builds paginator
+        if ($this->displayResults) {
+            if (\is_object($this->buildPaginator) && $this->buildPaginator instanceof \Closure) {
+                // Case: Manual paginator (by closure) is enabled
+                $this->paginator = $this->buildPaginator->__invoke(
+                    $this->queryBuilder,
+                    $this->sessionValues->page,
+                    $this->sessionValues->resultsPerPage
+                );
+            } elseif (true === $this->buildPaginator || \is_array($this->buildPaginator)) {
+                // Case: Auto paginator is enabled
+                $paginatorOptions = [];
+                if (\is_array($this->buildPaginator)) {
+                    $paginatorOptions = $this->buildPaginator;
                 }
+
+                $this->paginator = DoctrinePaginatorBuilder::createDoctrinePaginator(
+                    $this->queryBuilder,
+                    $this->sessionValues->page,
+                    $this->sessionValues->resultsPerPage,
+                    $paginatorOptions
+                );
             }
         }
     }
 
     /**
-     * Return default displayed columns.
+     * Reset search form values.
      */
-    public function getDefaultDisplayedColumns(): array
+    public function raz(): void
     {
-        $columns = [];
-        foreach ($this->availableColumns as $column) {
-            if ($column->defaultDisplayed) {
-                $columns[] = $column->id;
-            }
-        }
-        if (0 == \count($columns)) {
-            throw new \Exception('Config Crud: One column displayed is required');
+        $this->initIfNecessary();
+        if ($this->searchForm) {
+            $newValue = clone $this->searchForm->getDefaultData();
+            $this->changeFilterValues($newValue);
+            $this->searchForm->getForm()->setData(clone $newValue);
+            $this->sessionValues->searchFormIsSubmittedAndValid = false;
         }
+        $this->changePage(1);
+        $this->save();
 
-        return $columns;
+        if ($this->displayResultsOnlyIfSearch) {
+            $this->displayResults = false;
+        }
     }
 
     /**
-     * Load user values.
+     * Reset sort.
      */
-    protected function load(): void
+    public function razSort(): void
     {
-        $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
-        $object = $session->get($this->sessionName); // Load from session
+        $this->initIfNecessary();
+        $this->sessionValues->sense = $this->defaultSense;
+        $this->sessionValues->sort = $this->defaultSort;
+        $this->save();
+    }
 
-        if (!empty($object)) {
-            $this->sessionValues = $object;
-            $this->checkCrudSession();
+    /**
+     * Reset display settings.
+     */
+    protected function razDisplaySettings(): void
+    {
+        $this->sessionValues->displayedColumns = $this->getDefaultDisplayedColumns();
+        $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
+        $this->sessionValues->sense = $this->defaultSense;
+        $this->sessionValues->sort = $this->defaultSort;
 
-            return;
+        if ($this->persistentSettings) {
+            // Remove settings in database
+            $qb = $this->container->get('doctrine')->getManager()->createQueryBuilder();
+            $qb->delete('EcommitCrudBundle:UserCrudSettings', 's')
+                ->andWhere('s.user = :user AND s.crudName = :crud_name')
+                ->setParameters(['user' => $this->container->get('security.token_storage')->getToken()->getUser(), 'crud_name' => $this->sessionName])
+                ->getQuery()
+                ->execute();
         }
+    }
 
-        // If session is null => Assign default value
-        $this->sessionValues = new CrudSession(
-            $this->defaultResultsPerPage,
-            $this->getDefaultDisplayedColumns(),
-            $this->defaultSort,
-            $this->defaultSense,
-            ($this->searchForm) ? $this->searchForm->getDefaultData() : null,
-        );
+    /**
+     * Clears this object, before sending it to template.
+     */
+    public function clearTemplate(): void
+    {
+        if ($this->searchForm) {
+            $this->searchForm->createFormView();
+            $this->searchForm = $this->searchForm->getForm();
+        }
+        $this->displaySettingsForm = $this->displaySettingsForm->createView();
+    }
 
-        // If persistent settings is enabled -> Retrieve from database
-        if ($this->persistentSettings) {
-            $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
-                [
-                    'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
-                    'crudName' => $this->sessionName,
-                ]
-            );
-            if ($objectDatabase) {
-                $this->sessionValues = $objectDatabase->transformToCrudSession($this->sessionValues);
-                $this->checkCrudSession();
+    public function getTwigFunctionsConfiguration(): array
+    {
+        return $this->twigFunctionsConfiguration;
+    }
 
-                return;
-            }
+    public function getTwigFunctionConfiguration(string $function): array
+    {
+        if (isset($this->twigFunctionsConfiguration[$function])) {
+            return $this->twigFunctionsConfiguration[$function];
+        }
+
+        return [];
+    }
+
+    public function setTwigFunctionsConfiguration(array $twigFunctionsConfiguration): self
+    {
+        $this->twigFunctionsConfiguration = $twigFunctionsConfiguration;
+
+        return $this;
+    }
+
+    protected function testIfDatabaseMustMeUpdated(mixed $oldValue, mixed $new_value): void
+    {
+        if ($oldValue != $new_value) {
+            $this->updateDatabase = true;
         }
     }
 
@@ -626,6 +815,16 @@ protected function processRequest(): void
         }
     }
 
+    /**
+     * Returns the search form.
+     *
+     * @return Form (before clearTemplate) or FormView (after clearTemplate)
+     */
+    public function getDisplaySettingsForm(): Form|FormView|null
+    {
+        return $this->displaySettingsForm;
+    }
+
     protected function createDisplaySettingsForm(): void
     {
         $resultsPerPageChoices = [];
@@ -651,287 +850,88 @@ protected function createDisplaySettingsForm(): void
     }
 
     /**
-     * Reset display settings.
-     */
-    protected function razDisplaySettings(): void
-    {
-        $this->sessionValues->displayedColumns = $this->getDefaultDisplayedColumns();
-        $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
-        $this->sessionValues->sense = $this->defaultSense;
-        $this->sessionValues->sort = $this->defaultSort;
-
-        if ($this->persistentSettings) {
-            // Remove settings in database
-            $qb = $this->container->get('doctrine')->getManager()->createQueryBuilder();
-            $qb->delete('EcommitCrudBundle:UserCrudSettings', 's')
-                ->andWhere('s.user = :user AND s.crudName = :crud_name')
-                ->setParameters(['user' => $this->container->get('security.token_storage')->getToken()->getUser(), 'crud_name' => $this->sessionName])
-                ->getQuery()
-                ->execute();
-        }
-    }
-
-    /**
-     * Reset search form values.
+     * Load user values.
      */
-    public function raz(): void
+    protected function load(): void
     {
-        $this->initIfNecessary();
-        if ($this->searchForm) {
-            $newValue = clone $this->searchForm->getDefaultData();
-            $this->changeFilterValues($newValue);
-            $this->searchForm->getForm()->setData(clone $newValue);
-            $this->sessionValues->searchFormIsSubmittedAndValid = false;
-        }
-        $this->changePage(1);
-        $this->save();
-
-        if ($this->displayResultsOnlyIfSearch) {
-            $this->displayResults = false;
-        }
-    }
+        $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
+        $object = $session->get($this->sessionName); // Load from session
 
-    /**
-     * Reset sort.
-     */
-    public function razSort(): void
-    {
-        $this->initIfNecessary();
-        $this->sessionValues->sense = $this->defaultSense;
-        $this->sessionValues->sort = $this->defaultSort;
-        $this->save();
-    }
+        if (!empty($object)) {
+            $this->sessionValues = $object;
+            $this->checkCrudSession();
 
-    /**
-     * Builds the query.
-     */
-    public function buildQuery(): void
-    {
-        // Builds query
-        $columnSortId = $this->sessionValues->sort;
-        if ('defaultPersonalizedSort' == $columnSortId) {
-            // Default personalised sort is used
-            foreach ($this->defaultPersonalizedSort as $key => $value) {
-                if (\is_int($key)) {
-                    $sort = $value;
-                    $sense = $this->defaultSense;
-                } else {
-                    $sort = $key;
-                    $sense = $value;
-                }
-                $this->queryBuilder->addOrderBy($sort, $sense);
-            }
-        } else {
-            $columnSortAlias = $this->availableColumns[$columnSortId]->aliasSort;
-            if (empty($columnSortAlias)) {
-                // Sort alias is not defined. Alias is used
-                $columnSortAlias = $this->availableColumns[$columnSortId]->alias;
-                $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
-            } elseif (\is_array($columnSortAlias)) {
-                // Sort alias is defined in many columns
-                foreach ($columnSortAlias as $oneColumnSortAlias) {
-                    $this->queryBuilder->addOrderBy($oneColumnSortAlias, $this->sessionValues->sense);
-                }
-            } else {
-                // Sort alias is defined in one column
-                $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
-            }
+            return;
         }
 
-        // Adds form searcher filters
-        if ($this->searchForm) {
-            $this->searchForm->updateQueryBuilder($this->queryBuilder, $this->sessionValues->searchFormData);
-        }
+        // If session is null => Assign default value
+        $this->sessionValues = new CrudSession(
+            $this->defaultResultsPerPage,
+            $this->getDefaultDisplayedColumns(),
+            $this->defaultSort,
+            $this->defaultSense,
+            ($this->searchForm) ? $this->searchForm->getDefaultData() : null,
+        );
 
-        // Builds paginator
-        if ($this->displayResults) {
-            if (\is_object($this->buildPaginator) && $this->buildPaginator instanceof \Closure) {
-                // Case: Manual paginator (by closure) is enabled
-                $this->paginator = $this->buildPaginator->__invoke(
-                    $this->queryBuilder,
-                    $this->sessionValues->page,
-                    $this->sessionValues->resultsPerPage
-                );
-            } elseif (true === $this->buildPaginator || \is_array($this->buildPaginator)) {
-                // Case: Auto paginator is enabled
-                $paginatorOptions = [];
-                if (\is_array($this->buildPaginator)) {
-                    $paginatorOptions = $this->buildPaginator;
-                }
+        // If persistent settings is enabled -> Retrieve from database
+        if ($this->persistentSettings) {
+            $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
+                [
+                    'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
+                    'crudName' => $this->sessionName,
+                ]
+            );
+            if ($objectDatabase) {
+                $this->sessionValues = $objectDatabase->transformToCrudSession($this->sessionValues);
+                $this->checkCrudSession();
 
-                $this->paginator = DoctrinePaginatorBuilder::createDoctrinePaginator(
-                    $this->queryBuilder,
-                    $this->sessionValues->page,
-                    $this->sessionValues->resultsPerPage,
-                    $paginatorOptions
-                );
+                return;
             }
         }
     }
 
     /**
-     * Return default results per page.
-     */
-    public function getDefaultResultsPerPage(): ?int
-    {
-        return $this->defaultResultsPerPage;
-    }
-
-    /**
-     * Clears this object, before sending it to template.
-     */
-    public function clearTemplate(): void
-    {
-        if ($this->searchForm) {
-            $this->searchForm->createFormView();
-            $this->searchForm = $this->searchForm->getForm();
-        }
-        $this->displaySettingsForm = $this->displaySettingsForm->createView();
-    }
-
-    /**
-     * Returns availabled columns.
-     */
-    public function getColumns(): array
-    {
-        return $this->availableColumns;
-    }
-
-    public function getColumn(string $columnId): CrudColumn
-    {
-        if (isset($this->availableColumns[$columnId])) {
-            return $this->availableColumns[$columnId];
-        }
-        throw new \Exception('Crud: Column '.$columnId.' does not exist');
-    }
-
-    /**
-     * Returns availabled virtual columns.
-     */
-    public function getVirtualColumns(): array
-    {
-        return $this->availableVirtualColumns;
-    }
-
-    public function getVirtualColumn(string $columnId): CrudColumn
-    {
-        if (isset($this->availableVirtualColumns[$columnId])) {
-            return $this->availableVirtualColumns[$columnId];
-        }
-        throw new \Exception('Crud: Column '.$columnId.' does not exist');
-    }
-
-    public function getSessionValues(): CrudSession
-    {
-        return $this->sessionValues;
-    }
-
-    public function getPaginator(): ?PaginatorInterface
-    {
-        return $this->paginator;
-    }
-
-    public function setPaginator(?PaginatorInterface $value): self
-    {
-        $this->paginator = $value;
-
-        return $this;
-    }
-
-    /**
-     * Returns the search form.
-     *
-     * @return SearchFormBuilder (before clearTemplate) or FormView (after clearTemplate)
-     */
-    public function getSearchForm(): SearchFormBuilder|FormView|null
-    {
-        return $this->searchForm;
-    }
-
-    /**
-     * Returns the search form.
-     *
-     * @return Form (before clearTemplate) or FormView (after clearTemplate)
+     * Saves user value.
      */
-    public function getDisplaySettingsForm(): Form|FormView|null
-    {
-        return $this->displaySettingsForm;
-    }
-
-    public function getDivIdSearch(): string
-    {
-        return $this->divIdSearch;
-    }
-
-    public function setDivIdSearch(string $divIdSearch): self
-    {
-        $this->divIdSearch = $divIdSearch;
-
-        return $this;
-    }
-
-    public function getDivIdList(): string
-    {
-        return $this->divIdList;
-    }
-
-    public function setDivIdList(string $divIdList): self
-    {
-        $this->divIdList = $divIdList;
-
-        return $this;
-    }
-
-    public function getSessionName(): string
-    {
-        return $this->sessionName;
-    }
-
-    public function getDisplayResultsOnlyIfSearch(): bool
-    {
-        return $this->displayResultsOnlyIfSearch;
-    }
-
-    public function setDisplayResultsOnlyIfSearch(bool $displayResultsOnlyIfSearch): self
-    {
-        $this->displayResultsOnlyIfSearch = $displayResultsOnlyIfSearch;
-
-        return $this;
-    }
-
-    public function getDisplayResults(): bool
-    {
-        return $this->displayResults;
-    }
-
-    public function setDisplayResults(bool $displayResults): self
+    protected function save(): void
     {
-        $this->displayResults = $displayResults;
-        if (false === $displayResults && $this->paginator) {
-            $this->paginator = null;
+        // Save in session
+        $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
+        $sessionValues = clone $this->sessionValues;
+        if (\is_object($this->sessionValues->searchFormData)) {
+            $sessionValues->searchFormData = clone $this->sessionValues->searchFormData;
         }
+        $session->set($this->sessionName, $sessionValues);
 
-        return $this;
-    }
-
-    public function getTwigFunctionsConfiguration(): array
-    {
-        return $this->twigFunctionsConfiguration;
-    }
+        // Save in database
+        if ($this->persistentSettings && $this->updateDatabase) {
+            $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
+                [
+                    'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
+                    'crudName' => $this->sessionName,
+                ]
+            );
+            $em = $this->container->get('doctrine')->getManager();
 
-    public function getTwigFunctionConfiguration(string $function): array
-    {
-        if (isset($this->twigFunctionsConfiguration[$function])) {
-            return $this->twigFunctionsConfiguration[$function];
+            if ($objectDatabase) {
+                // Update object in database
+                $objectDatabase->updateFromSessionManager($this->sessionValues);
+                $em->flush();
+            } else {
+                // Create object in database only if not default values
+                if ($this->sessionValues->displayedColumns != $this->getDefaultDisplayedColumns() ||
+                    $this->sessionValues->resultsPerPage != $this->defaultResultsPerPage ||
+                    $this->sessionValues->sense != $this->defaultSense ||
+                    $this->sessionValues->sort != $this->defaultSort
+                ) {
+                    $objectDatabase = new UserCrudSettings();
+                    $objectDatabase->setUser($this->container->get('security.token_storage')->getToken()->getUser());
+                    $objectDatabase->setCrudName($this->sessionName);
+                    $objectDatabase->updateFromSessionManager($this->sessionValues);
+                    $em->persist($objectDatabase);
+                    $em->flush();
+                }
+            }
         }
-
-        return [];
-    }
-
-    public function setTwigFunctionsConfiguration(array $twigFunctionsConfiguration): self
-    {
-        $this->twigFunctionsConfiguration = $twigFunctionsConfiguration;
-
-        return $this;
     }
 }

From b8617d8d830922e4c7f112046fee6d11543e10e8 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 17:22:12 +0200
Subject: [PATCH 130/264] Better error message in Crud::init

---
 src/Crud/Crud.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 0c6c0d4..722d58b 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -77,17 +77,17 @@ public function init(): void
 
         // Cheks not empty values
         $checkValues = [
-            'availableColumns',
-            'availableResultsPerPage',
-            'defaultSort',
-            'defaultSense',
-            'defaultResultsPerPage',
-            'queryBuilder',
-            'routeName',
+            'availableColumns' => 'addColumn',
+            'availableResultsPerPage' => 'setAvailableResultsPerPage',
+            'defaultResultsPerPage' => 'setAvailableResultsPerPage',
+            'defaultSort' => 'setDefaultSort',
+            'defaultSense' => 'setDefaultSort',
+            'queryBuilder' => 'setQueryBuilder',
+            'routeName' => 'setRoute',
         ];
-        foreach ($checkValues as $value) {
+        foreach ($checkValues as $value => $method) {
             if (empty($this->$value)) {
-                throw new \Exception('Config Crud: Option '.$value.' is required');
+                throw new \Exception(sprintf('The CRUD configuration is not complete. You must call the "%s" method.', $method));
             }
         }
 

From 8edb402e985c95ac893fc6f143dd60c81c1ae93b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 20:18:13 +0200
Subject: [PATCH 131/264] Rename buildQuery to build

Crud::buildQuery -> Crud::build
CrudControllerTrait::beforeBuildQuery -> CrudControllerTrait::beforeBuild
CrudControllerTrait::afterBuildQuery -> CrudControllerTrait::afterBuild
CrudResponseGenerator : Option "before_build_query" to "before_build"
CrudResponseGenerator : Option "after_build_query" to "after_build"
---
 doc/cookbook/data-template.md                 |  6 +-
 doc/upgrade/3.0.md                            |  8 +--
 src/Controller/CrudControllerTrait.php        |  8 +--
 src/Crud/Crud.php                             | 71 ++++++++++---------
 src/Crud/CrudResponseGenerator.php            | 18 ++---
 tests/Form/Filter/AbstractFilterTest.php      |  2 +-
 tests/Form/Filter/EntityAjaxFilterTest.php    |  4 +-
 tests/Form/Filter/EntityFilterTest.php        |  4 +-
 .../Controller/UserWithoutTraitController.php | 16 ++---
 .../App/templates/user/list.html.twig         |  2 +-
 .../Controller/TestCrudControllerTest.php     | 36 +++++-----
 11 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/doc/cookbook/data-template.md b/doc/cookbook/data-template.md
index a218d2e..fdc534d 100644
--- a/doc/cookbook/data-template.md
+++ b/doc/cookbook/data-template.md
@@ -3,8 +3,8 @@
 Par défaut, un contrôleur héritant de `AbstractCrudController` ou utilisant `CrudControllerTrait` retourne aux templates l'objet Crud (nom de variable Twig: `crud`).
 
 Pour passer des variables supplémentaires aux templates Twig, peuvent être surchargées les méthodes :
-* `beforeBuildQuery` : Ajouter des données avant la génération de la requête Doctrine
-* `afterBuildQuery` : Ajouter des données après la génération de la requête Doctrine
+* `beforeBuild` : Ajouter des données avant la génération de la requête Doctrine et du paginator
+* `afterBuild` : Ajouter des données après la génération de la requête Doctrine et du paginator
 
 Exemple :
 
@@ -19,7 +19,7 @@ class MyCrudController extends AbstractCrudController
 {
     //...
 
-    protected function beforeBuildQuery(Crud $crud, array $data): array
+    protected function beforeBuild(Crud $crud, array $data): array
     {
         $data['my_var'] = 'my value';
         
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index b27e55b..528e788 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -47,13 +47,7 @@
 * La méthode `autoAjaxSearchAction` de `CrudControllerTrait` est supprimée. Il n'existe plus d'action spécifique à la recherche.
 * Les méthodes `prepareList`, `processSearch`, `renderCrudView` et `renderCrud` de `CrudControllerTrait` sont supprimées.
 * La méthode `configCrud` de `CrudControllerTrait` est supprimée. Utiliser à la place la méthode `getCrud` (signature différente).
-* La méthode `addDataAfterBuildQuery` de `CrudControllerTrait` est supprimée. Voir l'alternative avec [le nouveau système](../cookbook/data-template.md).
-* La signature de la méthode `beforeBuildQuery` de `CrudControllerTrait` est modifiée:
-    * Avant: `beforeBuildQuery()`
-    * Maintenant: `beforeBuildQuery(Crud $crud, array $data): array`
-* La signature de la méthode `afterBuildQuery` de `CrudControllerTrait` est modifiée:
-    * Avant: `afterBuildQuery()`
-    * Maintenant: `afterBuildQuery(Crud $crud, array $data): array`
+* Les méthodes `addDataAfterBuildQuery`, `beforeBuildQuery` et `afterBuildQuery` de `CrudControllerTrait` sont supprimées. Voir l'alternative avec [le nouveau système](../cookbook/data-template.md).
 * La méthode `getCrudRequiredServices` de `CrudControllerTrait` ne retourne plus les services `twig` et `request_stack`. Si
   les contrôleurs n'hérite pas de `AbstractCrudController` ou `Symfony\Bundle\FrameworkBundle\Controller\AbstractController`,
   ces services ne seront plus injectés au locator du contrôleur.
diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index dd3b033..710764a 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -44,17 +44,17 @@ protected function getCrudOptions(): array
     {
         return [
             'template_generator' => fn (string $action) => $this->getTemplateName($action),
-            'before_build_query' => fn (Crud $crud, array $data) => $this->beforeBuildQuery($crud, $data),
-            'after_build_query' => fn (Crud $crud, array $data) => $this->afterBuildQuery($crud, $data),
+            'before_build' => fn (Crud $crud, array $data) => $this->beforeBuild($crud, $data),
+            'after_build' => fn (Crud $crud, array $data) => $this->afterBuild($crud, $data),
         ];
     }
 
-    protected function beforeBuildQuery(Crud $crud, array $data): array
+    protected function beforeBuild(Crud $crud, array $data): array
     {
         return $data;
     }
 
-    protected function afterBuildQuery(Crud $crud, array $data): array
+    protected function afterBuild(Crud $crud, array $data): array
     {
         return $data;
     }
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 722d58b..200eb23 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -509,10 +509,13 @@ public function processForm(): void
         }
     }
 
-    /**
-     * Builds the query.
-     */
-    public function buildQuery(): void
+    public function build(): void
+    {
+        $this->updateQueryBuilder();
+        $this->buildPaginator();
+    }
+
+    protected function updateQueryBuilder(): void
     {
         // Builds query
         $columnSortId = $this->sessionValues->sort;
@@ -530,17 +533,13 @@ public function buildQuery(): void
             }
         } else {
             $columnSortAlias = $this->availableColumns[$columnSortId]->aliasSort;
-            if (empty($columnSortAlias)) {
-                // Sort alias is not defined. Alias is used
-                $columnSortAlias = $this->availableColumns[$columnSortId]->alias;
-                $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
-            } elseif (\is_array($columnSortAlias)) {
-                // Sort alias is defined in many columns
+            if (\is_array($columnSortAlias)) {
+                // Sort alias in many columns
                 foreach ($columnSortAlias as $oneColumnSortAlias) {
                     $this->queryBuilder->addOrderBy($oneColumnSortAlias, $this->sessionValues->sense);
                 }
             } else {
-                // Sort alias is defined in one column
+                // Sort alias in one column
                 $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
             }
         }
@@ -549,31 +548,37 @@ public function buildQuery(): void
         if ($this->searchForm) {
             $this->searchForm->updateQueryBuilder($this->queryBuilder, $this->sessionValues->searchFormData);
         }
+    }
 
-        // Builds paginator
-        if ($this->displayResults) {
-            if (\is_object($this->buildPaginator) && $this->buildPaginator instanceof \Closure) {
-                // Case: Manual paginator (by closure) is enabled
-                $this->paginator = $this->buildPaginator->__invoke(
-                    $this->queryBuilder,
-                    $this->sessionValues->page,
-                    $this->sessionValues->resultsPerPage
-                );
-            } elseif (true === $this->buildPaginator || \is_array($this->buildPaginator)) {
-                // Case: Auto paginator is enabled
-                $paginatorOptions = [];
-                if (\is_array($this->buildPaginator)) {
-                    $paginatorOptions = $this->buildPaginator;
-                }
+    protected function buildPaginator(): void
+    {
+        if (!$this->displayResults || false === $this->buildPaginator) {
+            return;
+        }
 
-                $this->paginator = DoctrinePaginatorBuilder::createDoctrinePaginator(
-                    $this->queryBuilder,
-                    $this->sessionValues->page,
-                    $this->sessionValues->resultsPerPage,
-                    $paginatorOptions
-                );
-            }
+        if (\is_object($this->buildPaginator) && $this->buildPaginator instanceof \Closure) {
+            // Case: Manual paginator (by closure) is enabled
+            $this->paginator = $this->buildPaginator->__invoke(
+                $this->queryBuilder,
+                $this->sessionValues->page,
+                $this->sessionValues->resultsPerPage
+            );
+
+            return;
         }
+
+        // Case: Auto paginator is enabled
+        $paginatorOptions = [];
+        if (\is_array($this->buildPaginator)) {
+            $paginatorOptions = $this->buildPaginator;
+        }
+
+        $this->paginator = DoctrinePaginatorBuilder::createDoctrinePaginator(
+            $this->queryBuilder,
+            $this->sessionValues->page,
+            $this->sessionValues->resultsPerPage,
+            $paginatorOptions
+        );
     }
 
     /**
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index f792aeb..5b260f2 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -92,14 +92,14 @@ protected function processCrud(Crud $crud, array $options): array
             $crud->processForm();
         }
 
-        if (null !== $options['before_build_query']) {
-            $data = $options['before_build_query']($crud, $data);
+        if (null !== $options['before_build']) {
+            $data = $options['before_build']($crud, $data);
         }
 
-        $crud->buildQuery();
+        $crud->build();
 
-        if (null !== $options['after_build_query']) {
-            $data = $options['after_build_query']($crud, $data);
+        if (null !== $options['after_build']) {
+            $data = $options['after_build']($crud, $data);
         }
 
         $crud->clearTemplate();
@@ -111,15 +111,15 @@ protected function getOptions(array $options): array
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
-            'before_build_query' => null,
-            'after_build_query' => null,
+            'before_build' => null,
+            'after_build' => null,
         ]);
         $resolver->setRequired([
             'template_generator',
         ]);
         $resolver->setAllowedTypes('template_generator', 'callable');
-        $resolver->setAllowedTypes('before_build_query', ['null', 'callable']);
-        $resolver->setAllowedTypes('after_build_query', ['null', 'callable']);
+        $resolver->setAllowedTypes('before_build', ['null', 'callable']);
+        $resolver->setAllowedTypes('after_build', ['null', 'callable']);
 
         return $resolver->resolve($options);
     }
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTest.php
index acd3b40..3eadbb5 100644
--- a/tests/Form/Filter/AbstractFilterTest.php
+++ b/tests/Form/Filter/AbstractFilterTest.php
@@ -124,7 +124,7 @@ protected function initCrudAndGetFormView(Crud $crud): FormView
 
     protected function checkQueryBuilder(Crud $crud, ?string $whereExpected, array $parametersExpected = []): void
     {
-        $crud->buildQuery();
+        $crud->build();
 
         $queryBuilder = $crud->getQueryBuilder();
         if (null === $whereExpected) {
diff --git a/tests/Form/Filter/EntityAjaxFilterTest.php b/tests/Form/Filter/EntityAjaxFilterTest.php
index e7f33e7..e27b92d 100644
--- a/tests/Form/Filter/EntityAjaxFilterTest.php
+++ b/tests/Form/Filter/EntityAjaxFilterTest.php
@@ -43,7 +43,7 @@ public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedVie
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
-        $crud->buildQuery();
+        $crud->build();
         $idsFound = [];
         foreach ($crud->getQueryBuilder()->getQuery()->getResult() as $entity) {
             $idsFound[] = $entity->getId();
@@ -178,7 +178,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']); // Twig doesn't display invalid list
 
-        $crud->buildQuery();
+        $crud->build();
         $idsFound = [];
         foreach ($crud->getQueryBuilder()->getQuery()->getResult() as $entity) {
             $idsFound[] = $entity->getId();
diff --git a/tests/Form/Filter/EntityFilterTest.php b/tests/Form/Filter/EntityFilterTest.php
index 995fa07..38df880 100644
--- a/tests/Form/Filter/EntityFilterTest.php
+++ b/tests/Form/Filter/EntityFilterTest.php
@@ -42,7 +42,7 @@ public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedVie
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
-        $crud->buildQuery();
+        $crud->build();
         $idsFound = [];
         foreach ($crud->getQueryBuilder()->getQuery()->getResult() as $entity) {
             $idsFound[] = $entity->getId();
@@ -188,7 +188,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
-        $crud->buildQuery();
+        $crud->build();
         $idsFound = [];
         foreach ($crud->getQueryBuilder()->getQuery()->getResult() as $entity) {
             $idsFound[] = $entity->getId();
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index eb5519a..32ddd6e 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -59,13 +59,13 @@ public function crudAction(Request $request, CrudResponseGenerator $crudResponse
         if ($request->query->has('test-before-and-after-build-query')) {
             return $crudResponseGenerator->getResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
                 'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
-                'before_build_query' => function (Crud $crud, array $data) {
-                    $data['test_before_after_build_query'] = 'BEFORE';
+                'before_build' => function (Crud $crud, array $data) {
+                    $data['test_before_after_build'] = 'BEFORE';
 
                     return $data;
                 },
-                'after_build_query' => function (Crud $crud, array $data) {
-                    $data['test_before_after_build_query'] = $data['test_before_after_build_query'].' AFTER';
+                'after_build' => function (Crud $crud, array $data) {
+                    $data['test_before_after_build'] = $data['test_before_after_build'].' AFTER';
 
                     return $data;
                 },
@@ -82,13 +82,13 @@ public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResp
         if ($request->query->has('test-before-and-after-build-query')) {
             return $crudResponseGenerator->getAjaxResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
                 'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
-                'before_build_query' => function (Crud $crud, array $data) {
-                    $data['test_before_after_build_query'] = 'BEFORE';
+                'before_build' => function (Crud $crud, array $data) {
+                    $data['test_before_after_build'] = 'BEFORE';
 
                     return $data;
                 },
-                'after_build_query' => function (Crud $crud, array $data) {
-                    $data['test_before_after_build_query'] = $data['test_before_after_build_query'].' AFTER';
+                'after_build' => function (Crud $crud, array $data) {
+                    $data['test_before_after_build'] = $data['test_before_after_build'].' AFTER';
 
                     return $data;
                 },
diff --git a/tests/Functional/App/templates/user/list.html.twig b/tests/Functional/App/templates/user/list.html.twig
index e4ad185..dadff8a 100644
--- a/tests/Functional/App/templates/user/list.html.twig
+++ b/tests/Functional/App/templates/user/list.html.twig
@@ -20,7 +20,7 @@
         </table>
     </div>
 
-    {% if test_before_after_build_query is defined %}<div>TEST BEFORE AFTER BUILD QUERY {{ test_before_after_build_query }}</div>{% endif %}
+    {% if test_before_after_build is defined %}<div>TEST BEFORE AFTER BUILD {{ test_before_after_build }}</div>{% endif %}
 
     <div class="info-pagination">
         {% trans with {'%first%': crud.paginator.firstIndice, '%last%' : crud.paginator.lastIndice} %}Results %first%-%last%{% endtrans %}  -
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 8b049b1..0ed0a5d 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -40,7 +40,7 @@ public function testList(): Client
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
         $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -58,7 +58,7 @@ public function testChangeSortSense(Client $client): Client
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['first_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('YvonEmbavé', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -76,7 +76,7 @@ public function testChangeSortColumn(Client $client): Client
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -97,7 +97,7 @@ public function testChangeDisplayedColumns(Client $client): Client
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -119,7 +119,7 @@ public function testChangePerPage(Client $client): Client
         $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -135,7 +135,7 @@ public function testPersistentValuesAfterChangeSortAndSettings(Client $client):
         $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -153,7 +153,7 @@ public function testChangePage(Client $client): Client
         $this->assertSame([2, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('JudieCieux', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -169,7 +169,7 @@ public function testPersistentValuesAfterChangePage(Client $client): Client
         $this->assertSame([2, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('JudieCieux', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -188,7 +188,7 @@ public function testSearch(Client $client): Client
         $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('HenriPoste', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -204,7 +204,7 @@ public function testPersistentValuesAfterSearch(Client $client): Client
         $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('HenriPoste', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -223,7 +223,7 @@ public function testSearchWithoutFilter(Client $client): Client
         $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('HenriPlait', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -241,7 +241,7 @@ public function testResetSearch(Client $client): Client
         $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -257,7 +257,7 @@ public function testPersistentValuesAfterResetSearch(Client $client): Client
         $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
         $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -278,7 +278,7 @@ public function testResetSettings(Client $client): Client
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
         $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -294,7 +294,7 @@ public function testPersistentValuesAfterResetSettings(Client $client): Client
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
         $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
-        $this->checkBeforeAndAfterBuildQuery($client->getCrawler());
+        $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
@@ -369,15 +369,15 @@ public function testManualRazSort(Client $client): Client
         return $client;
     }
 
-    protected function checkBeforeAndAfterBuildQuery(Crawler $crawler): void
+    protected function checkBeforeAndAfterBuild(Crawler $crawler): void
     {
         if (null === static::SEARCH_IN_LIST) {
-            $this->assertCount(0, $crawler->filterXPath('//div[contains(text(), "TEST BEFORE AFTER BUILD QUERY")]'));
+            $this->assertCount(0, $crawler->filterXPath('//div[contains(text(), "TEST BEFORE AFTER BUILD")]'));
 
             return;
         }
 
-        $this->assertCount(1, $crawler->filterXPath('//div[contains(text(), "TEST BEFORE AFTER BUILD QUERY '.static::SEARCH_IN_LIST.'")]'));
+        $this->assertCount(1, $crawler->filterXPath('//div[contains(text(), "TEST BEFORE AFTER BUILD '.static::SEARCH_IN_LIST.'")]'));
     }
 
     protected function countRowsAndColumns(Crawler $crawler): array

From 084e5a09837e15ee4c999f092dc2d64c34fa72a4 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 20:36:53 +0200
Subject: [PATCH 132/264] Rename raz to reset

Crud::raz -> Crud::reset
Crud::razSort -> Crud::resetSort
Crud::razDisplaySettings -> Crud::resetDisplaySettings
---
 assets/js/crud.js                             |  2 +-
 doc/upgrade/3.0.md                            |  2 ++
 src/Crud/Crud.php                             | 26 +++++++------------
 src/Form/Type/DisplaySettingsType.php         |  2 +-
 src/Twig/CrudExtension.php                    |  2 +-
 .../App/Controller/UserController.php         |  4 +--
 .../Controller/UserWithoutTraitController.php |  4 +--
 .../Controller/TestCrudControllerTest.php     | 10 +++----
 8 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/assets/js/crud.js b/assets/js/crud.js
index fabd0a5..873d54a 100644
--- a/assets/js/crud.js
+++ b/assets/js/crud.js
@@ -70,7 +70,7 @@ $(document).on('click', 'button.ec-crud-display-settings-uncheck-all-columns', f
   })
 })
 
-$(document).on('click', 'button.ec-crud-display-settings-raz', function (event) {
+$(document).on('click', 'button.ec-crud-display-settings-reset', function (event) {
   const displaySettingsContainer = $(this).parents('div.ec-crud-display-settings')
   const displaySettingsContainerId = $(displaySettingsContainer).attr('id')
   const listId = $(displaySettingsContainer).attr('data-crud-list-id')
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 528e788..fabe814 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -83,6 +83,8 @@
     * Avant: `createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = [])`
     * Après: `createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = [])`
 * La méthode `createDisplaySettingsForm` est maintenant protégée.
+* La méthode `raz` est renommée en `reset`
+* La méthode `razSort` est renommée en `resetSort`
 * Les options du FormType personnalisé du formulaire de recherche doivent être passées dans l'option `form_options` (3ème argument) de `createSearchForm`
 * La signature du constructeur de `CrudFactory` est modifiée:
     * Avant: `__construct(RouterInterface $router, FormFactoryInterface $formFactory, RequestStack $requestStack, ManagerRegistry $registry, TokenStorageInterface $tokenStorage, array $templateConfiguration)`
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 200eb23..322679b 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -109,7 +109,7 @@ public function init(): void
         $this->processRequest();
 
         // Searcher form: Allocates object
-        if ($this->searchForm && !$this->container->get('request_stack')->getCurrentRequest()->query->has('raz')) {
+        if ($this->searchForm && !$this->container->get('request_stack')->getCurrentRequest()->query->has('reset')) {
             // IMPORTANT
             // We have not to allocate directelly the "$this->sessionValues->searchFormData" object
             // because otherwise it will be linked to form, and will be updated when the "bind" function will
@@ -490,7 +490,7 @@ public function processForm(): void
         }
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
-        if ($request->query->has('raz')) {
+        if ($request->query->has('reset')) {
             return;
         }
         if ('POST' == $request->getMethod()) {
@@ -584,7 +584,7 @@ protected function buildPaginator(): void
     /**
      * Reset search form values.
      */
-    public function raz(): void
+    public function reset(): void
     {
         $this->initIfNecessary();
         if ($this->searchForm) {
@@ -601,10 +601,7 @@ public function raz(): void
         }
     }
 
-    /**
-     * Reset sort.
-     */
-    public function razSort(): void
+    public function resetSort(): void
     {
         $this->initIfNecessary();
         $this->sessionValues->sense = $this->defaultSense;
@@ -612,10 +609,7 @@ public function razSort(): void
         $this->save();
     }
 
-    /**
-     * Reset display settings.
-     */
-    protected function razDisplaySettings(): void
+    protected function resetDisplaySettings(): void
     {
         $this->sessionValues->displayedColumns = $this->getDefaultDisplayedColumns();
         $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
@@ -791,14 +785,14 @@ protected function changePage(mixed $value): void
     protected function processRequest(): void
     {
         $request = $this->container->get('request_stack')->getCurrentRequest();
-        if ($request->query->has('razsettings')) {
+        if ($request->query->has('resetsettings')) {
             // Reset display settings
-            $this->razDisplaySettings();
+            $this->resetDisplaySettings();
 
             return;
         }
-        if ($request->query->has('raz')) {
-            $this->raz();
+        if ($request->query->has('reset')) {
+            $this->reset();
 
             return;
         }
@@ -850,7 +844,7 @@ protected function createDisplaySettingsForm(): void
             'results_per_page_choices' => $resultsPerPageChoices,
             'columns_choices' => $columnsChoices,
             'action' => $this->getUrl(['display-settings' => 1]),
-            'reset_settings_url' => $this->getUrl(['razsettings' => 1]),
+            'reset_settings_url' => $this->getUrl(['resetsettings' => 1]),
         ]);
     }
 
diff --git a/src/Form/Type/DisplaySettingsType.php b/src/Form/Type/DisplaySettingsType.php
index d9a55a6..60204ff 100644
--- a/src/Form/Type/DisplaySettingsType.php
+++ b/src/Form/Type/DisplaySettingsType.php
@@ -51,7 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'label' => 'display_settings.reset_display_settings',
             'translation_domain' => 'EcommitCrudBundle',
             'attr' => [
-                'class' => 'ec-crud-display-settings-raz',
+                'class' => 'ec-crud-display-settings-reset',
                 'data-reset-url' => $options['reset_settings_url'],
             ],
         ]);
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index bb9a194..a9b3fd6 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -562,7 +562,7 @@ public function searchFormReset(Environment $environment, Crud $crud, array $opt
             [
                 'data-crud-search-id' => $crud->getDivIdSearch(),
                 'data-crud-list-id' => $crud->getDivIdList(),
-                'data-ec-crud-ajax-url' => $crud->getSearchUrl(['raz' => 1]),
+                'data-ec-crud-ajax-url' => $crud->getSearchUrl(['reset' => 1]),
             ],
             $options['button_attr'],
             $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options']))
diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index 61a744c..e34637b 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -41,10 +41,10 @@ protected function getCrud(): Crud
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('manual-reset')) {
-            $crud->raz();
+            $crud->reset();
         }
         if ($request->query->has('manual-reset-sort')) {
-            $crud->razSort();
+            $crud->resetSort();
         }
 
         return $crud;
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index 32ddd6e..538f6d9 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -45,10 +45,10 @@ protected function getCrud(string $sessionName, array $routeParams = []): Crud
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('manual-reset')) {
-            $crud->raz();
+            $crud->reset();
         }
         if ($request->query->has('manual-reset-sort')) {
-            $crud->razSort();
+            $crud->resetSort();
         }
 
         return $crud;
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 0ed0a5d..3043f25 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -302,7 +302,7 @@ public function testPersistentValuesAfterResetSettings(Client $client): Client
     /**
      * @depends testPersistentValuesAfterResetSettings
      */
-    public function testManualRaz(Client $client): Client
+    public function testManualReset(Client $client): Client
     {
         $client->request('GET', static::URL);
 
@@ -321,7 +321,7 @@ public function testManualRaz(Client $client): Client
         $this->waitForAjax($client);
         $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
 
-        // Manuel RAZ (before CRUD initialization)
+        // Manuel RESET (before CRUD initialization)
         if (parse_url(static::URL, \PHP_URL_QUERY)) {
             $resetUrl = static::URL.'&manual-reset=1';
         } else {
@@ -335,9 +335,9 @@ public function testManualRaz(Client $client): Client
     }
 
     /**
-     * @depends testManualRaz
+     * @depends testManualReset
      */
-    public function testManualRazSort(Client $client): Client
+    public function testManualResetSort(Client $client): Client
     {
         $client->request('GET', static::URL);
 
@@ -355,7 +355,7 @@ public function testManualRazSort(Client $client): Client
         $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame(['last_name', Crud::ASC], $this->getSort($client->getCrawler()));
 
-        // Manuel RAZ (before CRUD initialization)
+        // Manuel RESET (before CRUD initialization)
         if (parse_url(static::URL, \PHP_URL_QUERY)) {
             $resetUrl = static::URL.'&manual-reset-sort=1';
         } else {

From b578e4404d95a0ba1cbbf007f9512a55bcc5e9e5 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 20:58:46 +0200
Subject: [PATCH 133/264] Rename Crud::processForm to processSearchForm

---
 doc/upgrade/3.0.md                 | 1 +
 src/Crud/Crud.php                  | 5 +----
 src/Crud/CrudResponseGenerator.php | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index fabe814..2472407 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -85,6 +85,7 @@
 * La méthode `createDisplaySettingsForm` est maintenant protégée.
 * La méthode `raz` est renommée en `reset`
 * La méthode `razSort` est renommée en `resetSort`
+* La méthode `processForm` est renommée en `processSearchForm`
 * Les options du FormType personnalisé du formulaire de recherche doivent être passées dans l'option `form_options` (3ème argument) de `createSearchForm`
 * La signature du constructeur de `CrudFactory` est modifiée:
     * Avant: `__construct(RouterInterface $router, FormFactoryInterface $formFactory, RequestStack $requestStack, ManagerRegistry $registry, TokenStorageInterface $tokenStorage, array $templateConfiguration)`
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 322679b..79eb217 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -480,10 +480,7 @@ public function setDivIdList(string $divIdList): self
         return $this;
     }
 
-    /**
-     * Process search form.
-     */
-    public function processForm(): void
+    public function processSearchForm(): void
     {
         if (!$this->searchForm) {
             throw new NotFoundHttpException('Crud: Search form does not exist');
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index 5b260f2..16ee759 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -89,7 +89,7 @@ protected function processCrud(Crud $crud, array $options): array
 
         $crud->initIfNecessary();
         if ($request->query->has('search')) {
-            $crud->processForm();
+            $crud->processSearchForm();
         }
 
         if (null !== $options['before_build']) {

From 96b00823eecdd9f8e1bb7bf1db8632b17cd1fc69 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 21:03:11 +0200
Subject: [PATCH 134/264] Rename Crud::clearTemplate to createView

---
 doc/upgrade/3.0.md                 | 5 +++--
 src/Crud/Crud.php                  | 9 +++------
 src/Crud/CrudResponseGenerator.php | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 2472407..a1d7105 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -72,8 +72,8 @@
     * `$user`
 * Les méthodes suivantes de `Crud` sont supprimées:
     * `getSearcherForm`. Elle est remplacée par la méthode `getSearchForm`. Cette nouvelle méthode retourne :
-        * Soit un objet `SearchFormBuilder`, avant que la méthode `clearTemplate` soit appelée
-        * Soit un objet `FormView`, après que la méthode `clearTemplate` soit appelée
+        * Soit un objet `SearchFormBuilder`, avant que la méthode `createView` soit appelée
+        * Soit un objet `FormView`, après que la méthode `createView` soit appelée
     * `setUseDbal`
     * `configureTemplate`, `getTemplateConfiguration` et `validateConfigureTemplateFunctionName`: Voir l'alternative avec
       [le nouveau système](../cookbook/template_configuration.md).
@@ -86,6 +86,7 @@
 * La méthode `raz` est renommée en `reset`
 * La méthode `razSort` est renommée en `resetSort`
 * La méthode `processForm` est renommée en `processSearchForm`
+* La méthode `clearTemplate` est renommée en `createView`
 * Les options du FormType personnalisé du formulaire de recherche doivent être passées dans l'option `form_options` (3ème argument) de `createSearchForm`
 * La signature du constructeur de `CrudFactory` est modifiée:
     * Avant: `__construct(RouterInterface $router, FormFactoryInterface $formFactory, RequestStack $requestStack, ManagerRegistry $registry, TokenStorageInterface $tokenStorage, array $templateConfiguration)`
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 79eb217..cf1dc65 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -442,7 +442,7 @@ public function getSessionValues(): CrudSession
     /**
      * Returns the search form.
      *
-     * @return SearchFormBuilder (before clearTemplate) or FormView (after clearTemplate)
+     * @return SearchFormBuilder (before createView) or FormView (after createView)
      */
     public function getSearchForm(): SearchFormBuilder|FormView|null
     {
@@ -624,10 +624,7 @@ protected function resetDisplaySettings(): void
         }
     }
 
-    /**
-     * Clears this object, before sending it to template.
-     */
-    public function clearTemplate(): void
+    public function createView(): void
     {
         if ($this->searchForm) {
             $this->searchForm->createFormView();
@@ -814,7 +811,7 @@ protected function processRequest(): void
     /**
      * Returns the search form.
      *
-     * @return Form (before clearTemplate) or FormView (after clearTemplate)
+     * @return Form (before createView) or FormView (after createView)
      */
     public function getDisplaySettingsForm(): Form|FormView|null
     {
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index 16ee759..e0d1c63 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -102,7 +102,7 @@ protected function processCrud(Crud $crud, array $options): array
             $data = $options['after_build']($crud, $data);
         }
 
-        $crud->clearTemplate();
+        $crud->createView();
 
         return $data;
     }

From 21b5749591be543fa40c56c775b55a675ee766ff Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 21:08:12 +0200
Subject: [PATCH 135/264] Add Crud unit tests

---
 tests/Crud/CrudTest.php | 572 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 572 insertions(+)
 create mode 100644 tests/Crud/CrudTest.php

diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
new file mode 100644
index 0000000..b529561
--- /dev/null
+++ b/tests/Crud/CrudTest.php
@@ -0,0 +1,572 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Crud;
+
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudColumn;
+use Ecommit\CrudBundle\Crud\CrudSession;
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
+use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\UserSearcher;
+use Ecommit\DoctrineUtils\Paginator\DoctrineORMPaginator;
+use Ecommit\Paginator\PaginatorInterface;
+use Psr\Container\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
+use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
+
+class CrudTest extends KernelTestCase
+{
+    protected function setUp(): void
+    {
+        self::bootKernel();
+    }
+
+    /**
+     * @dataProvider getTestCrudWithInvalidSessionNameProvider
+     */
+    public function testCrudWithInvalidSessionName(string $sessionName): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Variable sessionName is not given or is invalid');
+
+        $this->createCrud($sessionName);
+    }
+
+    public function getTestCrudWithInvalidSessionNameProvider(): array
+    {
+        return [
+            [''],
+            ['aa#bb'],
+            ['aa bb'],
+            [str_pad('', 101, 'a')],
+        ];
+    }
+
+    public function testGetSessionName(): void
+    {
+        $crud = $this->createCrud('session_name');
+        $this->assertSame('session_name', $crud->getSessionName());
+    }
+
+    public function testGetSessionValues(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $this->assertInstanceOf(CrudSession::class, $crud->getSessionValues());
+    }
+
+    public function testColumns(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertSame([], $crud->getColumns());
+        $this->assertInstanceOf(Crud::class, $crud->addColumn('username', 'u.username', 'username'));
+        $this->assertInstanceOf(Crud::class, $crud->addColumn('firstName', 'u.firstName', 'first_name', [
+            'sortable' => false,
+            'default_displayed' => false,
+            'alias_search' => 'alias_search2',
+            'alias_sort' => 'alias_sort2',
+        ]));
+        $column1 = new CrudColumn('username', 'u.username', 'username', true, true);
+        $column2 = new CrudColumn('firstName', 'u.firstName', 'first_name', false, false, 'alias_search2', 'alias_sort2');
+        $this->assertEquals($column1, $crud->getColumn('username'));
+        $this->assertEquals($column2, $crud->getColumn('firstName'));
+        $columns = [
+            'username' => $column1,
+            'firstName' => $column2,
+        ];
+        $this->assertEquals($columns, $crud->getColumns());
+    }
+
+    public function testAddColumnTooLong(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Column id is too long');
+
+        $crud = $this->createCrud('session_name');
+        $crud->addColumn(str_pad('', 101, 'a'), 'alias', 'label');
+    }
+
+    public function testAddColumnWithInvalidOption(): void
+    {
+        $this->expectException(UndefinedOptionsException::class);
+
+        $crud = $this->createCrud('session_name');
+        $crud->addColumn('column1', 'alias1', 'label1', [
+            'bad_option' => 'value',
+        ]);
+    }
+
+    public function testAddColumnWithInvalidTypeSortableOption(): void
+    {
+        $this->expectException(InvalidOptionsException::class);
+
+        $crud = $this->createCrud('session_name');
+        $crud->addColumn('column1', 'alias1', 'label1', [
+            'sortable' => 'not_bool',
+        ]);
+    }
+
+    public function testAddColumnWithInvalidTypeDefaultDisplayedOption(): void
+    {
+        $this->expectException(InvalidOptionsException::class);
+
+        $crud = $this->createCrud('session_name');
+        $crud->addColumn('column1', 'alias1', 'label1', [
+            'default_displayed' => 'not_bool',
+        ]);
+    }
+
+    public function testGetColumnNotExists(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Crud: Column invalid does not exist');
+
+        $crud = $this->createCrud('session_name');
+        $crud->getColumn('invalid');
+    }
+
+    public function testGetDefaultDisplayedColumns(): void
+    {
+        $crud = $this->createValidCrud();
+
+        $this->assertSame(['firstName'], $crud->getDefaultDisplayedColumns());
+    }
+
+    public function testGetDefaultDisplayedColumnsEmpty(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Config Crud: One column displayed is required');
+
+        $crud = $this->createCrud();
+        $crud->getDefaultDisplayedColumns();
+    }
+
+    public function testVirtualColumns(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertSame([], $crud->getVirtualColumns());
+
+        $this->assertInstanceOf(Crud::class, $crud->addVirtualColumn('columnv1', 'aliasv1'));
+        $this->assertInstanceOf(Crud::class, $crud->addVirtualColumn('columnv2', 'aliasv2'));
+
+        $column1 = new CrudColumn('columnv1', 'aliasv1', null, false, false);
+        $column2 = new CrudColumn('columnv2', 'aliasv2', null, false, false);
+        $this->assertEquals($column1, $crud->getVirtualColumn('columnv1'));
+        $this->assertEquals($column2, $crud->getVirtualColumn('columnv2'));
+
+        $columns = [
+            'columnv1' => $column1,
+            'columnv2' => $column2,
+        ];
+        $this->assertEquals($columns, $crud->getVirtualColumns());
+    }
+
+    public function testGetVirtualColumnNotExists(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Crud: Column invalid does not exist');
+
+        $crud = $this->createCrud('session_name');
+        $crud->getVirtualColumn('invalid');
+    }
+
+    public function testQueryBuilder(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertNull($crud->getQueryBuilder());
+        $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
+            ->createQueryBuilder('u')
+            ->select('u');
+        $this->assertInstanceOf(Crud::class, $crud->setQueryBuilder($queryBuilder));
+        $this->assertSame($queryBuilder, $crud->getQueryBuilder());
+    }
+
+    public function testAvailableResultsPerPage(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertSame([], $crud->getAvailableResultsPerPage());
+        $this->assertNull($crud->getDefaultResultsPerPage());
+        $this->assertInstanceOf(Crud::class, $crud->setAvailableResultsPerPage([10, 50, 100], 50));
+        $this->assertSame([10, 50, 100], $crud->getAvailableResultsPerPage());
+        $this->assertSame(50, $crud->getDefaultResultsPerPage());
+    }
+
+    public function testSort(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertNull($crud->getDefaultSort());
+        $this->assertNull($crud->getDefaultSense());
+        $this->assertInstanceOf(Crud::class, $crud->setDefaultSort('username', Crud::DESC));
+        $this->assertSame('username', $crud->getDefaultSort());
+        $this->assertSame(Crud::DESC, $crud->getDefaultSense());
+    }
+
+    public function testDefaultPersonalizedSort(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertSame([], $crud->getDefaultPersonalizedSort());
+
+        $this->assertInstanceOf(Crud::class, $crud->setDefaultPersonalizedSort(['u.userId']));
+
+        $this->assertSame(['u.userId'], $crud->getDefaultPersonalizedSort());
+        $this->assertSame('defaultPersonalizedSort', $crud->getDefaultSort());
+        $this->assertSame(Crud::ASC, $crud->getDefaultSense());
+    }
+
+    public function testRouting(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertNull($crud->getRouteName());
+        $this->assertSame([], $crud->getRouteParams());
+        $this->assertInstanceOf(Crud::class, $crud->setRoute('user_ajax_crud', ['param1' => 'val1']));
+        $this->assertSame('user_ajax_crud', $crud->getRouteName());
+        $this->assertSame(['param1' => 'val1'], $crud->getRouteParams());
+        $this->assertSame('/user/ajax-crud?param1=val1', $crud->getUrl());
+        $this->assertSame('/user/ajax-crud?param1=val1&param2=val2', $crud->getUrl(['param2' => 'val2']));
+        $this->assertSame('/user/ajax-crud?param1=val1&search=1', $crud->getSearchUrl());
+        $this->assertSame('/user/ajax-crud?param1=val1&search=1&param2=val2', $crud->getSearchUrl(['param2' => 'val2']));
+    }
+
+    public function testCreateAndGetSearchForm(): void
+    {
+        $crud = $this->createValidCrud();
+
+        $this->assertNull($crud->getSearchForm());
+
+        $crud->createSearchForm(new UserSearcher());
+        $this->assertInstanceOf(SearchFormBuilder::class, $crud->getSearchForm());
+
+        $crud->init();
+        $crud->createView();
+        $this->assertInstanceOf(FormView::class, $crud->getSearchForm());
+    }
+
+    public function testSetPersistentSettings(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertInstanceOf(Crud::class, $crud->setPersistentSettings(true));
+    }
+
+    public function testSetBuildPaginatorTrue(): void
+    {
+        $crud = $this->createValidCrud();
+
+        $this->assertInstanceOf(Crud::class, $crud->setBuildPaginator(true));
+        $crud->init();
+        $crud->build();
+
+        $this->assertInstanceOf(DoctrineORMPaginator::class, $crud->getPaginator());
+    }
+
+    public function testSetBuildPaginatorFalse(): void
+    {
+        $crud = $this->createValidCrud();
+
+        $this->assertInstanceOf(Crud::class, $crud->setBuildPaginator(false));
+        $crud->init();
+        $crud->build();
+
+        $this->assertNull($crud->getPaginator());
+    }
+
+    public function testSetBuildPaginatorClosure(): void
+    {
+        $crud = $this->createValidCrud();
+
+        $this->assertInstanceOf(Crud::class, $crud->setBuildPaginator(function (QueryBuilder $queryBuilder, int $page, int $resultsPerPage) {
+            $this->assertInstanceOf(QueryBuilder::class, $queryBuilder);
+            $this->assertSame(1, $page);
+            $this->assertSame(50, $resultsPerPage);
+
+            return $this->createMock(PaginatorInterface::class);
+        }));
+        $crud->init();
+        $crud->build();
+
+        $this->assertInstanceOf(PaginatorInterface::class, $crud->getPaginator());
+    }
+
+    public function testDivIdList(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertSame('crud_list', $crud->getDivIdList());
+        $this->assertInstanceOf(Crud::class, $crud->setDivIdList('val'));
+        $this->assertSame('val', $crud->getDivIdList());
+    }
+
+    public function testDivIdSearch(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertSame('crud_search', $crud->getDivIdSearch());
+        $this->assertInstanceOf(Crud::class, $crud->setDivIdSearch('val'));
+        $this->assertSame('val', $crud->getDivIdSearch());
+    }
+
+    public function testDisplayResultsOnlyIfSearch(): void
+    {
+        $crud = $this->createValidCrud(true);
+
+        $this->assertTrue($crud->getDisplayResults());
+        $this->assertFalse($crud->getDisplayResultsOnlyIfSearch());
+        $this->assertInstanceOf(Crud::class, $crud->setDisplayResultsOnlyIfSearch(true));
+        $this->assertTrue($crud->getDisplayResultsOnlyIfSearch());
+
+        $crud->init();
+        $crud->build();
+        $this->assertFalse($crud->getDisplayResults());
+        $this->assertNull($crud->getPaginator());
+    }
+
+    public function testDisplayResultsOnlyIfSearchWithoutSearcher(): void
+    {
+        $crud = $this->createValidCrud(false);
+
+        $this->assertTrue($crud->getDisplayResults());
+        $this->assertFalse($crud->getDisplayResultsOnlyIfSearch());
+        $this->assertInstanceOf(Crud::class, $crud->setDisplayResultsOnlyIfSearch(true));
+        $this->assertTrue($crud->getDisplayResultsOnlyIfSearch());
+
+        $crud->init();
+        $crud->build();
+        $this->assertTrue($crud->getDisplayResults());
+        $this->assertNotNull($crud->getPaginator());
+    }
+
+    public function testDisplayResultsTrue(): void
+    {
+        $crud = $this->createValidCrud();
+
+        $this->assertTrue($crud->getDisplayResults());
+        $this->assertInstanceOf(Crud::class, $crud->setDisplayResults(true));
+
+        $crud->init();
+        $crud->build();
+        $this->assertTrue($crud->getDisplayResults());
+        $this->assertNotNull($crud->getPaginator());
+    }
+
+    public function testDisplayResultsFalse(): void
+    {
+        $crud = $this->createValidCrud();
+
+        $this->assertTrue($crud->getDisplayResults());
+        $this->assertInstanceOf(Crud::class, $crud->setDisplayResults(false));
+
+        $crud->init();
+        $crud->build();
+        $this->assertFalse($crud->getDisplayResults());
+        $this->assertNull($crud->getPaginator());
+    }
+
+    public function testDisplayResultsFalseAfterInit(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+        $crud->build();
+
+        $this->assertInstanceOf(Crud::class, $crud->setDisplayResults(false));
+        $this->assertFalse($crud->getDisplayResults());
+        $this->assertNull($crud->getPaginator());
+    }
+
+    public function testTwigFunctionsConfiguration(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertSame([], $crud->getTwigFunctionsConfiguration());
+        $config = [
+            'function1' => ['val'],
+        ];
+        $this->assertInstanceOf(Crud::class, $crud->setTwigFunctionsConfiguration($config));
+        $this->assertSame($config, $crud->getTwigFunctionsConfiguration());
+        $this->assertSame(['val'], $crud->getTwigFunctionConfiguration('function1'));
+    }
+
+    public function testGetTwigFunctionConfigurationNotExists(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->assertSame([], $crud->getTwigFunctionConfiguration('function1'));
+    }
+
+    public function testPaginator(): void
+    {
+        $crud = $this->createValidCrud();
+
+        $this->assertNull($crud->getPaginator());
+
+        $crud->init();
+        $crud->build();
+        $this->assertInstanceOf(PaginatorInterface::class, $crud->getPaginator());
+
+        $this->assertInstanceOf(Crud::class, $crud->setPaginator(null));
+        $this->assertNull($crud->getPaginator());
+
+        $this->assertInstanceOf(Crud::class, $crud->setPaginator($this->createMock(PaginatorInterface::class)));
+        $this->assertInstanceOf(PaginatorInterface::class, $crud->getPaginator());
+    }
+
+    public function testGetDisplaySettingsForm(): void
+    {
+        $crud = $this->createValidCrud();
+        $this->assertNull($crud->getDisplaySettingsForm());
+
+        $crud->init();
+        $this->assertInstanceOf(Form::class, $crud->getDisplaySettingsForm());
+
+        $crud->createView();
+        $this->assertInstanceOf(FormView::class, $crud->getDisplaySettingsForm());
+    }
+
+    /**
+     * @dataProvider getTestIncompleteInitProvider
+     */
+    public function testIncompleteInit(string $property, string $method, mixed $value): void
+    {
+        $crud = $this->createValidCrud();
+        $reflectionClass = new \ReflectionClass($crud);
+        $reflectionProperty = $reflectionClass->getProperty($property);
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($crud, $value);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage($method);
+
+        $crud->init();
+    }
+
+    public function getTestIncompleteInitProvider(): array
+    {
+        return [
+            ['availableColumns', 'addColumn', []],
+            ['availableResultsPerPage', 'setAvailableResultsPerPage', []],
+            ['defaultResultsPerPage', 'setAvailableResultsPerPage', null],
+            ['defaultSort', 'setDefaultSort', null],
+            ['defaultSense', 'setDefaultSort', null],
+            ['queryBuilder', 'setQueryBuilder', null],
+            ['routeName', 'setRoute', null],
+        ];
+    }
+
+    public function testInitIfNecessary(): void
+    {
+        $crud = $this->createValidCrud();
+        $this->assertFalse($crud->isInitialized());
+
+        $crud->initIfNecessary();
+        $this->assertTrue($crud->isInitialized());
+    }
+
+    public function testInitIfNecessaryAfterInit(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $crud->initIfNecessary();
+        $this->assertTrue($crud->isInitialized());
+    }
+
+    public function testInit(): void
+    {
+        $crud = $this->createValidCrud();
+        $this->assertFalse($crud->isInitialized());
+
+        $crud->init();
+        $this->assertTrue($crud->isInitialized());
+    }
+
+    public function testInitAfterInit(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('CRUD already initialized');
+
+        $crud->init();
+    }
+
+    protected function createCrud(string $sessionName = 'session_name'): Crud
+    {
+        $session = $this->createMock(SessionInterface::class);
+        $session->expects($this->any())
+            ->method('get')
+            ->willReturn(null);
+        $session->expects($this->any())
+            ->method('set');
+
+        $request = new Request();
+        $request->setSession($session);
+        $requestStack = $this->createMock(RequestStack::class);
+        $requestStack->method('getCurrentRequest')
+            ->willReturn($request);
+
+        $container = $this->createMock(ContainerInterface::class);
+        $container->method('get')
+            ->willReturnCallback(function ($name) use ($requestStack) {
+                if ('request_stack' === $name) {
+                    return $requestStack;
+                }
+
+                return static::getContainer()->get('ecommit_crud.locator')->get($name);
+            });
+
+        $crud = $this->getMockBuilder(Crud::class)
+            ->setConstructorArgs([$sessionName, $container])
+            ->onlyMethods(['save'])
+            ->getMock();
+
+        return $crud;
+    }
+
+    protected function createValidCrud(bool $withSearcher = false): Crud
+    {
+        $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
+            ->createQueryBuilder('u')
+            ->select('u');
+
+        $crud = $this->createCrud('session_name')
+            ->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
+            ->addColumn('firstName', 'u.firstName', 'first_name')
+            ->setQueryBuilder($queryBuilder)
+            ->setAvailableResultsPerPage([10, 50, 100], 50)
+            ->setDefaultSort('username', Crud::DESC)
+            ->setRoute('user_ajax_crud', ['param1' => 'val1'])
+            ;
+        if ($withSearcher) {
+            $crud->createSearchForm(new UserSearcher());
+        }
+
+        return $crud;
+    }
+}

From b1032f3e0c689bf5e65b13597b360614f3633309 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 21:29:47 +0200
Subject: [PATCH 136/264] Add CrudFilters unit tests

---
 tests/Crud/CrudFiltersTest.php | 72 ++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 tests/Crud/CrudFiltersTest.php

diff --git a/tests/Crud/CrudFiltersTest.php b/tests/Crud/CrudFiltersTest.php
new file mode 100644
index 0000000..0c285eb
--- /dev/null
+++ b/tests/Crud/CrudFiltersTest.php
@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Crud;
+
+use Ecommit\CrudBundle\Crud\CrudFilters;
+use Ecommit\CrudBundle\Form\Filter\FilterInterface;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+
+class CrudFiltersTest extends TestCase
+{
+    protected CrudFilters $crudFilters;
+
+    protected function setUp(): void
+    {
+        $this->crudFilters = $this->createCrudFilters();
+    }
+
+    /**
+     * @dataProvider getTestHasProvider
+     */
+    public function testHas(string $filter, $expected): void
+    {
+        $this->assertSame($expected, $this->crudFilters->has($filter));
+    }
+
+    public function getTestHasProvider(): array
+    {
+        return [
+            ['filter_1', true],
+            ['bad_filer', false],
+        ];
+    }
+
+    public function testGet(): void
+    {
+        $filter = $this->crudFilters->get('filter_1');
+        $this->assertInstanceOf(FilterInterface::class, $filter);
+    }
+
+    protected function createCrudFilters(): CrudFilters
+    {
+        $filters = [
+            'filter_1' => $this->createFilter('filter_1'),
+            'filter_2' => $this->createFilter('filter_2'),
+        ];
+
+        $container = $this->createMock(ContainerInterface::class);
+        $container->method('has')
+            ->willReturnCallback(fn ($name): bool => \array_key_exists($name, $filters));
+        $container->method('get')
+            ->willReturnCallback(fn ($name): FilterInterface => $filters[$name]);
+
+        return new CrudFilters($container);
+    }
+
+    protected function createFilter(string $name): FilterInterface
+    {
+        return $this->createMock(FilterInterface::class);
+    }
+}

From 39136a11acfd8fe7209916444fb1aad454ebedc2 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 12 Apr 2022 21:34:33 +0200
Subject: [PATCH 137/264] Fix CS

---
 src/Crud/Crud.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index cf1dc65..828a3d3 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -654,9 +654,9 @@ public function setTwigFunctionsConfiguration(array $twigFunctionsConfiguration)
         return $this;
     }
 
-    protected function testIfDatabaseMustMeUpdated(mixed $oldValue, mixed $new_value): void
+    protected function testIfDatabaseMustMeUpdated(mixed $oldValue, mixed $newValue): void
     {
-        if ($oldValue != $new_value) {
+        if ($oldValue != $newValue) {
             $this->updateDatabase = true;
         }
     }
@@ -697,9 +697,9 @@ protected function changeColumnsDisplayed(array $value): void
         $oldValue = $this->sessionValues->displayedColumns;
         $newDisplayedColumns = [];
         $availableColumns = $this->availableColumns;
-        foreach ($value as $column_name) {
-            if (\array_key_exists($column_name, $availableColumns)) {
-                $newDisplayedColumns[] = $column_name;
+        foreach ($value as $columnName) {
+            if (\array_key_exists($columnName, $availableColumns)) {
+                $newDisplayedColumns[] = $columnName;
             }
         }
         if (0 == \count($newDisplayedColumns)) {

From e06a39a4e9ba60c367dc5af03a6a1d01d9ff5a06 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 14 Apr 2022 12:18:26 +0200
Subject: [PATCH 138/264] Remove useless code

---
 src/Crud/SearchFormBuilder.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index acb4923..88bccfa 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -98,11 +98,6 @@ public function addFilter(string $property, string $filter, array $options = [])
                     return $columns[$options['column_id']]->label;
                 }
 
-                $virtualColumns = $this->crud->getVirtualColumns();
-                if (\array_key_exists($options['column_id'], $virtualColumns)) {
-                    return $virtualColumns[$options['column_id']]->label;
-                }
-
                 return null;
             },
         ]);

From e7f7db198cb92df74853389c787a7a355cb6c90f Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 14 Apr 2022 12:23:03 +0200
Subject: [PATCH 139/264] [SearchFormBuilder] Avoid finding the filter service
 if not needed

---
 src/Crud/SearchFormBuilder.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index 88bccfa..12882f5 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -167,14 +167,14 @@ public function updateQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Que
             $propertyAccessor = PropertyAccess::createPropertyAccessor();
             $value = $propertyAccessor->getValue($searcher, $property);
 
-            /** @var FilterInterface $filterService */
-            $filterService = $this->container->get('ecommit_crud.filters')->get($filter['name']);
-            if (!$filterService->supportsQueryBuilder($queryBuilder)) {
-                throw new \Exception('"%s" filter does not support "%s" query builder', $filter['name'], $queryBuilder::class);
-            }
             if ($filter['options']['update_query_builder']) {
                 $filter['options']['update_query_builder']($queryBuilder, $property, $value, $filter['options']);
             } else {
+                /** @var FilterInterface $filterService */
+                $filterService = $this->container->get('ecommit_crud.filters')->get($filter['name']);
+                if (!$filterService->supportsQueryBuilder($queryBuilder)) {
+                    throw new \Exception('"%s" filter does not support "%s" query builder', $filter['name'], $queryBuilder::class);
+                }
                 $filterService->updateQueryBuilder($queryBuilder, $property, $value, $filter['options']);
             }
         }

From a30d740c2c8169ca4d1c160f851512f417e8aafc Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 14 Apr 2022 12:27:43 +0200
Subject: [PATCH 140/264] Fix SearcherFormBuilder::getField when FormView
 object

---
 src/Crud/SearchFormBuilder.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index 12882f5..a4192b5 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -122,6 +122,10 @@ public function addField(string $property, string $type, array $options = []): s
 
     public function getField(string $property): FormBuilderInterface|Form|FormView
     {
+        if ($this->form instanceof FormView) {
+            return $this->form[$property];
+        }
+
         return $this->form->get($property);
     }
 

From 3ed1e83e34d3b717b16355f3888d657624de63c5 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 14 Apr 2022 12:32:30 +0200
Subject: [PATCH 141/264] Fix exception constructor

---
 src/Crud/SearchFormBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index a4192b5..b7d3e80 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -177,7 +177,7 @@ public function updateQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Que
                 /** @var FilterInterface $filterService */
                 $filterService = $this->container->get('ecommit_crud.filters')->get($filter['name']);
                 if (!$filterService->supportsQueryBuilder($queryBuilder)) {
-                    throw new \Exception('"%s" filter does not support "%s" query builder', $filter['name'], $queryBuilder::class);
+                    throw new \Exception(sprintf('"%s" filter does not support "%s" query builder', $filter['name'], $queryBuilder::class));
                 }
                 $filterService->updateQueryBuilder($queryBuilder, $property, $value, $filter['options']);
             }

From a5c1996587b658741570616f5d13a1cbe7d42eba Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 14 Apr 2022 15:07:17 +0200
Subject: [PATCH 142/264] Fix types

---
 src/Crud/Crud.php              |  5 +++--
 src/Crud/SearchFormBuilder.php | 20 +++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 828a3d3..961c574 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -21,6 +21,7 @@
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -33,7 +34,7 @@ final class Crud
 
     protected CrudSession $sessionValues;
     protected SearchFormBuilder|FormView|null $searchForm = null;
-    protected Form|FormView|null $displaySettingsForm = null;
+    protected FormInterface|FormView|null $displaySettingsForm = null;
     protected bool $isInitialized = false;
     protected bool $initializationInProgress = false;
     protected array $availableColumns = [];
@@ -813,7 +814,7 @@ protected function processRequest(): void
      *
      * @return Form (before createView) or FormView (after createView)
      */
-    public function getDisplaySettingsForm(): Form|FormView|null
+    public function getDisplaySettingsForm(): FormInterface|FormView|null
     {
         return $this->displaySettingsForm;
     }
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index b7d3e80..a7f3ba0 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -17,8 +17,8 @@
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 use Ecommit\CrudBundle\Form\Type\FormSearchType;
 use Psr\Container\ContainerInterface;
-use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -27,7 +27,7 @@
 final class SearchFormBuilder
 {
     protected array $options;
-    protected FormBuilderInterface|Form|FormView $form;
+    protected FormBuilderInterface|FormInterface|FormView $form;
     protected array $filters = [];
 
     public function __construct(protected ContainerInterface $container, protected Crud $crud, protected SearcherInterface $defaultData, ?string $type, array $options)
@@ -120,7 +120,7 @@ public function addField(string $property, string $type, array $options = []): s
         return $this;
     }
 
-    public function getField(string $property): FormBuilderInterface|Form|FormView
+    public function getField(string $property): FormBuilderInterface|FormInterface|FormView
     {
         if ($this->form instanceof FormView) {
             return $this->form[$property];
@@ -129,7 +129,7 @@ public function getField(string $property): FormBuilderInterface|Form|FormView
         return $this->form->get($property);
     }
 
-    public function createForm(): void
+    public function createForm(): self
     {
         // Add filters
         foreach ($this->filters as $property => $filter) {
@@ -146,14 +146,18 @@ public function createForm(): void
 
         $this->form->setAction($this->crud->getSearchUrl());
         $this->form = $this->form->getForm();
+
+        return $this;
     }
 
-    public function createFormView(): void
+    public function createFormView(): self
     {
         $this->form = $this->form->createView();
+
+        return $this;
     }
 
-    public function getForm(): FormBuilderInterface|Form|FormView
+    public function getForm(): FormBuilderInterface|FormInterface|FormView
     {
         return $this->form;
     }
@@ -163,7 +167,7 @@ public function getDefaultData(): SearcherInterface
         return $this->defaultData;
     }
 
-    public function updateQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface $queryBuilder, SearcherInterface $searcher): void
+    public function updateQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface $queryBuilder, SearcherInterface $searcher): self
     {
         $searcher->updateQueryBuilder($queryBuilder, $this->options);
 
@@ -182,5 +186,7 @@ public function updateQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Que
                 $filterService->updateQueryBuilder($queryBuilder, $property, $value, $filter['options']);
             }
         }
+
+        return $this;
     }
 }

From c6b5afffff44e0b3ee9b445011f4ef1bb6f59868 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 14 Apr 2022 15:12:37 +0200
Subject: [PATCH 143/264] Add SearchFormBuilder unit tests

---
 tests/Crud/SearchFormBuilderTest.php | 412 +++++++++++++++++++++++++++
 1 file changed, 412 insertions(+)
 create mode 100644 tests/Crud/SearchFormBuilderTest.php

diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
new file mode 100644
index 0000000..2df1228
--- /dev/null
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -0,0 +1,412 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Crud;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Ecommit\CrudBundle\Form\Filter\FilterInterface;
+use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
+use Ecommit\CrudBundle\Form\Type\FormSearchType;
+use Psr\Container\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+
+class SearchFormBuilderTest extends KernelTestCase
+{
+    protected function setUp(): void
+    {
+        self::bootKernel();
+    }
+
+    /**
+     * @dataProvider getTestCreateFormBuilderProvider
+     */
+    public function testCreateFormBuilder(?string $type, string $expectedName, string $expectedType): void
+    {
+        $defaultData = $this->createMock(SearcherInterface::class);
+        $defaultData->expects($this->once())->method('buildForm');
+
+        $searchFormBuilder = new SearchFormBuilder($this->createCrudContainer(), $this->createCrud(), $defaultData, $type, []);
+        $this->assertSame($expectedName, $searchFormBuilder->getForm()->getFormConfig()->getName());
+        $this->assertInstanceOf($expectedType, $searchFormBuilder->getForm()->getFormConfig()->getType()->getInnerType());
+    }
+
+    public function getTestCreateFormBuilderProvider(): array
+    {
+        return [
+            [null, 'crud_search_session_name', FormSearchType::class],
+            [FormType::class, 'form', FormType::class],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestCreateFormBuilderProvider
+     */
+    public function testCreateFormBuilderWithFormOptions(?string $type, string $expectedName, string $expectedType): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder(type: $type, options: [
+            'form_options' => [
+                'attr' => ['class' => 'myclass'],
+            ],
+        ]);
+        $this->assertSame(['class' => 'myclass'], $searchFormBuilder->getForm()->getFormConfig()->getOption('attr'));
+    }
+
+    /**
+     * @dataProvider getTestCreateFormBuilderProvider
+     */
+    public function testCreateFormBuilderWithValidationGroups(?string $type, string $expectedName, string $expectedType): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder(type: $type, options: [
+            'validation_groups' => ['my_group'],
+        ]);
+        $this->assertSame(['my_group'], $searchFormBuilder->getForm()->getFormConfig()->getOption('validation_groups'));
+    }
+
+    /**
+     * @dataProvider getTestCreateFormBuilderProvider
+     */
+    public function testCreateFormBuilderWithValidationGroupsAndFormOptions(?string $type, string $expectedName, string $expectedType): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder(type: $type, options: [
+            'validation_groups' => ['my_group1'],
+            'form_options' => [
+                'validation_groups' => ['my_group2'],
+            ],
+        ]);
+        $this->assertSame(['my_group2'], $searchFormBuilder->getForm()->getFormConfig()->getOption('validation_groups'));
+    }
+
+    public function testAddFilterNotExists(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Filter "bad_filter" not found');
+
+        $this->createSearchFormBuilder()->addFilter('property', 'bad_filter');
+    }
+
+    public function testAddFilter(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $this->assertSame($searchFormBuilder, $searchFormBuilder->addFilter('property', 'my_filter'));
+        $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
+        $this->assertCount(1, $filters);
+        $this->assertArrayHasKey('property', $filters);
+        $this->assertSame('my_filter', $filters['property']['name']);
+    }
+
+    public function testAddFilterAutovalidateDefaultValueFromBuilder(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder(options: [
+            'autovalidate' => false,
+        ])
+            ->addFilter('property', 'my_filter');
+        $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
+        $this->assertFalse($filters['property']['options']['autovalidate']);
+    }
+
+    public function testAddFilterValidationGroupsDefaultValueFromBuilder(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder(options: [
+            'validation_groups' => ['my_group1'],
+        ])
+            ->addFilter('property', 'my_filter');
+        $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
+        $this->assertSame(['my_group1'], $filters['property']['options']['validation_groups']);
+    }
+
+    public function testAddFilterAliasSearch(): void
+    {
+        $crud = $this->createCrud()
+            ->addColumn('column1', 'alias1', 'label1')
+            ->addColumn('column2', 'alias2', 'label1', [
+                'alias_search' => 'custom_alias2',
+            ])
+            ->addVirtualColumn('virtual1', 'virtualalias1');
+        $searchFormBuilder = $this->createSearchFormBuilder(crud: $crud)
+            ->addFilter('column1', 'my_filter')
+            ->addFilter('column2', 'my_filter')
+            ->addFilter('virtual1', 'my_filter');
+        $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
+        $this->assertSame('alias1', $filters['column1']['options']['alias_search']);
+        $this->assertSame('custom_alias2', $filters['column2']['options']['alias_search']);
+        $this->assertSame('virtualalias1', $filters['virtual1']['options']['alias_search']);
+    }
+
+    public function testAddFilterLabel(): void
+    {
+        $crud = $this->createCrud()
+            ->addColumn('column1', 'alias1', 'label1')
+            ->addVirtualColumn('virtual1', 'virtualalias1');
+        $searchFormBuilder = $this->createSearchFormBuilder(crud: $crud)
+            ->addFilter('column1', 'my_filter')
+            ->addFilter('column2', 'my_filter')
+            ->addFilter('virtual1', 'my_filter');
+        $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
+        $this->assertSame('label1', $filters['column1']['options']['label']);
+        $this->assertNull($filters['virtual1']['options']['label']);
+    }
+
+    public function testAddField(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $this->assertSame($searchFormBuilder, $searchFormBuilder->addField('property', TextType::class, [
+            'label' => 'my_label',
+        ]));
+        $form = $this->getPrivateValue($searchFormBuilder, 'form');
+        $this->assertCount(1, $form);
+        $this->assertTrue($form->has('property'));
+        $field = $form->get('property');
+        $this->assertInstanceOf(TextType::class, $field->getFormConfig()->getType()->getInnerType());
+        $this->assertSame('my_label', $field->getFormConfig()->getOption('label'));
+    }
+
+    public function testGetField(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder()
+            ->addField('property', TextType::class);
+        $this->assertInstanceOf(FormBuilderInterface::class, $searchFormBuilder->getField('property'));
+
+        $searchFormBuilder->createForm();
+        $this->assertInstanceOf(FormInterface::class, $searchFormBuilder->getField('property'));
+
+        $searchFormBuilder->createFormView();
+        $this->assertInstanceOf(FormView::class, $searchFormBuilder->getField('property'));
+    }
+
+    public function testCreateFormColumnNotExists(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder()
+            ->addFilter('column1', 'my_filter');
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Column "column1" not found');
+
+        $searchFormBuilder->createForm();
+    }
+
+    public function testCreateForm(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $this->assertSame($searchFormBuilder, $searchFormBuilder->createForm());
+    }
+
+    public function testCreateFormWithDefaultColumnId(): void
+    {
+        $filter = $this->createMock(FilterInterface::class);
+        $filter->expects($this->exactly(2))->method('buildForm')->withConsecutive(
+            [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'column1', self::callback(fn ($value): bool => \is_array($value))],
+            [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'virtual1', self::callback(fn ($value): bool => \is_array($value))],
+        );
+        $crud = $this->createCrud()
+            ->addColumn('column1', 'alias1', 'label1')
+            ->addVirtualColumn('virtual1', 'alias2');
+        $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
+            ->addFilter('column1', 'my_filter')
+            ->addFilter('virtual1', 'my_filter')
+            ->createForm();
+    }
+
+    public function testCreateFormWithColumnIdOption(): void
+    {
+        $filter = $this->createMock(FilterInterface::class);
+        $filter->expects($this->exactly(2))->method('buildForm')->withConsecutive(
+            [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'property1', self::callback(fn ($value): bool => \is_array($value))],
+            [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'property2', self::callback(fn ($value): bool => \is_array($value))],
+        );
+        $crud = $this->createCrud()
+            ->addColumn('column1', 'alias1', 'label1')
+            ->addVirtualColumn('virtual1', 'alias1');
+        $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
+            ->addFilter('property1', 'my_filter', [
+                'column_id' => 'column1',
+            ])
+            ->addFilter('property2', 'my_filter', [
+                'column_id' => 'virtual1',
+            ])
+            ->createForm();
+    }
+
+    public function testActionAfterCreateForm(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $searchFormBuilder->createForm();
+        $this->assertSame('/user/ajax-crud?search=1', $searchFormBuilder->getForm()->getConfig()->getAction());
+    }
+
+    public function testCreateFormView(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder()->createForm();
+        $this->assertSame($searchFormBuilder, $searchFormBuilder->createFormView());
+    }
+
+    public function testGetForm(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $this->assertInstanceOf(FormBuilderInterface::class, $searchFormBuilder->getForm());
+
+        $searchFormBuilder->createForm();
+        $this->assertInstanceOf(FormInterface::class, $searchFormBuilder->getForm());
+
+        $searchFormBuilder->createFormView();
+        $this->assertInstanceOf(FormView::class, $searchFormBuilder->getForm());
+    }
+
+    public function testGetDefaultData(): void
+    {
+        $defaultData = $this->createMock(SearcherInterface::class);
+        $searchFormBuilder = $this->createSearchFormBuilder(defaultData: $defaultData);
+        $this->assertSame($defaultData, $searchFormBuilder->getDefaultData());
+    }
+
+    public function testUpdateQueryBuilder(): void
+    {
+        $queryBuilder = $this->createMock(QueryBuilder::class);
+
+        $filter = $this->createMock(FilterInterface::class);
+        $filter->expects($this->once())->method('updateQueryBuilder')->with(
+            self::equalTo($queryBuilder),
+            'property',
+            'value',
+            self::callback(fn ($value): bool => \is_array($value))
+        );
+        $filter->expects($this->once())->method('supportsQueryBuilder')->with($queryBuilder)->willReturn(true);
+
+        $crud = $this->createCrud()
+            ->addColumn('column1', 'alias1', 'label1');
+        $searchFormBuilder = $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
+            ->addFilter('property', 'my_filter', [
+                'column_id' => 'column1',
+            ]);
+
+        $searcherData = $this->getMockBuilder(SearcherInterface::class)
+            ->addMethods(['getProperty'])
+            ->onlyMethods(['buildForm', 'updateQueryBuilder', 'configureOptions'])
+            ->getMock();
+        $searcherData->expects($this->once())->method('getProperty')->willReturn('value');
+        $this->assertSame($searchFormBuilder, $searchFormBuilder->updateQueryBuilder($queryBuilder, $searcherData));
+    }
+
+    public function testUpdateQueryBuilderWithUpdateQueryBuilderOption(): void
+    {
+        $queryBuilder = $this->createMock(QueryBuilder::class);
+
+        $filter = $this->createMock(FilterInterface::class);
+        $filter->expects($this->never())->method('updateQueryBuilder');
+        $filter->expects($this->never())->method('supportsQueryBuilder');
+
+        $callback = $this->getMockBuilder(\stdClass::class)->addMethods(['getCallback'])->getMock();
+        $callback->expects($this->once())->method('getCallback')->with(
+            self::equalTo($queryBuilder),
+            'property',
+            'value',
+            self::callback(fn ($value): bool => \is_array($value))
+        );
+
+        $crud = $this->createCrud()
+            ->addColumn('column1', 'alias1', 'label1');
+        $searchFormBuilder = $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
+            ->addFilter('property', 'my_filter', [
+                'column_id' => 'column1',
+                'update_query_builder' => function ($queryBuilder, $property, $value, $options) use ($callback): void {
+                    $callback->getCallback($queryBuilder, $property, $value, $options);
+                },
+            ]);
+
+        $searcherData = $this->getMockBuilder(SearcherInterface::class)
+            ->addMethods(['getProperty'])
+            ->onlyMethods(['buildForm', 'updateQueryBuilder', 'configureOptions'])
+            ->getMock();
+        $searcherData->expects($this->once())->method('getProperty')->willReturn('value');
+        $searchFormBuilder->updateQueryBuilder($queryBuilder, $searcherData);
+    }
+
+    public function testUpdateQueryBuilderNotSuported(): void
+    {
+        $queryBuilder = new QueryBuilder($this->createMock(EntityManagerInterface::class));
+
+        $filter = $this->createMock(FilterInterface::class);
+        $filter->expects($this->never())->method('updateQueryBuilder');
+        $filter->expects($this->once())->method('supportsQueryBuilder')->with($queryBuilder)->willReturn(false);
+
+        $crud = $this->createCrud()
+            ->addColumn('column1', 'alias1', 'label1');
+        $searchFormBuilder = $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
+            ->addFilter('property', 'my_filter', [
+                'column_id' => 'column1',
+            ]);
+
+        $searcherData = $this->getMockBuilder(SearcherInterface::class)
+            ->addMethods(['getProperty'])
+            ->onlyMethods(['buildForm', 'updateQueryBuilder', 'configureOptions'])
+            ->getMock();
+        $searcherData->expects($this->once())->method('getProperty')->willReturn('value');
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('"my_filter" filter does not support "Doctrine\ORM\QueryBuilder" query builder');
+
+        $searchFormBuilder->updateQueryBuilder($queryBuilder, $searcherData);
+    }
+
+    protected function createCrudContainer(array $filters = []): ContainerInterface
+    {
+        $crudFilters = $this->createMock(ContainerInterface::class);
+        $crudFilters->method('has')->willReturnCallback(fn (string $id) => \array_key_exists($id, $filters));
+        $crudFilters->method('get')->willReturnCallback(fn (string $id) => $filters[$id]);
+
+        $services = [
+            'form.factory' => self::getContainer()->get('form.factory'),
+            'ecommit_crud.filters' => $crudFilters,
+        ];
+        $container = $this->createMock(ContainerInterface::class);
+        $container->method('has')->willReturnCallback(fn (string $id) => \array_key_exists($id, $services));
+        $container->method('get')->willReturnCallback(fn (string $id) => $services[$id]);
+
+        return $container;
+    }
+
+    protected function createCrud(): Crud
+    {
+        $crud = $this->getMockBuilder(Crud::class)
+            ->setConstructorArgs(['session_name', static::getContainer()->get('ecommit_crud.locator')])
+            ->onlyMethods(['load', 'save'])
+            ->getMock();
+        $crud->setRoute('user_ajax_crud');
+
+        return $crud;
+    }
+
+    protected function createSearchFormBuilder(?array $filters = null, ?Crud $crud = null, ?SearcherInterface $defaultData = null, ?string $type = null, array $options = []): SearchFormBuilder
+    {
+        $filters = (null !== $filters) ? $filters : ['my_filter' => $this->createMock(FilterInterface::class)];
+        $crud = ($crud) ?: $this->createCrud();
+        $defaultData = ($defaultData) ?: $this->createMock(SearcherInterface::class);
+
+        return new SearchFormBuilder($this->createCrudContainer($filters), $crud, $defaultData, $type, $options);
+    }
+
+    protected function getPrivateValue(SearchFormBuilder $searchFormBuilder, string $property): mixed
+    {
+        $reflectionProperty = (new \ReflectionClass($searchFormBuilder))->getProperty($property);
+        $reflectionProperty->setAccessible(true);
+
+        return $reflectionProperty->getValue($searchFormBuilder);
+    }
+}

From cf5c050f196e4dee0be6bf854b8e459f3e9a1ee4 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 14 Apr 2022 21:37:36 +0200
Subject: [PATCH 144/264] Fix addFilter usage when column is not set

---
 src/Crud/CrudColumnReference.php     | 21 +++++++++
 src/Crud/SearchFormBuilder.php       | 52 +++++++++++----------
 tests/Crud/CrudTest.php              | 68 +++++++++++++++++++++++++++-
 tests/Crud/SearchFormBuilderTest.php | 27 ++++++++---
 4 files changed, 137 insertions(+), 31 deletions(-)
 create mode 100644 src/Crud/CrudColumnReference.php

diff --git a/src/Crud/CrudColumnReference.php b/src/Crud/CrudColumnReference.php
new file mode 100644
index 0000000..7ab466a
--- /dev/null
+++ b/src/Crud/CrudColumnReference.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud;
+
+class CrudColumnReference
+{
+    public function __construct(public string $id)
+    {
+    }
+}
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index a7f3ba0..b4962f0 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -59,8 +59,6 @@ protected function createFormBuilder(?string $type): void
             $formName = sprintf('crud_search_%s', $this->crud->getSessionName());
             $this->form = $formFactory->createNamedBuilder($formName, FormSearchType::class, null, $formOptions);
         }
-
-        $this->defaultData->buildForm($this, $this->options);
     }
 
     public function addFilter(string $property, string $filter, array $options = []): self
@@ -79,27 +77,8 @@ public function addFilter(string $property, string $filter, array $options = [])
             'required' => false,
             'type_options' => [],
             'update_query_builder' => null,
-            'alias_search' => function (Options $options) {
-                $columns = $this->crud->getColumns();
-                if (\array_key_exists($options['column_id'], $columns)) {
-                    return $columns[$options['column_id']]->aliasSearch;
-                }
-
-                $virtualColumns = $this->crud->getVirtualColumns();
-                if (\array_key_exists($options['column_id'], $virtualColumns)) {
-                    return $virtualColumns[$options['column_id']]->aliasSearch;
-                }
-
-                return null;
-            },
-            'label' => function (Options $options) {
-                $columns = $this->crud->getColumns();
-                if (\array_key_exists($options['column_id'], $columns)) {
-                    return $columns[$options['column_id']]->label;
-                }
-
-                return null;
-            },
+            'alias_search' => fn (Options $options) => new CrudColumnReference($options['column_id']),
+            'label' => fn (Options $options) => new CrudColumnReference($options['column_id']),
         ]);
         $resolver->setAllowedTypes('update_query_builder', ['null', 'callable']);
         $filterService->configureOptions($resolver);
@@ -131,6 +110,9 @@ public function getField(string $property): FormBuilderInterface|FormInterface|F
 
     public function createForm(): self
     {
+        $this->defaultData->buildForm($this, $this->options);
+        $this->resolveFilters();
+
         // Add filters
         foreach ($this->filters as $property => $filter) {
             // Check if column exists
@@ -150,6 +132,30 @@ public function createForm(): self
         return $this;
     }
 
+    protected function resolveFilters(): void
+    {
+        $columns = $this->crud->getColumns();
+        $virtualColumns = $this->crud->getVirtualColumns();
+
+        foreach ($this->filters as $property => $filter) {
+            if ($filter['options']['label'] instanceof CrudColumnReference) {
+                if (\array_key_exists($filter['options']['label']->id, $columns)) {
+                    $this->filters[$property]['options']['label'] = $columns[$filter['options']['label']->id]->label;
+                } elseif (\array_key_exists($filter['options']['alias_search']->id, $virtualColumns)) {
+                    $this->filters[$property]['options']['label'] = null;
+                }
+            }
+
+            if ($filter['options']['alias_search'] instanceof CrudColumnReference) {
+                if (\array_key_exists($filter['options']['alias_search']->id, $columns)) {
+                    $this->filters[$property]['options']['alias_search'] = $columns[$filter['options']['alias_search']->id]->aliasSearch;
+                } elseif (\array_key_exists($filter['options']['alias_search']->id, $virtualColumns)) {
+                    $this->filters[$property]['options']['alias_search'] = $virtualColumns[$filter['options']['alias_search']->id]->aliasSearch;
+                }
+            }
+        }
+    }
+
     public function createFormView(): self
     {
         $this->form = $this->form->createView();
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index b529561..d7c752b 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -17,8 +17,11 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Crud\CrudColumn;
+use Ecommit\CrudBundle\Crud\CrudFilters;
 use Ecommit\CrudBundle\Crud\CrudSession;
 use Ecommit\CrudBundle\Crud\SearchFormBuilder;
+use Ecommit\CrudBundle\Form\Filter\FilterInterface;
+use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
 use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\UserSearcher;
 use Ecommit\DoctrineUtils\Paginator\DoctrineORMPaginator;
@@ -516,7 +519,56 @@ public function testInitAfterInit(): void
         $crud->init();
     }
 
-    protected function createCrud(string $sessionName = 'session_name'): Crud
+    public function testCallCreateSearchFormBeforeRequiredOptions(): void
+    {
+        $filter = $this->createMock(FilterInterface::class);
+        $filter->expects($this->exactly(4))->method('buildForm')->willReturnCallback(function (SearchFormBuilder $builder, string $property, array $options): void {
+            if (\in_array($property, ['userId', 'lastName'])) { // Virtual columns
+                $this->assertNull($options['label']);
+            } else {
+                $expectedLabel = 'label_'.$property;
+                $this->assertSame($expectedLabel, $options['label']);
+            }
+        });
+        $filter->expects($this->exactly(4))->method('supportsQueryBuilder')->willReturn(true);
+        $filter->expects($this->exactly(4))->method('updateQueryBuilder')->willReturnCallback(function ($queryBuilder, string $property, $value, array $options): void {
+            $this->assertSame('u.'.$property, $options['alias_search']);
+        });
+
+        $searcherData = $this->getMockBuilder(SearcherInterface::class)
+            ->addMethods(['getUsername', 'getFirstName', 'getLastName', 'getUserId'])
+            ->onlyMethods(['buildForm', 'updateQueryBuilder', 'configureOptions'])
+            ->getMock();
+        $searcherData->expects($this->once())->method('buildForm')->willReturnCallback(function (SearchFormBuilder $builder, array $options): void {
+            $builder->addFilter('username', 'my_filter');
+            $builder->addFilter('userId', 'my_filter');
+        });
+        $searcherData->method('getUsername')->willReturn('val');
+        $searcherData->method('getFirstName')->willReturn('val');
+        $searcherData->method('getLastName')->willReturn('val');
+        $searcherData->method('getUserId')->willReturn('val');
+
+        $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
+            ->createQueryBuilder('u')
+            ->select('u');
+
+        $crud = $this->createCrud(filters: ['my_filter' => $filter])
+            ->createSearchForm($searcherData); // Call createSearchForm before setting options : alias_search and label are not known yet
+        $crud->getSearchForm()->addFilter('firstName', 'my_filter'); // Call addFilter before setting options : alias_search and label are not known yet
+        $crud->getSearchForm()->addFilter('lastName', 'my_filter'); // Call addFilter before setting options : alias_search and label are not known yet
+        $crud->addColumn('username', 'u.username', 'label_username')
+            ->addColumn('firstName', 'u.firstName', 'label_firstName')
+            ->addVirtualColumn('lastName', 'u.lastName')
+            ->addVirtualColumn('userId', 'u.userId')
+            ->setQueryBuilder($queryBuilder)
+            ->setAvailableResultsPerPage([10, 50, 100], 50)
+            ->setDefaultSort('username', Crud::ASC)
+            ->setRoute('user_ajax_crud')
+            ->init();
+        $crud->build();
+    }
+
+    protected function createCrud(string $sessionName = 'session_name', array $filters = []): Crud
     {
         $session = $this->createMock(SessionInterface::class);
         $session->expects($this->any())
@@ -531,11 +583,23 @@ protected function createCrud(string $sessionName = 'session_name'): Crud
         $requestStack->method('getCurrentRequest')
             ->willReturn($request);
 
+        $crudFilters = $this->createMock(CrudFilters::class);
+        $crudFilters->method('has')->willReturnCallback(fn (string $name) => \array_key_exists($name, $filters) || static::getContainer()->get(CrudFilters::class)->has($name));
+        $crudFilters->method('get')->willReturnCallback(function (string $name) use ($filters): FilterInterface {
+            if (\array_key_exists($name, $filters)) {
+                return $filters[$name];
+            }
+
+            return static::getContainer()->get(CrudFilters::class)->get($name);
+        });
+
         $container = $this->createMock(ContainerInterface::class);
         $container->method('get')
-            ->willReturnCallback(function ($name) use ($requestStack) {
+            ->willReturnCallback(function ($name) use ($requestStack, $crudFilters) {
                 if ('request_stack' === $name) {
                     return $requestStack;
+                } elseif ('ecommit_crud.filters' === $name) {
+                    return $crudFilters;
                 }
 
                 return static::getContainer()->get('ecommit_crud.locator')->get($name);
diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
index 2df1228..de06ab3 100644
--- a/tests/Crud/SearchFormBuilderTest.php
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -16,6 +16,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudColumnReference;
 use Ecommit\CrudBundle\Crud\SearchFormBuilder;
 use Ecommit\CrudBundle\Form\Filter\FilterInterface;
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
@@ -40,10 +41,7 @@ protected function setUp(): void
      */
     public function testCreateFormBuilder(?string $type, string $expectedName, string $expectedType): void
     {
-        $defaultData = $this->createMock(SearcherInterface::class);
-        $defaultData->expects($this->once())->method('buildForm');
-
-        $searchFormBuilder = new SearchFormBuilder($this->createCrudContainer(), $this->createCrud(), $defaultData, $type, []);
+        $searchFormBuilder = $this->createSearchFormBuilder(type: $type);
         $this->assertSame($expectedName, $searchFormBuilder->getForm()->getFormConfig()->getName());
         $this->assertInstanceOf($expectedType, $searchFormBuilder->getForm()->getFormConfig()->getType()->getInnerType());
     }
@@ -144,6 +142,14 @@ public function testAddFilterAliasSearch(): void
             ->addFilter('column1', 'my_filter')
             ->addFilter('column2', 'my_filter')
             ->addFilter('virtual1', 'my_filter');
+        $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
+        $this->assertEquals(new CrudColumnReference('column1'), $filters['column1']['options']['alias_search']);
+        $this->assertEquals(new CrudColumnReference('column2'), $filters['column2']['options']['alias_search']);
+        $this->assertEquals(new CrudColumnReference('virtual1'), $filters['virtual1']['options']['alias_search']);
+
+        // Resolve filters
+        $searchFormBuilder->createForm();
+
         $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
         $this->assertSame('alias1', $filters['column1']['options']['alias_search']);
         $this->assertSame('custom_alias2', $filters['column2']['options']['alias_search']);
@@ -157,8 +163,14 @@ public function testAddFilterLabel(): void
             ->addVirtualColumn('virtual1', 'virtualalias1');
         $searchFormBuilder = $this->createSearchFormBuilder(crud: $crud)
             ->addFilter('column1', 'my_filter')
-            ->addFilter('column2', 'my_filter')
             ->addFilter('virtual1', 'my_filter');
+        $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
+        $this->assertEquals(new CrudColumnReference('column1'), $filters['column1']['options']['label']);
+        $this->assertEquals(new CrudColumnReference('virtual1'), $filters['virtual1']['options']['label']);
+
+        // Resolve filters
+        $searchFormBuilder->createForm();
+
         $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
         $this->assertSame('label1', $filters['column1']['options']['label']);
         $this->assertNull($filters['virtual1']['options']['label']);
@@ -204,7 +216,10 @@ public function testCreateFormColumnNotExists(): void
 
     public function testCreateForm(): void
     {
-        $searchFormBuilder = $this->createSearchFormBuilder();
+        $defaultData = $this->createMock(SearcherInterface::class);
+        $defaultData->expects($this->once())->method('buildForm');
+
+        $searchFormBuilder = $this->createSearchFormBuilder(defaultData: $defaultData);
         $this->assertSame($searchFormBuilder, $searchFormBuilder->createForm());
     }
 

From 352595f864e8e255ba05f9e178b228632c842cda Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 14 Apr 2022 21:52:19 +0200
Subject: [PATCH 145/264] Rename CrudFilters service

---
 config/services.xml                                    | 2 +-
 src/DependencyInjection/Compiler/FiltersPass.php       | 2 +-
 tests/Crud/CrudTest.php                                | 4 ++--
 tests/DependencyInjection/EcommitCrudExtensionTest.php | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/config/services.xml b/config/services.xml
index 1fa8c75..cad6425 100644
--- a/config/services.xml
+++ b/config/services.xml
@@ -10,7 +10,7 @@
                 <argument key="request_stack" type="service" id="Symfony\Component\HttpFoundation\RequestStack"/>
                 <argument key="doctrine" type="service" id="Doctrine\Persistence\ManagerRegistry"/>
                 <argument key="security.token_storage" type="service" id="Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface"/>
-                <argument key="ecommit_crud.filters" type="service" id="Ecommit\CrudBundle\Crud\CrudFilters"/>
+                <argument key="ecommit_crud.filters" type="service" id="ecommit_crud.filters"/>
             </argument>
             <tag name="container.service_locator"/>
         </service>
diff --git a/src/DependencyInjection/Compiler/FiltersPass.php b/src/DependencyInjection/Compiler/FiltersPass.php
index 341008f..028b798 100644
--- a/src/DependencyInjection/Compiler/FiltersPass.php
+++ b/src/DependencyInjection/Compiler/FiltersPass.php
@@ -34,7 +34,7 @@ public function process(ContainerBuilder $container): void
             $lazyServicesRefs[$name] = new Reference($id);
         }
 
-        $container->register(CrudFilters::class, CrudFilters::class)
+        $container->register('ecommit_crud.filters', CrudFilters::class)
             ->setPublic(false)
             ->setArguments([ServiceLocatorTagPass::register($container, $lazyServicesRefs)]);
     }
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index d7c752b..bc8e9c8 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -584,13 +584,13 @@ protected function createCrud(string $sessionName = 'session_name', array $filte
             ->willReturn($request);
 
         $crudFilters = $this->createMock(CrudFilters::class);
-        $crudFilters->method('has')->willReturnCallback(fn (string $name) => \array_key_exists($name, $filters) || static::getContainer()->get(CrudFilters::class)->has($name));
+        $crudFilters->method('has')->willReturnCallback(fn (string $name) => \array_key_exists($name, $filters) || static::getContainer()->get('ecommit_crud.filters')->has($name));
         $crudFilters->method('get')->willReturnCallback(function (string $name) use ($filters): FilterInterface {
             if (\array_key_exists($name, $filters)) {
                 return $filters[$name];
             }
 
-            return static::getContainer()->get(CrudFilters::class)->get($name);
+            return static::getContainer()->get('ecommit_crud.filters')->get($name);
         });
 
         $container = $this->createMock(ContainerInterface::class);
diff --git a/tests/DependencyInjection/EcommitCrudExtensionTest.php b/tests/DependencyInjection/EcommitCrudExtensionTest.php
index 3966fc0..b9856d7 100644
--- a/tests/DependencyInjection/EcommitCrudExtensionTest.php
+++ b/tests/DependencyInjection/EcommitCrudExtensionTest.php
@@ -13,7 +13,6 @@
 
 namespace Ecommit\CrudBundle\Tests\DependencyInjection;
 
-use Ecommit\CrudBundle\Crud\CrudFilters;
 use Ecommit\CrudBundle\Tests\Functional\App\Form\Filter\MyFilter;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
@@ -26,7 +25,7 @@ protected function setUp(): void
 
     public function testAutoconfigureTag(): void
     {
-        $crudFilters = self::getContainer()->get(CrudFilters::class);
+        $crudFilters = self::getContainer()->get('ecommit_crud.filters');
 
         $this->assertTrue($crudFilters->has(MyFilter::class));
     }

From fb8c8e6863c01dc9ca53135bb5ac6bf19949c507 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 14 Apr 2022 22:07:27 +0200
Subject: [PATCH 146/264] Add column id unicity

---
 src/Crud/Crud.php       |  6 ++++++
 tests/Crud/CrudTest.php | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 961c574..0efd4cf 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -159,6 +159,9 @@ public function addColumn(string $id, string $alias, string $label, array $optio
         if (mb_strlen($id) > 100) {
             throw new \Exception('Column id is too long');
         }
+        if (\array_key_exists($id, $this->availableColumns) || \array_key_exists($id, $this->availableVirtualColumns)) {
+            throw new \Exception(sprintf('The column "%s" already exists', $id));
+        }
 
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
@@ -229,6 +232,9 @@ public function getDefaultDisplayedColumns(): array
      */
     public function addVirtualColumn(string $id, string $aliasSearch): self
     {
+        if (\array_key_exists($id, $this->availableColumns) || \array_key_exists($id, $this->availableVirtualColumns)) {
+            throw new \Exception(sprintf('The column "%s" already exists', $id));
+        }
         $column = new CrudColumn($id, $aliasSearch, null, false, false, null, null);
         $this->availableVirtualColumns[$id] = $column;
 
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index bc8e9c8..29c105e 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -110,6 +110,39 @@ public function testAddColumnTooLong(): void
         $crud->addColumn(str_pad('', 101, 'a'), 'alias', 'label');
     }
 
+    /**
+     * @dataProvider getTestAddColumnAlreadyExistsProvider
+     */
+    public function testAddColumnAlreadyExists(callable $callback): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The column "column1" already exists');
+
+        $callback($this->createCrud());
+    }
+
+    public function getTestAddColumnAlreadyExistsProvider(): array
+    {
+        return [
+            [function (Crud $crud): void {
+                $crud->addColumn('column1', 'alias1', 'label1')
+                    ->addColumn('column1', 'alias1', 'label1');
+            }],
+            [function (Crud $crud): void {
+                $crud->addVirtualColumn('column1', 'alias1', 'label1')
+                    ->addVirtualColumn('column1', 'alias1', 'label1');
+            }],
+            [function (Crud $crud): void {
+                $crud->addColumn('column1', 'alias1', 'label1')
+                    ->addVirtualColumn('column1', 'alias1', 'label1');
+            }],
+            [function (Crud $crud): void {
+                $crud->addVirtualColumn('column1', 'alias1', 'label1')
+                    ->addColumn('column1', 'alias1', 'label1');
+            }],
+        ];
+    }
+
     public function testAddColumnWithInvalidOption(): void
     {
         $this->expectException(UndefinedOptionsException::class);

From e90814284d925a5abe0fb1a84cd05a8a6febc6d0 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 15 Apr 2022 11:58:41 +0200
Subject: [PATCH 147/264] Add crudMustNotBeInitialized and
 crudMustBeInitialized

---
 src/Crud/Crud.php       | 38 ++++++++++++++++++++++++++++
 tests/Crud/CrudTest.php | 56 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 0efd4cf..c244c29 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -142,6 +142,26 @@ public function initIfNecessary(): void
         }
     }
 
+    protected function crudMustNotBeInitialized(): void
+    {
+        if (!$this->isInitialized) {
+            return;
+        }
+
+        $caller = debug_backtrace()[1]['function'];
+        throw new \Exception(sprintf('The method "%s" cannot be called after CRUD initialization', $caller));
+    }
+
+    protected function crudMustBeInitialized(): void
+    {
+        if ($this->isInitialized || $this->initializationInProgress) {
+            return;
+        }
+
+        $caller = debug_backtrace()[1]['function'];
+        throw new \Exception(sprintf('The method "%s" cannot be called before CRUD initialization', $caller));
+    }
+
     /**
      * Add a column inside the crud.
      *
@@ -156,6 +176,7 @@ public function initIfNecessary(): void
      */
     public function addColumn(string $id, string $alias, string $label, array $options = []): self
     {
+        $this->crudMustNotBeInitialized();
         if (mb_strlen($id) > 100) {
             throw new \Exception('Column id is too long');
         }
@@ -232,6 +253,7 @@ public function getDefaultDisplayedColumns(): array
      */
     public function addVirtualColumn(string $id, string $aliasSearch): self
     {
+        $this->crudMustNotBeInitialized();
         if (\array_key_exists($id, $this->availableColumns) || \array_key_exists($id, $this->availableVirtualColumns)) {
             throw new \Exception(sprintf('The column "%s" already exists', $id));
         }
@@ -264,6 +286,7 @@ public function getQueryBuilder(): \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Que
 
     public function setQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface $queryBuilder): self
     {
+        $this->crudMustNotBeInitialized();
         $this->queryBuilder = $queryBuilder;
 
         return $this;
@@ -284,6 +307,7 @@ public function getDefaultResultsPerPage(): ?int
 
     public function setAvailableResultsPerPage(array $availableResultsPerPage, int $defaultValue): self
     {
+        $this->crudMustNotBeInitialized();
         $this->availableResultsPerPage = $availableResultsPerPage;
         $this->defaultResultsPerPage = $defaultValue;
 
@@ -308,6 +332,7 @@ public function getDefaultSense(): ?string
      */
     public function setDefaultSort(string $sort, string $sense): self
     {
+        $this->crudMustNotBeInitialized();
         $this->defaultSort = $sort;
         $this->defaultSense = $sense;
 
@@ -328,6 +353,7 @@ public function getDefaultPersonalizedSort(): array
      */
     public function setDefaultPersonalizedSort(array $criterias): self
     {
+        $this->crudMustNotBeInitialized();
         $this->defaultPersonalizedSort = $criterias;
 
         $this->defaultSort = 'defaultPersonalizedSort';
@@ -338,6 +364,7 @@ public function setDefaultPersonalizedSort(array $criterias): self
 
     public function setRoute(string $routeName, array $parameters = []): self
     {
+        $this->crudMustNotBeInitialized();
         $this->routeName = $routeName;
         $this->routeParams = $parameters;
 
@@ -386,6 +413,7 @@ public function getDisplayResultsOnlyIfSearch(): bool
 
     public function setDisplayResultsOnlyIfSearch(bool $displayResultsOnlyIfSearch): self
     {
+        $this->crudMustNotBeInitialized();
         $this->displayResultsOnlyIfSearch = $displayResultsOnlyIfSearch;
 
         return $this;
@@ -411,6 +439,7 @@ public function setDisplayResults(bool $displayResults): self
      */
     public function setBuildPaginator(bool|\Closure|array $value): self
     {
+        $this->crudMustNotBeInitialized();
         $this->buildPaginator = $value;
 
         return $this;
@@ -433,6 +462,7 @@ public function setPaginator(?PaginatorInterface $value): self
      */
     public function setPersistentSettings(bool $value): self
     {
+        $this->crudMustNotBeInitialized();
         if ($value && (null === $this->container->get('security.token_storage')->getToken() || !($this->container->get('security.token_storage')->getToken()->getUser() instanceof UserInterface))) {
             $value = false;
         }
@@ -443,6 +473,8 @@ public function setPersistentSettings(bool $value): self
 
     public function getSessionValues(): CrudSession
     {
+        $this->crudMustBeInitialized();
+
         return $this->sessionValues;
     }
 
@@ -458,6 +490,7 @@ public function getSearchForm(): SearchFormBuilder|FormView|null
 
     public function createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = []): self
     {
+        $this->crudMustNotBeInitialized();
         $this->searchForm = new SearchFormBuilder($this->container, $this, $defaultData, $type, $options);
 
         return $this;
@@ -470,6 +503,7 @@ public function getDivIdSearch(): string
 
     public function setDivIdSearch(string $divIdSearch): self
     {
+        $this->crudMustNotBeInitialized();
         $this->divIdSearch = $divIdSearch;
 
         return $this;
@@ -482,6 +516,7 @@ public function getDivIdList(): string
 
     public function setDivIdList(string $divIdList): self
     {
+        $this->crudMustNotBeInitialized();
         $this->divIdList = $divIdList;
 
         return $this;
@@ -489,6 +524,7 @@ public function setDivIdList(string $divIdList): self
 
     public function processSearchForm(): void
     {
+        $this->crudMustBeInitialized();
         if (!$this->searchForm) {
             throw new NotFoundHttpException('Crud: Search form does not exist');
         }
@@ -515,6 +551,7 @@ public function processSearchForm(): void
 
     public function build(): void
     {
+        $this->crudMustBeInitialized();
         $this->updateQueryBuilder();
         $this->buildPaginator();
     }
@@ -633,6 +670,7 @@ protected function resetDisplaySettings(): void
 
     public function createView(): void
     {
+        $this->crudMustBeInitialized();
         if ($this->searchForm) {
             $this->searchForm->createFormView();
             $this->searchForm = $this->searchForm->getForm();
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 29c105e..58b94b1 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -601,6 +601,62 @@ public function testCallCreateSearchFormBeforeRequiredOptions(): void
         $crud->build();
     }
 
+    /**
+     * @dataProvider getTestCallMethodNotAllowedBeforeInitializationProvider
+     */
+    public function testCallMethodNotAllowedBeforeInitialization(string $method, array $arguments = []): void
+    {
+        $crud = $this->createValidCrud(true);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage(sprintf('The method "%s" cannot be called before CRUD initialization', $method));
+
+        $crud->$method(...$arguments);
+    }
+
+    public function getTestCallMethodNotAllowedBeforeInitializationProvider(): array
+    {
+        return [
+            ['getSessionValues'],
+            ['processSearchForm'],
+            ['build'],
+            ['createView'],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestCallMethodNotAllowedAfterInitializationProvider
+     */
+    public function testCallMethodNotAllowedAfterInitialization(string $method, array $arguments = []): void
+    {
+        $crud = $this->createValidCrud(true);
+        $crud->init();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage(sprintf('The method "%s" cannot be called after CRUD initialization', $method));
+
+        $crud->$method(...$arguments);
+    }
+
+    public function getTestCallMethodNotAllowedAfterInitializationProvider(): array
+    {
+        return [
+            ['addColumn', ['column', 'alias', 'label']],
+            ['addVirtualColumn', ['column', 'alias']],
+            ['setQueryBuilder', [$this->createMock(QueryBuilder::class)]],
+            ['setAvailableResultsPerPage', [[5, 10], 10]],
+            ['setDefaultSort', ['column', Crud::ASC]],
+            ['setDefaultPersonalizedSort', [[]]],
+            ['setRoute', ['route']],
+            ['setDisplayResultsOnlyIfSearch', [true]],
+            ['setBuildPaginator', [true]],
+            ['setPersistentSettings', [true]],
+            ['createSearchForm', [$this->createMock(SearcherInterface::class)]],
+            ['setDivIdSearch', ['div']],
+            ['setDivIdList', ['div']],
+        ];
+    }
+
     protected function createCrud(string $sessionName = 'session_name', array $filters = []): Crud
     {
         $session = $this->createMock(SessionInterface::class);

From a083ed61715ab85b819e12566bead8fe8c256dd5 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 15 Apr 2022 12:08:27 +0200
Subject: [PATCH 148/264] [SearchFormBuilder] The "addFilter" method cannot be
 called after the form creation

---
 src/Crud/SearchFormBuilder.php       |  3 +++
 tests/Crud/SearchFormBuilderTest.php | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index b4962f0..4473ffa 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -63,6 +63,9 @@ protected function createFormBuilder(?string $type): void
 
     public function addFilter(string $property, string $filter, array $options = []): self
     {
+        if (!$this->form instanceof FormBuilderInterface) {
+            throw new \Exception('The "addFilter" method cannot be called after the form creation');
+        }
         if (!$this->container->get('ecommit_crud.filters')->has($filter)) {
             throw new \Exception(sprintf('Filter "%s" not found', $filter));
         }
diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
index de06ab3..e1c92b2 100644
--- a/tests/Crud/SearchFormBuilderTest.php
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -92,6 +92,16 @@ public function testCreateFormBuilderWithValidationGroupsAndFormOptions(?string
         $this->assertSame(['my_group2'], $searchFormBuilder->getForm()->getFormConfig()->getOption('validation_groups'));
     }
 
+    public function testAddFilterFormAlreadyCreated(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The "addFilter" method cannot be called after the form creation');
+
+        $this->createSearchFormBuilder()
+            ->createForm()
+            ->addFilter('property', 'my_filter');
+    }
+
     public function testAddFilterNotExists(): void
     {
         $this->expectException(\Exception::class);

From f28bb08c99de82cfd5c16fe5f6661bafb90ab009 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 15 Apr 2022 19:19:04 +0200
Subject: [PATCH 149/264] Fix test names

---
 .../Controller/TestCrudControllerTest.php     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 3043f25..49d5106 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -127,7 +127,7 @@ public function testChangePerPage(Client $client): Client
     /**
      * @depends testChangePerPage
      */
-    public function testPersistentValuesAfterChangeSortAndSettings(Client $client): Client
+    public function testSessionValuesAfterChangeSortAndSettings(Client $client): Client
     {
         $client->request('GET', static::URL);
 
@@ -141,7 +141,7 @@ public function testPersistentValuesAfterChangeSortAndSettings(Client $client):
     }
 
     /**
-     * @depends testPersistentValuesAfterChangeSortAndSettings
+     * @depends testSessionValuesAfterChangeSortAndSettings
      */
     public function testChangePage(Client $client): Client
     {
@@ -161,7 +161,7 @@ public function testChangePage(Client $client): Client
     /**
      * @depends testChangePage
      */
-    public function testPersistentValuesAfterChangePage(Client $client): Client
+    public function testSessionValuesAfterChangePage(Client $client): Client
     {
         $client->request('GET', static::URL);
 
@@ -175,7 +175,7 @@ public function testPersistentValuesAfterChangePage(Client $client): Client
     }
 
     /**
-     * @depends testPersistentValuesAfterChangePage
+     * @depends testSessionValuesAfterChangePage
      */
     public function testSearch(Client $client): Client
     {
@@ -196,7 +196,7 @@ public function testSearch(Client $client): Client
     /**
      * @depends testSearch
      */
-    public function testPersistentValuesAfterSearch(Client $client): Client
+    public function testSessionValuesAfterSearch(Client $client): Client
     {
         $client->request('GET', static::URL);
 
@@ -210,7 +210,7 @@ public function testPersistentValuesAfterSearch(Client $client): Client
     }
 
     /**
-     * @depends testPersistentValuesAfterSearch
+     * @depends testSessionValuesAfterSearch
      */
     public function testSearchWithoutFilter(Client $client): Client
     {
@@ -249,7 +249,7 @@ public function testResetSearch(Client $client): Client
     /**
      * @depends testResetSearch
      */
-    public function testPersistentValuesAfterResetSearch(Client $client): Client
+    public function testSessionValuesAfterResetSearch(Client $client): Client
     {
         $client->request('GET', static::URL);
 
@@ -263,7 +263,7 @@ public function testPersistentValuesAfterResetSearch(Client $client): Client
     }
 
     /**
-     * @depends testPersistentValuesAfterResetSearch
+     * @depends testSessionValuesAfterResetSearch
      */
     public function testResetSettings(Client $client): Client
     {
@@ -286,7 +286,7 @@ public function testResetSettings(Client $client): Client
     /**
      * @depends testResetSettings
      */
-    public function testPersistentValuesAfterResetSettings(Client $client): Client
+    public function testSessionValuesAfterResetSettings(Client $client): Client
     {
         $client->request('GET', static::URL);
 
@@ -300,7 +300,7 @@ public function testPersistentValuesAfterResetSettings(Client $client): Client
     }
 
     /**
-     * @depends testPersistentValuesAfterResetSettings
+     * @depends testSessionValuesAfterResetSettings
      */
     public function testManualReset(Client $client): Client
     {

From 7b5ba9288094c60bdc753db23302cfd9bf5e1629 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Apr 2022 15:28:41 +0200
Subject: [PATCH 150/264] [Persistent settings] Add functional tests

---
 .../App/Controller/UserController.php         |  28 +-
 .../UserWithPersistentSettingsController.php  |  47 +++
 .../App/DataFixtures/TestUserFixtures.php     |  12 +
 tests/Functional/App/Entity/TestUser.php      |  35 +-
 tests/Functional/App/config/routes.yaml       |  21 ++
 tests/Functional/App/config/security.yaml     |  18 +
 .../Functional/App/templates/login.html.twig  |   9 +
 .../Controller/TestCrudControllerTest.php     |  68 +---
 ...udControllerWithPersistentSettingsTest.php | 331 ++++++++++++++++++
 tests/Functional/Controller/TestTrait.php     |  87 +++++
 10 files changed, 585 insertions(+), 71 deletions(-)
 create mode 100644 tests/Functional/App/Controller/UserWithPersistentSettingsController.php
 create mode 100644 tests/Functional/App/templates/login.html.twig
 create mode 100644 tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
 create mode 100644 tests/Functional/Controller/TestTrait.php

diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index e34637b..8b921c3 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -28,16 +28,16 @@ protected function getCrud(): Crud
             ->createQueryBuilder('u')
             ->select('u');
 
-        $crud = $this->createCrud('user');
+        $crud = $this->createCrud(static::getCrudName());
         $crud->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
             ->addColumn('firstName', 'u.firstName', 'first_name')
             ->addColumn('lastName', 'u.lastName', 'last_name')
             ->setQueryBuilder($queryBuilder)
-            ->setAvailableResultsPerPage([5, 5, 10, 50], 5)
+            ->setAvailableResultsPerPage([5, 10, 50], 5)
             ->setDefaultSort('firstName', Crud::ASC)
             ->createSearchForm(new UserSearcher())
-            ->setRoute('user_ajax_crud')
-            ->setPersistentSettings(true);
+            ->setRoute(static::getCrudRouteName(), static::getCrudRouteParams())
+            ->setPersistentSettings(static::getPersistentSettings());
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('manual-reset')) {
@@ -50,6 +50,26 @@ protected function getCrud(): Crud
         return $crud;
     }
 
+    public function getCrudName(): string
+    {
+        return 'user';
+    }
+
+    public function getCrudRouteName(): string
+    {
+        return 'user_ajax_crud';
+    }
+
+    public function getCrudRouteParams(): array
+    {
+        return [];
+    }
+
+    public function getPersistentSettings(): bool
+    {
+        return false;
+    }
+
     protected function getTemplateName(string $action): string
     {
         return sprintf('user/%s.html.twig', $action);
diff --git a/tests/Functional/App/Controller/UserWithPersistentSettingsController.php b/tests/Functional/App/Controller/UserWithPersistentSettingsController.php
new file mode 100644
index 0000000..5c0a058
--- /dev/null
+++ b/tests/Functional/App/Controller/UserWithPersistentSettingsController.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\App\Controller;
+
+use Symfony\Component\HttpFoundation\Response;
+
+class UserWithPersistentSettingsController extends UserController
+{
+    public function getCrudName(): string
+    {
+        return 'crud_persistent_settings';
+    }
+
+    public function getCrudRouteName(): string
+    {
+        return 'user_with_persistent_settings_ajax_crud';
+    }
+
+    public function getCrudRouteParams(): array
+    {
+        return [
+            'scope' => $this->container->get('request_stack')->getCurrentRequest()->attributes->get('scope'),
+            'persistent' => $this->container->get('request_stack')->getCurrentRequest()->attributes->get('persistent'),
+        ];
+    }
+
+    public function getPersistentSettings(): bool
+    {
+        return 'yes' === $this->container->get('request_stack')->getCurrentRequest()->attributes->get('persistent');
+    }
+
+    public function loginAction(): Response
+    {
+        return $this->render('login.html.twig');
+    }
+}
diff --git a/tests/Functional/App/DataFixtures/TestUserFixtures.php b/tests/Functional/App/DataFixtures/TestUserFixtures.php
index 2ab9c8e..94b8ead 100644
--- a/tests/Functional/App/DataFixtures/TestUserFixtures.php
+++ b/tests/Functional/App/DataFixtures/TestUserFixtures.php
@@ -15,6 +15,8 @@
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Entity\UserCrudSettings;
 use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
 
 class TestUserFixtures extends Fixture
@@ -41,8 +43,18 @@ public function load(ObjectManager $manager): void
                 ->setFirstName($data[0])
                 ->setLastName($data[1]);
             $manager->persist($user);
+            $this->addReference('user_'.$data[0].$data[1], $user);
         }
 
+        $userCrudSettings = new UserCrudSettings();
+        $userCrudSettings->setUser($this->getReference('user_EveReste'))
+            ->setCrudName('crud_persistent_settings')
+            ->setDisplayedColumns(['username', 'firstName'])
+            ->setResultsDisplayed(50)
+            ->setSort('firstName')
+            ->setSense(Crud::DESC);
+        $manager->persist($userCrudSettings);
+
         $manager->flush();
     }
 }
diff --git a/tests/Functional/App/Entity/TestUser.php b/tests/Functional/App/Entity/TestUser.php
index 0ed6c51..6784f7f 100644
--- a/tests/Functional/App/Entity/TestUser.php
+++ b/tests/Functional/App/Entity/TestUser.php
@@ -15,10 +15,12 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Ecommit\CrudBundle\Entity\UserCrudInterface;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'user')]
-class TestUser implements UserCrudInterface
+class TestUser implements UserCrudInterface, UserInterface, PasswordAuthenticatedUserInterface
 {
     #[ORM\Id]
     #[ORM\Column(type: 'integer')]
@@ -34,6 +36,37 @@ class TestUser implements UserCrudInterface
     #[ORM\Column(type: 'string', length: 30)]
     protected $lastName;
 
+    /*
+     * Methods
+     */
+
+    public function getRoles(): array
+    {
+        return ['ROLE_USER'];
+    }
+
+    public function eraseCredentials(): void
+    {
+    }
+
+    public function getUserIdentifier(): string
+    {
+        return $this->username;
+    }
+
+    public function getPassword(): ?string
+    {
+        return $this->username;
+    }
+
+    /**
+     * SF < 6.
+     */
+    public function getSalt(): string
+    {
+        return '';
+    }
+
     /*
      * Getters / Setters (auto-generated)
      */
diff --git a/tests/Functional/App/config/routes.yaml b/tests/Functional/App/config/routes.yaml
index 7e3fb40..44dac7e 100644
--- a/tests/Functional/App/config/routes.yaml
+++ b/tests/Functional/App/config/routes.yaml
@@ -14,8 +14,29 @@ user_without_trait_ajax_crud:
     path: /user-without-trait/ajax-crud
     controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserWithoutTraitController::ajaxCrudAction
 
+user_with_persistent_settings_crud:
+    path: /user-with-persistent-settings/{scope}/{persistent}
+    requirements:
+        scope: private|public
+        persistent: yes|no
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserWithPersistentSettingsController::crudAction
+
+user_with_persistent_settings_ajax_crud:
+    path: /user-with-persistent-settings/{scope}/{persistent}/ajax-crud
+    requirements:
+        scope: private|public
+        persistent: yes|no
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserWithPersistentSettingsController::ajaxCrudAction
+
 fake_route:
     path: /fake
     controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction
     defaults:
         path: /
+
+login:
+    path: /login
+    controller: Ecommit\CrudBundle\Tests\Functional\App\Controller\UserWithPersistentSettingsController::loginAction
+
+logout:
+    path: /logout
diff --git a/tests/Functional/App/config/security.yaml b/tests/Functional/App/config/security.yaml
index 31fded0..29a9ffa 100644
--- a/tests/Functional/App/config/security.yaml
+++ b/tests/Functional/App/config/security.yaml
@@ -1,6 +1,24 @@
 security:
     enable_authenticator_manager: true
+    password_hashers:
+        Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'plaintext'
+
+    providers:
+        app_user_provider:
+            entity:
+                class: Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser
+                property: username
 
     firewalls:
         main:
             pattern: ^/
+            provider: app_user_provider
+            form_login:
+                login_path: login
+                check_path: login
+            logout:
+                path: logout
+
+    access_control:
+        - { path: ^/user-with-persistent-settings/private, roles: ROLE_USER }
+        - { path: ^/, roles: PUBLIC_ACCESS }
diff --git a/tests/Functional/App/templates/login.html.twig b/tests/Functional/App/templates/login.html.twig
new file mode 100644
index 0000000..8a596a2
--- /dev/null
+++ b/tests/Functional/App/templates/login.html.twig
@@ -0,0 +1,9 @@
+<form action="{{ path('login') }}" method="post">
+    <label for="username">Email:</label>
+    <input type="text" id="username" name="_username" />
+
+    <label for="password">Password:</label>
+    <input type="password" id="password" name="_password"/>
+
+    <button type="submit">login</button>
+</form>
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 49d5106..57a5b22 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -20,6 +20,8 @@
 
 class TestCrudControllerTest extends PantherTestCase
 {
+    use TestTrait;
+
     public const URL = '/user/';
     public const SESSION_NAME = 'user';
     public const SEARCH_IN_LIST = null;
@@ -379,70 +381,4 @@ protected function checkBeforeAndAfterBuild(Crawler $crawler): void
 
         $this->assertCount(1, $crawler->filterXPath('//div[contains(text(), "TEST BEFORE AFTER BUILD '.static::SEARCH_IN_LIST.'")]'));
     }
-
-    protected function countRowsAndColumns(Crawler $crawler): array
-    {
-        $rows = $crawler->filterXPath('//table[@class="result"]/tbody/tr');
-        $countRows = \count($rows);
-        $columns = $rows->first()->filterXPath('td');
-        $countColumns = \count($columns);
-
-        return [$countRows, $countColumns];
-    }
-
-    protected function getPagination(Crawler $crawler): array
-    {
-        $infos = $crawler->filterXPath('//div[@class="info-pagination"]')->text();
-
-        preg_match('/^Results \d+\-\d+ \- Page (\d+)\/(\d+)$/', $infos, $groups);
-
-        $page = (int) $groups[1];
-        $countPages = (int) $groups[2];
-
-        return [$page, $countPages];
-    }
-
-    protected function getSort(Crawler $crawler): array
-    {
-        $iSort = $crawler->filterXPath('//table[@class="result"]/thead/tr/th/a/i');
-        if (0 === \count($iSort)) {
-            return [];
-        }
-        $iSort = $iSort->first();
-
-        switch ($iSort->text()) {
-            case '^':
-                $sense = Crud::ASC;
-                break;
-            case 'v':
-                $sense = Crud::DESC;
-                break;
-            default:
-                throw new \Exception('Bad sense');
-        }
-
-        $column = $iSort->filterXPath('ancestor::th')->last()->text();
-        $column = str_replace(' '.$iSort->text(), '', $column);
-
-        return [$column, $sense];
-    }
-
-    protected function getFirstUsername(Crawler $crawler): ?string
-    {
-        $rows = $crawler->filterXPath('//table[@class="result"]/tbody/tr');
-        if (0 === \count($rows)) {
-            return null;
-        }
-
-        return $rows->first()->getAttribute('data-username');
-    }
-
-    protected function waitForAjax(Client $client, int $timeout = 5): void
-    {
-        $driver = $client->getWebDriver();
-
-        $driver->wait($timeout, 500)->until(static fn ($driver) => !$driver->executeScript('return (typeof jQuery !== "undefined" && jQuery.active);'));
-
-        usleep(500000);
-    }
 }
diff --git a/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
new file mode 100644
index 0000000..d637449
--- /dev/null
+++ b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
@@ -0,0 +1,331 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\Controller;
+
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Entity\UserCrudSettings;
+use Symfony\Component\Panther\Client;
+use Symfony\Component\Panther\PantherTestCase;
+
+class TestCrudControllerWithPersistentSettingsTest extends PantherTestCase
+{
+    use TestTrait;
+
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        static::$defaultOptions['browser'] = static::FIREFOX;
+    }
+
+    public function testListWithUserWithoutPersistent(): Client
+    {
+        $client = static::createPantherClient();
+        $this->login($client, 'EveReste');
+        $client->request('GET', '/user-with-persistent-settings/private/no');
+
+        // Check default values
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
+
+        $this->checkUserCrudSettingsDatabase(
+            username: 'EveReste',
+            resultsDisplayed: 50,
+            displayedColumns: ['username', 'firstName'],
+            sort: 'firstName',
+            sense: Crud::DESC
+        );
+
+        return $client;
+    }
+
+    /**
+     * @depends testListWithUserWithoutPersistent
+     */
+    public function testChangeSettingsWithUserWithoutPersistent($client): Client
+    {
+        $this->changeSettings(
+            client: $client,
+            headerColumnClicks: ['last_name', 'last_name'],
+            displayColumnClicks: ['username'],
+            resultsPerPage: 10
+        );
+
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+
+        $this->checkUserCrudSettingsDatabase(
+            username: 'EveReste',
+            resultsDisplayed: 50,
+            displayedColumns: ['username', 'firstName'],
+            sort: 'firstName',
+            sense: Crud::DESC
+        );
+
+        return $client;
+    }
+
+    /**
+     * @depends testChangeSettingsWithUserWithoutPersistent
+     */
+    public function testResetSettingsWithUserWithoutPersistent($client): Client
+    {
+        $this->resetSettings($client);
+
+        $this->checkUserCrudSettingsDatabase(
+            username: 'EveReste',
+            resultsDisplayed: 50,
+            displayedColumns: ['username', 'firstName'],
+            sort: 'firstName',
+            sense: Crud::DESC
+        );
+
+        $this->logout($client);
+
+        return $client;
+    }
+
+    /**
+     * @depends testResetSettingsWithUserWithoutPersistent
+     */
+    public function testListWithUserWithPersistent(Client $client): Client
+    {
+        $this->login($client, 'EveReste');
+        $client->request('GET', '/user-with-persistent-settings/private/yes');
+
+        // Check persistent values
+        $this->assertSame([11, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame(['first_name', Crud::DESC], $this->getSort($client->getCrawler()));
+
+        $this->checkUserCrudSettingsDatabase(
+            username: 'EveReste',
+            resultsDisplayed: 50,
+            displayedColumns: ['username', 'firstName'],
+            sort: 'firstName',
+            sense: Crud::DESC
+        );
+
+        return $client;
+    }
+
+    /**
+     * @depends testListWithUserWithPersistent
+     */
+    public function testChangeSettingsWithUserWithPersistent($client): Client
+    {
+        $this->changeSettings(
+            client: $client,
+            headerColumnClicks: ['username', 'username'],
+            displayColumnClicks: ['lastName'],
+            resultsPerPage: 10
+        );
+
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame(['username', Crud::ASC], $this->getSort($client->getCrawler()));
+
+        $this->checkUserCrudSettingsDatabase(
+            username: 'EveReste',
+            resultsDisplayed: 10,
+            displayedColumns: ['username', 'firstName', 'lastName'],
+            sort: 'username',
+            sense: Crud::ASC
+        );
+
+        return $client;
+    }
+
+    /**
+     * @depends testChangeSettingsWithUserWithPersistent
+     */
+    public function testResetSettingsWithUserWithPersistent($client): Client
+    {
+        $this->resetSettings($client);
+
+        // Check default values
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
+
+        $this->assertNull($this->getUserCrudSettings('EveReste'));
+
+        return $client;
+    }
+
+    /**
+     * @depends testResetSettingsWithUserWithPersistent
+     */
+    public function testCreateSettingsWithUserWithPersistent($client): Client
+    {
+        $this->changeSettings(
+            client: $client,
+            headerColumnClicks: ['last_name', 'last_name'],
+            displayColumnClicks: ['username'],
+            resultsPerPage: 10
+        );
+
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+
+        $this->checkUserCrudSettingsDatabase(
+            username: 'EveReste',
+            resultsDisplayed: 10,
+            displayedColumns: ['firstName', 'lastName', 'username'],
+            sort: 'lastName',
+            sense: Crud::DESC
+        );
+
+        $this->logout($client);
+
+        return $client;
+    }
+
+    /**
+     * @depends testCreateSettingsWithUserWithPersistent
+     */
+    public function testListWithoutUserWithPersistent(Client $client): Client
+    {
+        $client->request('GET', '/user-with-persistent-settings/public/yes');
+
+        // Check default values
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
+
+        $this->checkUserCrudSettingsDatabase(
+            username: 'EveReste',
+            resultsDisplayed: 10,
+            displayedColumns: ['firstName', 'lastName', 'username'],
+            sort: 'lastName',
+            sense: Crud::DESC
+        );
+
+        return $client;
+    }
+
+    /**
+     * @depends testListWithoutUserWithPersistent
+     */
+    public function testChangeSettingsWithoutUserWithPersistent($client): Client
+    {
+        $this->changeSettings(
+            client: $client,
+            headerColumnClicks: ['last_name', 'last_name'],
+            displayColumnClicks: ['username'],
+            resultsPerPage: 10
+        );
+
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
+
+        $this->checkUserCrudSettingsDatabase(
+            username: 'EveReste',
+            resultsDisplayed: 10,
+            displayedColumns: ['firstName', 'lastName', 'username'],
+            sort: 'lastName',
+            sense: Crud::DESC
+        );
+
+        return $client;
+    }
+
+    /**
+     * @depends testChangeSettingsWithoutUserWithPersistent
+     */
+    public function testResetSettingsWithoutUserWithPersistent($client): Client
+    {
+        $this->resetSettings($client);
+
+        $this->checkUserCrudSettingsDatabase(
+            username: 'EveReste',
+            resultsDisplayed: 10,
+            displayedColumns: ['firstName', 'lastName', 'username'],
+            sort: 'lastName',
+            sense: Crud::DESC
+        );
+
+        return $client;
+    }
+
+    protected function login(Client $client, string $username): void
+    {
+        $client->request('GET', '/login');
+
+        $form = $client->getCrawler()->filterXPath('//button[@type="submit"]')->form();
+        $form['_username'] = $username;
+        $form['_password'] = $username;
+        $client->submit($form);
+    }
+
+    protected function logout(Client $client): void
+    {
+        $client->request('GET', '/logout');
+    }
+
+    protected function changeSettings(Client $client, array $headerColumnClicks = [], array $displayColumnClicks = [], ?int $resultsPerPage = null): void
+    {
+        foreach ($headerColumnClicks as $column) {
+            $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[contains(text(), "'.$column.'")]');
+            $link->click();
+            $this->waitForAjax($client);
+        }
+
+        if (\count($displayColumnClicks) > 0 || null !== $resultsPerPage) {
+            $button = $client->getCrawler()->filterXPath('//button[contains(.,"Display Settings")]');
+            $button->first()->click();
+            $form = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_crud_persistent_settings"]/descendant::button[@type="submit"]')->form();
+
+            foreach ($displayColumnClicks as $column) {
+                $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_crud_persistent_settings"]/descendant::input[@value="'.$column.'"]')->click();
+            }
+
+            if (null !== $resultsPerPage) {
+                $form['crud_display_settings_crud_persistent_settings[resultsPerPage]'] = $resultsPerPage;
+            }
+
+            $client->submit($form);
+            $this->waitForAjax($client);
+        }
+    }
+
+    protected function resetSettings(Client $client): void
+    {
+        $button = $client->getCrawler()->filterXPath('//button[contains(., "Display Settings")]');
+        $button->first()->click();
+
+        $button = $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_crud_persistent_settings"]/descendant::button[contains(., "Reset display settings")]');
+        $button->first()->click();
+        $this->waitForAjax($client);
+    }
+
+    protected function checkUserCrudSettingsDatabase(string $username, int $resultsDisplayed, array $displayedColumns, string $sort, string $sense): void
+    {
+        $userCrudSettings = $this->getUserCrudSettings($username);
+        $this->assertSame($resultsDisplayed, $userCrudSettings->getResultsDisplayed());
+        $this->assertSame($displayedColumns, $userCrudSettings->getDisplayedColumns());
+        $this->assertSame($sort, $userCrudSettings->getSort());
+        $this->assertSame($sense, $userCrudSettings->getSense());
+    }
+
+    protected function getUserCrudSettings(string $username): ?UserCrudSettings
+    {
+        $queryBuilder = static::getContainer()->get('doctrine')->getRepository(UserCrudSettings::class)->createQueryBuilder('ucs');
+
+        return $queryBuilder->select('ucs')
+            ->leftJoin('ucs.user', 'u')
+            ->andWhere('u.username = :username')
+            ->setParameter('username', $username)
+            ->andWhere('ucs.crudName = :crudName')
+            ->setParameter('crudName', 'crud_persistent_settings')
+            ->getQuery()
+            ->getOneOrNullResult();
+    }
+}
diff --git a/tests/Functional/Controller/TestTrait.php b/tests/Functional/Controller/TestTrait.php
new file mode 100644
index 0000000..65ac0e1
--- /dev/null
+++ b/tests/Functional/Controller/TestTrait.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Functional\Controller;
+
+use Ecommit\CrudBundle\Crud\Crud;
+use Symfony\Component\Panther\Client;
+use Symfony\Component\Panther\DomCrawler\Crawler;
+
+trait TestTrait
+{
+    protected function countRowsAndColumns(Crawler $crawler): array
+    {
+        $rows = $crawler->filterXPath('//table[@class="result"]/tbody/tr');
+        $countRows = \count($rows);
+        $columns = $rows->first()->filterXPath('td');
+        $countColumns = \count($columns);
+
+        return [$countRows, $countColumns];
+    }
+
+    protected function getPagination(Crawler $crawler): array
+    {
+        $infos = $crawler->filterXPath('//div[@class="info-pagination"]')->text();
+
+        preg_match('/^Results \d+\-\d+ \- Page (\d+)\/(\d+)$/', $infos, $groups);
+
+        $page = (int) $groups[1];
+        $countPages = (int) $groups[2];
+
+        return [$page, $countPages];
+    }
+
+    protected function getSort(Crawler $crawler): array
+    {
+        $iSort = $crawler->filterXPath('//table[@class="result"]/thead/tr/th/a/i');
+        if (0 === \count($iSort)) {
+            return [];
+        }
+        $iSort = $iSort->first();
+
+        switch ($iSort->text()) {
+            case '^':
+                $sense = Crud::ASC;
+                break;
+            case 'v':
+                $sense = Crud::DESC;
+                break;
+            default:
+                throw new \Exception('Bad sense');
+        }
+
+        $column = $iSort->filterXPath('ancestor::th')->last()->text();
+        $column = str_replace(' '.$iSort->text(), '', $column);
+
+        return [$column, $sense];
+    }
+
+    protected function getFirstUsername(Crawler $crawler): ?string
+    {
+        $rows = $crawler->filterXPath('//table[@class="result"]/tbody/tr');
+        if (0 === \count($rows)) {
+            return null;
+        }
+
+        return $rows->first()->getAttribute('data-username');
+    }
+
+    protected function waitForAjax(Client $client, int $timeout = 5): void
+    {
+        $driver = $client->getWebDriver();
+
+        $driver->wait($timeout, 500)->until(static fn ($driver) => !$driver->executeScript('return (typeof jQuery !== "undefined" && jQuery.active);'));
+
+        usleep(500000);
+    }
+}

From 7d0ee5e362c58bbc95e9b5e13954038c6634a16f Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Apr 2022 19:07:54 +0200
Subject: [PATCH 151/264] Add alias_sort test

---
 tests/Crud/CrudTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 58b94b1..4e99642 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -101,6 +101,17 @@ public function testColumns(): void
         $this->assertEquals($columns, $crud->getColumns());
     }
 
+    public function testAddColumnWithAliasSort(): void
+    {
+        $crud = $this->createValidCrud()
+            ->addColumn('my_column', 'u.alias', 'My Column', ['alias_sort' => 'u.lastName'])
+            ->setDefaultSort('my_column', Crud::ASC);
+        $crud->init();
+        $crud->build();
+
+        $this->assertSame(['u.lastName ASC'], $crud->getQueryBuilder()->getDQLPart('orderBy')[0]->getParts());
+    }
+
     public function testAddColumnTooLong(): void
     {
         $this->expectException(\Exception::class);

From c0daddb325eaa15c0a12009342fd87455f20c50c Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Apr 2022 19:26:53 +0200
Subject: [PATCH 152/264] Improve exception messages

---
 src/Crud/Crud.php                    | 12 ++++++------
 src/Crud/Http/QueryBuilder.php       |  4 ++--
 src/Crud/SearchFormBuilder.php       |  6 +++---
 tests/Crud/CrudTest.php              | 13 +++++++------
 tests/Crud/Http/QueryBuilderTest.php |  4 ++--
 tests/Crud/SearchFormBuilderTest.php |  6 +++---
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index c244c29..4c9a05e 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -60,7 +60,7 @@ final class Crud
     public function __construct(protected string $sessionName, protected ContainerInterface $container)
     {
         if (!preg_match('/^[a-zA-Z0-9_]{1,50}$/', $sessionName)) {
-            throw new \Exception('Variable sessionName is not given or is invalid');
+            throw new \Exception('The session name format is invalid');
         }
 
         return $this;
@@ -88,7 +88,7 @@ public function init(): void
         ];
         foreach ($checkValues as $value => $method) {
             if (empty($this->$value)) {
-                throw new \Exception(sprintf('The CRUD configuration is not complete. You must call the "%s" method.', $method));
+                throw new \Exception(sprintf('The CRUD configuration is not complete. You must call the "%s" method', $method));
             }
         }
 
@@ -178,7 +178,7 @@ public function addColumn(string $id, string $alias, string $label, array $optio
     {
         $this->crudMustNotBeInitialized();
         if (mb_strlen($id) > 100) {
-            throw new \Exception('Column id is too long');
+            throw new \Exception(sprintf('The column id "%s" is too long', $id));
         }
         if (\array_key_exists($id, $this->availableColumns) || \array_key_exists($id, $this->availableVirtualColumns)) {
             throw new \Exception(sprintf('The column "%s" already exists', $id));
@@ -224,7 +224,7 @@ public function getColumn(string $columnId): CrudColumn
         if (isset($this->availableColumns[$columnId])) {
             return $this->availableColumns[$columnId];
         }
-        throw new \Exception('Crud: Column '.$columnId.' does not exist');
+        throw new \Exception(sprintf('The column "%s" does not exist', $columnId));
     }
 
     /**
@@ -239,7 +239,7 @@ public function getDefaultDisplayedColumns(): array
             }
         }
         if (0 == \count($columns)) {
-            throw new \Exception('Config Crud: One column displayed is required');
+            throw new \Exception('At least one column is required');
         }
 
         return $columns;
@@ -276,7 +276,7 @@ public function getVirtualColumn(string $columnId): CrudColumn
         if (isset($this->availableVirtualColumns[$columnId])) {
             return $this->availableVirtualColumns[$columnId];
         }
-        throw new \Exception('Crud: Column '.$columnId.' does not exist');
+        throw new \Exception(sprintf('The column "%s" does not exist', $columnId));
     }
 
     public function getQueryBuilder(): \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface|null
diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index ff4898f..8c6fd53 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -63,12 +63,12 @@ public function addParameter(QueryBuilderParameterInterface $parameter): self
             $this->queryParameters[] = $parameter;
         } elseif ($parameter instanceof QueryBuilderBodyParameter) {
             if (null !== $this->body) {
-                throw new \Exception('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported.');
+                throw new \Exception('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported');
             }
             $this->bodyParameters[] = $parameter;
         } elseif ($parameter instanceof QueryBuilderBody) {
             if (\count($this->bodyParameters) > 0) {
-                throw new \Exception('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported.');
+                throw new \Exception('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported');
             }
             $this->body = $parameter;
         } elseif ($parameter instanceof QueryBuilderHeaderParameter) {
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index 4473ffa..2b42a2c 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -67,7 +67,7 @@ public function addFilter(string $property, string $filter, array $options = [])
             throw new \Exception('The "addFilter" method cannot be called after the form creation');
         }
         if (!$this->container->get('ecommit_crud.filters')->has($filter)) {
-            throw new \Exception(sprintf('Filter "%s" not found', $filter));
+            throw new \Exception(sprintf('The filter "%s" does not exist', $filter));
         }
         /** @var FilterInterface $filterService */
         $filterService = $this->container->get('ecommit_crud.filters')->get($filter);
@@ -121,7 +121,7 @@ public function createForm(): self
             // Check if column exists
             $columnId = $filter['options']['column_id'];
             if (!\array_key_exists($columnId, $this->crud->getColumns()) && !\array_key_exists($columnId, $this->crud->getVirtualColumns())) {
-                throw new \Exception(sprintf('Column "%s" not found', $columnId));
+                throw new \Exception(sprintf('The column "%s" does not exist', $columnId));
             }
 
             /** @var FilterInterface $filterService */
@@ -190,7 +190,7 @@ public function updateQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Que
                 /** @var FilterInterface $filterService */
                 $filterService = $this->container->get('ecommit_crud.filters')->get($filter['name']);
                 if (!$filterService->supportsQueryBuilder($queryBuilder)) {
-                    throw new \Exception(sprintf('"%s" filter does not support "%s" query builder', $filter['name'], $queryBuilder::class));
+                    throw new \Exception(sprintf('The filter "%s" does not support "%s" query builder', $filter['name'], $queryBuilder::class));
                 }
                 $filterService->updateQueryBuilder($queryBuilder, $property, $value, $filter['options']);
             }
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 4e99642..bbf5c92 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void
     public function testCrudWithInvalidSessionName(string $sessionName): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Variable sessionName is not given or is invalid');
+        $this->expectExceptionMessage('The session name format is invalid');
 
         $this->createCrud($sessionName);
     }
@@ -114,11 +114,12 @@ public function testAddColumnWithAliasSort(): void
 
     public function testAddColumnTooLong(): void
     {
+        $columnId = str_pad('', 101, 'a');
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Column id is too long');
+        $this->expectExceptionMessage('The column id "'.$columnId.'" is too long');
 
         $crud = $this->createCrud('session_name');
-        $crud->addColumn(str_pad('', 101, 'a'), 'alias', 'label');
+        $crud->addColumn($columnId, 'alias', 'label');
     }
 
     /**
@@ -187,7 +188,7 @@ public function testAddColumnWithInvalidTypeDefaultDisplayedOption(): void
     public function testGetColumnNotExists(): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Crud: Column invalid does not exist');
+        $this->expectExceptionMessage('The column "invalid" does not exist');
 
         $crud = $this->createCrud('session_name');
         $crud->getColumn('invalid');
@@ -203,7 +204,7 @@ public function testGetDefaultDisplayedColumns(): void
     public function testGetDefaultDisplayedColumnsEmpty(): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Config Crud: One column displayed is required');
+        $this->expectExceptionMessage('At least one column is required');
 
         $crud = $this->createCrud();
         $crud->getDefaultDisplayedColumns();
@@ -233,7 +234,7 @@ public function testVirtualColumns(): void
     public function testGetVirtualColumnNotExists(): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Crud: Column invalid does not exist');
+        $this->expectExceptionMessage('The column "invalid" does not exist');
 
         $crud = $this->createCrud('session_name');
         $crud->getVirtualColumn('invalid');
diff --git a/tests/Crud/Http/QueryBuilderTest.php b/tests/Crud/Http/QueryBuilderTest.php
index f56dab7..5475c73 100644
--- a/tests/Crud/Http/QueryBuilderTest.php
+++ b/tests/Crud/Http/QueryBuilderTest.php
@@ -80,7 +80,7 @@ public function testAddBodyParameter(): void
     public function testAddBodyParameterNotAllowed(): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported.');
+        $this->expectExceptionMessage('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported');
 
         $queryBuilder = $this->createQueryBuider();
         $queryBuilder->addParameter(new QueryBuilderBody('val1'));
@@ -101,7 +101,7 @@ public function testAddBody(): void
     public function testAddBodyNotAllowed(): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported.');
+        $this->expectExceptionMessage('Use QueryBuilderBodyParameter and QueryBuilderBody classes is not supported');
 
         $queryBuilder = $this->createQueryBuider();
         $queryBuilder->addParameter(new QueryBuilderBodyParameter('param1', 'val1'));
diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
index e1c92b2..bb675f3 100644
--- a/tests/Crud/SearchFormBuilderTest.php
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -105,7 +105,7 @@ public function testAddFilterFormAlreadyCreated(): void
     public function testAddFilterNotExists(): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Filter "bad_filter" not found');
+        $this->expectExceptionMessage('The filter "bad_filter" does not exist');
 
         $this->createSearchFormBuilder()->addFilter('property', 'bad_filter');
     }
@@ -219,7 +219,7 @@ public function testCreateFormColumnNotExists(): void
             ->addFilter('column1', 'my_filter');
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Column "column1" not found');
+        $this->expectExceptionMessage('The column "column1" does not exist');
 
         $searchFormBuilder->createForm();
     }
@@ -385,7 +385,7 @@ public function testUpdateQueryBuilderNotSuported(): void
         $searcherData->expects($this->once())->method('getProperty')->willReturn('value');
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('"my_filter" filter does not support "Doctrine\ORM\QueryBuilder" query builder');
+        $this->expectExceptionMessage('The filter "my_filter" does not support "Doctrine\ORM\QueryBuilder" query builder');
 
         $searchFormBuilder->updateQueryBuilder($queryBuilder, $searcherData);
     }

From 6c268b70e60c903b19df7137be6694cf28dc80ee Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Apr 2022 21:26:21 +0200
Subject: [PATCH 153/264] Replace "sense" by "sortDirection"

---
 doc/cookbook/http.md                          |  6 +-
 doc/upgrade/3.0.md                            |  2 +
 src/Crud/Crud.php                             | 58 +++++++++----------
 src/Crud/CrudSession.php                      |  2 +-
 src/Crud/Http/QueryBuilder.php                |  8 +--
 src/Crud/QueryBuilderInterface.php            |  4 +-
 src/Entity/UserCrudSettings.php               | 14 ++---
 templates/Theme/base.html.twig                |  8 +--
 tests/Crud/CrudTest.php                       |  8 +--
 tests/Crud/Http/QueryBuilderTest.php          | 22 +++----
 .../App/DataFixtures/TestUserFixtures.php     |  2 +-
 .../Controller/TestCrudControllerTest.php     |  4 +-
 ...udControllerWithPersistentSettingsTest.php | 22 +++----
 tests/Functional/Controller/TestTrait.php     |  8 +--
 tests/Twig/CrudExtensionTest.php              | 16 ++---
 15 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/doc/cookbook/http.md b/doc/cookbook/http.md
index 91dd9f1..cbe02cd 100644
--- a/doc/cookbook/http.md
+++ b/doc/cookbook/http.md
@@ -66,9 +66,9 @@ class MyHttpController extends AbstractCrudController
 
         //FACULTATIF - Ajout dans la requête HTTP la gestion du tri
         $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
-            foreach ($orders as $sort => $sense) {
-                $senseParameter = ($sense === Crud::ASC)? '-' : '';
-                $queryBuilder->addParameter(new QueryBuilderQueryParameter('sort', $senseParameter.$sort));
+            foreach ($orders as $sort => $sortDirection) {
+                $sortDirectionParameter = ($sortDirection === Crud::ASC)? '-' : '';
+                $queryBuilder->addParameter(new QueryBuilderQueryParameter('sort', $sortDirection.$sort));
             }
         });
 
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index a1d7105..b40cec0 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -27,6 +27,7 @@
 
 * La colonne `sort` de la table `user_crud_settings` a maintenant une longueur de 100 caractères (30 avant). Mettre à jour
   la base de données
+* La colonne `sense` de la table `user_crud_settings` est remplacée par la colonne `sort_direction`. Mettre à jour la base de données
 
 
 
@@ -83,6 +84,7 @@
     * Avant: `createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = [])`
     * Après: `createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = [])`
 * La méthode `createDisplaySettingsForm` est maintenant protégée.
+* La méthode `getDefaultSense` est renommée en `getDefaultSortDirection`
 * La méthode `raz` est renommée en `reset`
 * La méthode `razSort` est renommée en `resetSort`
 * La méthode `processForm` est renommée en `processSearchForm`
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 4c9a05e..be9fb78 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -42,7 +42,7 @@ final class Crud
     protected array $availableResultsPerPage = [];
     protected ?string $defaultSort = null;
     protected array $defaultPersonalizedSort = [];
-    protected ?string $defaultSense = null;
+    protected ?string $defaultSortDirection = null;
     protected ?int $defaultResultsPerPage = null;
     protected \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface|null $queryBuilder = null;
     protected bool $persistentSettings = false;
@@ -82,7 +82,7 @@ public function init(): void
             'availableResultsPerPage' => 'setAvailableResultsPerPage',
             'defaultResultsPerPage' => 'setAvailableResultsPerPage',
             'defaultSort' => 'setDefaultSort',
-            'defaultSense' => 'setDefaultSort',
+            'defaultSortDirection' => 'setDefaultSort',
             'queryBuilder' => 'setQueryBuilder',
             'routeName' => 'setRoute',
         ];
@@ -106,7 +106,7 @@ public function init(): void
 
         $this->createDisplaySettingsForm();
 
-        // Process request (resultsPerPage, sort, sense, change_columns)
+        // Process request (resultsPerPage, sort, sortDirection, change_columns)
         $this->processRequest();
 
         // Searcher form: Allocates object
@@ -319,22 +319,22 @@ public function getDefaultSort(): ?string
         return $this->defaultSort;
     }
 
-    public function getDefaultSense(): ?string
+    public function getDefaultSortDirection(): ?string
     {
-        return $this->defaultSense;
+        return $this->defaultSortDirection;
     }
 
     /**
      * Set the default sort.
      *
-     * @param string $sort  Column id
-     * @param const  $sense Sense (Crud::ASC / Crud::DESC)
+     * @param string $sort          Column id
+     * @param const  $sortDirection Sort direction (Crud::ASC / Crud::DESC)
      */
-    public function setDefaultSort(string $sort, string $sense): self
+    public function setDefaultSort(string $sort, string $sortDirection): self
     {
         $this->crudMustNotBeInitialized();
         $this->defaultSort = $sort;
-        $this->defaultSense = $sense;
+        $this->defaultSortDirection = $sortDirection;
 
         return $this;
     }
@@ -348,7 +348,7 @@ public function getDefaultPersonalizedSort(): array
      * Set the default personalized sort.
      *
      * @param array $criterias Criterias :
-     *                         If key is defined: Key = Sort  Value = Sense
+     *                         If key is defined: Key = Sort  Value = Sort direction
      *                         If key is not defined: Value = Sort
      */
     public function setDefaultPersonalizedSort(array $criterias): self
@@ -357,7 +357,7 @@ public function setDefaultPersonalizedSort(array $criterias): self
         $this->defaultPersonalizedSort = $criterias;
 
         $this->defaultSort = 'defaultPersonalizedSort';
-        $this->defaultSense = self::ASC; // Used if not defined in criterias
+        $this->defaultSortDirection = self::ASC; // Used if not defined in criterias
 
         return $this;
     }
@@ -565,23 +565,23 @@ protected function updateQueryBuilder(): void
             foreach ($this->defaultPersonalizedSort as $key => $value) {
                 if (\is_int($key)) {
                     $sort = $value;
-                    $sense = $this->defaultSense;
+                    $sortDirection = $this->defaultSortDirection;
                 } else {
                     $sort = $key;
-                    $sense = $value;
+                    $sortDirection = $value;
                 }
-                $this->queryBuilder->addOrderBy($sort, $sense);
+                $this->queryBuilder->addOrderBy($sort, $sortDirection);
             }
         } else {
             $columnSortAlias = $this->availableColumns[$columnSortId]->aliasSort;
             if (\is_array($columnSortAlias)) {
                 // Sort alias in many columns
                 foreach ($columnSortAlias as $oneColumnSortAlias) {
-                    $this->queryBuilder->addOrderBy($oneColumnSortAlias, $this->sessionValues->sense);
+                    $this->queryBuilder->addOrderBy($oneColumnSortAlias, $this->sessionValues->sortDirection);
                 }
             } else {
                 // Sort alias in one column
-                $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sense);
+                $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sortDirection);
             }
         }
 
@@ -645,7 +645,7 @@ public function reset(): void
     public function resetSort(): void
     {
         $this->initIfNecessary();
-        $this->sessionValues->sense = $this->defaultSense;
+        $this->sessionValues->sortDirection = $this->defaultSortDirection;
         $this->sessionValues->sort = $this->defaultSort;
         $this->save();
     }
@@ -654,7 +654,7 @@ protected function resetDisplaySettings(): void
     {
         $this->sessionValues->displayedColumns = $this->getDefaultDisplayedColumns();
         $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
-        $this->sessionValues->sense = $this->defaultSense;
+        $this->sessionValues->sortDirection = $this->defaultSortDirection;
         $this->sessionValues->sort = $this->defaultSort;
 
         if ($this->persistentSettings) {
@@ -715,7 +715,7 @@ protected function checkCrudSession(): void
         $this->changeNumberResultsDisplayed($this->sessionValues->resultsPerPage);
         $this->changeColumnsDisplayed($this->sessionValues->displayedColumns);
         $this->changeSort($this->sessionValues->sort);
-        $this->changeSense($this->sessionValues->sense);
+        $this->changeSortDirection($this->sessionValues->sortDirection);
         $this->changeFilterValues($this->sessionValues->searchFormData);
         $this->changePage($this->sessionValues->page);
     }
@@ -774,17 +774,17 @@ protected function changeSort(mixed $value): void
     }
 
     /**
-     * User action: Changes sense.
+     * User action: Changes sort direction.
      */
-    protected function changeSense(mixed $value): void
+    protected function changeSortDirection(mixed $value): void
     {
-        $oldValue = $this->sessionValues->sense;
+        $oldValue = $this->sessionValues->sortDirection;
         if (\is_scalar($value) && (self::ASC === $value || self::DESC === $value)) {
-            $this->sessionValues->sense = $value;
+            $this->sessionValues->sortDirection = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
-            $this->sessionValues->sense = $this->defaultSense;
-            $this->testIfDatabaseMustMeUpdated($oldValue, $this->defaultSense);
+            $this->sessionValues->sortDirection = $this->defaultSortDirection;
+            $this->testIfDatabaseMustMeUpdated($oldValue, $this->defaultSortDirection);
         }
     }
 
@@ -845,8 +845,8 @@ protected function processRequest(): void
         if ($request->query->has('sort')) {
             $this->changeSort($request->query->get('sort'));
         }
-        if ($request->query->has('sense')) {
-            $this->changeSense($request->query->get('sense'));
+        if ($request->query->has('sort-direction')) {
+            $this->changeSortDirection($request->query->get('sort-direction'));
         }
         if ($request->query->has('page')) {
             $this->changePage($request->query->get('page'));
@@ -907,7 +907,7 @@ protected function load(): void
             $this->defaultResultsPerPage,
             $this->getDefaultDisplayedColumns(),
             $this->defaultSort,
-            $this->defaultSense,
+            $this->defaultSortDirection,
             ($this->searchForm) ? $this->searchForm->getDefaultData() : null,
         );
 
@@ -959,7 +959,7 @@ protected function save(): void
                 // Create object in database only if not default values
                 if ($this->sessionValues->displayedColumns != $this->getDefaultDisplayedColumns() ||
                     $this->sessionValues->resultsPerPage != $this->defaultResultsPerPage ||
-                    $this->sessionValues->sense != $this->defaultSense ||
+                    $this->sessionValues->sortDirection != $this->defaultSortDirection ||
                     $this->sessionValues->sort != $this->defaultSort
                 ) {
                     $objectDatabase = new UserCrudSettings();
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index 7c61074..e88a7ba 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -23,7 +23,7 @@ final class CrudSession
     public int $page = 1;
     public bool $searchFormIsSubmittedAndValid = false;
 
-    public function __construct(public int $resultsPerPage, public array $displayedColumns, public string $sort, public string $sense, public ?SearcherInterface $searchFormData = null)
+    public function __construct(public int $resultsPerPage, public array $displayedColumns, public string $sort, public string $sortDirection, public ?SearcherInterface $searchFormData = null)
     {
     }
 }
diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index 8c6fd53..6404ceb 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -87,17 +87,17 @@ public function setBodyIsJson(bool $bodyIsJson): self
         return $this;
     }
 
-    public function addOrderBy(string $sort, string $sense): self
+    public function addOrderBy(string $sort, string $sortDirection): self
     {
-        $this->orders[$sort] = $sense;
+        $this->orders[$sort] = $sortDirection;
 
         return $this;
     }
 
-    public function orderBy(string $sort, string $sense): self
+    public function orderBy(string $sort, string $sortDirection): self
     {
         $this->orders = [];
-        $this->addOrderBy($sort, $sense);
+        $this->addOrderBy($sort, $sortDirection);
 
         return $this;
     }
diff --git a/src/Crud/QueryBuilderInterface.php b/src/Crud/QueryBuilderInterface.php
index 76e5e5f..8aef70e 100644
--- a/src/Crud/QueryBuilderInterface.php
+++ b/src/Crud/QueryBuilderInterface.php
@@ -15,9 +15,9 @@
 
 interface QueryBuilderInterface
 {
-    public function addOrderBy(string $sort, string $sense): self;
+    public function addOrderBy(string $sort, string $sortDirection): self;
 
-    public function orderBy(string $sort, string $sense): self;
+    public function orderBy(string $sort, string $sortDirection): self;
 
     public function addParameter(QueryBuilderParameterInterface $parameter): self;
 }
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index 3885608..38ab232 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -38,7 +38,7 @@ class UserCrudSettings
     protected $sort;
 
     #[ORM\Column(type: 'string', length: 4)]
-    protected $sense;
+    protected $sortDirection;
 
     public function setCrudName(string $crudName): self
     {
@@ -88,16 +88,16 @@ public function getSort(): string
         return $this->sort;
     }
 
-    public function setSense(string $sense): self
+    public function setSortDirection(string $sortDirection): self
     {
-        $this->sense = $sense;
+        $this->sortDirection = $sortDirection;
 
         return $this;
     }
 
-    public function getSense(): string
+    public function getSortDirection(): string
     {
-        return $this->sense;
+        return $this->sortDirection;
     }
 
     public function setUser(\Ecommit\CrudBundle\Entity\UserCrudInterface $user): self
@@ -119,7 +119,7 @@ public function transformToCrudSession(CrudSession $crudSessionManager): CrudSes
     {
         $crudSessionManager->displayedColumns = $this->displayedColumns;
         $crudSessionManager->resultsPerPage = $this->resultsDisplayed;
-        $crudSessionManager->sense = $this->sense;
+        $crudSessionManager->sortDirection = $this->sortDirection;
         $crudSessionManager->sort = $this->sort;
 
         return $crudSessionManager;
@@ -132,7 +132,7 @@ public function updateFromSessionManager(CrudSession $crudSessionManager): void
     {
         $this->displayedColumns = $crudSessionManager->displayedColumns;
         $this->resultsDisplayed = $crudSessionManager->resultsPerPage;
-        $this->sense = $crudSessionManager->sense;
+        $this->sortDirection = $crudSessionManager->sortDirection;
         $this->sort = $crudSessionManager->sort;
     }
 }
diff --git a/templates/Theme/base.html.twig b/templates/Theme/base.html.twig
index 0aa8481..212be19 100644
--- a/templates/Theme/base.html.twig
+++ b/templates/Theme/base.html.twig
@@ -90,7 +90,7 @@
         {{ block('th_not_sortable', template_name) }}
     {% elseif crud.sessionValues.sort != column.id %}
         {{ block('th_sortable_not_active', template_name) }}
-    {% elseif crud.sessionValues.sense == constant('Ecommit\\CrudBundle\\Crud\\Crud::DESC') %}
+    {% elseif crud.sessionValues.sortDirection == constant('Ecommit\\CrudBundle\\Crud\\Crud::DESC') %}
         {{ block('th_sortable_active_desc', template_name) }}
     {% else %}
         {{ block('th_sortable_active_asc', template_name) }}
@@ -117,7 +117,7 @@
 {% block th_sortable_active_asc %}
     {% set th_attr = th_attr.sortable_active_asc|merge({class: (th_attr.sortable_active_asc.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-active-asc')|trim}) %}
     {% set a_attr = a_attr.sortable_active_asc %}
-    {% set new_sense = constant('Ecommit\\CrudBundle\\Crud\\Crud::DESC') %}
+    {% set new_sort_direction = constant('Ecommit\\CrudBundle\\Crud\\Crud::DESC') %}
     {% set icon_name = 'asc' %}
     {{ block('th_sortable_active', template_name) }}
 {% endblock %}
@@ -125,7 +125,7 @@
 {% block th_sortable_active_desc %}
     {% set th_attr = th_attr.sortable_active_desc|merge({class: (th_attr.sortable_active_desc.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-active-desc')|trim}) %}
     {% set a_attr = a_attr.sortable_active_desc %}
-    {% set new_sense = constant('Ecommit\\CrudBundle\\Crud\\Crud::ASC') %}
+    {% set new_sort_direction = constant('Ecommit\\CrudBundle\\Crud\\Crud::ASC') %}
     {% set icon_name = 'desc' %}
     {{ block('th_sortable_active', template_name) }}
 {% endblock %}
@@ -135,7 +135,7 @@
         {% set a_attr = a_attr|merge({class: (a_attr.class|default('') ~ ' ec-crud-ajax-link-auto')|trim}) %}
     {% endif %}
     <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id, 'sense': new_sense})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>
+        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id, 'sort-direction': new_sort_direction})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>
             {{- label|trans }} {{ crud_icon(icon_name) -}}
         </a>
     </th>
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index bbf5c92..e3b5ee6 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -268,10 +268,10 @@ public function testSort(): void
         $crud = $this->createCrud();
 
         $this->assertNull($crud->getDefaultSort());
-        $this->assertNull($crud->getDefaultSense());
+        $this->assertNull($crud->getDefaultSortDirection());
         $this->assertInstanceOf(Crud::class, $crud->setDefaultSort('username', Crud::DESC));
         $this->assertSame('username', $crud->getDefaultSort());
-        $this->assertSame(Crud::DESC, $crud->getDefaultSense());
+        $this->assertSame(Crud::DESC, $crud->getDefaultSortDirection());
     }
 
     public function testDefaultPersonalizedSort(): void
@@ -284,7 +284,7 @@ public function testDefaultPersonalizedSort(): void
 
         $this->assertSame(['u.userId'], $crud->getDefaultPersonalizedSort());
         $this->assertSame('defaultPersonalizedSort', $crud->getDefaultSort());
-        $this->assertSame(Crud::ASC, $crud->getDefaultSense());
+        $this->assertSame(Crud::ASC, $crud->getDefaultSortDirection());
     }
 
     public function testRouting(): void
@@ -520,7 +520,7 @@ public function getTestIncompleteInitProvider(): array
             ['availableResultsPerPage', 'setAvailableResultsPerPage', []],
             ['defaultResultsPerPage', 'setAvailableResultsPerPage', null],
             ['defaultSort', 'setDefaultSort', null],
-            ['defaultSense', 'setDefaultSort', null],
+            ['defaultSortDirection', 'setDefaultSort', null],
             ['queryBuilder', 'setQueryBuilder', null],
             ['routeName', 'setRoute', null],
         ];
diff --git a/tests/Crud/Http/QueryBuilderTest.php b/tests/Crud/Http/QueryBuilderTest.php
index 5475c73..285f519 100644
--- a/tests/Crud/Http/QueryBuilderTest.php
+++ b/tests/Crud/Http/QueryBuilderTest.php
@@ -136,16 +136,16 @@ public function testOrderBy(): void
     {
         $queryBuilder = $this->createQueryBuider();
         $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
-            foreach ($orders as $sort => $sense) {
+            foreach ($orders as $sort => $sortDirection) {
                 $queryBuilder->addParameter(new QueryBuilderBodyParameter('sort', $sort));
-                $queryBuilder->addParameter(new QueryBuilderBodyParameter('sense', $sense));
+                $queryBuilder->addParameter(new QueryBuilderBodyParameter('sort-direction', $sortDirection));
             }
         });
         $queryBuilder->orderBy('col1', Crud::ASC);
         $response = $queryBuilder->getResponse(1, 1);
 
         $this->checkRequest($response, [
-            'body' => 'sort=col1&sense=ASC',
+            'body' => 'sort=col1&sort-direction=ASC',
         ]);
     }
 
@@ -154,20 +154,20 @@ public function testAddOrderBy(): void
         $queryBuilder = $this->createQueryBuider();
         $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
             $paramSort = [];
-            $paramSense = [];
-            foreach ($orders as $sort => $sense) {
+            $paramSortDirection = [];
+            foreach ($orders as $sort => $sortDirection) {
                 $paramSort[] = $sort;
-                $paramSense[] = $sense;
+                $paramSortDirection[] = $sortDirection;
             }
             $queryBuilder->addParameter(new QueryBuilderBodyParameter('sort', implode(',', $paramSort)));
-            $queryBuilder->addParameter(new QueryBuilderBodyParameter('sense', implode(',', $paramSense)));
+            $queryBuilder->addParameter(new QueryBuilderBodyParameter('sort-direction', implode(',', $paramSortDirection)));
         });
         $queryBuilder->addOrderBy('col1', Crud::ASC);
         $queryBuilder->addOrderBy('col2', Crud::DESC);
         $response = $queryBuilder->getResponse(1, 1);
 
         $this->checkRequest($response, [
-            'body' => 'sort=col1%2Ccol2&sense=ASC%2CDESC',
+            'body' => 'sort=col1%2Ccol2&sort-direction=ASC%2CDESC',
         ]);
     }
 
@@ -192,9 +192,9 @@ public function testFull(): void
         $queryBuilder->addParameter(new QueryBuilderBodyParameter('bodyparam1', 'bodyparamval1'));
         $queryBuilder->addParameter(new QueryBuilderHeaderParameter('headerparam1', 'headerparamval1'));
         $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
-            foreach ($orders as $sort => $sense) {
+            foreach ($orders as $sort => $sortDirection) {
                 $queryBuilder->addParameter(new QueryBuilderQueryParameter('sort', $sort));
-                $queryBuilder->addParameter(new QueryBuilderQueryParameter('sense', $sense));
+                $queryBuilder->addParameter(new QueryBuilderQueryParameter('sort-direction', $sortDirection));
             }
         });
         $queryBuilder->setPaginationBuilder(function (QueryBuilder $queryBuilder, $page, $resultsPerPage): void {
@@ -207,7 +207,7 @@ public function testFull(): void
 
         $this->checkRequest($response, [
             'method' => 'POST',
-            'url' => 'http://test/url?queryparam1=queryparamval1&page=10&per_page=100&sort=col1&sense=ASC',
+            'url' => 'http://test/url?queryparam1=queryparamval1&page=10&per_page=100&sort=col1&sort-direction=ASC',
             'body' => 'bodyparam1=bodyparamval1',
             'headers' => ['headerparam1: headerparamval1'],
         ]);
diff --git a/tests/Functional/App/DataFixtures/TestUserFixtures.php b/tests/Functional/App/DataFixtures/TestUserFixtures.php
index 94b8ead..341ad09 100644
--- a/tests/Functional/App/DataFixtures/TestUserFixtures.php
+++ b/tests/Functional/App/DataFixtures/TestUserFixtures.php
@@ -52,7 +52,7 @@ public function load(ObjectManager $manager): void
             ->setDisplayedColumns(['username', 'firstName'])
             ->setResultsDisplayed(50)
             ->setSort('firstName')
-            ->setSense(Crud::DESC);
+            ->setSortDirection(Crud::DESC);
         $manager->persist($userCrudSettings);
 
         $manager->flush();
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 57a5b22..2ef301f 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -50,7 +50,7 @@ public function testList(): Client
     /**
      * @depends testList
      */
-    public function testChangeSortSense(Client $client): Client
+    public function testChangeSortDirection(Client $client): Client
     {
         $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[contains(text(), "first_name")]');
         $link->click();
@@ -66,7 +66,7 @@ public function testChangeSortSense(Client $client): Client
     }
 
     /**
-     * @depends testChangeSortSense
+     * @depends testChangeSortDirection
      */
     public function testChangeSortColumn(Client $client): Client
     {
diff --git a/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
index d637449..f08e8c9 100644
--- a/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
+++ b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
@@ -44,7 +44,7 @@ public function testListWithUserWithoutPersistent(): Client
             resultsDisplayed: 50,
             displayedColumns: ['username', 'firstName'],
             sort: 'firstName',
-            sense: Crud::DESC
+            sortDirection: Crud::DESC
         );
 
         return $client;
@@ -70,7 +70,7 @@ public function testChangeSettingsWithUserWithoutPersistent($client): Client
             resultsDisplayed: 50,
             displayedColumns: ['username', 'firstName'],
             sort: 'firstName',
-            sense: Crud::DESC
+            sortDirection: Crud::DESC
         );
 
         return $client;
@@ -88,7 +88,7 @@ public function testResetSettingsWithUserWithoutPersistent($client): Client
             resultsDisplayed: 50,
             displayedColumns: ['username', 'firstName'],
             sort: 'firstName',
-            sense: Crud::DESC
+            sortDirection: Crud::DESC
         );
 
         $this->logout($client);
@@ -113,7 +113,7 @@ public function testListWithUserWithPersistent(Client $client): Client
             resultsDisplayed: 50,
             displayedColumns: ['username', 'firstName'],
             sort: 'firstName',
-            sense: Crud::DESC
+            sortDirection: Crud::DESC
         );
 
         return $client;
@@ -139,7 +139,7 @@ public function testChangeSettingsWithUserWithPersistent($client): Client
             resultsDisplayed: 10,
             displayedColumns: ['username', 'firstName', 'lastName'],
             sort: 'username',
-            sense: Crud::ASC
+            sortDirection: Crud::ASC
         );
 
         return $client;
@@ -181,7 +181,7 @@ public function testCreateSettingsWithUserWithPersistent($client): Client
             resultsDisplayed: 10,
             displayedColumns: ['firstName', 'lastName', 'username'],
             sort: 'lastName',
-            sense: Crud::DESC
+            sortDirection: Crud::DESC
         );
 
         $this->logout($client);
@@ -205,7 +205,7 @@ public function testListWithoutUserWithPersistent(Client $client): Client
             resultsDisplayed: 10,
             displayedColumns: ['firstName', 'lastName', 'username'],
             sort: 'lastName',
-            sense: Crud::DESC
+            sortDirection: Crud::DESC
         );
 
         return $client;
@@ -231,7 +231,7 @@ public function testChangeSettingsWithoutUserWithPersistent($client): Client
             resultsDisplayed: 10,
             displayedColumns: ['firstName', 'lastName', 'username'],
             sort: 'lastName',
-            sense: Crud::DESC
+            sortDirection: Crud::DESC
         );
 
         return $client;
@@ -249,7 +249,7 @@ public function testResetSettingsWithoutUserWithPersistent($client): Client
             resultsDisplayed: 10,
             displayedColumns: ['firstName', 'lastName', 'username'],
             sort: 'lastName',
-            sense: Crud::DESC
+            sortDirection: Crud::DESC
         );
 
         return $client;
@@ -306,13 +306,13 @@ protected function resetSettings(Client $client): void
         $this->waitForAjax($client);
     }
 
-    protected function checkUserCrudSettingsDatabase(string $username, int $resultsDisplayed, array $displayedColumns, string $sort, string $sense): void
+    protected function checkUserCrudSettingsDatabase(string $username, int $resultsDisplayed, array $displayedColumns, string $sort, string $sortDirection): void
     {
         $userCrudSettings = $this->getUserCrudSettings($username);
         $this->assertSame($resultsDisplayed, $userCrudSettings->getResultsDisplayed());
         $this->assertSame($displayedColumns, $userCrudSettings->getDisplayedColumns());
         $this->assertSame($sort, $userCrudSettings->getSort());
-        $this->assertSame($sense, $userCrudSettings->getSense());
+        $this->assertSame($sortDirection, $userCrudSettings->getSortDirection());
     }
 
     protected function getUserCrudSettings(string $username): ?UserCrudSettings
diff --git a/tests/Functional/Controller/TestTrait.php b/tests/Functional/Controller/TestTrait.php
index 65ac0e1..dafeb23 100644
--- a/tests/Functional/Controller/TestTrait.php
+++ b/tests/Functional/Controller/TestTrait.php
@@ -51,19 +51,19 @@ protected function getSort(Crawler $crawler): array
 
         switch ($iSort->text()) {
             case '^':
-                $sense = Crud::ASC;
+                $sortDirection = Crud::ASC;
                 break;
             case 'v':
-                $sense = Crud::DESC;
+                $sortDirection = Crud::DESC;
                 break;
             default:
-                throw new \Exception('Bad sense');
+                throw new \Exception('Bad sort direction');
         }
 
         $column = $iSort->filterXPath('ancestor::th')->last()->text();
         $column = str_replace(' '.$iSort->text(), '', $column);
 
-        return [$column, $sense];
+        return [$column, $sortDirection];
     }
 
     protected function getFirstUsername(Crawler $crawler): ?string
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 7c21b9e..f3376b6 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -464,13 +464,13 @@ public function testThColumnSortableNotActive(): void
     public function testThColumnSortableActiveAsc(): void
     {
         $html = $this->crudExtension->th($this->environment, 'column1', $this->createCrud());
-        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-asc"><a href="/user?sort=column1&amp;sense=DESC" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>', $html);
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-asc"><a href="/user?sort=column1&amp;sort-direction=DESC" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>', $html);
     }
 
     public function testThColumnSortableActiveDesc(): void
     {
         $html = $this->crudExtension->th($this->environment, 'column1', $this->createCrud('column1', CRUD::DESC));
-        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-desc"><a href="/user?sort=column1&amp;sense=ASC" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>', $html);
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-desc"><a href="/user?sort=column1&amp;sort-direction=ASC" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>', $html);
     }
 
     public function testThWithAjaxOptions(): void
@@ -494,9 +494,9 @@ public function testThWithLabel(): void
     /**
      * @dataProvider getTestThWithAttrOptionsProvider
      */
-    public function testThWithAttrOptions(string $columnId, string $sort, string $sense, string $expected): void
+    public function testThWithAttrOptions(string $columnId, string $sort, string $sortDirection, string $expected): void
     {
-        $html = $this->crudExtension->th($this->environment, $columnId, $this->createCrud($sort, $sense), [
+        $html = $this->crudExtension->th($this->environment, $columnId, $this->createCrud($sort, $sortDirection), [
             'th_attr' => [
                 'not_sortable' => ['class' => 'a', 'data-a' => 'val'],
                 'sortable_active_asc' => ['class' => 'b', 'data-b' => 'val'],
@@ -517,8 +517,8 @@ public function getTestThWithAttrOptionsProvider(): array
     {
         return [
             ['column3', 'column1', Crud::ASC, '<th class="a ec-crud-th ec-crud-th-not-sortable" data-a="val">label3</th>'],
-            ['column1', 'column1', Crud::ASC, '<th class="b ec-crud-th ec-crud-th-sortable-active-asc" data-b="val"><a href="/user?sort=column1&amp;sense=DESC" class="e ec-crud-ajax-link-auto" data-e="val" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>'],
-            ['column1', 'column1', Crud::DESC, '<th class="c ec-crud-th ec-crud-th-sortable-active-desc" data-c="val"><a href="/user?sort=column1&amp;sense=ASC" class="f ec-crud-ajax-link-auto" data-f="val" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>'],
+            ['column1', 'column1', Crud::ASC, '<th class="b ec-crud-th ec-crud-th-sortable-active-asc" data-b="val"><a href="/user?sort=column1&amp;sort-direction=DESC" class="e ec-crud-ajax-link-auto" data-e="val" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>'],
+            ['column1', 'column1', Crud::DESC, '<th class="c ec-crud-th ec-crud-th-sortable-active-desc" data-c="val"><a href="/user?sort=column1&amp;sort-direction=ASC" class="f ec-crud-ajax-link-auto" data-f="val" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>'],
             ['column2', 'column1', Crud::ASC, '<th class="d ec-crud-th ec-crud-th-sortable-not-active" data-d="val"><a href="/user?sort=column2" class="g ec-crud-ajax-link-auto" data-g="val" data-ec-crud-ajax-update="#myId">label2</a></th>'],
         ];
     }
@@ -721,7 +721,7 @@ public function testTdWithBadOptions(): void
         ]);
     }
 
-    protected function createCrud(string $sort = 'column1', string $sense = Crud::ASC): Crud
+    protected function createCrud(string $sort = 'column1', string $sortDirection = Crud::ASC): Crud
     {
         $columns = [
             'column1' => new CrudColumn('column1', 'alias1', 'label1', true, true, 'alias1', 'alias1'),
@@ -737,7 +737,7 @@ protected function createCrud(string $sort = 'column1', string $sense = Crud::AS
                 'column3',
             ],
             $sort,
-            $sense,
+            $sortDirection,
         );
 
         $crud = $this->getMockBuilder(Crud::class)

From c708dbcd093fa2f10edd69c463042e6f4d4587fe Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Apr 2022 21:33:42 +0200
Subject: [PATCH 154/264] Change UserCrudSettings::displayedColumns type

---
 doc/upgrade/3.0.md              | 1 +
 src/Entity/UserCrudSettings.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index b40cec0..892b685 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -27,6 +27,7 @@
 
 * La colonne `sort` de la table `user_crud_settings` a maintenant une longueur de 100 caractères (30 avant). Mettre à jour
   la base de données
+* La colonne `displayed_columns` de la table `user_crud_settings` a maintenant un type `JSON`. Mettre à jour la base de données
 * La colonne `sense` de la table `user_crud_settings` est remplacée par la colonne `sort_direction`. Mettre à jour la base de données
 
 
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index 38ab232..8f95311 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -31,7 +31,7 @@ class UserCrudSettings
     #[ORM\Column(type: 'integer', name: 'results_displayed')]
     protected $resultsDisplayed;
 
-    #[ORM\Column(type: 'array', name: 'displayed_columns')]
+    #[ORM\Column(type: 'json', name: 'displayed_columns')]
     protected $displayedColumns = [];
 
     #[ORM\Column(type: 'string', length: 100)]

From 75595e655b75d3880fe811040715c0423ca9f511 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Apr 2022 21:40:58 +0200
Subject: [PATCH 155/264] Update internal tags

---
 src/Crud/CrudColumn.php                              | 3 +++
 src/Crud/CrudColumnReference.php                     | 5 ++++-
 src/Crud/CrudSession.php                             | 2 ++
 src/Crud/Http/AbstractQueryBuilderNamedParameter.php | 3 ---
 src/Crud/Http/AbstractQueryBuilderParameter.php      | 3 ---
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index c6b9cc9..aea51f4 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -13,6 +13,9 @@
 
 namespace Ecommit\CrudBundle\Crud;
 
+/**
+ * @internal
+ */
 final class CrudColumn
 {
     public string $aliasSearch;
diff --git a/src/Crud/CrudColumnReference.php b/src/Crud/CrudColumnReference.php
index 7ab466a..bdad072 100644
--- a/src/Crud/CrudColumnReference.php
+++ b/src/Crud/CrudColumnReference.php
@@ -13,7 +13,10 @@
 
 namespace Ecommit\CrudBundle\Crud;
 
-class CrudColumnReference
+/**
+ * @internal
+ */
+final class CrudColumnReference
 {
     public function __construct(public string $id)
     {
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index e88a7ba..a7cdd34 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -16,6 +16,8 @@
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 
 /**
+ * @internal
+ *
  * $searchFormData: Search's object (used by "setData" inside the form). Used to save the data of the search form.
  */
 final class CrudSession
diff --git a/src/Crud/Http/AbstractQueryBuilderNamedParameter.php b/src/Crud/Http/AbstractQueryBuilderNamedParameter.php
index 2a0f429..24024ad 100644
--- a/src/Crud/Http/AbstractQueryBuilderNamedParameter.php
+++ b/src/Crud/Http/AbstractQueryBuilderNamedParameter.php
@@ -13,9 +13,6 @@
 
 namespace Ecommit\CrudBundle\Crud\Http;
 
-/**
- * @internal
- */
 abstract class AbstractQueryBuilderNamedParameter extends AbstractQueryBuilderParameter
 {
     public function __construct(public string $name, mixed $value)
diff --git a/src/Crud/Http/AbstractQueryBuilderParameter.php b/src/Crud/Http/AbstractQueryBuilderParameter.php
index 20b3c62..68516a0 100644
--- a/src/Crud/Http/AbstractQueryBuilderParameter.php
+++ b/src/Crud/Http/AbstractQueryBuilderParameter.php
@@ -15,9 +15,6 @@
 
 use Ecommit\CrudBundle\Crud\QueryBuilderParameterInterface;
 
-/**
- * @internal
- */
 abstract class AbstractQueryBuilderParameter implements QueryBuilderParameterInterface
 {
     public function __construct(public mixed $value)

From 8d62e6c1f3da8a8680888d94bfbaa086a5b31998 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 17 Apr 2022 10:15:09 +0200
Subject: [PATCH 156/264] Update license year

---
 .github/workflows/tests.yml | 4 ++++
 LICENSE                     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b8000e2..db8a6ad 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -110,6 +110,10 @@ jobs:
                 if: matrix.coding-standards
                 run: php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
 
+            -   name: Check license year
+                if: matrix.coding-standards
+                run: cat LICENSE |grep -E "\(c\) ([0-9]+\-)*`date +%G`"
+
             -   name: Run ESLint
                 if: matrix.coding-standards
                 run: ./node_modules/.bin/eslint assets/js/* tests/assets/js/*
diff --git a/LICENSE b/LICENSE
index b2a515f..0eb55ec 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 E-COMMIT
+Copyright (c) 2011-2022 E-COMMIT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From ba6d3652d30a9bef36909ecfde525139ff48eb5a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 17 Apr 2022 10:52:32 +0200
Subject: [PATCH 157/264] [CRUD] Remove public void

---
 src/Crud/Crud.php       |  30 +++++++++---
 tests/Crud/CrudTest.php | 106 ++++++++++++++++++++++++++--------------
 2 files changed, 91 insertions(+), 45 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index be9fb78..d37860b 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -69,7 +69,7 @@ public function __construct(protected string $sessionName, protected ContainerIn
     /**
      * Inits the CRUD.
      */
-    public function init(): void
+    public function init(): self
     {
         if ($this->isInitialized) {
             throw new \Exception('CRUD already initialized');
@@ -128,6 +128,8 @@ public function init(): void
 
         $this->initializationInProgress = false;
         $this->isInitialized = true;
+
+        return $this;
     }
 
     public function isInitialized(): bool
@@ -135,11 +137,13 @@ public function isInitialized(): bool
         return $this->isInitialized;
     }
 
-    public function initIfNecessary(): void
+    public function initIfNecessary(): self
     {
         if (!$this->isInitialized && !$this->initializationInProgress) {
             $this->init();
         }
+
+        return $this;
     }
 
     protected function crudMustNotBeInitialized(): void
@@ -522,7 +526,7 @@ public function setDivIdList(string $divIdList): self
         return $this;
     }
 
-    public function processSearchForm(): void
+    public function processSearchForm(): self
     {
         $this->crudMustBeInitialized();
         if (!$this->searchForm) {
@@ -531,7 +535,7 @@ public function processSearchForm(): void
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('reset')) {
-            return;
+            return $this;
         }
         if ('POST' == $request->getMethod()) {
             if ($this->displayResultsOnlyIfSearch) {
@@ -547,13 +551,17 @@ public function processSearchForm(): void
                 $this->save();
             }
         }
+
+        return $this;
     }
 
-    public function build(): void
+    public function build(): self
     {
         $this->crudMustBeInitialized();
         $this->updateQueryBuilder();
         $this->buildPaginator();
+
+        return $this;
     }
 
     protected function updateQueryBuilder(): void
@@ -625,7 +633,7 @@ protected function buildPaginator(): void
     /**
      * Reset search form values.
      */
-    public function reset(): void
+    public function reset(): self
     {
         $this->initIfNecessary();
         if ($this->searchForm) {
@@ -640,14 +648,18 @@ public function reset(): void
         if ($this->displayResultsOnlyIfSearch) {
             $this->displayResults = false;
         }
+
+        return $this;
     }
 
-    public function resetSort(): void
+    public function resetSort(): self
     {
         $this->initIfNecessary();
         $this->sessionValues->sortDirection = $this->defaultSortDirection;
         $this->sessionValues->sort = $this->defaultSort;
         $this->save();
+
+        return $this;
     }
 
     protected function resetDisplaySettings(): void
@@ -668,7 +680,7 @@ protected function resetDisplaySettings(): void
         }
     }
 
-    public function createView(): void
+    public function createView(): self
     {
         $this->crudMustBeInitialized();
         if ($this->searchForm) {
@@ -676,6 +688,8 @@ public function createView(): void
             $this->searchForm = $this->searchForm->getForm();
         }
         $this->displaySettingsForm = $this->displaySettingsForm->createView();
+
+        return $this;
     }
 
     public function getTwigFunctionsConfiguration(): array
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index e3b5ee6..6cc28f1 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -72,8 +72,8 @@ public function testGetSessionName(): void
 
     public function testGetSessionValues(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createValidCrud()
+            ->init();
 
         $this->assertInstanceOf(CrudSession::class, $crud->getSessionValues());
     }
@@ -105,9 +105,9 @@ public function testAddColumnWithAliasSort(): void
     {
         $crud = $this->createValidCrud()
             ->addColumn('my_column', 'u.alias', 'My Column', ['alias_sort' => 'u.lastName'])
-            ->setDefaultSort('my_column', Crud::ASC);
-        $crud->init();
-        $crud->build();
+            ->setDefaultSort('my_column', Crud::ASC)
+            ->init()
+            ->build();
 
         $this->assertSame(['u.lastName ASC'], $crud->getQueryBuilder()->getDQLPart('orderBy')[0]->getParts());
     }
@@ -311,8 +311,8 @@ public function testCreateAndGetSearchForm(): void
         $crud->createSearchForm(new UserSearcher());
         $this->assertInstanceOf(SearchFormBuilder::class, $crud->getSearchForm());
 
-        $crud->init();
-        $crud->createView();
+        $crud->init()
+            ->createView();
         $this->assertInstanceOf(FormView::class, $crud->getSearchForm());
     }
 
@@ -328,8 +328,8 @@ public function testSetBuildPaginatorTrue(): void
         $crud = $this->createValidCrud();
 
         $this->assertInstanceOf(Crud::class, $crud->setBuildPaginator(true));
-        $crud->init();
-        $crud->build();
+        $crud->init()
+            ->build();
 
         $this->assertInstanceOf(DoctrineORMPaginator::class, $crud->getPaginator());
     }
@@ -339,8 +339,8 @@ public function testSetBuildPaginatorFalse(): void
         $crud = $this->createValidCrud();
 
         $this->assertInstanceOf(Crud::class, $crud->setBuildPaginator(false));
-        $crud->init();
-        $crud->build();
+        $crud->init()
+            ->build();
 
         $this->assertNull($crud->getPaginator());
     }
@@ -356,12 +356,20 @@ public function testSetBuildPaginatorClosure(): void
 
             return $this->createMock(PaginatorInterface::class);
         }));
-        $crud->init();
-        $crud->build();
+        $crud->init()
+            ->build();
 
         $this->assertInstanceOf(PaginatorInterface::class, $crud->getPaginator());
     }
 
+    public function testBuild(): void
+    {
+        $crud = $this->createValidCrud()
+            ->init();
+
+        $this->assertInstanceOf(Crud::class, $crud->build());
+    }
+
     public function testDivIdList(): void
     {
         $crud = $this->createCrud();
@@ -389,8 +397,8 @@ public function testDisplayResultsOnlyIfSearch(): void
         $this->assertInstanceOf(Crud::class, $crud->setDisplayResultsOnlyIfSearch(true));
         $this->assertTrue($crud->getDisplayResultsOnlyIfSearch());
 
-        $crud->init();
-        $crud->build();
+        $crud->init()
+            ->build();
         $this->assertFalse($crud->getDisplayResults());
         $this->assertNull($crud->getPaginator());
     }
@@ -404,8 +412,8 @@ public function testDisplayResultsOnlyIfSearchWithoutSearcher(): void
         $this->assertInstanceOf(Crud::class, $crud->setDisplayResultsOnlyIfSearch(true));
         $this->assertTrue($crud->getDisplayResultsOnlyIfSearch());
 
-        $crud->init();
-        $crud->build();
+        $crud->init()
+            ->build();
         $this->assertTrue($crud->getDisplayResults());
         $this->assertNotNull($crud->getPaginator());
     }
@@ -417,8 +425,8 @@ public function testDisplayResultsTrue(): void
         $this->assertTrue($crud->getDisplayResults());
         $this->assertInstanceOf(Crud::class, $crud->setDisplayResults(true));
 
-        $crud->init();
-        $crud->build();
+        $crud->init()
+            ->build();
         $this->assertTrue($crud->getDisplayResults());
         $this->assertNotNull($crud->getPaginator());
     }
@@ -430,17 +438,17 @@ public function testDisplayResultsFalse(): void
         $this->assertTrue($crud->getDisplayResults());
         $this->assertInstanceOf(Crud::class, $crud->setDisplayResults(false));
 
-        $crud->init();
-        $crud->build();
+        $crud->init()
+            ->build();
         $this->assertFalse($crud->getDisplayResults());
         $this->assertNull($crud->getPaginator());
     }
 
     public function testDisplayResultsFalseAfterInit(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
-        $crud->build();
+        $crud = $this->createValidCrud()
+            ->init()
+            ->build();
 
         $this->assertInstanceOf(Crud::class, $crud->setDisplayResults(false));
         $this->assertFalse($crud->getDisplayResults());
@@ -473,8 +481,8 @@ public function testPaginator(): void
 
         $this->assertNull($crud->getPaginator());
 
-        $crud->init();
-        $crud->build();
+        $crud->init()
+            ->build();
         $this->assertInstanceOf(PaginatorInterface::class, $crud->getPaginator());
 
         $this->assertInstanceOf(Crud::class, $crud->setPaginator(null));
@@ -531,16 +539,16 @@ public function testInitIfNecessary(): void
         $crud = $this->createValidCrud();
         $this->assertFalse($crud->isInitialized());
 
-        $crud->initIfNecessary();
+        $this->assertInstanceOf(Crud::class, $crud->initIfNecessary());
         $this->assertTrue($crud->isInitialized());
     }
 
     public function testInitIfNecessaryAfterInit(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createValidCrud()
+            ->init()
+            ->initIfNecessary();
 
-        $crud->initIfNecessary();
         $this->assertTrue($crud->isInitialized());
     }
 
@@ -549,14 +557,14 @@ public function testInit(): void
         $crud = $this->createValidCrud();
         $this->assertFalse($crud->isInitialized());
 
-        $crud->init();
+        $this->assertInstanceOf(Crud::class, $crud->init());
         $this->assertTrue($crud->isInitialized());
     }
 
     public function testInitAfterInit(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createValidCrud()
+            ->init();
 
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('CRUD already initialized');
@@ -564,6 +572,30 @@ public function testInitAfterInit(): void
         $crud->init();
     }
 
+    public function testReset(): void
+    {
+        $crud = $this->createValidCrud()
+            ->init();
+
+        $this->assertInstanceOf(Crud::class, $crud->reset());
+    }
+
+    public function testResetSort(): void
+    {
+        $crud = $this->createValidCrud()
+            ->init();
+
+        $this->assertInstanceOf(Crud::class, $crud->resetSort());
+    }
+
+    public function testCreateView(): void
+    {
+        $crud = $this->createValidCrud()
+            ->init();
+
+        $this->assertInstanceOf(Crud::class, $crud->createView());
+    }
+
     public function testCallCreateSearchFormBeforeRequiredOptions(): void
     {
         $filter = $this->createMock(FilterInterface::class);
@@ -609,8 +641,8 @@ public function testCallCreateSearchFormBeforeRequiredOptions(): void
             ->setAvailableResultsPerPage([10, 50, 100], 50)
             ->setDefaultSort('username', Crud::ASC)
             ->setRoute('user_ajax_crud')
-            ->init();
-        $crud->build();
+            ->init()
+            ->build();
     }
 
     /**
@@ -641,8 +673,8 @@ public function getTestCallMethodNotAllowedBeforeInitializationProvider(): array
      */
     public function testCallMethodNotAllowedAfterInitialization(string $method, array $arguments = []): void
     {
-        $crud = $this->createValidCrud(true);
-        $crud->init();
+        $crud = $this->createValidCrud(true)
+            ->init();
 
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage(sprintf('The method "%s" cannot be called after CRUD initialization', $method));

From 159eadb8836ba016cc0aee88b9efc9eb6c4cfb92 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 18 Apr 2022 11:34:08 +0200
Subject: [PATCH 158/264] Check Crud::setAvailableResultsPerPage value

---
 src/Crud/Crud.php       |  6 ++++++
 tests/Crud/CrudTest.php | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index d37860b..7180faf 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -312,6 +312,12 @@ public function getDefaultResultsPerPage(): ?int
     public function setAvailableResultsPerPage(array $availableResultsPerPage, int $defaultValue): self
     {
         $this->crudMustNotBeInitialized();
+        if (0 === \count($availableResultsPerPage)) {
+            throw new \Exception('The 1st argument of the "setAvailableResultsPerPage" method must contain at least one integer');
+        }
+        if ($availableResultsPerPage !== array_filter($availableResultsPerPage, 'is_int')) {
+            throw new \Exception('The 1st argument of the "setAvailableResultsPerPage" method must contain only integers');
+        }
         $this->availableResultsPerPage = $availableResultsPerPage;
         $this->defaultResultsPerPage = $defaultValue;
 
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 6cc28f1..bed8272 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -263,6 +263,26 @@ public function testAvailableResultsPerPage(): void
         $this->assertSame(50, $crud->getDefaultResultsPerPage());
     }
 
+    public function testSetAvailableResultsPerPageWithEmptyArray(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The 1st argument of the "setAvailableResultsPerPage" method must contain at least one integer');
+
+        $crud->setAvailableResultsPerPage([], 1);
+    }
+
+    public function testSetAvailableResultsPerPageWithNotInteger(): void
+    {
+        $crud = $this->createCrud();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The 1st argument of the "setAvailableResultsPerPage" method must contain only integers');
+
+        $crud->setAvailableResultsPerPage([1, '10'], 1);
+    }
+
     public function testSort(): void
     {
         $crud = $this->createCrud();

From ac9502bac3d10c4f23cd0d2f55c8173d012d5304 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 18 Apr 2022 13:50:24 +0200
Subject: [PATCH 159/264] Add title_value variable in base.html.twig

---
 templates/Theme/base.html.twig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/Theme/base.html.twig b/templates/Theme/base.html.twig
index 212be19..fbc0a75 100644
--- a/templates/Theme/base.html.twig
+++ b/templates/Theme/base.html.twig
@@ -147,7 +147,8 @@
 {% apply spaceless %}
     {% if repeated_value %}
         {% if td_attr.title is not defined %}
-            {% set td_attr = td_attr|merge({title: value}) %}
+            {% set title_value = title_value|default(value) %}
+            {% set td_attr = td_attr|merge({title: title_value}) %}
         {% endif %}
         {% set value = options.repeated_values_string %}
     {% endif %}

From 67bc5dc35137d440edaebf063adfa2c1b178679f Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 18 Apr 2022 13:56:01 +0200
Subject: [PATCH 160/264] Improve crud_td unit tests

---
 tests/Twig/CrudExtensionTest.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index f3376b6..022ed22 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -558,8 +558,8 @@ public function testTdColumnNotDisplayed(): void
 
     public function testTdWithEscape(): void
     {
-        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1 é&');
-        $this->assertSame('<td>value1 é&amp;</td>', $html);
+        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1 é&>"');
+        $this->assertSame('<td>value1 é&amp;&gt;&quot;</td>', $html);
     }
 
     public function testTdWithoutEscape(): void
@@ -572,10 +572,10 @@ public function testTdWithoutEscape(): void
 
     public function testRepeatedValuesStringFirst(): CrudExtension
     {
-        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+        $html = $this->crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1 é&>"', [
             'repeated_values_string' => '"',
         ]);
-        $this->assertSame('<td>value1</td>', $html);
+        $this->assertSame('<td>value1 é&amp;&gt;&quot;</td>', $html);
 
         return $this->crudExtension;
     }
@@ -585,10 +585,10 @@ public function testRepeatedValuesStringFirst(): CrudExtension
      */
     public function testRepeatedValuesStringRepeat(CrudExtension $crudExtension): CrudExtension
     {
-        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1 é&>"', [
             'repeated_values_string' => 'Bis',
         ]);
-        $this->assertSame('<td title="value1">Bis</td>', $html);
+        $this->assertSame('<td title="value1 é&amp;&gt;&quot;">Bis</td>', $html);
 
         return $crudExtension;
     }
@@ -598,10 +598,10 @@ public function testRepeatedValuesStringRepeat(CrudExtension $crudExtension): Cr
      */
     public function testRepeatedValuesStringOtherColumn(CrudExtension $crudExtension): CrudExtension
     {
-        $html = $crudExtension->td($this->environment, 'column2', $this->createCrud(), 'value1', [
+        $html = $crudExtension->td($this->environment, 'column2', $this->createCrud(), 'value1 é&>"', [
             'repeated_values_string' => 'Bis',
         ]);
-        $this->assertSame('<td>value1</td>', $html);
+        $this->assertSame('<td>value1 é&amp;&gt;&quot;</td>', $html);
 
         return $crudExtension;
     }
@@ -611,10 +611,10 @@ public function testRepeatedValuesStringOtherColumn(CrudExtension $crudExtension
      */
     public function testRepeatedValuesStringOtherColumnRepeat(CrudExtension $crudExtension): CrudExtension
     {
-        $html = $crudExtension->td($this->environment, 'column2', $this->createCrud(), 'value1', [
+        $html = $crudExtension->td($this->environment, 'column2', $this->createCrud(), 'value1 é&>"', [
             'repeated_values_string' => 'Bis',
         ]);
-        $this->assertSame('<td title="value1">Bis</td>', $html);
+        $this->assertSame('<td title="value1 é&amp;&gt;&quot;">Bis</td>', $html);
 
         return $crudExtension;
     }
@@ -624,11 +624,11 @@ public function testRepeatedValuesStringOtherColumnRepeat(CrudExtension $crudExt
      */
     public function testRepeatedValuesStringRepeatWithMarkup(CrudExtension $crudExtension): CrudExtension
     {
-        $markup = new Markup('value1', 'UTF-8');
+        $markup = new Markup('value1 é&>"', 'UTF-8');
         $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), $markup, [
             'repeated_values_string' => 'Bis',
         ]);
-        $this->assertSame('<td title="value1">Bis</td>', $html);
+        $this->assertSame('<td title="value1 é&amp;&gt;&quot;">Bis</td>', $html);
 
         return $crudExtension;
     }
@@ -638,7 +638,7 @@ public function testRepeatedValuesStringRepeatWithMarkup(CrudExtension $crudExte
      */
     public function testRepeatedValuesStringRepeatWithTitleAttr(CrudExtension $crudExtension): CrudExtension
     {
-        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1', [
+        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value1 é&>"', [
             'repeated_values_string' => 'Bis',
             'td_attr' => ['title' => 'Repeated'],
         ]);
@@ -652,10 +652,10 @@ public function testRepeatedValuesStringRepeatWithTitleAttr(CrudExtension $crudE
      */
     public function testRepeatedValuesStringNotRepeat(CrudExtension $crudExtension): CrudExtension
     {
-        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value2', [
+        $html = $crudExtension->td($this->environment, 'column1', $this->createCrud(), 'value2 é&>"', [
             'repeated_values_string' => 'Bis',
         ]);
-        $this->assertSame('<td>value2</td>', $html);
+        $this->assertSame('<td>value2 é&amp;&gt;&quot;</td>', $html);
 
         return $crudExtension;
     }

From 661f2df898d9f9463f08842f80dc92bbf4069877 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 18 Apr 2022 14:24:29 +0200
Subject: [PATCH 161/264] Improve form_start_ajax

---
 src/Twig/CrudExtension.php       |  5 +++--
 tests/Twig/CrudExtensionTest.php | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index a9b3fd6..662f3cb 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -586,15 +586,16 @@ public function searchFormReset(Environment $environment, Crud $crud, array $opt
      * @param array $options Options:
      *                       * auto_class: Auto CSS class used. Default: ec-crud-ajax-form-auto
      *                       * ajax_options: See "ajaxAttributes" method options
+     *                       * + form_start function options
      */
     public function formStartAjax(FormView $formView, array $options = []): string
     {
         $autoClass = 'ec-crud-ajax-form-auto';
-        if (isset($options['auto_class']) && null !== isset($options['auto_class'])) {
+        if (isset($options['auto_class']) && null !== $options['auto_class']) {
             $autoClass = $options['auto_class'];
             unset($options['auto_class']);
         }
-        if (isset($options['attr']['class'])) {
+        if (isset($options['attr']['class']) && null !== $options['attr']['class']) {
             $options['attr']['class'] = sprintf('%s %s', $autoClass, $options['attr']['class']);
         } else {
             $options['attr']['class'] = $autoClass;
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 022ed22..4f149d0 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -120,6 +120,16 @@ public function testFormStartAjaxWithBadAjaxOptions(): void
         ]);
     }
 
+    public function testFormStartAjaxWithFormStartOptions(): void
+    {
+        $html = $this->crudExtension->formStartAjax($this->createFormView(), [
+            'method' => 'get',
+        ]);
+
+        $xpath = '//form[@method="get" and @action="/url" and contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")]';
+        $this->assertMatchesXpath($html, $xpath);
+    }
+
     /**
      * @dataProvider getTestAjaxAttributesProvider
      */

From 18d7cf3d9003da0e89353184bcfe2ee873f33680 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 21 Apr 2022 15:18:04 +0200
Subject: [PATCH 162/264] Improve attribute creation

---
 src/Twig/CrudExtension.php     | 98 +++++++++++++++++++---------------
 templates/Theme/base.html.twig | 18 +++----
 2 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 662f3cb..f55029a 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -17,6 +17,7 @@
 use Ecommit\Paginator\PaginatorInterface;
 use Symfony\Component\Form\FormRendererInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
@@ -169,7 +170,7 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
                     $liResolver->setAllowedTypes($option, 'array');
                 }
             },
-            'a_attr' => function (OptionsResolver $aResolver): void {
+            'a_attr' => function (OptionsResolver $aResolver, Options $parent): void {
                 $aResolver->setDefaults([
                     'first_page' => [],
                     'previous_page' => [],
@@ -180,6 +181,17 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
                 ]);
                 foreach (['first_page', 'previous_page', 'current_page', 'next_page', 'last_page', 'other_page'] as $option) {
                     $aResolver->setAllowedTypes($option, 'array');
+                    $aResolver->addNormalizer($option, function (Options $options, $value) use ($parent) {
+                        if (null !== $parent['ajax_options']) {
+                            return array_merge(
+                                $value,
+                                ['class' => (isset($value['class'])) ? $value['class'].' ec-crud-ajax-link-auto' : 'ec-crud-ajax-link-auto'],
+                                $this->getAjaxAttributes($this->validateAjaxOptions($parent['ajax_options'])),
+                            );
+                        }
+
+                        return $value;
+                    });
                 }
             },
             'render' => null,
@@ -282,7 +294,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
                     $thResolver->setAllowedTypes($option, 'array');
                 }
             },
-            'a_attr' => function (OptionsResolver $aResolver): void {
+            'a_attr' => function (OptionsResolver $aResolver, Options $parent): void {
                 $aResolver->setDefaults([
                     'sortable_active_asc' => [],
                     'sortable_active_desc' => [],
@@ -290,6 +302,17 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
                 ]);
                 foreach (['sortable_active_asc', 'sortable_active_desc', 'sortable_not_active'] as $option) {
                     $aResolver->setAllowedTypes($option, 'array');
+                    $aResolver->addNormalizer($option, function (Options $options, $value) use ($parent) {
+                        if (null !== $parent['ajax_options']) {
+                            return array_merge(
+                                $value,
+                                ['class' => (isset($value['class'])) ? $value['class'].' ec-crud-ajax-link-auto' : 'ec-crud-ajax-link-auto'],
+                                $this->getAjaxAttributes($this->validateAjaxOptions($parent['ajax_options'])),
+                            );
+                        }
+
+                        return $value;
+                    });
                 }
             },
             'render' => null,
@@ -297,6 +320,13 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
             'block' => 'th',
         ]);
         $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
+        $resolver->addNormalizer('ajax_options', function (Options $options, $value) use ($crud) {
+            if (!isset($value['update'])) {
+                $value['update'] = '#'.$crud->getDivIdList();
+            }
+
+            return $value;
+        });
         $resolver->setAllowedTypes('label', ['null', 'string']);
         $options = $resolver->resolve($this->buildOptions('crud_th', $options, $crud));
 
@@ -315,10 +345,6 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
             ]);
         }
 
-        if (!isset($options['ajax_options']['update'])) {
-            $options['ajax_options']['update'] = '#'.$crud->getDivIdList();
-        }
-
         // If the label was not defined, we take default label
         $label = $options['label'];
         if (null === $label) {
@@ -458,6 +484,18 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('form_attr', ['array']);
+        $resolver->addNormalizer('form_attr', function (Options $options, $value) use ($crud) {
+            return array_merge(
+                [
+                    'data-crud-search-id' => $crud->getDivIdSearch(),
+                    'data-crud-list-id' => $crud->getDivIdList(),
+                ],
+                $crud->getSearchForm()->vars['attr'],
+                $value,
+                $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
+                ['class' => (isset($value['class'])) ? $value['class'].' ec-crud-search-form' : 'ec-crud-search-form'],
+            );
+        });
         $options = $resolver->resolve($this->buildOptions('crud_search_form_start', $options, $crud));
 
         if ($options['render']) {
@@ -467,26 +505,6 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
             ]);
         }
 
-        $options['form_attr'] = array_merge(
-            [
-                'data-crud-search-id' => $crud->getDivIdSearch(),
-                'data-crud-list-id' => $crud->getDivIdList(),
-            ],
-            $crud->getSearchForm()->vars['attr'],
-            $options['form_attr'],
-            $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options']))
-        );
-        $class = 'ec-crud-search-form';
-        if (isset($options['form_attr']['class'])) {
-            $options['form_attr']['class'] = sprintf('%s %s', $class, $options['form_attr']['class']);
-        } else {
-            $options['form_attr']['class'] = $class;
-        }
-
-        if (!isset($options['form_attr']['novalidate'])) {
-            $options['form_attr']['novalidate'] = 'novalidate';
-        }
-
         return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
             'crud' => $crud,
             'options' => $options,
@@ -549,6 +567,18 @@ public function searchFormReset(Environment $environment, Crud $crud, array $opt
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('button_attr', ['array']);
+        $resolver->addNormalizer('button_attr', function (Options $options, $value) use ($crud) {
+            return array_merge(
+                [
+                    'data-crud-search-id' => $crud->getDivIdSearch(),
+                    'data-crud-list-id' => $crud->getDivIdList(),
+                    'data-ec-crud-ajax-url' => $crud->getSearchUrl(['reset' => 1]),
+                ],
+                $value,
+                $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
+                ['class' => (isset($value['class'])) ? $value['class'].' ec-crud-search-reset' : 'ec-crud-search-reset'],
+            );
+        });
         $options = $resolver->resolve($this->buildOptions('crud_search_form_reset', $options, $crud));
 
         if ($options['render']) {
@@ -558,22 +588,6 @@ public function searchFormReset(Environment $environment, Crud $crud, array $opt
             ]);
         }
 
-        $options['button_attr'] = array_merge(
-            [
-                'data-crud-search-id' => $crud->getDivIdSearch(),
-                'data-crud-list-id' => $crud->getDivIdList(),
-                'data-ec-crud-ajax-url' => $crud->getSearchUrl(['reset' => 1]),
-            ],
-            $options['button_attr'],
-            $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options']))
-        );
-        $class = 'ec-crud-search-reset';
-        if (isset($options['button_attr']['class'])) {
-            $options['button_attr']['class'] = sprintf('%s %s', $class, $options['button_attr']['class']);
-        } else {
-            $options['button_attr']['class'] = $class;
-        }
-
         return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
             'crud' => $crud,
             'options' => $options,
diff --git a/templates/Theme/base.html.twig b/templates/Theme/base.html.twig
index fbc0a75..fc31339 100644
--- a/templates/Theme/base.html.twig
+++ b/templates/Theme/base.html.twig
@@ -73,11 +73,8 @@
     {% if page %}
         {% set li_attr_child = li_attr_child|default([]) %}
         {% set a_attr_child = a_attr_child|default([]) %}
-        {% if ajax_options is not null %}
-            {% set a_attr_child = a_attr_child|merge({class: (a_attr_child.class|default('') ~ ' ec-crud-ajax-link-auto')|trim}) %}
-        {% endif %}
         <li{% with { attr: li_attr_child } %}{{ block('attributes', template_name) }}{% endwith %}>
-            <a href="{{ path(route_name, route_params|merge({(attribute_page): page})) }}"{% with { attr: a_attr_child } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>{{ page_label }}</a>
+            <a href="{{ path(route_name, route_params|merge({(attribute_page): page})) }}"{% with { attr: a_attr_child } %}{{ block('attributes', template_name) }}{% endwith %}>{{ page_label }}</a>
         </li>
     {% endif %}
 {% endblock %}
@@ -106,11 +103,8 @@
 {% block th_sortable_not_active %}
     {% set th_attr = th_attr.sortable_not_active|merge({class: (th_attr.sortable_not_active.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-not-active')|trim}) %}
     {% set a_attr = a_attr.sortable_not_active %}
-    {% if ajax_options is not null %}
-        {% set a_attr = a_attr|merge({class: (a_attr.class|default('') ~ ' ec-crud-ajax-link-auto')|trim}) %}
-    {% endif %}
     <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>{{ label|trans }}</a>
+        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}>{{ label|trans }}</a>
     </th>
 {% endblock %}
 
@@ -131,11 +125,8 @@
 {% endblock %}
 
 {% block th_sortable_active %}
-    {% if ajax_options is not null %}
-        {% set a_attr = a_attr|merge({class: (a_attr.class|default('') ~ ' ec-crud-ajax-link-auto')|trim}) %}
-    {% endif %}
     <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id, 'sort-direction': new_sort_direction})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}{% if ajax_options is not null %}{{ ajax_attributes(ajax_options) }}{% endif %}>
+        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id, 'sort-direction': new_sort_direction})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
             {{- label|trans }} {{ crud_icon(icon_name) -}}
         </a>
     </th>
@@ -237,6 +228,9 @@
 
 {% block search_form_start %}
 {% apply spaceless %}
+    {% if form_attr.novalidate is not defined %}
+        {% set form_attr = form_attr|merge({novalidate: 'novalidate'}) %}
+    {% endif %}
     {{ form_start(crud.searchForm, {'attr': form_attr}) }}
 {% endapply %}
 {% endblock %}

From e54eb4e9a4d7783d36ea696d9789342065dba5de Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 22 Apr 2022 19:20:01 +0200
Subject: [PATCH 163/264] [TD] Use Bootstrap tooltip

---
 templates/Theme/bootstrap3.html.twig | 13 +++++++++++++
 templates/Theme/bootstrap4.html.twig | 13 +++++++++++++
 templates/Theme/bootstrap5.html.twig | 13 +++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/templates/Theme/bootstrap3.html.twig b/templates/Theme/bootstrap3.html.twig
index 50aca24..7b68411 100644
--- a/templates/Theme/bootstrap3.html.twig
+++ b/templates/Theme/bootstrap3.html.twig
@@ -13,6 +13,19 @@
     {{ parent() }}
 {% endblock %}
 
+{# td #}
+
+{% block td %}
+{% apply spaceless %}
+    {% if repeated_value %}
+        {% if td_attr['data-toggle'] is not defined %}
+            {% set td_attr = td_attr|merge({'data-toggle': 'tooltip'}) %}
+        {% endif %}
+    {% endif %}
+    {{ parent() }}
+{% endapply %}
+{% endblock %}
+
 {# Display settings #}
 
 {% block display_settings_button %}
diff --git a/templates/Theme/bootstrap4.html.twig b/templates/Theme/bootstrap4.html.twig
index 9b70c40..efa5d4e 100644
--- a/templates/Theme/bootstrap4.html.twig
+++ b/templates/Theme/bootstrap4.html.twig
@@ -21,6 +21,19 @@
     {% endif %}
 {% endblock %}
 
+{# td #}
+
+{% block td %}
+{% apply spaceless %}
+    {% if repeated_value %}
+        {% if td_attr['data-toggle'] is not defined %}
+            {% set td_attr = td_attr|merge({'data-toggle': 'tooltip'}) %}
+        {% endif %}
+    {% endif %}
+    {{ parent() }}
+{% endapply %}
+{% endblock %}
+
 {# Display settings #}
 
 {% block display_settings_button %}
diff --git a/templates/Theme/bootstrap5.html.twig b/templates/Theme/bootstrap5.html.twig
index 46c657d..9a45aa0 100644
--- a/templates/Theme/bootstrap5.html.twig
+++ b/templates/Theme/bootstrap5.html.twig
@@ -21,6 +21,19 @@
     {% endif %}
 {% endblock %}
 
+{# td #}
+
+{% block td %}
+{% apply spaceless %}
+    {% if repeated_value %}
+        {% if td_attr['data-toggle'] is not defined %}
+            {% set td_attr = td_attr|merge({'data-toggle': 'tooltip'}) %}
+        {% endif %}
+    {% endif %}
+    {{ parent() }}
+{% endapply %}
+{% endblock %}
+
 {# Display settings #}
 
 {% block display_settings_button %}

From c1a2de157edbf11036b2ca8fdf62506fc852a482 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 27 Apr 2022 21:10:05 +0200
Subject: [PATCH 164/264] Add doctrine/persistence 3 support

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c445dea..b4f2c6f 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-mbstring": "*",
         "doctrine/doctrine-bundle": "^2.4.5",
         "doctrine/orm": "^2.9",
-        "doctrine/persistence": "^1.3|^2.0",
+        "doctrine/persistence": "^1.3|^2.0|^3.0",
         "ecommit/doctrine-utils": "1.0.x-dev",
         "ecommit/paginator": "1.0.x-dev",
         "ecommit/scalar-values": "^1.0",

From 83c49a5783616f9865861f4378359c2c8a472d8d Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 28 Apr 2022 10:19:39 +0200
Subject: [PATCH 165/264] Add missing dependencies

---
 .github/workflows/tests.yml | 6 ++++++
 .gitignore                  | 1 +
 composer.json               | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index db8a6ad..97784b6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -110,6 +110,12 @@ jobs:
                 if: matrix.coding-standards
                 run: php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
 
+            -   name: Analyze composer dependencies
+                if: matrix.coding-standards
+                run: |
+                    curl -LSs https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar > composer-require-checker.phar
+                    php composer-require-checker.phar check composer.json
+
             -   name: Check license year
                 if: matrix.coding-standards
                 run: cat LICENSE |grep -E "\(c\) ([0-9]+\-)*`date +%G`"
diff --git a/.gitignore b/.gitignore
index 0fdf336..3d41713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .php-cs-fixer.cache
 .phpunit.result.cache
 composer.lock
+/composer-require-checker.phar
 /drivers/
 /node_modules/
 /tests/Functional/App/public/build/
diff --git a/composer.json b/composer.json
index b4f2c6f..e779673 100644
--- a/composer.json
+++ b/composer.json
@@ -11,13 +11,17 @@
     ],
     "require": {
         "php": "^8.0",
+        "ext-json": "*",
         "ext-mbstring": "*",
+        "doctrine/collections": "^1.5",
+        "doctrine/dbal": "^2.13.1|^3.2",
         "doctrine/doctrine-bundle": "^2.4.5",
         "doctrine/orm": "^2.9",
         "doctrine/persistence": "^1.3|^2.0|^3.0",
         "ecommit/doctrine-utils": "1.0.x-dev",
         "ecommit/paginator": "1.0.x-dev",
         "ecommit/scalar-values": "^1.0",
+        "psr/container": "^1.1|^2.0",
         "symfony/asset": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
@@ -25,6 +29,7 @@
         "symfony/form": "^5.4|^6.0",
         "symfony/framework-bundle": "^5.4|^6.0",
         "symfony/http-client": "^5.4|^6.0",
+        "symfony/http-client-contracts": "^2.4|^3.0",
         "symfony/http-foundation": "^5.4|^6.0",
         "symfony/http-kernel": "^5.4|^6.0",
         "symfony/intl": "^5.4|^6.0",
@@ -32,7 +37,9 @@
         "symfony/property-access": "^5.4|^6.0",
         "symfony/routing": "^5.4|^6.0",
         "symfony/security-bundle": "^5.4|^6.0",
+        "symfony/security-core": "^5.4|^6.0",
         "symfony/security-csrf": "^5.4|^6.0",
+        "symfony/service-contracts": "^1.1.6|^2|^3",
         "symfony/translation": "^5.4|^6.0",
         "symfony/twig-bridge": "^5.4|^6.0",
         "symfony/twig-bundle": "^5.4|^6.0",

From 5e77662022955dc4bbf65eb46b401f61fb10ce77 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 28 Apr 2022 10:30:38 +0200
Subject: [PATCH 166/264] Upgrade dbrekelmans/bdi

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e779673..896c7cf 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
         "twig/twig": "^2.12.0|^3.0"
     },
     "require-dev": {
-        "dbrekelmans/bdi": "^0.3.0",
+        "dbrekelmans/bdi": "^1.0",
         "dg/bypass-finals": "^1.3",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^3.0",

From a59f57d205533522f875558af4d4cb760cc49094 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 30 Apr 2022 19:59:03 +0200
Subject: [PATCH 167/264] Fix repository call

---
 src/Crud/Crud.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 7180faf..d16f065 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -933,7 +933,7 @@ protected function load(): void
 
         // If persistent settings is enabled -> Retrieve from database
         if ($this->persistentSettings) {
-            $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
+            $objectDatabase = $this->container->get('doctrine')->getRepository(UserCrudSettings::class)->findOneBy(
                 [
                     'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
                     'crudName' => $this->sessionName,
@@ -963,7 +963,7 @@ protected function save(): void
 
         // Save in database
         if ($this->persistentSettings && $this->updateDatabase) {
-            $objectDatabase = $this->container->get('doctrine')->getRepository('EcommitCrudBundle:UserCrudSettings')->findOneBy(
+            $objectDatabase = $this->container->get('doctrine')->getRepository(UserCrudSettings::class)->findOneBy(
                 [
                     'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
                     'crudName' => $this->sessionName,

From 6c26b2c6cfd36bb49e016acaf79fc9052d32f2b3 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 30 Apr 2022 19:13:38 +0200
Subject: [PATCH 168/264] Fix load data from session without search form

---
 src/Crud/Crud.php       |  2 +-
 tests/Crud/CrudTest.php | 52 +++++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index d16f065..7895182 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -811,7 +811,7 @@ protected function changeSortDirection(mixed $value): void
     /**
      * User action: Changes search form values.
      */
-    protected function changeFilterValues(SearcherInterface $value): void
+    protected function changeFilterValues(?SearcherInterface $value): void
     {
         if (!$this->searchForm) {
             return;
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index bed8272..848506a 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -51,7 +51,7 @@ public function testCrudWithInvalidSessionName(string $sessionName): void
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The session name format is invalid');
 
-        $this->createCrud($sessionName);
+        $this->createCrud(sessionName: $sessionName);
     }
 
     public function getTestCrudWithInvalidSessionNameProvider(): array
@@ -66,7 +66,7 @@ public function getTestCrudWithInvalidSessionNameProvider(): array
 
     public function testGetSessionName(): void
     {
-        $crud = $this->createCrud('session_name');
+        $crud = $this->createCrud(sessionName: 'session_name');
         $this->assertSame('session_name', $crud->getSessionName());
     }
 
@@ -118,7 +118,7 @@ public function testAddColumnTooLong(): void
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The column id "'.$columnId.'" is too long');
 
-        $crud = $this->createCrud('session_name');
+        $crud = $this->createCrud();
         $crud->addColumn($columnId, 'alias', 'label');
     }
 
@@ -159,7 +159,7 @@ public function testAddColumnWithInvalidOption(): void
     {
         $this->expectException(UndefinedOptionsException::class);
 
-        $crud = $this->createCrud('session_name');
+        $crud = $this->createCrud();
         $crud->addColumn('column1', 'alias1', 'label1', [
             'bad_option' => 'value',
         ]);
@@ -169,7 +169,7 @@ public function testAddColumnWithInvalidTypeSortableOption(): void
     {
         $this->expectException(InvalidOptionsException::class);
 
-        $crud = $this->createCrud('session_name');
+        $crud = $this->createCrud();
         $crud->addColumn('column1', 'alias1', 'label1', [
             'sortable' => 'not_bool',
         ]);
@@ -179,7 +179,7 @@ public function testAddColumnWithInvalidTypeDefaultDisplayedOption(): void
     {
         $this->expectException(InvalidOptionsException::class);
 
-        $crud = $this->createCrud('session_name');
+        $crud = $this->createCrud();
         $crud->addColumn('column1', 'alias1', 'label1', [
             'default_displayed' => 'not_bool',
         ]);
@@ -190,7 +190,7 @@ public function testGetColumnNotExists(): void
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The column "invalid" does not exist');
 
-        $crud = $this->createCrud('session_name');
+        $crud = $this->createCrud();
         $crud->getColumn('invalid');
     }
 
@@ -236,7 +236,7 @@ public function testGetVirtualColumnNotExists(): void
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The column "invalid" does not exist');
 
-        $crud = $this->createCrud('session_name');
+        $crud = $this->createCrud();
         $crud->getVirtualColumn('invalid');
     }
 
@@ -410,7 +410,7 @@ public function testDivIdSearch(): void
 
     public function testDisplayResultsOnlyIfSearch(): void
     {
-        $crud = $this->createValidCrud(true);
+        $crud = $this->createValidCrud(withSearcher: true);
 
         $this->assertTrue($crud->getDisplayResults());
         $this->assertFalse($crud->getDisplayResultsOnlyIfSearch());
@@ -425,7 +425,7 @@ public function testDisplayResultsOnlyIfSearch(): void
 
     public function testDisplayResultsOnlyIfSearchWithoutSearcher(): void
     {
-        $crud = $this->createValidCrud(false);
+        $crud = $this->createValidCrud();
 
         $this->assertTrue($crud->getDisplayResults());
         $this->assertFalse($crud->getDisplayResultsOnlyIfSearch());
@@ -670,7 +670,7 @@ public function testCallCreateSearchFormBeforeRequiredOptions(): void
      */
     public function testCallMethodNotAllowedBeforeInitialization(string $method, array $arguments = []): void
     {
-        $crud = $this->createValidCrud(true);
+        $crud = $this->createValidCrud(withSearcher: true);
 
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage(sprintf('The method "%s" cannot be called before CRUD initialization', $method));
@@ -693,7 +693,7 @@ public function getTestCallMethodNotAllowedBeforeInitializationProvider(): array
      */
     public function testCallMethodNotAllowedAfterInitialization(string $method, array $arguments = []): void
     {
-        $crud = $this->createValidCrud(true)
+        $crud = $this->createValidCrud(withSearcher: true)
             ->init();
 
         $this->expectException(\Exception::class);
@@ -721,12 +721,30 @@ public function getTestCallMethodNotAllowedAfterInitializationProvider(): array
         ];
     }
 
-    protected function createCrud(string $sessionName = 'session_name', array $filters = []): Crud
+    public function testLoadSessionWithSearchForm(): void
+    {
+        $sessionValue = new CrudSession(10, ['username'], 'firstName', Crud::ASC, new UserSearcher());
+        $crud = $this->createValidCrud(crud: $this->createCrud(sessionValue: clone $sessionValue), withSearcher: true);
+        $crud->init();
+
+        $this->assertEquals($sessionValue, $crud->getSessionValues());
+    }
+
+    public function testLoadSessionWithoutSearchForm(): void
+    {
+        $sessionValue = new CrudSession(10, ['username'], 'firstName', Crud::ASC);
+        $crud = $this->createValidCrud(crud: $this->createCrud(sessionValue: clone $sessionValue));
+        $crud->init();
+
+        $this->assertEquals($sessionValue, $crud->getSessionValues());
+    }
+
+    protected function createCrud(string $sessionName = 'session_name', array $filters = [], mixed $sessionValue = null): Crud
     {
         $session = $this->createMock(SessionInterface::class);
         $session->expects($this->any())
             ->method('get')
-            ->willReturn(null);
+            ->willReturn($sessionValue);
         $session->expects($this->any())
             ->method('set');
 
@@ -766,14 +784,14 @@ protected function createCrud(string $sessionName = 'session_name', array $filte
         return $crud;
     }
 
-    protected function createValidCrud(bool $withSearcher = false): Crud
+    protected function createValidCrud(?Crud $crud = null, bool $withSearcher = false): Crud
     {
         $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
             ->createQueryBuilder('u')
             ->select('u');
 
-        $crud = $this->createCrud('session_name')
-            ->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
+        $crud = ($crud) ?: $this->createCrud('session_name');
+        $crud->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
             ->addColumn('firstName', 'u.firstName', 'first_name')
             ->setQueryBuilder($queryBuilder)
             ->setAvailableResultsPerPage([10, 50, 100], 50)

From e8061d0b1ea3f64169669d453b2dba41202d86b4 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 30 Apr 2022 19:52:17 +0200
Subject: [PATCH 169/264] Add Crud::change* tests

---
 tests/Crud/CrudTest.php | 200 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 200 insertions(+)

diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 848506a..d5a1133 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -739,6 +739,206 @@ public function testLoadSessionWithoutSearchForm(): void
         $this->assertEquals($sessionValue, $crud->getSessionValues());
     }
 
+    public function testChangeNumberResultsDisplayed(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeNumberResultsDisplayed');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, 10);
+        $this->assertSame(10, $crud->getSessionValues()->resultsPerPage);
+    }
+
+    public function testChangeNumberResultsDisplayedWithBadValue(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeNumberResultsDisplayed');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, 99);
+        $this->assertSame(50, $crud->getSessionValues()->resultsPerPage);
+    }
+
+    public function testChangeColumnsDisplayed(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeColumnsDisplayed');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, ['username']);
+        $this->assertSame(['username'], $crud->getSessionValues()->displayedColumns);
+    }
+
+    /**
+     * @dataProvider getTestChangeColumnsDisplayedWithBadValueProvider
+     */
+    public function testChangeColumnsDisplayedWithBadValue(array $value): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeColumnsDisplayed');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, $value);
+        $this->assertSame(['firstName'], $crud->getSessionValues()->displayedColumns);
+    }
+
+    public function getTestChangeColumnsDisplayedWithBadValueProvider(): array
+    {
+        return [
+            [['bad_column']],
+            [[]],
+        ];
+    }
+
+    public function testChangeSort(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, 'firstName');
+        $this->assertSame('firstName', $crud->getSessionValues()->sort);
+    }
+
+    /**
+     * @dataProvider getTestChangeSortWithBadValueProvider
+     */
+    public function testChangeSortWithBadValue(mixed $value): void
+    {
+        $crud = $this->createValidCrud()
+            ->addColumn('column_not_sortable', 'alias', 'label', ['sortable' => false])
+            ->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, $value);
+        $this->assertSame('username', $crud->getSessionValues()->sort);
+    }
+
+    public function getTestChangeSortWithBadValueProvider(): array
+    {
+        return [
+            [null],
+            [['val']], // Not scalar
+            ['bad_column'],
+            ['column_not_sortable'],
+            ['defaultPersonalizedSort'],
+        ];
+    }
+
+    public function testChangeSortPersonalizedSort(): void
+    {
+        $crud = $this->createValidCrud()
+            ->setDefaultPersonalizedSort(['criteria'])
+            ->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, 'defaultPersonalizedSort');
+        $this->assertSame('defaultPersonalizedSort', $crud->getSessionValues()->sort);
+    }
+
+    /**
+     * @dataProvider getTestChangeSortPersonalizedSortWithBadValueProvider
+     */
+    public function testChangeSortPersonalizedSortWithBadValue(mixed $value): void
+    {
+        $crud = $this->createValidCrud()
+            ->setDefaultPersonalizedSort(['criteria'])
+            ->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, $value);
+        $this->assertSame('defaultPersonalizedSort', $crud->getSessionValues()->sort);
+    }
+
+    public function getTestChangeSortPersonalizedSortWithBadValueProvider(): array
+    {
+        return [
+            [null],
+            [['val']], // Not scalar
+            ['bad_column'],
+            ['column_not_sortable'],
+        ];
+    }
+
+    public function testChangeSortDirection(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSortDirection');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, Crud::ASC);
+        $this->assertSame(Crud::ASC, $crud->getSessionValues()->sortDirection);
+    }
+
+    /**
+     * @dataProvider getTestChangeSortDirectionWithBadValueProvider
+     */
+    public function testChangeSortDirectionWithBadValue(mixed $value): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSortDirection');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, $value);
+        $this->assertSame(Crud::DESC, $crud->getSessionValues()->sortDirection);
+    }
+
+    public function getTestChangeSortDirectionWithBadValueProvider(): array
+    {
+        return [
+            [null],
+            [['val']], // Not scalar
+            ['bad_direction'],
+        ];
+    }
+
+    public function testChangeFilterValues(): void
+    {
+        $crud = $this->createValidCrud(withSearcher: true);
+        $crud->init();
+
+        $value = new UserSearcher();
+        $value->username = 'val';
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, $value);
+        $this->assertEquals($value, $crud->getSessionValues()->searchFormData);
+    }
+
+    /**
+     * @dataProvider getTestChangeFilterValuesWithBadValueProvider
+     */
+    public function testChangeFilterValuesWithBadValue(?SearcherInterface $value): void
+    {
+        $crud = $this->createValidCrud(withSearcher: true);
+        $crud->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, $value);
+        $this->assertNotEquals($value, $crud->getSessionValues()->searchFormData);
+        $this->assertEquals(new UserSearcher(), $crud->getSessionValues()->searchFormData);
+    }
+
+    public function getTestChangeFilterValuesWithBadValueProvider(): array
+    {
+        return [
+            [null],
+            [$this->createMock(SearcherInterface::class)],
+        ];
+    }
+
     protected function createCrud(string $sessionName = 'session_name', array $filters = [], mixed $sessionValue = null): Crud
     {
         $session = $this->createMock(SessionInterface::class);

From cd5a84581120fe0956ef5942b0e388f51f42adb8 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 30 Apr 2022 20:48:18 +0200
Subject: [PATCH 170/264] Checks if the search form is active in
 Crud::changeFilterValues

---
 src/Crud/Crud.php       |  2 ++
 tests/Crud/CrudTest.php | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 7895182..0d2aad8 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -814,6 +814,8 @@ protected function changeSortDirection(mixed $value): void
     protected function changeFilterValues(?SearcherInterface $value): void
     {
         if (!$this->searchForm) {
+            $this->sessionValues->searchFormData = null;
+
             return;
         }
         if (null !== $value && $value::class === \get_class($this->searchForm->getDefaultData())) {
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index d5a1133..7c4fd90 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -939,6 +939,17 @@ public function getTestChangeFilterValuesWithBadValueProvider(): array
         ];
     }
 
+    public function testChangeFilterValuesWithoutSearchForm(): void
+    {
+        $crud = $this->createValidCrud();
+        $crud->init();
+
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($crud, new UserSearcher());
+        $this->assertNull($crud->getSessionValues()->searchFormData);
+    }
+
     protected function createCrud(string $sessionName = 'session_name', array $filters = [], mixed $sessionValue = null): Crud
     {
         $session = $this->createMock(SessionInterface::class);

From 50d773d25ce104d9e3285e483289c1eafdd0b912 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 1 May 2022 11:42:10 +0200
Subject: [PATCH 171/264] Fix Psalm issues

---
 .github/workflows/tests.yml                   | 13 ++++++--
 composer.json                                 |  3 +-
 psalm.xml                                     | 16 ++++++++++
 src/Crud/Crud.php                             | 12 +++-----
 src/Crud/CrudResponseGenerator.php            |  6 +++-
 .../EcommitCrudExtension.php                  | 10 +++----
 .../Entity/EntitiesToChoicesTransformer.php   | 30 +++++++++----------
 .../Entity/EntitiesToIdsTransformer.php       | 10 +++----
 .../Entity/EntityToChoiceTransformer.php      | 24 +++++++--------
 .../Entity/EntityToIdTransformer.php          | 10 +++----
 src/Form/Filter/TextFilter.php                |  2 +-
 src/Twig/CrudExtension.php                    |  7 +++--
 12 files changed, 86 insertions(+), 57 deletions(-)
 create mode 100644 psalm.xml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 97784b6..5191886 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -40,6 +40,11 @@ jobs:
                         description: 'with Coding Standards'
                         coding-standards: true
 
+                    #Static Analysis
+                    -   php-version: '8.1'
+                        description: 'with Static Analysis'
+                        static-analysis: true
+
         name: PHP ${{ matrix.php-version }} ${{ matrix.description }}
 
         runs-on: 'ubuntu-latest'
@@ -99,11 +104,11 @@ jobs:
                     yarn encore dev
 
             -   name: Run PHPUnit
-                if: matrix.coding-standards != true
+                if: matrix.coding-standards != true && matrix.static-analysis != true
                 run: php vendor/phpunit/phpunit/phpunit
 
             -   name: Run Karma
-                if: matrix.coding-standards != true
+                if: matrix.coding-standards != true && matrix.static-analysis != true
                 run: xvfb-run ./node_modules/.bin/karma start --single-run
 
             -   name: Run PHP CS Fixer
@@ -123,3 +128,7 @@ jobs:
             -   name: Run ESLint
                 if: matrix.coding-standards
                 run: ./node_modules/.bin/eslint assets/js/* tests/assets/js/*
+
+            -   name: Run Psalm
+                if: matrix.static-analysis
+                run: php vendor/bin/psalm --stats --output-format=github --php-version=8.1
diff --git a/composer.json b/composer.json
index 896c7cf..8be944a 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,8 @@
         "symfony/dom-crawler": "^5.4|^6.0",
         "symfony/panther": "^2.0.1",
         "symfony/webpack-encore-bundle": "^1.7.3",
-        "symfony/yaml": "^5.4|^6.0"
+        "symfony/yaml": "^5.4|^6.0",
+        "vimeo/psalm": "^4.22"
     },
     "autoload": {
         "psr-4": { "Ecommit\\CrudBundle\\": "src/" }
diff --git a/psalm.xml b/psalm.xml
new file mode 100644
index 0000000..6e207b6
--- /dev/null
+++ b/psalm.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="4"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    phpVersion="8.1"
+>
+    <projectFiles>
+        <directory name="src"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+        </ignoreFiles>
+    </projectFiles>
+</psalm>
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 0d2aad8..f4e5511 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -338,7 +338,7 @@ public function getDefaultSortDirection(): ?string
      * Set the default sort.
      *
      * @param string $sort          Column id
-     * @param const  $sortDirection Sort direction (Crud::ASC / Crud::DESC)
+     * @param string $sortDirection Sort direction (Crud::ASC / Crud::DESC)
      */
     public function setDefaultSort(string $sort, string $sortDirection): self
     {
@@ -489,9 +489,7 @@ public function getSessionValues(): CrudSession
     }
 
     /**
-     * Returns the search form.
-     *
-     * @return SearchFormBuilder (before createView) or FormView (after createView)
+     * Returns the search form (SearchFormBuilder object before createView or FormView object after createView).
      */
     public function getSearchForm(): SearchFormBuilder|FormView|null
     {
@@ -611,7 +609,7 @@ protected function buildPaginator(): void
             return;
         }
 
-        if (\is_object($this->buildPaginator) && $this->buildPaginator instanceof \Closure) {
+        if ($this->buildPaginator instanceof \Closure) {
             // Case: Manual paginator (by closure) is enabled
             $this->paginator = $this->buildPaginator->__invoke(
                 $this->queryBuilder,
@@ -876,9 +874,7 @@ protected function processRequest(): void
     }
 
     /**
-     * Returns the search form.
-     *
-     * @return Form (before createView) or FormView (after createView)
+     * Returns the search form (FormInterface object before createView or FormView object after createView).
      */
     public function getDisplaySettingsForm(): FormInterface|FormView|null
     {
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index e0d1c63..475bc49 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -14,6 +14,7 @@
 namespace Ecommit\CrudBundle\Crud;
 
 use Psr\Container\ContainerInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
@@ -53,9 +54,12 @@ public function getAjaxResponse(Crud $crud, array $options = []): Response
                 'render_list' => $this->renderCrudView($this->getTemplateName($options['template_generator'], 'list'), $data),
             ]);
         } elseif ($request->query->has('display-settings')) {
+            /** @var FormView $displaySettingsForm */
+            $displaySettingsForm = $crud->getDisplaySettingsForm();
+
             return new JsonResponse([
                 'render_list' => $this->renderCrudView($this->getTemplateName($options['template_generator'], 'list'), $data),
-                'form_is_valid' => $crud->getDisplaySettingsForm()->vars['valid'],
+                'form_is_valid' => $displaySettingsForm->vars['valid'],
             ]);
         }
 
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index 9ac8b37..1209090 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -29,18 +29,18 @@ class EcommitCrudExtension extends Extension
      *
      * @throws \InvalidArgumentException When provided tag is not defined in this extension
      */
-    public function load(array $config, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $config);
+        $configs = $this->processConfiguration($configuration, $configs);
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
         $loader->load('services.xml');
         $loader->load('filters.xml');
 
-        $container->setParameter('ecommit_crud.theme', $config['theme']);
-        $container->setParameter('ecommit_crud.icon_theme', $config['icon_theme']);
-        $container->setParameter('ecommit_crud.twig_functions_configuration', $config['twig_functions_configuration']);
+        $container->setParameter('ecommit_crud.theme', $configs['theme']);
+        $container->setParameter('ecommit_crud.icon_theme', $configs['icon_theme']);
+        $container->setParameter('ecommit_crud.twig_functions_configuration', $configs['twig_functions_configuration']);
 
         $container->registerForAutoconfiguration(FilterInterface::class)->addTag('ecommit_crud.filter');
     }
diff --git a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
index 80dbf04..4ec0baf 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
@@ -28,18 +28,18 @@ public function __construct(QueryBuilder $queryBuilder, string $identifier, mixe
         parent::__construct($queryBuilder, $identifier, $choiceLabel, $throwExceptionIfValueNotFoundInReverse);
     }
 
-    public function transform(mixed $collection)
+    public function transform(mixed $value)
     {
-        if (null === $collection) {
+        if (null === $value) {
             return [];
         }
 
-        if (!($collection instanceof Collection)) {
-            throw new UnexpectedTypeException($collection, Collection::class);
+        if (!($value instanceof Collection)) {
+            throw new UnexpectedTypeException($value, Collection::class);
         }
 
         $results = [];
-        foreach ($collection as $entity) {
+        foreach ($value as $entity) {
             $identifier = (string) $this->accessor->getValue($entity, $this->identifier);
             $label = $this->extractLabel($entity);
 
@@ -49,28 +49,28 @@ public function transform(mixed $collection)
         return $results;
     }
 
-    public function reverseTransform(mixed $identifiers)
+    public function reverseTransform(mixed $value)
     {
         $collection = new ArrayCollection();
 
-        if ('' === $identifiers || null === $identifiers) {
+        if ('' === $value || null === $value) {
             return $collection;
         }
 
-        if (!\is_array($identifiers)) {
+        if (!\is_array($value)) {
             throw new TransformationFailedException('This collection must be an array');
         }
-        $identifiers = ScalarValues::filterScalarValues($identifiers);
+        $value = ScalarValues::filterScalarValues($value);
 
-        if (0 === \count($identifiers)) {
+        if (0 === \count($value)) {
             return $collection;
         }
-        $identifiers = array_unique($identifiers);
-        if (\count($identifiers) > $this->maxResults) {
+        $value = array_unique($value);
+        if (\count($value) > $this->maxResults) {
             throw new TransformationFailedException(sprintf('This collection should contain %s elements or less.', $this->maxResults));
         }
 
-        $hash = $this->getCacheHash($identifiers);
+        $hash = $this->getCacheHash($value);
         if (\array_key_exists($hash, $this->cachedResults)) {
             $collection = $this->cachedResults[$hash];
         } else {
@@ -79,14 +79,14 @@ public function reverseTransform(mixed $identifiers)
             try {
                 $queryBuilderLoader = new ORMQueryBuilderLoader($this->queryBuilder);
 
-                foreach ($queryBuilderLoader->getEntitiesByIds($this->identifier, $identifiers) as $entity) {
+                foreach ($queryBuilderLoader->getEntitiesByIds($this->identifier, $value) as $entity) {
                     $collection->add($entity);
                 }
             } catch (\Exception $exception) {
                 throw new TransformationFailedException('Tranformation: Query Error');
             }
 
-            if ($collection->count() !== \count($identifiers) && $this->throwExceptionIfValueNotFoundInReverse) {
+            if ($collection->count() !== \count($value) && $this->throwExceptionIfValueNotFoundInReverse) {
                 throw new TransformationFailedException('Entities not found');
             }
 
diff --git a/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
index 90dbe36..c649c66 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
@@ -18,18 +18,18 @@
 
 class EntitiesToIdsTransformer extends EntitiesToChoicesTransformer
 {
-    public function transform(mixed $collection)
+    public function transform(mixed $value)
     {
-        if (null === $collection) {
+        if (null === $value) {
             return [];
         }
 
-        if (!($collection instanceof Collection)) {
-            throw new UnexpectedTypeException($collection, Collection::class);
+        if (!($value instanceof Collection)) {
+            throw new UnexpectedTypeException($value, Collection::class);
         }
 
         $results = [];
-        foreach ($collection as $entity) {
+        foreach ($value as $entity) {
             $identifier = (string) $this->accessor->getValue($entity, $this->identifier);
 
             $results[] = $identifier;
diff --git a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
index 4563022..4d2f80d 100644
--- a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
@@ -19,35 +19,35 @@
 
 class EntityToChoiceTransformer extends AbstractEntityTransformer
 {
-    public function transform(mixed $entity)
+    public function transform(mixed $value)
     {
-        if (null === $entity || '' === $entity) {
+        if (null === $value || '' === $value) {
             return null;
         }
 
-        if (!\is_object($entity)) {
-            throw new UnexpectedTypeException($entity, 'object');
+        if (!\is_object($value)) {
+            throw new UnexpectedTypeException($value, 'object');
         }
 
-        $identifier = (string) $this->accessor->getValue($entity, $this->identifier);
-        $label = $this->extractLabel($entity);
+        $identifier = (string) $this->accessor->getValue($value, $this->identifier);
+        $label = $this->extractLabel($value);
 
         $results[$identifier] = $label;
 
         return $results;
     }
 
-    public function reverseTransform(mixed $identifier)
+    public function reverseTransform(mixed $value)
     {
-        if ('' === $identifier || null === $identifier) {
+        if ('' === $value || null === $value) {
             return null;
         }
 
-        if (!\is_scalar($identifier)) {
+        if (!\is_scalar($value)) {
             throw new TransformationFailedException('Value is not scalar');
         }
 
-        $hash = $this->getCacheHash($identifier);
+        $hash = $this->getCacheHash($value);
         if (\array_key_exists($hash, $this->cachedResults)) {
             $entity = $this->cachedResults[$hash];
         } else {
@@ -55,13 +55,13 @@ public function reverseTransform(mixed $identifier)
 
             try {
                 $queryBuilderLoader = new ORMQueryBuilderLoader($this->queryBuilder);
-                $entities = $queryBuilderLoader->getEntitiesByIds($this->identifier, [$identifier]);
+                $entities = $queryBuilderLoader->getEntitiesByIds($this->identifier, [$value]);
             } catch (\Exception $exception) {
                 throw new TransformationFailedException('Tranformation: Query Error');
             }
             if (1 !== \count($entities)) {
                 if ($this->throwExceptionIfValueNotFoundInReverse) {
-                    throw new TransformationFailedException(sprintf('The entity with key "%s" could not be found or is not unique', $identifier));
+                    throw new TransformationFailedException(sprintf('The entity with key "%s" could not be found or is not unique', (string) $value));
                 }
 
                 return null;
diff --git a/src/Form/DataTransformer/Entity/EntityToIdTransformer.php b/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
index 1874fca..864d06b 100644
--- a/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
@@ -17,17 +17,17 @@
 
 class EntityToIdTransformer extends EntityToChoiceTransformer
 {
-    public function transform(mixed $entity)
+    public function transform(mixed $value)
     {
-        if (null === $entity || '' === $entity) {
+        if (null === $value || '' === $value) {
             return null;
         }
 
-        if (!\is_object($entity)) {
-            throw new UnexpectedTypeException($entity, 'object');
+        if (!\is_object($value)) {
+            throw new UnexpectedTypeException($value, 'object');
         }
 
-        $identifier = (string) $this->accessor->getValue($entity, $this->identifier);
+        $identifier = (string) $this->accessor->getValue($value, $this->identifier);
 
         return $identifier;
     }
diff --git a/src/Form/Filter/TextFilter.php b/src/Form/Filter/TextFilter.php
index f23d240..2f45383 100644
--- a/src/Form/Filter/TextFilter.php
+++ b/src/Form/Filter/TextFilter.php
@@ -35,7 +35,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
 
     public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
     {
-        if (null === $value || '' === $value || !\is_scalar($value)) {
+        if (null === $value || '' === $value || !\is_string($value)) {
             return;
         }
 
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index f55029a..983a076 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -485,12 +485,15 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('form_attr', ['array']);
         $resolver->addNormalizer('form_attr', function (Options $options, $value) use ($crud) {
+            /** @var FormView $searchForm */
+            $searchForm = $crud->getSearchForm();
+
             return array_merge(
                 [
                     'data-crud-search-id' => $crud->getDivIdSearch(),
                     'data-crud-list-id' => $crud->getDivIdList(),
                 ],
-                $crud->getSearchForm()->vars['attr'],
+                $searchForm->vars['attr'],
                 $value,
                 $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
                 ['class' => (isset($value['class'])) ? $value['class'].' ec-crud-search-form' : 'ec-crud-search-form'],
@@ -709,7 +712,7 @@ public function crudIcon(Environment $environment, string $iconName, ?string $ic
         return $this->renderBlock($environment, $iconTheme, $iconName);
     }
 
-    protected function renderBlock(Environment $environment, string $templateName, string $blockName, array $parameters = []): ?string
+    protected function renderBlock(Environment $environment, string $templateName, string $blockName, array $parameters = []): string
     {
         $template = $environment->load($templateName);
 

From 6c982c9a3264199779e9fc80a04c03a9cc86bfb5 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 2 May 2022 10:11:53 +0200
Subject: [PATCH 172/264] Fix Psalm issues (level 2)

---
 .github/workflows/tests.yml                   |  2 +-
 .php-cs-fixer.dist.php                        |  1 +
 doc/cookbook/advanced-searcher.md             |  4 +-
 doc/cookbook/http.md                          |  2 +-
 psalm.xml                                     | 44 ++++++++++++++++++-
 src/Crud/Crud.php                             | 21 +++++----
 src/Crud/Http/QueryBuilder.php                |  8 ++--
 src/Crud/SearchFormBuilder.php                |  4 ++
 .../Compiler/TwigFormPass.php                 |  3 ++
 src/DependencyInjection/Configuration.php     |  2 +
 .../EcommitCrudExtension.php                  |  2 +-
 src/Entity/UserCrudSettings.php               | 22 +++++++---
 src/EventListener/MappingEntities.php         |  3 +-
 .../Entity/EntityToChoiceTransformer.php      |  1 +
 src/Form/Filter/AbstractFilter.php            |  2 +-
 src/Form/Filter/BooleanFilter.php             |  2 +-
 src/Form/Filter/ChoiceFilter.php              |  2 +-
 src/Form/Filter/CollectionFilterTrait.php     |  2 +-
 src/Form/Filter/DateFilter.php                |  2 +-
 src/Form/Filter/EntityAjaxFilter.php          |  2 +-
 src/Form/Filter/EntityFilter.php              |  2 +-
 src/Form/Filter/FilterInterface.php           |  2 +-
 src/Form/Filter/IntegerFilter.php             |  4 +-
 src/Form/Filter/NotNullFilter.php             |  2 +-
 src/Form/Filter/NullFilter.php                |  2 +-
 src/Form/Filter/NumberFilter.php              |  2 +-
 src/Form/Filter/TextFilter.php                |  2 +-
 src/Form/Searcher/AbstractSearcher.php        |  2 +-
 src/Form/Searcher/SearcherInterface.php       |  2 +-
 src/Form/Type/EntityAjaxType.php              |  8 ++--
 src/Twig/CrudExtension.php                    | 15 ++++---
 .../App/DataFixtures/TestUserFixtures.php     | 15 ++++---
 32 files changed, 131 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5191886..20a51db 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -131,4 +131,4 @@ jobs:
 
             -   name: Run Psalm
                 if: matrix.static-analysis
-                run: php vendor/bin/psalm --stats --output-format=github --php-version=8.1
+                run: php vendor/bin/psalm --stats --output-format=github
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 70910b3..209f0d2 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -37,6 +37,7 @@
         'phpdoc_order' => true,
         'protected_to_private' => false,
         'fully_qualified_strict_types' => false,
+        'phpdoc_to_comment' => false, // PSALM comments
     ])
     ->setFinder($finder)
 ;
diff --git a/doc/cookbook/advanced-searcher.md b/doc/cookbook/advanced-searcher.md
index 13b544c..1e04195 100644
--- a/doc/cookbook/advanced-searcher.md
+++ b/doc/cookbook/advanced-searcher.md
@@ -33,7 +33,7 @@ class CarSearcher extends AbstractSearcher
         ]);
     }
     
-    public function updateQueryBuilder($queryBuilder, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, array $options): void
     {
         //Traitement du filtre de recherche "name"
         if (null !== $this->name) {
@@ -61,7 +61,7 @@ class CarSearcher extends AbstractSearcher
      */
     public $name;
 
-    public function updateQueryBuilder($queryBuilder, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, array $options): void
     {
         //Traitement du filtre de recherche "name"
         if (null !== $this->name) {
diff --git a/doc/cookbook/http.md b/doc/cookbook/http.md
index cbe02cd..03c20e7 100644
--- a/doc/cookbook/http.md
+++ b/doc/cookbook/http.md
@@ -160,7 +160,7 @@ class CitySearcher extends AbstractSearcher
         ]);
     }
 
-    public function updateQueryBuilder($queryBuilder, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, array $options): void
     {
         //Traitement de la recherche
 
diff --git a/psalm.xml b/psalm.xml
index 6e207b6..9e69ce1 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="4"
+    errorLevel="2"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
@@ -13,4 +13,46 @@
             <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
+
+    <issueHandlers>
+        <ArgumentTypeCoercion>
+            <errorLevel type="suppress">
+                <file name="src/Entity/UserCrudSettings.php" />
+                <file name="src/EventListener/MappingEntities.php" />
+            </errorLevel>
+        </ArgumentTypeCoercion>
+
+        <PossiblyNullArgument>
+            <errorLevel type="suppress">
+                <file name="src/Crud/Crud.php" />
+            </errorLevel>
+        </PossiblyNullArgument>
+
+        <PossiblyNullPropertyAssignmentValue>
+            <errorLevel type="suppress">
+                <file name="src/Crud/Crud.php" />
+            </errorLevel>
+        </PossiblyNullPropertyAssignmentValue>
+
+        <PossiblyNullReference>
+            <errorLevel type="suppress">
+                <file name="src/Crud/Crud.php" />
+                <file name="src/DependencyInjection/Configuration.php" />
+            </errorLevel>
+        </PossiblyNullReference>
+
+        <PossiblyUndefinedMethod>
+            <errorLevel type="suppress">
+                <file name="src/Crud/Crud.php" />
+                <file name="src/DependencyInjection/Configuration.php" />
+                <directory name="src/Form/Filter" />
+            </errorLevel>
+        </PossiblyUndefinedMethod>
+
+        <PropertyNotSetInConstructor>
+            <errorLevel type="suppress">
+                <file name="src/Crud/Crud.php" />
+            </errorLevel>
+        </PropertyNotSetInConstructor>
+    </issueHandlers>
 </psalm>
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index f4e5511..e8b21b3 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -115,6 +115,7 @@ public function init(): self
             // We have not to allocate directelly the "$this->sessionValues->searchFormData" object
             // because otherwise it will be linked to form, and will be updated when the "bind" function will
             // be called (If form is not valid, the session values will still be updated: Undesirable behavior)
+            /** @psalm-suppress PossiblyInvalidClone */
             $values = clone $this->sessionValues->searchFormData;
             try {
                 $this->searchForm->getForm()->setData($values);
@@ -774,15 +775,13 @@ protected function changeColumnsDisplayed(array $value): void
 
     /**
      * User Action: Changes sort.
-     *
-     * @param string $value Column id
      */
     protected function changeSort(mixed $value): void
     {
         $oldValue = $this->sessionValues->sort;
         $availableColumns = $this->availableColumns;
-        if ((\is_scalar($value) && \array_key_exists($value, $availableColumns) && $availableColumns[$value]->sortable)
-            || (\is_scalar($value) && 'defaultPersonalizedSort' === $value && $this->defaultPersonalizedSort)) {
+        if ((\is_string($value) && \array_key_exists($value, $availableColumns) && $availableColumns[$value]->sortable)
+            || (\is_string($value) && 'defaultPersonalizedSort' === $value && $this->defaultPersonalizedSort)) {
             $this->sessionValues->sort = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
@@ -797,7 +796,7 @@ protected function changeSort(mixed $value): void
     protected function changeSortDirection(mixed $value): void
     {
         $oldValue = $this->sessionValues->sortDirection;
-        if (\is_scalar($value) && (self::ASC === $value || self::DESC === $value)) {
+        if (\is_string($value) && (self::ASC === $value || self::DESC === $value)) {
             $this->sessionValues->sortDirection = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
@@ -980,10 +979,14 @@ protected function save(): void
                     $this->sessionValues->sortDirection != $this->defaultSortDirection ||
                     $this->sessionValues->sort != $this->defaultSort
                 ) {
-                    $objectDatabase = new UserCrudSettings();
-                    $objectDatabase->setUser($this->container->get('security.token_storage')->getToken()->getUser());
-                    $objectDatabase->setCrudName($this->sessionName);
-                    $objectDatabase->updateFromSessionManager($this->sessionValues);
+                    $objectDatabase = new UserCrudSettings(
+                        $this->container->get('security.token_storage')->getToken()->getUser(),
+                        $this->sessionName,
+                        $this->sessionValues->resultsPerPage,
+                        $this->sessionValues->displayedColumns,
+                        $this->sessionValues->sort,
+                        $this->sessionValues->sortDirection
+                    );
                     $em->persist($objectDatabase);
                     $em->flush();
                 }
diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index 6404ceb..dfefe6d 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -29,12 +29,14 @@ final class QueryBuilder implements QueryBuilderInterface
     protected ?\Closure $orderBuilder = null;
     protected ?\Closure $paginationBuilder = null;
     protected array $orders = [];
+    protected HttpClientInterface $client;
 
-    public function __construct(protected string $url, protected string $httpMethod, protected ?HttpClientInterface $client = null)
+    public function __construct(protected string $url, protected string $httpMethod, ?HttpClientInterface $client = null)
     {
-        if (null === $this->client) {
-            $this->client = HttpClient::create();
+        if (null === $client) {
+            $client = HttpClient::create();
         }
+        $this->client = $client;
     }
 
     /**
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index 2b42a2c..a94f8ee 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -97,6 +97,7 @@ public function addFilter(string $property, string $filter, array $options = [])
 
     public function addField(string $property, string $type, array $options = []): self
     {
+        /** @psalm-suppress PossiblyUndefinedMethod */
         $this->form->add($property, $type, $options);
 
         return $this;
@@ -129,7 +130,9 @@ public function createForm(): self
             $filterService->buildForm($this, $property, $filter['options']);
         }
 
+        /** @psalm-suppress PossiblyUndefinedMethod */
         $this->form->setAction($this->crud->getSearchUrl());
+        /** @psalm-suppress PossiblyUndefinedMethod */
         $this->form = $this->form->getForm();
 
         return $this;
@@ -161,6 +164,7 @@ protected function resolveFilters(): void
 
     public function createFormView(): self
     {
+        /** @psalm-suppress PossiblyUndefinedMethod */
         $this->form = $this->form->createView();
 
         return $this;
diff --git a/src/DependencyInjection/Compiler/TwigFormPass.php b/src/DependencyInjection/Compiler/TwigFormPass.php
index da2cceb..ca5b402 100644
--- a/src/DependencyInjection/Compiler/TwigFormPass.php
+++ b/src/DependencyInjection/Compiler/TwigFormPass.php
@@ -18,6 +18,9 @@
 
 class TwigFormPass implements CompilerPassInterface
 {
+    /**
+     * @psalm-suppress PossiblyInvalidArgument
+     */
     public function process(ContainerBuilder $container): void
     {
         $container->setParameter('twig.form.resources', array_merge(
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index b9fcab8..5da11f2 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -13,6 +13,7 @@
 
 namespace Ecommit\CrudBundle\DependencyInjection;
 
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -29,6 +30,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('ecommit_crud');
+        /** @var ArrayNodeDefinition $rootNode */
         $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index 1209090..b9824e7 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -24,7 +24,7 @@ class EcommitCrudExtension extends Extension
     /**
      * Loads a specific configuration.
      *
-     * @param array            $config    An array of configuration values
+     * @param array            $configs   An array of configuration values
      * @param ContainerBuilder $container A ContainerBuilder instance
      *
      * @throws \InvalidArgumentException When provided tag is not defined in this extension
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index 8f95311..ff0eead 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -22,23 +22,33 @@ class UserCrudSettings
 {
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: 'Ecommit\CrudBundle\Entity\UserCrudInterface')]
-    protected $user;
+    protected UserCrudInterface $user;
 
     #[ORM\Id]
     #[ORM\Column(type: 'string', length: 255, name: 'crud_name')]
-    protected $crudName;
+    protected string $crudName;
 
     #[ORM\Column(type: 'integer', name: 'results_displayed')]
-    protected $resultsDisplayed;
+    protected int $resultsDisplayed;
 
     #[ORM\Column(type: 'json', name: 'displayed_columns')]
-    protected $displayedColumns = [];
+    protected array $displayedColumns = [];
 
     #[ORM\Column(type: 'string', length: 100)]
-    protected $sort;
+    protected string $sort;
 
     #[ORM\Column(type: 'string', length: 4)]
-    protected $sortDirection;
+    protected string $sortDirection;
+
+    public function __construct(UserCrudInterface $user, string $crudName, int $resultsDisplayed, array $displayedColumns, string $sort, string $sortDirection)
+    {
+        $this->user = $user;
+        $this->crudName = $crudName;
+        $this->resultsDisplayed = $resultsDisplayed;
+        $this->displayedColumns = $displayedColumns;
+        $this->sort = $sort;
+        $this->sortDirection = $sortDirection;
+    }
 
     public function setCrudName(string $crudName): self
     {
diff --git a/src/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
index ed6316e..69d24f2 100644
--- a/src/EventListener/MappingEntities.php
+++ b/src/EventListener/MappingEntities.php
@@ -18,7 +18,7 @@
 
 final class MappingEntities
 {
-    protected $isLoad = false;
+    protected bool $isLoad = false;
 
     public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
@@ -28,6 +28,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
             return;
         }
 
+        /** @var string $className */
         $className = $metadata->getName();
         if (!$this->isLoad && is_subclass_of($className, 'Ecommit\CrudBundle\Entity\UserCrudInterface')) {
             $userCrudSettingsMetadata = $eventArgs->getEntityManager()->getMetadataFactory()->getMetadataFor('Ecommit\CrudBundle\Entity\UserCrudSettings');
diff --git a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
index 4d2f80d..300c825 100644
--- a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
@@ -32,6 +32,7 @@ public function transform(mixed $value)
         $identifier = (string) $this->accessor->getValue($value, $this->identifier);
         $label = $this->extractLabel($value);
 
+        /** @psalm-suppress PossiblyUndefinedVariable */
         $results[$identifier] = $label;
 
         return $results;
diff --git a/src/Form/Filter/AbstractFilter.php b/src/Form/Filter/AbstractFilter.php
index ce7367d..8ba31f2 100644
--- a/src/Form/Filter/AbstractFilter.php
+++ b/src/Form/Filter/AbstractFilter.php
@@ -22,7 +22,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
     {
     }
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
     }
 
diff --git a/src/Form/Filter/BooleanFilter.php b/src/Form/Filter/BooleanFilter.php
index 6dfb9cf..7f5744d 100644
--- a/src/Form/Filter/BooleanFilter.php
+++ b/src/Form/Filter/BooleanFilter.php
@@ -34,7 +34,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         $builder->addField($property, ChoiceType::class, $typeOptions);
     }
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         if (null === $value || '' === $value || !\is_scalar($value)) {
             return;
diff --git a/src/Form/Filter/ChoiceFilter.php b/src/Form/Filter/ChoiceFilter.php
index 685961d..96c3334 100644
--- a/src/Form/Filter/ChoiceFilter.php
+++ b/src/Form/Filter/ChoiceFilter.php
@@ -29,7 +29,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         $builder->addField($property, $options['type'], $typeOptions);
     }
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         $this->updateCollectionQueryBuilder($queryBuilder, $property, $value, $options);
     }
diff --git a/src/Form/Filter/CollectionFilterTrait.php b/src/Form/Filter/CollectionFilterTrait.php
index e73d3f1..95896cf 100644
--- a/src/Form/Filter/CollectionFilterTrait.php
+++ b/src/Form/Filter/CollectionFilterTrait.php
@@ -38,7 +38,7 @@ protected function getCollectionTypeOptions(array $options): array
         ];
     }
 
-    protected function updateCollectionQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    protected function updateCollectionQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         if (null === $value || '' === $value || [] === $value) {
             return;
diff --git a/src/Form/Filter/DateFilter.php b/src/Form/Filter/DateFilter.php
index f4cb7ed..4090c71 100644
--- a/src/Form/Filter/DateFilter.php
+++ b/src/Form/Filter/DateFilter.php
@@ -35,7 +35,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         $builder->addField($property, $type, $typeOptions);
     }
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         if (null === $value || '' === $value || !$value instanceof \DateTimeInterface) {
             return;
diff --git a/src/Form/Filter/EntityAjaxFilter.php b/src/Form/Filter/EntityAjaxFilter.php
index 77270c6..700579a 100644
--- a/src/Form/Filter/EntityAjaxFilter.php
+++ b/src/Form/Filter/EntityAjaxFilter.php
@@ -51,7 +51,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         }
     }
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         $this->updateCollectionQueryBuilder($queryBuilder, $property, $value, $options);
     }
diff --git a/src/Form/Filter/EntityFilter.php b/src/Form/Filter/EntityFilter.php
index 3c4f24f..af14ed9 100644
--- a/src/Form/Filter/EntityFilter.php
+++ b/src/Form/Filter/EntityFilter.php
@@ -63,7 +63,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         }
     }
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         $this->updateCollectionQueryBuilder($queryBuilder, $property, $value, $options);
     }
diff --git a/src/Form/Filter/FilterInterface.php b/src/Form/Filter/FilterInterface.php
index d93ef4a..059e7ef 100644
--- a/src/Form/Filter/FilterInterface.php
+++ b/src/Form/Filter/FilterInterface.php
@@ -20,7 +20,7 @@ interface FilterInterface
 {
     public function buildForm(SearchFormBuilder $builder, string $property, array $options): void;
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void;
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void;
 
     public function configureOptions(OptionsResolver $resolver): void;
 
diff --git a/src/Form/Filter/IntegerFilter.php b/src/Form/Filter/IntegerFilter.php
index dd4b8b3..3ef4840 100644
--- a/src/Form/Filter/IntegerFilter.php
+++ b/src/Form/Filter/IntegerFilter.php
@@ -31,7 +31,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         $builder->addField($property, IntegerType::class, $typeOptions);
     }
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         if (null === $value || '' === $value || !\is_scalar($value) || !$this->testNumberValue($value)) {
             return;
@@ -43,7 +43,7 @@ public function updateQueryBuilder($queryBuilder, string $property, $value, arra
             ->setParameter($parameterName, $value);
     }
 
-    protected function testNumberValue($value): bool
+    protected function testNumberValue(mixed $value): bool
     {
         return \is_int($value) || (\is_string($value) && preg_match('/^\d+$/', $value));
     }
diff --git a/src/Form/Filter/NotNullFilter.php b/src/Form/Filter/NotNullFilter.php
index a64cce9..52a9291 100644
--- a/src/Form/Filter/NotNullFilter.php
+++ b/src/Form/Filter/NotNullFilter.php
@@ -15,7 +15,7 @@
 
 class NotNullFilter extends NullFilter
 {
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         if (!$value) {
             return;
diff --git a/src/Form/Filter/NullFilter.php b/src/Form/Filter/NullFilter.php
index 10f5584..63ed03e 100644
--- a/src/Form/Filter/NullFilter.php
+++ b/src/Form/Filter/NullFilter.php
@@ -24,7 +24,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         $builder->addField($property, CheckboxType::class, $typeOptions);
     }
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         if (!$value) {
             return;
diff --git a/src/Form/Filter/NumberFilter.php b/src/Form/Filter/NumberFilter.php
index b44c91a..53f0de3 100644
--- a/src/Form/Filter/NumberFilter.php
+++ b/src/Form/Filter/NumberFilter.php
@@ -24,7 +24,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         $builder->addField($property, NumberType::class, $typeOptions);
     }
 
-    protected function testNumberValue($value): bool
+    protected function testNumberValue(mixed $value): bool
     {
         return is_numeric($value);
     }
diff --git a/src/Form/Filter/TextFilter.php b/src/Form/Filter/TextFilter.php
index 2f45383..9d6569e 100644
--- a/src/Form/Filter/TextFilter.php
+++ b/src/Form/Filter/TextFilter.php
@@ -33,7 +33,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         $builder->addField($property, $options['type'], $typeOptions);
     }
 
-    public function updateQueryBuilder($queryBuilder, string $property, $value, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed $value, array $options): void
     {
         if (null === $value || '' === $value || !\is_string($value)) {
             return;
diff --git a/src/Form/Searcher/AbstractSearcher.php b/src/Form/Searcher/AbstractSearcher.php
index af9742f..a4ae6c6 100644
--- a/src/Form/Searcher/AbstractSearcher.php
+++ b/src/Form/Searcher/AbstractSearcher.php
@@ -22,7 +22,7 @@ public function buildForm(SearchFormBuilder $builder, array $options): void
     {
     }
 
-    public function updateQueryBuilder($queryBuilder, array $options): void
+    public function updateQueryBuilder(mixed $queryBuilder, array $options): void
     {
     }
 
diff --git a/src/Form/Searcher/SearcherInterface.php b/src/Form/Searcher/SearcherInterface.php
index 1b515cb..d56b0eb 100644
--- a/src/Form/Searcher/SearcherInterface.php
+++ b/src/Form/Searcher/SearcherInterface.php
@@ -20,7 +20,7 @@ interface SearcherInterface
 {
     public function buildForm(SearchFormBuilder $builder, array $options): void;
 
-    public function updateQueryBuilder($queryBuilder, array $options): void;
+    public function updateQueryBuilder(mixed $queryBuilder, array $options): void;
 
     public function configureOptions(OptionsResolver $resolver): void;
 }
diff --git a/src/Form/Type/EntityAjaxType.php b/src/Form/Type/EntityAjaxType.php
index 76b08c6..a3cdc69 100644
--- a/src/Form/Type/EntityAjaxType.php
+++ b/src/Form/Type/EntityAjaxType.php
@@ -13,7 +13,9 @@
 
 namespace Ecommit\CrudBundle\Form\Type;
 
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ObjectManager;
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToChoicesTransformer;
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToChoiceTransformer;
 use Symfony\Component\Form\AbstractType;
@@ -84,7 +86,7 @@ public function configureOptions(OptionsResolver $resolver): void
             'identifier' => null, // Internal
         ]);
 
-        $emNormalizer = function (Options $options, $em) {
+        $emNormalizer = function (Options $options, ?string $em): ObjectManager {
             if (null !== $em) {
                 return $this->registry->getManager($em);
             }
@@ -98,7 +100,7 @@ public function configureOptions(OptionsResolver $resolver): void
         };
         $resolver->setNormalizer('em', $emNormalizer);
 
-        $queryBuilderNormalizer = function (Options $options, $queryBuilder) {
+        $queryBuilderNormalizer = function (Options $options, null|QueryBuilder|\Closure $queryBuilder): QueryBuilder {
             $em = $options['em'];
             $class = $options['class'];
 
@@ -116,7 +118,7 @@ public function configureOptions(OptionsResolver $resolver): void
         };
         $resolver->setNormalizer('query_builder', $queryBuilderNormalizer);
 
-        $identifierNormalizer = function (Options $options, $identifier) {
+        $identifierNormalizer = function (Options $options, ?string $identifier): string {
             if (null !== $identifier) {
                 return $identifier;
             }
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 983a076..cbdb853 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -25,13 +25,13 @@
 
 final class CrudExtension extends AbstractExtension
 {
-    protected $lastTdValues = [];
+    protected array $lastTdValues = [];
 
     public function __construct(protected FormRendererInterface $formRenderer, protected string $theme, protected string $iconTheme, protected array $configuration)
     {
     }
 
-    public function getName()
+    public function getName(): string
     {
         return 'ecommit_crud_crud_extension';
     }
@@ -181,7 +181,7 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
                 ]);
                 foreach (['first_page', 'previous_page', 'current_page', 'next_page', 'last_page', 'other_page'] as $option) {
                     $aResolver->setAllowedTypes($option, 'array');
-                    $aResolver->addNormalizer($option, function (Options $options, $value) use ($parent) {
+                    $aResolver->addNormalizer($option, function (Options $options, mixed $value) use ($parent): array {
                         if (null !== $parent['ajax_options']) {
                             return array_merge(
                                 $value,
@@ -261,6 +261,7 @@ public function crudPaginatorLinks(Environment $environment, Crud $crud, array $
 
         $options = $this->buildOptions('crud_paginator_links', $options, $crud);
 
+        /** @psalm-suppress PossiblyNullArgument */
         return $this->paginatorLinks($environment, $crud->getPaginator(), $crud->getRouteName(), $crud->getRouteParams(), $options);
     }
 
@@ -302,7 +303,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
                 ]);
                 foreach (['sortable_active_asc', 'sortable_active_desc', 'sortable_not_active'] as $option) {
                     $aResolver->setAllowedTypes($option, 'array');
-                    $aResolver->addNormalizer($option, function (Options $options, $value) use ($parent) {
+                    $aResolver->addNormalizer($option, function (Options $options, mixed $value) use ($parent): array {
                         if (null !== $parent['ajax_options']) {
                             return array_merge(
                                 $value,
@@ -320,7 +321,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
             'block' => 'th',
         ]);
         $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
-        $resolver->addNormalizer('ajax_options', function (Options $options, $value) use ($crud) {
+        $resolver->addNormalizer('ajax_options', function (Options $options, mixed $value) use ($crud): array {
             if (!isset($value['update'])) {
                 $value['update'] = '#'.$crud->getDivIdList();
             }
@@ -484,7 +485,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('form_attr', ['array']);
-        $resolver->addNormalizer('form_attr', function (Options $options, $value) use ($crud) {
+        $resolver->addNormalizer('form_attr', function (Options $options, mixed $value) use ($crud): array {
             /** @var FormView $searchForm */
             $searchForm = $crud->getSearchForm();
 
@@ -570,7 +571,7 @@ public function searchFormReset(Environment $environment, Crud $crud, array $opt
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('button_attr', ['array']);
-        $resolver->addNormalizer('button_attr', function (Options $options, $value) use ($crud) {
+        $resolver->addNormalizer('button_attr', function (Options $options, mixed $value) use ($crud): array {
             return array_merge(
                 [
                     'data-crud-search-id' => $crud->getDivIdSearch(),
diff --git a/tests/Functional/App/DataFixtures/TestUserFixtures.php b/tests/Functional/App/DataFixtures/TestUserFixtures.php
index 341ad09..b8a9cac 100644
--- a/tests/Functional/App/DataFixtures/TestUserFixtures.php
+++ b/tests/Functional/App/DataFixtures/TestUserFixtures.php
@@ -46,13 +46,14 @@ public function load(ObjectManager $manager): void
             $this->addReference('user_'.$data[0].$data[1], $user);
         }
 
-        $userCrudSettings = new UserCrudSettings();
-        $userCrudSettings->setUser($this->getReference('user_EveReste'))
-            ->setCrudName('crud_persistent_settings')
-            ->setDisplayedColumns(['username', 'firstName'])
-            ->setResultsDisplayed(50)
-            ->setSort('firstName')
-            ->setSortDirection(Crud::DESC);
+        $userCrudSettings = new UserCrudSettings(
+            $this->getReference('user_EveReste'),
+            'crud_persistent_settings',
+            50,
+            ['username', 'firstName'],
+            'firstName',
+            Crud::DESC
+        );
         $manager->persist($userCrudSettings);
 
         $manager->flush();

From 08cd6edd541d577f237300ed71278eaf2cb0beae Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 2 May 2022 11:40:21 +0200
Subject: [PATCH 173/264] The CrudColumn constructor now has a single options
 argument

---
 doc/upgrade/3.0.md               |  14 +--
 src/Crud/Crud.php                |  38 ++++----
 src/Crud/CrudColumn.php          |  95 ++++++++++++++++----
 src/Crud/SearchFormBuilder.php   |   6 +-
 src/Twig/CrudExtension.php       |   2 +-
 tests/Crud/CrudColumnTest.php    | 144 +++++++++++++++++++++++++++++++
 tests/Crud/CrudTest.php          |   8 +-
 tests/Twig/CrudExtensionTest.php |   8 +-
 8 files changed, 267 insertions(+), 48 deletions(-)
 create mode 100644 tests/Crud/CrudColumnTest.php

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 892b685..9504882 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -84,12 +84,12 @@
 * La méthode `createSearcherForm` de `Crud` est renommée en `createSearchForm`. La signature est modifiée:
     * Avant: `createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = [])`
     * Après: `createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = [])`
-* La méthode `createDisplaySettingsForm` est maintenant protégée.
-* La méthode `getDefaultSense` est renommée en `getDefaultSortDirection`
-* La méthode `raz` est renommée en `reset`
-* La méthode `razSort` est renommée en `resetSort`
-* La méthode `processForm` est renommée en `processSearchForm`
-* La méthode `clearTemplate` est renommée en `createView`
+* La méthode `createDisplaySettingsForm` de `Crud` est maintenant protégée.
+* La méthode `getDefaultSense` de `Crud` est renommée en `getDefaultSortDirection`
+* La méthode `raz` de `Crud` est renommée en `reset`
+* La méthode `razSort` de `Crud` est renommée en `resetSort`
+* La méthode `processForm` de `Crud` est renommée en `processSearchForm`
+* La méthode `clearTemplate` de `Crud` est renommée en `createView`
 * Les options du FormType personnalisé du formulaire de recherche doivent être passées dans l'option `form_options` (3ème argument) de `createSearchForm`
 * La signature du constructeur de `CrudFactory` est modifiée:
     * Avant: `__construct(RouterInterface $router, FormFactoryInterface $formFactory, RequestStack $requestStack, ManagerRegistry $registry, TokenStorageInterface $tokenStorage, array $templateConfiguration)`
@@ -99,6 +99,8 @@
 * La donnée membre `$formSearcherData` de `CrudSession` est supprimée. Elle est remplacée par `$searchFormData`
   qui est une instance de `SearcherInterface` ou nulle.
 * Ne plus appeler la méthode `init` de `Crud` dans a méthode `createCrud` des contrôleurs
+* Le constructeur de `CrudColumn` possède maintenant un unique argument d'options.
+* Les données membres publiques de `CrudColumn` n'existent plus (`id`, `alias`, `aliasSearch`, `aliasSort`, `label`, `sortable`, `defaultDisplayed`). Utiliser à la place les fonctions getters (modificaton des valeurs impossible).
 
 
 
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index e8b21b3..8b0ac8e 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -202,15 +202,20 @@ public function addColumn(string $id, string $alias, string $label, array $optio
         $resolver->setAllowedTypes('default_displayed', 'bool');
         $options = $resolver->resolve($options);
 
-        $column = new CrudColumn(
-            $id,
-            $alias,
-            $label,
-            $options['sortable'],
-            $options['default_displayed'],
-            $options['alias_search'],
-            $options['alias_sort']
-        );
+        $columnOptions = [
+            'id' => $id,
+            'alias' => $alias,
+            'label' => $label,
+            'sortable' => $options['sortable'],
+            'displayed_by_default' => $options['default_displayed'],
+        ];
+        if (null !== $options['alias_search']) {
+            $columnOptions['alias_search'] = $options['alias_search'];
+        }
+        if (null !== $options['alias_sort']) {
+            $columnOptions['alias_sort'] = $options['alias_sort'];
+        }
+        $column = new CrudColumn($columnOptions);
         $this->availableColumns[$id] = $column;
 
         return $this;
@@ -239,8 +244,8 @@ public function getDefaultDisplayedColumns(): array
     {
         $columns = [];
         foreach ($this->availableColumns as $column) {
-            if ($column->defaultDisplayed) {
-                $columns[] = $column->id;
+            if ($column->isDisplayedByDefault()) {
+                $columns[] = $column->getId();
             }
         }
         if (0 == \count($columns)) {
@@ -262,7 +267,10 @@ public function addVirtualColumn(string $id, string $aliasSearch): self
         if (\array_key_exists($id, $this->availableColumns) || \array_key_exists($id, $this->availableVirtualColumns)) {
             throw new \Exception(sprintf('The column "%s" already exists', $id));
         }
-        $column = new CrudColumn($id, $aliasSearch, null, false, false, null, null);
+        $column = new CrudColumn([
+            'id' => $id,
+            'alias' => $aliasSearch,
+        ]);
         $this->availableVirtualColumns[$id] = $column;
 
         return $this;
@@ -586,7 +594,7 @@ protected function updateQueryBuilder(): void
                 $this->queryBuilder->addOrderBy($sort, $sortDirection);
             }
         } else {
-            $columnSortAlias = $this->availableColumns[$columnSortId]->aliasSort;
+            $columnSortAlias = $this->availableColumns[$columnSortId]->getAliasSort();
             if (\is_array($columnSortAlias)) {
                 // Sort alias in many columns
                 foreach ($columnSortAlias as $oneColumnSortAlias) {
@@ -780,7 +788,7 @@ protected function changeSort(mixed $value): void
     {
         $oldValue = $this->sessionValues->sort;
         $availableColumns = $this->availableColumns;
-        if ((\is_string($value) && \array_key_exists($value, $availableColumns) && $availableColumns[$value]->sortable)
+        if ((\is_string($value) && \array_key_exists($value, $availableColumns) && $availableColumns[$value]->isSortable())
             || (\is_string($value) && 'defaultPersonalizedSort' === $value && $this->defaultPersonalizedSort)) {
             $this->sessionValues->sort = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
@@ -888,7 +896,7 @@ protected function createDisplaySettingsForm(): void
         }
         $columnsChoices = [];
         foreach ($this->getColumns() as $column) {
-            $columnsChoices[$column->id] = $column->label;
+            $columnsChoices[$column->getId()] = $column->getLabel();
         }
         $data = [
             'resultsPerPage' => $this->getSessionValues()->resultsPerPage,
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index aea51f4..fa376be 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -13,28 +13,93 @@
 
 namespace Ecommit\CrudBundle\Crud;
 
-/**
- * @internal
- */
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
 final class CrudColumn
 {
-    public string $aliasSearch;
-    public string $aliasSort;
+    /**
+     * @var array{
+     *     id: string,
+     *     alias: string,
+     *     label: string,
+     *     sortable: bool,
+     *     displayed_by_default: bool,
+     *     alias_sort: string,
+     *     alias_search: string
+     * }
+     */
+    protected array $options;
 
     /**
      * Constructor.
      *
-     * @param string $id               Column id (used everywhere inside the crud)
-     * @param string $alias            Column SQL alias
-     * @param string $label            Column label (used in the header table)
-     * @param bool   $sortable         If the column is sortable
-     * @param bool   $defaultDisplayed If the column is displayed, by default
-     * @param string $aliasSearch      Column SQL alias, used during searchs
-     * @param string $aliasSort        Column(s) SQL alias (string or array of strings), used during sorting
+     * @param array $options Options:
+     *                       * id : Column id (used everywhere inside the crud) (Required)
+     *                       * alias: Column SQL alias (Required)
+     *                       * label: Column label (used in the header table) (Default: id option)
+     *                       * sortable: If the column is sortable (Défault: true)
+     *                       * displayed_by_default: If the column is displayed, by default (Default: true)
+     *                       * alias_sort: Column(s) SQL alias (string or array of strings), used during sorting (Defaut: alias option)
+     *                       * alias_search: Column SQL alias, used during searchs (Defaut: alias option)
      */
-    public function __construct(public string $id, public string $alias, public ?string $label, public bool $sortable, public bool $defaultDisplayed, ?string $aliasSearch = null, ?string $aliasSort = null)
+    public function __construct(array $options)
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setRequired([
+            'id',
+            'alias',
+        ]);
+        $resolver->setDefaults([
+            'label' => fn (Options $options): string => $options['id'],
+            'sortable' => true,
+            'displayed_by_default' => true,
+            'alias_sort' => fn (Options $options): string => $options['alias'],
+            'alias_search' => fn (Options $options): string => $options['alias'],
+        ]);
+        $resolver->setAllowedTypes('id', 'string');
+        $resolver->setAllowedTypes('alias', 'string');
+        $resolver->setAllowedTypes('label', 'string');
+        $resolver->setAllowedTypes('sortable', 'bool');
+        $resolver->setAllowedTypes('displayed_by_default', 'bool');
+        $resolver->setAllowedTypes('alias_sort', 'string');
+        $resolver->setAllowedTypes('alias_search', 'string');
+
+        $this->options = $resolver->resolve($options);
+    }
+
+    public function getId(): string
+    {
+        return $this->options['id'];
+    }
+
+    public function getAlias(): string
+    {
+        return $this->options['alias'];
+    }
+
+    public function getLabel(): string
+    {
+        return $this->options['label'];
+    }
+
+    public function isSortable(): bool
+    {
+        return $this->options['sortable'];
+    }
+
+    public function isDisplayedByDefault(): bool
+    {
+        return $this->options['displayed_by_default'];
+    }
+
+    public function getAliasSearch(): string
+    {
+        return $this->options['alias_search'];
+    }
+
+    public function getAliasSort(): string
     {
-        $this->aliasSearch = $aliasSearch ?: $alias;
-        $this->aliasSort = $aliasSort ?: $alias;
+        return $this->options['alias_sort'];
     }
 }
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index a94f8ee..d694db5 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -146,7 +146,7 @@ protected function resolveFilters(): void
         foreach ($this->filters as $property => $filter) {
             if ($filter['options']['label'] instanceof CrudColumnReference) {
                 if (\array_key_exists($filter['options']['label']->id, $columns)) {
-                    $this->filters[$property]['options']['label'] = $columns[$filter['options']['label']->id]->label;
+                    $this->filters[$property]['options']['label'] = $columns[$filter['options']['label']->id]->getLabel();
                 } elseif (\array_key_exists($filter['options']['alias_search']->id, $virtualColumns)) {
                     $this->filters[$property]['options']['label'] = null;
                 }
@@ -154,9 +154,9 @@ protected function resolveFilters(): void
 
             if ($filter['options']['alias_search'] instanceof CrudColumnReference) {
                 if (\array_key_exists($filter['options']['alias_search']->id, $columns)) {
-                    $this->filters[$property]['options']['alias_search'] = $columns[$filter['options']['alias_search']->id]->aliasSearch;
+                    $this->filters[$property]['options']['alias_search'] = $columns[$filter['options']['alias_search']->id]->getAliasSearch();
                 } elseif (\array_key_exists($filter['options']['alias_search']->id, $virtualColumns)) {
-                    $this->filters[$property]['options']['alias_search'] = $virtualColumns[$filter['options']['alias_search']->id]->aliasSearch;
+                    $this->filters[$property]['options']['alias_search'] = $virtualColumns[$filter['options']['alias_search']->id]->getAliasSearch();
                 }
             }
         }
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index cbdb853..dbc6940 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -349,7 +349,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
         // If the label was not defined, we take default label
         $label = $options['label'];
         if (null === $label) {
-            $label = $column->label;
+            $label = $column->getLabel();
         }
 
         return $this->renderBlock($environment, $options['theme'], $options['block'], array_merge($options, [
diff --git a/tests/Crud/CrudColumnTest.php b/tests/Crud/CrudColumnTest.php
new file mode 100644
index 0000000..e6df347
--- /dev/null
+++ b/tests/Crud/CrudColumnTest.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Crud;
+
+use Ecommit\CrudBundle\Crud\CrudColumn;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+
+class CrudColumnTest extends TestCase
+{
+    public function testMissingIdOption(): void
+    {
+        $options = $this->createValidConfig();
+        unset($options['id']);
+
+        $this->expectException(MissingOptionsException::class);
+        new CrudColumn($options);
+    }
+
+    public function testMissingAliasOption(): void
+    {
+        $options = $this->createValidConfig();
+        unset($options['id']);
+
+        $this->expectException(MissingOptionsException::class);
+        new CrudColumn($options);
+    }
+
+    public function testDefaultLabelOption(): void
+    {
+        $crudColumn = new CrudColumn($this->createValidConfig());
+        $this->assertSame('id1', $crudColumn->getLabel());
+    }
+
+    public function testDefaultSortableOption(): void
+    {
+        $crudColumn = new CrudColumn($this->createValidConfig());
+        $this->assertTrue($crudColumn->isSortable());
+    }
+
+    public function testDefaultDisplayedByDefaultOption(): void
+    {
+        $crudColumn = new CrudColumn($this->createValidConfig());
+        $this->assertTrue($crudColumn->isDisplayedByDefault());
+    }
+
+    public function testDefaultAliasSortOption(): void
+    {
+        $crudColumn = new CrudColumn($this->createValidConfig());
+        $this->assertSame('alias1', $crudColumn->getAliasSort());
+    }
+
+    public function testDefaultAliasSearchOption(): void
+    {
+        $crudColumn = new CrudColumn($this->createValidConfig());
+        $this->assertSame('alias1', $crudColumn->getAliasSearch());
+    }
+
+    public function testGetId(): void
+    {
+        $options = $this->createValidConfig();
+        $options['id'] = 'val';
+        $crudColumn = new CrudColumn($options);
+        $this->assertSame('val', $crudColumn->getId());
+    }
+
+    public function testGetAlias(): void
+    {
+        $options = $this->createValidConfig();
+        $options['alias'] = 'val';
+        $crudColumn = new CrudColumn($options);
+        $this->assertSame('val', $crudColumn->getAlias());
+    }
+
+    public function testGetLabel(): void
+    {
+        $options = $this->createValidConfig();
+        $options['label'] = 'val';
+        $crudColumn = new CrudColumn($options);
+        $this->assertSame('val', $crudColumn->getLabel());
+    }
+
+    /**
+     * @dataProvider getBooleanProvier
+     */
+    public function testIsSortable(bool $value): void
+    {
+        $options = $this->createValidConfig();
+        $options['sortable'] = $value;
+        $crudColumn = new CrudColumn($options);
+        $this->assertSame($value, $crudColumn->isSortable());
+    }
+
+    /**
+     * @dataProvider getBooleanProvier
+     */
+    public function testIsDisplayedByDefault(bool $value): void
+    {
+        $options = $this->createValidConfig();
+        $options['displayed_by_default'] = $value;
+        $crudColumn = new CrudColumn($options);
+        $this->assertSame($value, $crudColumn->isDisplayedByDefault());
+    }
+
+    public function testGetAliasSort(): void
+    {
+        $options = $this->createValidConfig();
+        $options['alias_sort'] = 'val';
+        $crudColumn = new CrudColumn($options);
+        $this->assertSame('val', $crudColumn->getAliasSort());
+    }
+
+    public function testGetAliasSearch(): void
+    {
+        $options = $this->createValidConfig();
+        $options['alias_search'] = 'val';
+        $crudColumn = new CrudColumn($options);
+        $this->assertSame('val', $crudColumn->getAliasSearch());
+    }
+
+    public function getBooleanProvier(): array
+    {
+        return [[true], [false]];
+    }
+
+    protected function createValidConfig(): array
+    {
+        return [
+            'id' => 'id1',
+            'alias' => 'alias1',
+        ];
+    }
+}
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 7c4fd90..7938193 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -90,8 +90,8 @@ public function testColumns(): void
             'alias_search' => 'alias_search2',
             'alias_sort' => 'alias_sort2',
         ]));
-        $column1 = new CrudColumn('username', 'u.username', 'username', true, true);
-        $column2 = new CrudColumn('firstName', 'u.firstName', 'first_name', false, false, 'alias_search2', 'alias_sort2');
+        $column1 = new CrudColumn(['id' => 'username', 'alias' => 'u.username', 'label' => 'username']);
+        $column2 = new CrudColumn(['id' => 'firstName', 'alias' => 'u.firstName', 'label' => 'first_name', 'sortable' => false, 'displayed_by_default' => false, 'alias_search' => 'alias_search2', 'alias_sort' => 'alias_sort2']);
         $this->assertEquals($column1, $crud->getColumn('username'));
         $this->assertEquals($column2, $crud->getColumn('firstName'));
         $columns = [
@@ -219,8 +219,8 @@ public function testVirtualColumns(): void
         $this->assertInstanceOf(Crud::class, $crud->addVirtualColumn('columnv1', 'aliasv1'));
         $this->assertInstanceOf(Crud::class, $crud->addVirtualColumn('columnv2', 'aliasv2'));
 
-        $column1 = new CrudColumn('columnv1', 'aliasv1', null, false, false);
-        $column2 = new CrudColumn('columnv2', 'aliasv2', null, false, false);
+        $column1 = new CrudColumn(['id' => 'columnv1', 'alias' => 'aliasv1']);
+        $column2 = new CrudColumn(['id' => 'columnv2', 'alias' => 'aliasv2']);
         $this->assertEquals($column1, $crud->getVirtualColumn('columnv1'));
         $this->assertEquals($column2, $crud->getVirtualColumn('columnv2'));
 
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 4f149d0..da7b017 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -734,10 +734,10 @@ public function testTdWithBadOptions(): void
     protected function createCrud(string $sort = 'column1', string $sortDirection = Crud::ASC): Crud
     {
         $columns = [
-            'column1' => new CrudColumn('column1', 'alias1', 'label1', true, true, 'alias1', 'alias1'),
-            'column2' => new CrudColumn('column2', 'alias2', 'label2', true, false, 'alias2', 'alias2'),
-            'column3' => new CrudColumn('column3', 'alias3', 'label3', false, true, 'alias3', 'alias3'),
-            'column4' => new CrudColumn('column4', 'alias4', 'label4', true, true, 'alias4', 'alias4'),
+            'column1' => new CrudColumn(['id' => 'column1', 'alias' => 'alias1', 'label' => 'label1']),
+            'column2' => new CrudColumn(['id' => 'column2', 'alias' => 'alias2', 'label' => 'label2', 'displayed_by_default' => false]),
+            'column3' => new CrudColumn(['id' => 'column3', 'alias' => 'alias3', 'label' => 'label3', 'sortable' => false]),
+            'column4' => new CrudColumn(['id' => 'column4', 'alias' => 'alias4', 'label' => 'label4']),
         ];
         $crudSession = new CrudSession(
             10,

From c8bb7b0d0933b1d8412b256ad18b00cc1fad3920 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 3 May 2022 20:48:04 +0200
Subject: [PATCH 174/264] Add CrudConfig

CrudControllerTrait
* Rename getCrudOptions method to getCrudResponseGeneratorOptions
* Remove getCrud method
* Add abstract getCrudOptions method
* Add createCrudConfig method
* createCrud(string $sessionName) method is replaced by createCrud(array $options)

Crud
* The constructor is now __construct(array $options, ContainerInterface $container)
* The init method is now protected
* Add public methods : getOptions
* Add protected methods: createSearchForm, buildSearchForm
* Remove public methods: isInitialized, initIfNecessary, addColumn, addVirtualColumn, setQueryBuilder, setAvailableResultsPerPage, setDefaultSort, setDefaultPersonalizedSort, setRoute, setDisplayResultsOnlyIfSearch, setBuildPaginator, setPersistentSettings, createSearchForm, setDivIdSearch, setDivIdList, setTwigFunctionsConfiguration
* Remove protected methods: crudMustNotBeInitialized, crudMustBeInitialized
* Method getAvailableResultsPerPage replaced by getMaxPerPageChoices
* Method getDefaultResultsPerPage replaced by getDefaultMaxPerPage
* Method getRouteParams replaced by getRouteParameters

CrudFactory
* create(string $sessionName): method is replaced by create(array $options):

CrudColumnReference: Remove
---
 doc/cookbook/advanced-searcher.md             |  16 +-
 doc/cookbook/display_results.md               |   8 +-
 doc/cookbook/div_ids.md                       |   8 +-
 doc/cookbook/http.md                          |  16 +-
 doc/cookbook/paginator.md                     |  16 +-
 doc/cookbook/sort.md                          |  24 +-
 doc/cookbook/template_configuration.md        |  10 +-
 doc/cookbook/virtual_columns.md               |  16 +-
 doc/crud.md                                   |  55 +-
 doc/upgrade/3.0.md                            |  55 +-
 psalm.xml                                     |  19 -
 src/Controller/CrudControllerTrait.php        |  22 +-
 src/Crud/Crud.php                             | 653 +++++-------
 src/Crud/CrudColumn.php                       |  11 +-
 src/Crud/CrudColumnReference.php              |  24 -
 src/Crud/CrudConfig.php                       | 251 +++++
 src/Crud/CrudFactory.php                      |   4 +-
 src/Crud/CrudResponseGenerator.php            |   1 -
 src/Crud/SearchFormBuilder.php                |  48 +-
 src/Twig/CrudExtension.php                    |   2 +-
 templates/Theme/base.html.twig                |   4 +-
 tests/Crud/AbstractCrudTest.php               | 104 ++
 tests/Crud/CrudColumnTest.php                 |  11 +
 tests/Crud/CrudConfigTest.php                 | 238 +++++
 tests/Crud/CrudTest.php                       | 938 +++++++++---------
 tests/Crud/SearchFormBuilderTest.php          |  84 +-
 tests/Form/Filter/AbstractFilterTest.php      |  41 +-
 tests/Form/Filter/BooleanFilterTest.php       |  40 +-
 tests/Form/Filter/ChoiceFilterTest.php        |  34 +-
 tests/Form/Filter/DateFilterTest.php          |  26 +-
 tests/Form/Filter/EntityAjaxFilterTest.php    |  22 +-
 tests/Form/Filter/EntityFilterTest.php        |  26 +-
 tests/Form/Filter/IntegerFilterTest.php       |  18 +-
 tests/Form/Filter/NullFilterTest.php          |   8 +-
 tests/Form/Filter/TextFilterTest.php          |  32 +-
 .../App/Controller/UserController.php         |  15 +-
 .../Controller/UserWithoutTraitController.php |   8 +-
 tests/Twig/CrudExtensionTest.php              |  13 +-
 38 files changed, 1676 insertions(+), 1245 deletions(-)
 delete mode 100644 src/Crud/CrudColumnReference.php
 create mode 100644 src/Crud/CrudConfig.php
 create mode 100644 tests/Crud/AbstractCrudTest.php
 create mode 100644 tests/Crud/CrudConfigTest.php

diff --git a/doc/cookbook/advanced-searcher.md b/doc/cookbook/advanced-searcher.md
index 1e04195..f947a3e 100644
--- a/doc/cookbook/advanced-searcher.md
+++ b/doc/cookbook/advanced-searcher.md
@@ -105,12 +105,12 @@ namespace App\Controller;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
 -           ->createSearchForm(new CarSearcher())
@@ -122,7 +122,7 @@ class MyCrudController extends AbstractCrudController
 +           ])
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 }
 ```
@@ -167,12 +167,12 @@ namespace App\Controller;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
 -           ->createSearchForm(new CarSearcher())
@@ -181,7 +181,7 @@ class MyCrudController extends AbstractCrudController
 +           ])
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 }
 ```
diff --git a/doc/cookbook/display_results.md b/doc/cookbook/display_results.md
index cb914ef..2679fa8 100644
--- a/doc/cookbook/display_results.md
+++ b/doc/cookbook/display_results.md
@@ -17,18 +17,18 @@ namespace App\Controller;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
 +           ->setDisplayResultsOnlyIfSearch(true)
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     //...
diff --git a/doc/cookbook/div_ids.md b/doc/cookbook/div_ids.md
index 855c7df..5ad7087 100644
--- a/doc/cookbook/div_ids.md
+++ b/doc/cookbook/div_ids.md
@@ -18,19 +18,19 @@ namespace App\Controller;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
 +           ->setDivIdList('my_div1')
 +           ->setDivIdSearch('my_div2')
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     //...
diff --git a/doc/cookbook/http.md b/doc/cookbook/http.md
index 03c20e7..6d43cc2 100644
--- a/doc/cookbook/http.md
+++ b/doc/cookbook/http.md
@@ -18,7 +18,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 class MyHttpController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected getCrudOptions(): array
     {
         /*
          * Demo de l'API : http://public.opendatasoft.com/api/records/1.0/search?dataset=correspondance-code-insee-code-postal&q=annecy
@@ -72,13 +72,13 @@ class MyHttpController extends AbstractCrudController
             }
         });
 
-        $crud = $this->createCrud('my_http_crud');
-        $crud->addColumn('name', 'fields.nom_comm', 'Nom', ['sortable' => false])
-            ->addColumn('postal_code', 'fields.postal_code', 'Postal code', ['sortable' => false])
-            ->addColumn('population', 'fields.population', 'Population', ['alias_sort' => 'population'])
-            ->addColumn('timestamp', 'record_timestamp', 'Timestamp', ['sortable' => false])
+        $crudConfig = $this->createCrudConfig('my_http_crud');
+        $crudConfig->addColumn(['id' => 'name', 'alias' => 'fields.nom_comm', 'label' => 'Nom', 'sortable' => false])
+            ->addColumn(['id' => 'postal_code', 'alias' =>  'fields.postal_code', 'label' =>  'Postal code', 'sortable' => false])
+            ->addColumn(['id' => 'population', 'alias' =>  'fields.population', 'label' =>  'Population', 'alias_sort' => 'population'])
+            ->addColumn(['id' => 'timestamp', 'alias' =>  'record_timestamp', 'label' =>  'Timestamp', 'sortable' => false])
             ->setQueryBuilder($queryBuilder)
-            ->setAvailableResultsPerPage([2, 5, 10], 5)
+            ->setMaxPerPage([2, 5, 10], 5)
             ->setDefaultSort('population', Crud::DESC)
             ->setRoute('my_http_crud_ajax')
             ->setBuildPaginator(function (QueryBuilder $queryBuilder, $page, $resultsPerPage) {
@@ -98,7 +98,7 @@ class MyHttpController extends AbstractCrudController
             ->createSearchForm(new CitySearcher())
             ->setPersistentSettings(true);
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     protected function getTemplateName(string $action): string
diff --git a/doc/cookbook/paginator.md b/doc/cookbook/paginator.md
index eaf99e0..ff8b93e 100644
--- a/doc/cookbook/paginator.md
+++ b/doc/cookbook/paginator.md
@@ -14,12 +14,12 @@ namespace App\Controller;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
 +           ->setBuildPaginator([
@@ -32,7 +32,7 @@ class MyCrudController extends AbstractCrudController
 +           ])
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     //...
@@ -52,12 +52,12 @@ namespace App\Controller;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
 +           ->setBuildPaginator(function ($queryBuilder, $page, $resultsPerPage) {
@@ -72,7 +72,7 @@ class MyCrudController extends AbstractCrudController
 +           })
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     //...
diff --git a/doc/cookbook/sort.md b/doc/cookbook/sort.md
index 5f6e853..21f6603 100644
--- a/doc/cookbook/sort.md
+++ b/doc/cookbook/sort.md
@@ -12,18 +12,18 @@ use Ecommit\CrudBundle\Crud\Crud;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
             ->setDefaultSort('id', Crud::ASC)
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     //...
@@ -42,18 +42,18 @@ use Ecommit\CrudBundle\Crud\Crud;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id',  ['alias_sort' => ['c1.id', 'c1.name']])
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id',  'alias_sort' => ['c1.id', 'c1.name']])
             //...
             ->setRoute('my_crud_ajax')
             ->setDefaultSort('id', Crud::ASC)
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     //...
@@ -72,12 +72,12 @@ use Ecommit\CrudBundle\Crud\Crud;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
             ->setDefaultPersonalizedSort([
@@ -86,7 +86,7 @@ class MyCrudController extends AbstractCrudController
             ])
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     //...
diff --git a/doc/cookbook/template_configuration.md b/doc/cookbook/template_configuration.md
index 833bf81..fdcbd95 100644
--- a/doc/cookbook/template_configuration.md
+++ b/doc/cookbook/template_configuration.md
@@ -17,7 +17,7 @@ Ces options par défaut peuvent être définies :
 
 L'ordre de priorité prise en compte pour les options est le suivant :
 * Options définies lors de l'appel de la méthode Twig
-* Options définies dans le CRUD
+* Options définies dans les options du CRUD
 * Options définies dans l'application
 * Options par défaut de EcommitCrudBundle
 
@@ -44,12 +44,12 @@ namespace App\Controller;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
 +           ->setTwigFunctionsConfiguration([
@@ -61,7 +61,7 @@ class MyCrudController extends AbstractCrudController
 +           ])
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     //...
diff --git a/doc/cookbook/virtual_columns.md b/doc/cookbook/virtual_columns.md
index 9b7a415..c7302c6 100644
--- a/doc/cookbook/virtual_columns.md
+++ b/doc/cookbook/virtual_columns.md
@@ -5,9 +5,9 @@ résultats mais les utilisateurs peuvent faire des recherches dessus.
 
 Pour ajouter une colonne virtuelle, la méthode `addVirtualColumn` doit être utilisée.
 
-Cette méthode prend comme paramètres:
-* Id de la colonne **Requis**
-* Alias Doctrine utilisé lors de la recherche SQL. **Requis**
+Cette méthode prend comme paramètre un tableau d'options :
+* **id** : Id de la colonne (Nous donnons un ID à la colonne). Cet ID est totalement indépendant des noms de colonnes DQL/SQL. **Dans ce document, à chaque fois que nous parlerons de l'ID d'une colonne, c'est ce paramètre qui sera concerné. Requis**
+* **alias** : Alias Doctrine (du query builder) utilisé pour la requête Doctrine **Requis**
 
 ```diff
 <?php
@@ -18,18 +18,18 @@ namespace App\Controller;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
-+           ->addVirtualColumn('my_virtual_column', 'c1.name')
++           ->addVirtualColumn(['id' => my_virtual_column', 'alias' => c1.name'])
             ->setRoute('my_crud_ajax')
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 
     //...
diff --git a/doc/crud.md b/doc/crud.md
index 404f442..521a677 100644
--- a/doc/crud.md
+++ b/doc/crud.md
@@ -96,7 +96,7 @@ class Category
 Nous devons créer une classe contrôleur héritant la classe abstraite `Ecommit\CrudBundle\Controller\AbstractCrudController`. 
 
 Notre classe doit surcharger les méthodes abstraites :
-* getCrud
+* getCrudOptions
 * getTemplateName
 
 ```php
@@ -111,7 +111,7 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         $em = $this->getDoctrine()->getManager();
         $queryBuilder = $em->createQueryBuilder();
@@ -119,19 +119,19 @@ class MyCrudController extends AbstractCrudController
             ->select('c1, c2')
             ->innerJoin('c1.category', 'c2');
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
-            ->addColumn('name', 'c1.name', 'Name')
-            ->addColumn('category', 'c2.name', 'Category', ['alias_search' => 'c2.id'])
-            ->addColumn('purchase_date', 'c1.purchaseDate', 'Purchase date')
-            ->addColumn('active', 'c1.active', 'Active')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crud->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
+            ->addColumn(['id' => 'name', 'alias' => 'c1.name', 'label' => 'Name'])
+            ->addColumn(['id' => 'category', 'alias' =>  'c2.name', 'label' =>  'Category', 'alias_search' => 'c2.id'])
+            ->addColumn(['id' => 'purchase_date', 'alias' =>  'c1.purchaseDate', 'label' =>  'Purchase date')
+            ->addColumn(['id' => 'active', 'alias' =>  'c1.active', 'label' =>  'Active')
             ->setQueryBuilder($queryBuilder)
-            ->setAvailableResultsPerPage([2, 5, 10], 5)
+            ->setMaxPerPage([2, 5, 10], 5)
             ->setDefaultSort('id', Crud::ASC)
             ->setRoute('my_crud_ajax')
             ->setPersistentSettings(true); //Enregistre les paramètres d'affichage en base de données. Par défaut: false
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
     
     protected function getTemplateName(string $action): string
@@ -157,20 +157,19 @@ class MyCrudController extends AbstractCrudController
 }
 ```
 
-Explications de configCrud():
-
-* Avec `$this->createCrud('my_crud')`, nous créons un CRUD (instance de `Ecommit\CrudBundle\Crud\Crud`) dont le nom est `my_crud`.
-* Nous déclarons chaque colonne du CRUD par la méthode `addColumn()`. Cette méthode prend en paramètres :
-    * Id de la colonne (Nous donnons un ID à la colonne). Cet ID est totalement indépendant des noms de colonnes DQL/SQL. **Dans ce document, à chaque fois que nous parlerons de l'ID d'une colonne, c'est ce paramètre qui sera concerné. Requis**
-    * Alias Doctrine (du query builder) utilisé pour la requête Doctrine **Requis**
-    * Label donné à la colonne (le label sera traduit si traduction est active sur le projet) **Requis**
-    * Tableau d'options (facultatif):
-        * **sortable**: Booléen qui définit si on active (ou non) le tri sur cette colonne **Défaut: True**
-        * **default_displayed**: Booléen qui définit si on affiche (ou non) cette colonne par défaut **Défaut: True**
-        * **alias_search**: Alias Doctrine utilisé lors de la recherche DQL/SQL. Si pas défini, utilise l'alias Doctrine défini en 2ème paramètre
-        * **alias_sort**: Alias Doctrine (chaine de caractères ou tableau de chaines de caractères) utilisé(s) lors du tri sur cette colonne. Si pas défini, utilise l'alias Doctrine défini en 2ème paramètre
+Explications de getCrudOptions():
+
+* Avec `$this->createCrudConfig('my_crud')`, nous créons une configuration de CRUD (instance de `Ecommit\CrudBundle\Crud\CrudConfig`) dont le nom est `my_crud`.
+* Nous déclarons chaque colonne du CRUD par la méthode `addColumn()`. Cette méthode prend en paramètre un tableau d'options :
+    * **id** : Id de la colonne (Nous donnons un ID à la colonne). Cet ID est totalement indépendant des noms de colonnes DQL/SQL. **Dans ce document, à chaque fois que nous parlerons de l'ID d'une colonne, c'est ce paramètre qui sera concerné. Requis**
+    * **alias** : Alias Doctrine (du query builder) utilisé pour la requête Doctrine **Requis**
+    * **label** : Label donné à la colonne (le label sera traduit si traduction est active sur le projet)
+    * **sortable**: Booléen qui définit si on active (ou non) le tri sur cette colonne **Défaut: True**
+    * **displayed_by_default**: Booléen qui définit si on affiche (ou non) cette colonne par défaut **Défaut: True**
+    * **alias_search**: Alias Doctrine utilisé lors de la recherche DQL/SQL. Si pas défini, utilise l'alias Doctrine défini par l'option `alias`
+    * **alias_sort**: Alias Doctrine (chaine de caractères ou tableau de chaines de caractères) utilisé(s) lors du tri sur cette colonne. Si pas défini, utilise l'alias Doctrine défini par l'option `alias`
 * Nous donnons la requête Doctrine (sous forme d'objet QueryBuilder ou d'une fonction anonyme) avec la méthode setQueryBuilder() Le moteur du CRUD modifiera automatiquement cette requête, en fonction des actions demandées par l'utilisateur
-* Nous définissions les paramètres du nombre de pages avec la méthode `setAvailableResultsPerPage()`. Cette méthode prend 2 paramètres :
+* Nous définissions les paramètres du nombre de pages avec la méthode `setMaxPerPage()`. Cette méthode prend 2 paramètres :
     * Un tableau contenant les différents nombres possibles du nombre de résultats par page. **Requis**
     * Le nombre de résultats par page, par défaut. **Requis**
 * Nous définissions le tri par défaut par la méthode `setDefaultSort`. Cette méthode prend 2 paramètres :
@@ -178,7 +177,7 @@ Explications de configCrud():
     * Le sens du tri par défaut (`Crud::ASC` ou `Crud::DESC`). **Requis**
 * On définit par la fonction `setRoute` la route Ajax utilisée pour mettre à jour notre liste
 * On active par la fonction `setPersistentSettings` l'enregistrement des propriétés d'affichage des utilisateurs en base de données. Par défaut, désactivé.
-* On retourne notre objet créé
+* On retourne notre objet créé pour la création du CRUD
 
 ## Ajout templates
 
@@ -353,18 +352,18 @@ namespace App\Controller;
 
 class MyCrudController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         //...
         
-        $crud = $this->createCrud('my_crud'); //Passé en argument: Nom du CRUD
-        $crud->addColumn('id', 'c1.id', 'Id')
+        $crudConfig = $this->createCrudConfig('my_crud'); //Passé en argument: Nom du CRUD
+        $crudConfig->addColumn(['id' => 'id', 'alias' => 'c1.id', 'label' => 'Id'])
             //...
             ->setRoute('my_crud_ajax')
 +           ->createSearchForm(new CarSearcher())
             //...
 
-        return $crud;
+        return $crudConfig->getOptions();
     }
 }
 ```
diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 9504882..bcb9564 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -43,12 +43,35 @@
   `getTemplateName(string $action): string`
 * La méthode `getTemplateName` (anciennement `getPathView`) dans `CrudControllerTrait` est maintenant abstraite. Celle-ci doit être rajouter
   dans vos contrôleurs CRUD.
-* La méthode `createCrud` de `CrudControllerTrait` est maintenant `final`.
+* La méthode `createCrud` de `CrudControllerTrait` est maintenant `final`. Cette méthode possède maintenant un unique argument d'options.
 * La méthode `autoListAction` de `CrudControllerTrait` est supprimée. Utiliser à la place la méthode `getCrudResponse` (signature différente).
 * La méthode `autoAjaxListAction` de `CrudControllerTrait` est supprimée. Utiliser à la place la méthode `getAjaxCrudResponse` (signature différente).
 * La méthode `autoAjaxSearchAction` de `CrudControllerTrait` est supprimée. Il n'existe plus d'action spécifique à la recherche.
 * Les méthodes `prepareList`, `processSearch`, `renderCrudView` et `renderCrud` de `CrudControllerTrait` sont supprimées.
-* La méthode `configCrud` de `CrudControllerTrait` est supprimée. Utiliser à la place la méthode `getCrud` (signature différente).
+* La méthode `configCrud` de `CrudControllerTrait` est supprimée. Utiliser à la place la méthode `getCrudOptions` (signature différente). Dans cette nouvelle méthode :
+  * Une instance de `Ecommit\CrudBundle\Crud\CrudConfig` doit être créé grâce à `$this->createCrudConfig()`
+  * Seules les methodes suivantes (par rapport à l'ancien système) peuvent être conservées :
+    * `setSessionName`
+    * `addColumn` avec les changements suivants :
+      * L'option `default_displayed` est remplacée par `displayed_by_default`
+      * Bien que l'ancienne signature de `addColumn` reste compatible, il est conseillé de passer à cette méthode un 
+         unique argument d'options suivantes: `id`, `alias`, `label`, `sortable`, `displayed_by_default`, `alias_sort`, `alias_search`
+    * `addVirtualColumn` avec les changements suivants :
+      * Bien que l'ancienne signature de `addColumn` reste compatible, il est conseillé de passer à cette méthode un
+            unique argument d'options suivantes: `id`, `alias`
+    * `setMaxPerPage` (anciennement `setAvailableResultsPerPage`)
+    * `setDefaultSort`
+    * `setDefaultPersonalizedSort`
+    * `setQueryBuilder`
+    * `setRoute`
+    * `createSearchForm` (anciennement `createSearcherForm`)
+    * `setDisplayResultsOnlyIfSearch`
+    * `setBuildPaginator`
+    * `setPersistentSettings`
+    * `setDivIdSearch`
+    * `setDivIdList`
+    * `setTwigFunctionsConfiguration`
+  * Retourner un tableau grâce à l'appel de `CrudConfig::getOptions()`
 * Les méthodes `addDataAfterBuildQuery`, `beforeBuildQuery` et `afterBuildQuery` de `CrudControllerTrait` sont supprimées. Voir l'alternative avec [le nouveau système](../cookbook/data-template.md).
 * La méthode `getCrudRequiredServices` de `CrudControllerTrait` ne retourne plus les services `twig` et `request_stack`. Si
   les contrôleurs n'hérite pas de `AbstractCrudController` ou `Symfony\Bundle\FrameworkBundle\Controller\AbstractController`,
@@ -64,14 +87,9 @@
 * Les classes `Crud`, `CrudColumn`, `CrudFactory` et `CrudSession` sont maintenant finales.
 * La signature du constructeur de `Crud` est modifiée:
     * Avant: `__construct($sessionName, RouterInterface $router, FormFactoryInterface $formFactory, Request $request, Registry $registry, $user)`
-    * Maintenant: `__construct($sessionName, ContainerInterface $container)`
+    * Maintenant: `__construct(array $options, ContainerInterface $container)`
     * Utilisation d'un locator
-* Les données membres suivantes de `Crud` sont supprimées:
-    * `$formSearcher`: Elle est remplacée par la donnée membre `$searchForm` qui est une instance de `SearchFormBuilder`
-      ou `Symfony\Component\Form\FormView` ou nulle.
-    * `$defaultFormSearcherData`
-    * `$router`, `formFactory`, `$request`, `$registry`: Un locator est utilisé à la place.
-    * `$user`
+* La méthode `init` de `Crud` n'est plus publique.
 * Les méthodes suivantes de `Crud` sont supprimées:
     * `getSearcherForm`. Elle est remplacée par la méthode `getSearchForm`. Cette nouvelle méthode retourne :
         * Soit un objet `SearchFormBuilder`, avant que la méthode `createView` soit appelée
@@ -81,24 +99,39 @@
       [le nouveau système](../cookbook/template_configuration.md).
     * `setSearchRoute`: Il n'existe plus de route spécifique à la recherche.
     * `initializeFieldsFilter`
+    * `addColumn`
+    * `addVirtualColumn`
+    * `setQueryBuilder`
+    * `setAvailableResultsPerPage`
+    * `setDefaultSort`
+    * `setDefaultPersonalizedSort`
+    * `setRoute`
+    * `setDisplayResultsOnlyIfSearch`
+    * `setBuildPaginator`
+    * `setPersistentSettings`
+    * `setDivIdSearch`
+    * `setDivIdList`
 * La méthode `createSearcherForm` de `Crud` est renommée en `createSearchForm`. La signature est modifiée:
     * Avant: `createSearcherForm(AbstractFormSearcher $defaultFormSearcherData, $type = null, $options = [])`
     * Après: `createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = [])`
-* La méthode `createDisplaySettingsForm` de `Crud` est maintenant protégée.
+* La méthode `createDisplaySettingsForm` de `Crud` n'est plus publique.
 * La méthode `getDefaultSense` de `Crud` est renommée en `getDefaultSortDirection`
 * La méthode `raz` de `Crud` est renommée en `reset`
 * La méthode `razSort` de `Crud` est renommée en `resetSort`
 * La méthode `processForm` de `Crud` est renommée en `processSearchForm`
 * La méthode `clearTemplate` de `Crud` est renommée en `createView`
+* La méthode `getAvailableResultsPerPage` de `Crud` est renommée en `getMaxPerPageChoices`
+* La méthode `getDefaultResultsPerPage` de `Crud` est renommée en `getDefaultMaxPerPage`
+* La méthode `getRouteParams` de `Crud` est renommée en `getRouteParameters`
 * Les options du FormType personnalisé du formulaire de recherche doivent être passées dans l'option `form_options` (3ème argument) de `createSearchForm`
 * La signature du constructeur de `CrudFactory` est modifiée:
     * Avant: `__construct(RouterInterface $router, FormFactoryInterface $formFactory, RequestStack $requestStack, ManagerRegistry $registry, TokenStorageInterface $tokenStorage, array $templateConfiguration)`
     * Maintenant: `__construct(ContainerInterface $container)`
     * Utilisation d'un locator
 * Toutes les données membres de `CrudFactory` sont supprimées. Un locator est utilisé à la place.
+* La méthode `create` de `CrudFactory`  possède maintenant un unique argument d'options.
 * La donnée membre `$formSearcherData` de `CrudSession` est supprimée. Elle est remplacée par `$searchFormData`
   qui est une instance de `SearcherInterface` ou nulle.
-* Ne plus appeler la méthode `init` de `Crud` dans a méthode `createCrud` des contrôleurs
 * Le constructeur de `CrudColumn` possède maintenant un unique argument d'options.
 * Les données membres publiques de `CrudColumn` n'existent plus (`id`, `alias`, `aliasSearch`, `aliasSort`, `label`, `sortable`, `defaultDisplayed`). Utiliser à la place les fonctions getters (modificaton des valeurs impossible).
 
diff --git a/psalm.xml b/psalm.xml
index 9e69ce1..730625c 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -22,21 +22,8 @@
             </errorLevel>
         </ArgumentTypeCoercion>
 
-        <PossiblyNullArgument>
-            <errorLevel type="suppress">
-                <file name="src/Crud/Crud.php" />
-            </errorLevel>
-        </PossiblyNullArgument>
-
-        <PossiblyNullPropertyAssignmentValue>
-            <errorLevel type="suppress">
-                <file name="src/Crud/Crud.php" />
-            </errorLevel>
-        </PossiblyNullPropertyAssignmentValue>
-
         <PossiblyNullReference>
             <errorLevel type="suppress">
-                <file name="src/Crud/Crud.php" />
                 <file name="src/DependencyInjection/Configuration.php" />
             </errorLevel>
         </PossiblyNullReference>
@@ -48,11 +35,5 @@
                 <directory name="src/Form/Filter" />
             </errorLevel>
         </PossiblyUndefinedMethod>
-
-        <PropertyNotSetInConstructor>
-            <errorLevel type="suppress">
-                <file name="src/Crud/Crud.php" />
-            </errorLevel>
-        </PropertyNotSetInConstructor>
     </issueHandlers>
 </psalm>
diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index 710764a..21d08e7 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -15,32 +15,42 @@
 
 use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudConfig;
 use Ecommit\CrudBundle\Crud\CrudFactory;
 use Ecommit\CrudBundle\Crud\CrudResponseGenerator;
 use Symfony\Component\HttpFoundation\Response;
 
 trait CrudControllerTrait
 {
-    abstract protected function getCrud(): Crud;
+    abstract protected function getCrudOptions(): array;
 
     abstract protected function getTemplateName(string $action): string;
 
-    final protected function createCrud(string $sessionName): Crud
+    protected function createCrudConfig(?string $sessionName = null): CrudConfig
     {
-        return $this->container->get(CrudFactory::class)->create($sessionName);
+        return new CrudConfig($sessionName);
+    }
+
+    final protected function createCrud(array $options): Crud
+    {
+        return $this->container->get(CrudFactory::class)->create($options);
     }
 
     public function getCrudResponse(): Response
     {
-        return $this->container->get(CrudResponseGenerator::class)->getResponse($this->getCrud(), $this->getCrudOptions());
+        $crud = $this->createCrud($this->getCrudOptions());
+
+        return $this->container->get(CrudResponseGenerator::class)->getResponse($crud, $this->getCrudResponseGeneratorOptions());
     }
 
     public function getAjaxCrudResponse(): Response
     {
-        return $this->container->get(CrudResponseGenerator::class)->getAjaxResponse($this->getCrud(), $this->getCrudOptions());
+        $crud = $this->createCrud($this->getCrudOptions());
+
+        return $this->container->get(CrudResponseGenerator::class)->getAjaxResponse($crud, $this->getCrudResponseGeneratorOptions());
     }
 
-    protected function getCrudOptions(): array
+    protected function getCrudResponseGeneratorOptions(): array
     {
         return [
             'template_generator' => fn (string $action) => $this->getTemplateName($action),
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 8b0ac8e..bcbb4d4 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -20,87 +20,188 @@
 use Ecommit\Paginator\PaginatorInterface;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Validation;
 
 final class Crud
 {
     public const DESC = 'DESC';
     public const ASC = 'ASC';
 
+    /**
+     * @var array{
+     *     session_name: string,
+     *     columns: array<string, CrudColumn>,
+     *     virtual_columns: array<string, CrudColumn>,
+     *     max_per_page_choices: array<int>,
+     *     default_max_per_page: int,
+     *     default_sort: string,
+     *     default_sort_direction: string,
+     *     default_personalized_sort: array,
+     *     query_builder: \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface,
+     *     route_name: string,
+     *     route_parameters: array,
+     *     search_form_data: ?SearcherInterface,
+     *     search_form_type: ?string,
+     *     search_form_options: array,
+     *     display_results_only_if_search: bool,
+     *     build_paginator: bool|\Closure|array,
+     *     persistent_settings: bool,
+     *     div_id_search: string,
+     *     div_id_list: string,
+     *     twig_functions_configuration: array,
+     * }
+     */
+    protected array $options;
+
     protected CrudSession $sessionValues;
     protected SearchFormBuilder|FormView|null $searchForm = null;
-    protected FormInterface|FormView|null $displaySettingsForm = null;
-    protected bool $isInitialized = false;
-    protected bool $initializationInProgress = false;
-    protected array $availableColumns = [];
-    protected array $availableVirtualColumns = [];
-    protected array $availableResultsPerPage = [];
-    protected ?string $defaultSort = null;
-    protected array $defaultPersonalizedSort = [];
-    protected ?string $defaultSortDirection = null;
-    protected ?int $defaultResultsPerPage = null;
-    protected \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface|null $queryBuilder = null;
-    protected bool $persistentSettings = false;
+    /** @psalm-suppress PropertyNotSetInConstructor */
+    protected FormInterface|FormView $displaySettingsForm;
     protected bool $updateDatabase = false;
     protected ?PaginatorInterface $paginator = null;
-    protected bool|\Closure|array $buildPaginator = true;
-    protected bool $displayResultsOnlyIfSearch = false;
     protected bool $displayResults = true;
-    protected array $twigFunctionsConfiguration = [];
-    protected ?string $routeName = null;
-    protected array $routeParams = [];
-    protected string $divIdSearch = 'crud_search';
-    protected string $divIdList = 'crud_list';
 
-    public function __construct(protected string $sessionName, protected ContainerInterface $container)
+    public function __construct(array $options, protected ContainerInterface $container)
     {
-        if (!preg_match('/^[a-zA-Z0-9_]{1,50}$/', $sessionName)) {
-            throw new \Exception('The session name format is invalid');
-        }
+        $resolver = new OptionsResolver();
+        $resolver->setRequired([
+            'session_name',
+            'columns',
+            'max_per_page_choices',
+            'default_max_per_page',
+            'default_sort',
+            'query_builder',
+            'route_name',
+        ]);
+        $resolver->setDefaults([
+            'virtual_columns' => [],
+            'default_sort_direction' => self::ASC,
+            'default_personalized_sort' => [],
+            'route_parameters' => [],
+            'search_form_data' => null,
+            'search_form_type' => null,
+            'search_form_options' => [],
+            'display_results_only_if_search' => false,
+            'build_paginator' => true,
+            'persistent_settings' => false,
+            'div_id_search' => 'crud_search',
+            'div_id_list' => 'crud_list',
+            'twig_functions_configuration' => [],
+        ]);
 
-        return $this;
-    }
+        $resolver->setAllowedTypes('session_name', 'string');
+        $resolver->setAllowedValues('session_name', Validation::createCallable(
+            new Assert\Regex(pattern: '/^[a-zA-Z0-9_]{1,50}$/', message: 'Invalid session_name format.'),
+        ));
+
+        $resolver->setAllowedTypes('columns', ['array']);
+        $resolver->setAllowedValues('columns', Validation::createCallable(
+            new Assert\Count(min: 1, minMessage: 'The CRUD should contain 1 column or more.'),
+        ));
+        $resolver->setNormalizer('columns', function (Options $options, array $value): array {
+            $columns = [];
+            foreach ($value as $column) {
+                if (\is_array($column)) {
+                    $column = new CrudColumn($column);
+                } elseif (!$column instanceof CrudColumn) {
+                    throw new \Exception('A column must be an array or a CrudColum instance.');
+                }
+                if (\array_key_exists($column->getId(), $columns)) {
+                    throw new \Exception(sprintf('The column "column1" already exists.', $column->getId()));
+                }
+                $columns[$column->getId()] = $column;
+            }
 
-    /**
-     * Inits the CRUD.
-     */
-    public function init(): self
-    {
-        if ($this->isInitialized) {
-            throw new \Exception('CRUD already initialized');
-        }
-        $this->initializationInProgress = true;
-
-        // Cheks not empty values
-        $checkValues = [
-            'availableColumns' => 'addColumn',
-            'availableResultsPerPage' => 'setAvailableResultsPerPage',
-            'defaultResultsPerPage' => 'setAvailableResultsPerPage',
-            'defaultSort' => 'setDefaultSort',
-            'defaultSortDirection' => 'setDefaultSort',
-            'queryBuilder' => 'setQueryBuilder',
-            'routeName' => 'setRoute',
-        ];
-        foreach ($checkValues as $value => $method) {
-            if (empty($this->$value)) {
-                throw new \Exception(sprintf('The CRUD configuration is not complete. You must call the "%s" method', $method));
+            return $columns;
+        });
+
+        $resolver->setAllowedTypes('virtual_columns', 'array');
+        $resolver->setNormalizer('virtual_columns', function (Options $options, array $value): array {
+            $columns = [];
+            foreach ($value as $column) {
+                if (\is_array($column)) {
+                    $column = new CrudColumn($column);
+                } elseif (!$column instanceof CrudColumn) {
+                    throw new \Exception('A column must be an array or a CrudColum instance.');
+                }
+                if (\array_key_exists($column->getId(), $columns)) {
+                    throw new \Exception(sprintf('The column "column1" already exists.', $column->getId()));
+                }
+                $columns[$column->getId()] = $column;
             }
-        }
 
-        if ($this->searchForm) {
-            $this->searchForm->createForm();
+            return $columns;
+        });
+
+        $resolver->setAllowedTypes('max_per_page_choices', 'int[]');
+        $resolver->setAllowedValues('max_per_page_choices', Validation::createCallable(
+            new Assert\Count(min: 1, minMessage: 'The max_per_page_choices should contain 1 value or more.'),
+        ));
+        $resolver->setAllowedTypes('default_max_per_page', 'int');
+
+        $resolver->setAllowedTypes('default_sort', 'string');
+        $resolver->setAllowedValues('default_sort_direction', [self::ASC, self::DESC]);
+        $resolver->setAllowedTypes('default_personalized_sort', 'string[]');
+
+        $resolver->setAllowedTypes('query_builder', [
+            \Doctrine\ORM\QueryBuilder::class,
+            \Doctrine\DBAL\Query\QueryBuilder::class,
+            QueryBuilderInterface::class,
+        ]);
+
+        $resolver->setAllowedTypes('route_name', 'string');
+        $resolver->setAllowedTypes('route_parameters', 'array');
+
+        $resolver->setAllowedTypes('search_form_data', ['null', SearcherInterface::class]);
+        $resolver->setAllowedTypes('search_form_type', ['null', 'string']);
+        $resolver->setAllowedTypes('search_form_options', 'array');
+
+        $resolver->setAllowedTypes('display_results_only_if_search', 'bool');
+        $resolver->setAllowedTypes('build_paginator', ['bool', \Closure::class, 'array']);
+
+        $resolver->setAllowedTypes('persistent_settings', 'bool');
+        $resolver->setNormalizer('persistent_settings', function (Options $options, bool $value): bool {
+            if ($value && (null === $this->container->get('security.token_storage')->getToken() || !($this->container->get('security.token_storage')->getToken()->getUser() instanceof UserInterface))) {
+                return false;
+            }
+
+            return $value;
+        });
+
+        $resolver->setAllowedTypes('div_id_search', 'string');
+        $resolver->setAllowedTypes('div_id_list', 'string');
+
+        $resolver->setAllowedTypes('twig_functions_configuration', 'array');
+
+        $this->options = $resolver->resolve($options);
+
+        // Check duplicates in columns / vitual columns
+        $duplicates = array_intersect_key($this->options['columns'], $this->options['virtual_columns']);
+        if (\count($duplicates) > 0) {
+            throw new \Exception(sprintf('The column "column1" already exists.', array_keys($duplicates)[0]));
         }
 
+        $this->init();
+
+        return $this;
+    }
+
+    protected function init(): void
+    {
+        $this->createSearchForm();
+
         // Loads user values inside this object
         $this->load();
 
         // Display or not results
-        if ($this->searchForm && $this->displayResultsOnlyIfSearch) {
+        if ($this->searchForm && $this->getDisplayResultsOnlyIfSearch()) {
             $this->displayResults = $this->sessionValues->searchFormIsSubmittedAndValid;
         }
 
@@ -109,116 +210,47 @@ public function init(): self
         // Process request (resultsPerPage, sort, sortDirection, change_columns)
         $this->processRequest();
 
-        // Searcher form: Allocates object
-        if ($this->searchForm && !$this->container->get('request_stack')->getCurrentRequest()->query->has('reset')) {
-            // IMPORTANT
-            // We have not to allocate directelly the "$this->sessionValues->searchFormData" object
-            // because otherwise it will be linked to form, and will be updated when the "bind" function will
-            // be called (If form is not valid, the session values will still be updated: Undesirable behavior)
-            /** @psalm-suppress PossiblyInvalidClone */
-            $values = clone $this->sessionValues->searchFormData;
-            try {
-                $this->searchForm->getForm()->setData($values);
-            } catch (TransformationFailedException $exception) {
-                // Avoid error if data stored in session is invalid
-            }
-        }
+        $this->buildSearchForm();
 
         // Saves
         $this->save();
-
-        $this->initializationInProgress = false;
-        $this->isInitialized = true;
-
-        return $this;
     }
 
-    public function isInitialized(): bool
+    protected function createSearchForm(): void
     {
-        return $this->isInitialized;
-    }
-
-    public function initIfNecessary(): self
-    {
-        if (!$this->isInitialized && !$this->initializationInProgress) {
-            $this->init();
+        if ($this->options['search_form_data']) {
+            $this->searchForm = new SearchFormBuilder($this->container, $this, $this->options['search_form_data'], $this->options['search_form_type'], $this->options['search_form_options']);
         }
-
-        return $this;
     }
 
-    protected function crudMustNotBeInitialized(): void
+    protected function buildSearchForm(): void
     {
-        if (!$this->isInitialized) {
+        if (!$this->searchForm) {
             return;
         }
 
-        $caller = debug_backtrace()[1]['function'];
-        throw new \Exception(sprintf('The method "%s" cannot be called after CRUD initialization', $caller));
-    }
+        $this->searchForm->createForm();
 
-    protected function crudMustBeInitialized(): void
-    {
-        if ($this->isInitialized || $this->initializationInProgress) {
+        // Allocates object
+        if ($this->container->get('request_stack')->getCurrentRequest()->query->has('reset')) {
             return;
         }
-
-        $caller = debug_backtrace()[1]['function'];
-        throw new \Exception(sprintf('The method "%s" cannot be called before CRUD initialization', $caller));
+        // IMPORTANT
+        // We have not to allocate directelly the "$this->sessionValues->searchFormData" object
+        // because otherwise it will be linked to form, and will be updated when the "bind" function will
+        // be called (If form is not valid, the session values will still be updated: Undesirable behavior)
+        /** @psalm-suppress PossiblyInvalidClone */
+        $values = clone $this->sessionValues->searchFormData;
+        try {
+            $this->searchForm->getForm()->setData($values);
+        } catch (TransformationFailedException $exception) {
+            // Avoid error if data stored in session is invalid
+        }
     }
 
-    /**
-     * Add a column inside the crud.
-     *
-     * @param string $id      Column id (used everywhere inside the crud)
-     * @param string $alias   Column SQL alias
-     * @param string $label   Column label (used in the header table)
-     * @param array  $options Options:
-     *                        * sortable: If the column is sortable (Default: true)
-     *                        * default_displayed: If the column is displayed, by default (Default: true)
-     *                        * alias_search: Column SQL alias, used during searchs. If null, $alias is used.
-     *                        * alias_sort: Column(s) SQL alias (string or array of strings), used during sorting. If null, $alias is used.
-     */
-    public function addColumn(string $id, string $alias, string $label, array $options = []): self
+    public function getOptions(): array
     {
-        $this->crudMustNotBeInitialized();
-        if (mb_strlen($id) > 100) {
-            throw new \Exception(sprintf('The column id "%s" is too long', $id));
-        }
-        if (\array_key_exists($id, $this->availableColumns) || \array_key_exists($id, $this->availableVirtualColumns)) {
-            throw new \Exception(sprintf('The column "%s" already exists', $id));
-        }
-
-        $resolver = new OptionsResolver();
-        $resolver->setDefaults(
-            [
-                'sortable' => true,
-                'default_displayed' => true,
-                'alias_search' => null,
-                'alias_sort' => null,
-            ]
-        );
-        $resolver->setAllowedTypes('sortable', 'bool');
-        $resolver->setAllowedTypes('default_displayed', 'bool');
-        $options = $resolver->resolve($options);
-
-        $columnOptions = [
-            'id' => $id,
-            'alias' => $alias,
-            'label' => $label,
-            'sortable' => $options['sortable'],
-            'displayed_by_default' => $options['default_displayed'],
-        ];
-        if (null !== $options['alias_search']) {
-            $columnOptions['alias_search'] = $options['alias_search'];
-        }
-        if (null !== $options['alias_sort']) {
-            $columnOptions['alias_sort'] = $options['alias_sort'];
-        }
-        $column = new CrudColumn($columnOptions);
-        $this->availableColumns[$id] = $column;
-
-        return $this;
+        return $this->options;
     }
 
     /**
@@ -226,15 +258,15 @@ public function addColumn(string $id, string $alias, string $label, array $optio
      */
     public function getColumns(): array
     {
-        return $this->availableColumns;
+        return $this->options['columns'];
     }
 
     public function getColumn(string $columnId): CrudColumn
     {
-        if (isset($this->availableColumns[$columnId])) {
-            return $this->availableColumns[$columnId];
+        if (isset($this->options['columns'][$columnId])) {
+            return $this->options['columns'][$columnId];
         }
-        throw new \Exception(sprintf('The column "%s" does not exist', $columnId));
+        throw new \Exception(sprintf('The column "%s" does not exist.', $columnId));
     }
 
     /**
@@ -243,161 +275,72 @@ public function getColumn(string $columnId): CrudColumn
     public function getDefaultDisplayedColumns(): array
     {
         $columns = [];
-        foreach ($this->availableColumns as $column) {
+        foreach ($this->getColumns() as $column) {
             if ($column->isDisplayedByDefault()) {
                 $columns[] = $column->getId();
             }
         }
         if (0 == \count($columns)) {
-            throw new \Exception('At least one column is required');
+            throw new \Exception('The CRUD should contain 1 displayed column or more.');
         }
 
         return $columns;
     }
 
-    /**
-     * Add a virtual column inside the crud.
-     *
-     * @param string $id          Column id (used everywhere inside the crud)
-     * @param string $aliasSearch column SQL alias, used during searchs
-     */
-    public function addVirtualColumn(string $id, string $aliasSearch): self
-    {
-        $this->crudMustNotBeInitialized();
-        if (\array_key_exists($id, $this->availableColumns) || \array_key_exists($id, $this->availableVirtualColumns)) {
-            throw new \Exception(sprintf('The column "%s" already exists', $id));
-        }
-        $column = new CrudColumn([
-            'id' => $id,
-            'alias' => $aliasSearch,
-        ]);
-        $this->availableVirtualColumns[$id] = $column;
-
-        return $this;
-    }
-
     /**
      * Returns availabled virtual columns.
      */
     public function getVirtualColumns(): array
     {
-        return $this->availableVirtualColumns;
+        return $this->options['virtual_columns'];
     }
 
     public function getVirtualColumn(string $columnId): CrudColumn
     {
-        if (isset($this->availableVirtualColumns[$columnId])) {
-            return $this->availableVirtualColumns[$columnId];
+        if (isset($this->options['virtual_columns'][$columnId])) {
+            return $this->options['virtual_columns'][$columnId];
         }
-        throw new \Exception(sprintf('The column "%s" does not exist', $columnId));
+        throw new \Exception(sprintf('The column "%s" does not exist.', $columnId));
     }
 
-    public function getQueryBuilder(): \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface|null
+    public function getQueryBuilder(): \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface
     {
-        return $this->queryBuilder;
+        return $this->options['query_builder'];
     }
 
-    public function setQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface $queryBuilder): self
+    public function getMaxPerPageChoices(): array
     {
-        $this->crudMustNotBeInitialized();
-        $this->queryBuilder = $queryBuilder;
-
-        return $this;
+        return $this->options['max_per_page_choices'];
     }
 
-    public function getAvailableResultsPerPage(): array
+    public function getDefaultMaxPerPage(): int
     {
-        return $this->availableResultsPerPage;
+        return $this->options['default_max_per_page'];
     }
 
-    /**
-     * Return default results per page.
-     */
-    public function getDefaultResultsPerPage(): ?int
+    public function getDefaultSort(): string
     {
-        return $this->defaultResultsPerPage;
+        return $this->options['default_sort'];
     }
 
-    public function setAvailableResultsPerPage(array $availableResultsPerPage, int $defaultValue): self
-    {
-        $this->crudMustNotBeInitialized();
-        if (0 === \count($availableResultsPerPage)) {
-            throw new \Exception('The 1st argument of the "setAvailableResultsPerPage" method must contain at least one integer');
-        }
-        if ($availableResultsPerPage !== array_filter($availableResultsPerPage, 'is_int')) {
-            throw new \Exception('The 1st argument of the "setAvailableResultsPerPage" method must contain only integers');
-        }
-        $this->availableResultsPerPage = $availableResultsPerPage;
-        $this->defaultResultsPerPage = $defaultValue;
-
-        return $this;
-    }
-
-    public function getDefaultSort(): ?string
-    {
-        return $this->defaultSort;
-    }
-
-    public function getDefaultSortDirection(): ?string
-    {
-        return $this->defaultSortDirection;
-    }
-
-    /**
-     * Set the default sort.
-     *
-     * @param string $sort          Column id
-     * @param string $sortDirection Sort direction (Crud::ASC / Crud::DESC)
-     */
-    public function setDefaultSort(string $sort, string $sortDirection): self
+    public function getDefaultSortDirection(): string
     {
-        $this->crudMustNotBeInitialized();
-        $this->defaultSort = $sort;
-        $this->defaultSortDirection = $sortDirection;
-
-        return $this;
+        return $this->options['default_sort_direction'];
     }
 
     public function getDefaultPersonalizedSort(): array
     {
-        return $this->defaultPersonalizedSort;
+        return $this->options['default_personalized_sort'];
     }
 
-    /**
-     * Set the default personalized sort.
-     *
-     * @param array $criterias Criterias :
-     *                         If key is defined: Key = Sort  Value = Sort direction
-     *                         If key is not defined: Value = Sort
-     */
-    public function setDefaultPersonalizedSort(array $criterias): self
+    public function getRouteName(): string
     {
-        $this->crudMustNotBeInitialized();
-        $this->defaultPersonalizedSort = $criterias;
-
-        $this->defaultSort = 'defaultPersonalizedSort';
-        $this->defaultSortDirection = self::ASC; // Used if not defined in criterias
-
-        return $this;
+        return $this->options['route_name'];
     }
 
-    public function setRoute(string $routeName, array $parameters = []): self
+    public function getRouteParameters(): array
     {
-        $this->crudMustNotBeInitialized();
-        $this->routeName = $routeName;
-        $this->routeParams = $parameters;
-
-        return $this;
-    }
-
-    public function getRouteName(): ?string
-    {
-        return $this->routeName;
-    }
-
-    public function getRouteParams(): array
-    {
-        return $this->routeParams;
+        return $this->options['route_parameters'];
     }
 
     /**
@@ -405,9 +348,9 @@ public function getRouteParams(): array
      */
     public function getUrl(array $parameters = []): string
     {
-        $parameters = array_merge($this->routeParams, $parameters);
+        $parameters = array_merge($this->getRouteParameters(), $parameters);
 
-        return $this->container->get('router')->generate($this->routeName, $parameters);
+        return $this->container->get('router')->generate($this->getRouteName(), $parameters);
     }
 
     /**
@@ -415,27 +358,19 @@ public function getUrl(array $parameters = []): string
      */
     public function getSearchUrl(array $parameters = []): string
     {
-        $parameters = array_merge($this->routeParams, ['search' => 1], $parameters);
+        $parameters = array_merge($this->getRouteParameters(), ['search' => 1], $parameters);
 
-        return $this->container->get('router')->generate($this->routeName, $parameters);
+        return $this->container->get('router')->generate($this->getRouteName(), $parameters);
     }
 
     public function getSessionName(): string
     {
-        return $this->sessionName;
+        return $this->options['session_name'];
     }
 
     public function getDisplayResultsOnlyIfSearch(): bool
     {
-        return $this->displayResultsOnlyIfSearch;
-    }
-
-    public function setDisplayResultsOnlyIfSearch(bool $displayResultsOnlyIfSearch): self
-    {
-        $this->crudMustNotBeInitialized();
-        $this->displayResultsOnlyIfSearch = $displayResultsOnlyIfSearch;
-
-        return $this;
+        return $this->options['display_results_only_if_search'];
     }
 
     public function getDisplayResults(): bool
@@ -453,17 +388,6 @@ public function setDisplayResults(bool $displayResults): self
         return $this;
     }
 
-    /**
-     * Enables (or not) the auto build paginator.
-     */
-    public function setBuildPaginator(bool|\Closure|array $value): self
-    {
-        $this->crudMustNotBeInitialized();
-        $this->buildPaginator = $value;
-
-        return $this;
-    }
-
     public function getPaginator(): ?PaginatorInterface
     {
         return $this->paginator;
@@ -476,24 +400,8 @@ public function setPaginator(?PaginatorInterface $value): self
         return $this;
     }
 
-    /*
-     * Use (or not) persistent settings.
-     */
-    public function setPersistentSettings(bool $value): self
-    {
-        $this->crudMustNotBeInitialized();
-        if ($value && (null === $this->container->get('security.token_storage')->getToken() || !($this->container->get('security.token_storage')->getToken()->getUser() instanceof UserInterface))) {
-            $value = false;
-        }
-        $this->persistentSettings = $value;
-
-        return $this;
-    }
-
     public function getSessionValues(): CrudSession
     {
-        $this->crudMustBeInitialized();
-
         return $this->sessionValues;
     }
 
@@ -505,45 +413,20 @@ public function getSearchForm(): SearchFormBuilder|FormView|null
         return $this->searchForm;
     }
 
-    public function createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = []): self
-    {
-        $this->crudMustNotBeInitialized();
-        $this->searchForm = new SearchFormBuilder($this->container, $this, $defaultData, $type, $options);
-
-        return $this;
-    }
-
     public function getDivIdSearch(): string
     {
-        return $this->divIdSearch;
-    }
-
-    public function setDivIdSearch(string $divIdSearch): self
-    {
-        $this->crudMustNotBeInitialized();
-        $this->divIdSearch = $divIdSearch;
-
-        return $this;
+        return $this->options['div_id_search'];
     }
 
     public function getDivIdList(): string
     {
-        return $this->divIdList;
-    }
-
-    public function setDivIdList(string $divIdList): self
-    {
-        $this->crudMustNotBeInitialized();
-        $this->divIdList = $divIdList;
-
-        return $this;
+        return $this->options['div_id_list'];
     }
 
     public function processSearchForm(): self
     {
-        $this->crudMustBeInitialized();
         if (!$this->searchForm) {
-            throw new NotFoundHttpException('Crud: Search form does not exist');
+            throw new NotFoundHttpException('Crud: Search form does not exist.');
         }
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
@@ -551,12 +434,12 @@ public function processSearchForm(): self
             return $this;
         }
         if ('POST' == $request->getMethod()) {
-            if ($this->displayResultsOnlyIfSearch) {
+            if ($this->getDisplayResultsOnlyIfSearch()) {
                 $this->displayResults = false;
             }
             $searchForm = $this->searchForm->getForm();
             $searchForm->handleRequest($request);
-            if ($searchForm->isSubmitted() && $searchForm->isValid() && false !== $this->buildPaginator) {
+            if ($searchForm->isSubmitted() && $searchForm->isValid() && false !== $this->options['build_paginator']) {
                 $this->displayResults = true;
                 $this->sessionValues->searchFormIsSubmittedAndValid = true;
                 $this->changeFilterValues($searchForm->getData());
@@ -570,7 +453,6 @@ public function processSearchForm(): self
 
     public function build(): self
     {
-        $this->crudMustBeInitialized();
         $this->updateQueryBuilder();
         $this->buildPaginator();
 
@@ -583,45 +465,46 @@ protected function updateQueryBuilder(): void
         $columnSortId = $this->sessionValues->sort;
         if ('defaultPersonalizedSort' == $columnSortId) {
             // Default personalised sort is used
-            foreach ($this->defaultPersonalizedSort as $key => $value) {
+            foreach ($this->getDefaultPersonalizedSort() as $key => $value) {
                 if (\is_int($key)) {
                     $sort = $value;
-                    $sortDirection = $this->defaultSortDirection;
+                    $sortDirection = $this->getDefaultSortDirection();
                 } else {
                     $sort = $key;
                     $sortDirection = $value;
                 }
-                $this->queryBuilder->addOrderBy($sort, $sortDirection);
+                $this->getQueryBuilder()->addOrderBy($sort, $sortDirection);
             }
         } else {
-            $columnSortAlias = $this->availableColumns[$columnSortId]->getAliasSort();
+            $columnSortAlias = $this->getColumn($columnSortId)->getAliasSort();
             if (\is_array($columnSortAlias)) {
                 // Sort alias in many columns
                 foreach ($columnSortAlias as $oneColumnSortAlias) {
-                    $this->queryBuilder->addOrderBy($oneColumnSortAlias, $this->sessionValues->sortDirection);
+                    $this->getQueryBuilder()->addOrderBy($oneColumnSortAlias, $this->sessionValues->sortDirection);
                 }
             } else {
                 // Sort alias in one column
-                $this->queryBuilder->orderBy($columnSortAlias, $this->sessionValues->sortDirection);
+                $this->getQueryBuilder()->orderBy($columnSortAlias, $this->sessionValues->sortDirection);
             }
         }
 
         // Adds form searcher filters
         if ($this->searchForm) {
-            $this->searchForm->updateQueryBuilder($this->queryBuilder, $this->sessionValues->searchFormData);
+            /** @psalm-suppress PossiblyNullArgument */
+            $this->searchForm->updateQueryBuilder($this->getQueryBuilder(), $this->sessionValues->searchFormData);
         }
     }
 
     protected function buildPaginator(): void
     {
-        if (!$this->displayResults || false === $this->buildPaginator) {
+        if (!$this->displayResults || false === $this->options['build_paginator']) {
             return;
         }
 
-        if ($this->buildPaginator instanceof \Closure) {
+        if ($this->options['build_paginator'] instanceof \Closure) {
             // Case: Manual paginator (by closure) is enabled
-            $this->paginator = $this->buildPaginator->__invoke(
-                $this->queryBuilder,
+            $this->paginator = $this->options['build_paginator']->__invoke(
+                $this->getQueryBuilder(),
                 $this->sessionValues->page,
                 $this->sessionValues->resultsPerPage
             );
@@ -631,12 +514,12 @@ protected function buildPaginator(): void
 
         // Case: Auto paginator is enabled
         $paginatorOptions = [];
-        if (\is_array($this->buildPaginator)) {
-            $paginatorOptions = $this->buildPaginator;
+        if (\is_array($this->options['build_paginator'])) {
+            $paginatorOptions = $this->options['build_paginator'];
         }
 
         $this->paginator = DoctrinePaginatorBuilder::createDoctrinePaginator(
-            $this->queryBuilder,
+            $this->getQueryBuilder(),
             $this->sessionValues->page,
             $this->sessionValues->resultsPerPage,
             $paginatorOptions
@@ -648,7 +531,6 @@ protected function buildPaginator(): void
      */
     public function reset(): self
     {
-        $this->initIfNecessary();
         if ($this->searchForm) {
             $newValue = clone $this->searchForm->getDefaultData();
             $this->changeFilterValues($newValue);
@@ -658,7 +540,7 @@ public function reset(): self
         $this->changePage(1);
         $this->save();
 
-        if ($this->displayResultsOnlyIfSearch) {
+        if ($this->getDisplayResultsOnlyIfSearch()) {
             $this->displayResults = false;
         }
 
@@ -667,9 +549,8 @@ public function reset(): self
 
     public function resetSort(): self
     {
-        $this->initIfNecessary();
-        $this->sessionValues->sortDirection = $this->defaultSortDirection;
-        $this->sessionValues->sort = $this->defaultSort;
+        $this->sessionValues->sortDirection = $this->getDefaultSortDirection();
+        $this->sessionValues->sort = $this->getDefaultSort();
         $this->save();
 
         return $this;
@@ -678,16 +559,16 @@ public function resetSort(): self
     protected function resetDisplaySettings(): void
     {
         $this->sessionValues->displayedColumns = $this->getDefaultDisplayedColumns();
-        $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
-        $this->sessionValues->sortDirection = $this->defaultSortDirection;
-        $this->sessionValues->sort = $this->defaultSort;
+        $this->sessionValues->resultsPerPage = $this->getDefaultMaxPerPage();
+        $this->sessionValues->sortDirection = $this->getDefaultSortDirection();
+        $this->sessionValues->sort = $this->getDefaultSort();
 
-        if ($this->persistentSettings) {
+        if ($this->options['persistent_settings']) {
             // Remove settings in database
             $qb = $this->container->get('doctrine')->getManager()->createQueryBuilder();
             $qb->delete('EcommitCrudBundle:UserCrudSettings', 's')
                 ->andWhere('s.user = :user AND s.crudName = :crud_name')
-                ->setParameters(['user' => $this->container->get('security.token_storage')->getToken()->getUser(), 'crud_name' => $this->sessionName])
+                ->setParameters(['user' => $this->container->get('security.token_storage')->getToken()->getUser(), 'crud_name' => $this->getSessionName()])
                 ->getQuery()
                 ->execute();
         }
@@ -695,7 +576,6 @@ protected function resetDisplaySettings(): void
 
     public function createView(): self
     {
-        $this->crudMustBeInitialized();
         if ($this->searchForm) {
             $this->searchForm->createFormView();
             $this->searchForm = $this->searchForm->getForm();
@@ -707,25 +587,18 @@ public function createView(): self
 
     public function getTwigFunctionsConfiguration(): array
     {
-        return $this->twigFunctionsConfiguration;
+        return $this->options['twig_functions_configuration'];
     }
 
     public function getTwigFunctionConfiguration(string $function): array
     {
-        if (isset($this->twigFunctionsConfiguration[$function])) {
-            return $this->twigFunctionsConfiguration[$function];
+        if (isset($this->options['twig_functions_configuration'][$function])) {
+            return $this->options['twig_functions_configuration'][$function];
         }
 
         return [];
     }
 
-    public function setTwigFunctionsConfiguration(array $twigFunctionsConfiguration): self
-    {
-        $this->twigFunctionsConfiguration = $twigFunctionsConfiguration;
-
-        return $this;
-    }
-
     protected function testIfDatabaseMustMeUpdated(mixed $oldValue, mixed $newValue): void
     {
         if ($oldValue != $newValue) {
@@ -753,10 +626,10 @@ protected function checkCrudSession(): void
     protected function changeNumberResultsDisplayed(int $value): void
     {
         $oldValue = $this->sessionValues->resultsPerPage;
-        if (\in_array($value, $this->availableResultsPerPage)) {
+        if (\in_array($value, $this->getMaxPerPageChoices())) {
             $this->sessionValues->resultsPerPage = $value;
         } else {
-            $this->sessionValues->resultsPerPage = $this->defaultResultsPerPage;
+            $this->sessionValues->resultsPerPage = $this->getDefaultMaxPerPage();
         }
         $this->testIfDatabaseMustMeUpdated($oldValue, $value);
     }
@@ -768,9 +641,9 @@ protected function changeColumnsDisplayed(array $value): void
     {
         $oldValue = $this->sessionValues->displayedColumns;
         $newDisplayedColumns = [];
-        $availableColumns = $this->availableColumns;
+        $columns = $this->getColumns();
         foreach ($value as $columnName) {
-            if (\array_key_exists($columnName, $availableColumns)) {
+            if (\array_key_exists($columnName, $columns)) {
                 $newDisplayedColumns[] = $columnName;
             }
         }
@@ -787,14 +660,14 @@ protected function changeColumnsDisplayed(array $value): void
     protected function changeSort(mixed $value): void
     {
         $oldValue = $this->sessionValues->sort;
-        $availableColumns = $this->availableColumns;
-        if ((\is_string($value) && \array_key_exists($value, $availableColumns) && $availableColumns[$value]->isSortable())
-            || (\is_string($value) && 'defaultPersonalizedSort' === $value && $this->defaultPersonalizedSort)) {
+        $columns = $this->getColumns();
+        if ((\is_string($value) && \array_key_exists($value, $columns) && $columns[$value]->isSortable())
+            || (\is_string($value) && 'defaultPersonalizedSort' === $value && $this->getDefaultPersonalizedSort())) {
             $this->sessionValues->sort = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
-            $this->sessionValues->sort = $this->defaultSort;
-            $this->testIfDatabaseMustMeUpdated($oldValue, $this->defaultSort);
+            $this->sessionValues->sort = $this->getDefaultSort();
+            $this->testIfDatabaseMustMeUpdated($oldValue, $this->getDefaultSort());
         }
     }
 
@@ -808,8 +681,8 @@ protected function changeSortDirection(mixed $value): void
             $this->sessionValues->sortDirection = $value;
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
-            $this->sessionValues->sortDirection = $this->defaultSortDirection;
-            $this->testIfDatabaseMustMeUpdated($oldValue, $this->defaultSortDirection);
+            $this->sessionValues->sortDirection = $this->getDefaultSortDirection();
+            $this->testIfDatabaseMustMeUpdated($oldValue, $this->getDefaultSortDirection());
         }
     }
 
@@ -891,7 +764,7 @@ public function getDisplaySettingsForm(): FormInterface|FormView|null
     protected function createDisplaySettingsForm(): void
     {
         $resultsPerPageChoices = [];
-        foreach ($this->getAvailableResultsPerPage() as $number) {
+        foreach ($this->getMaxPerPageChoices() as $number) {
             $resultsPerPageChoices[$number] = $number;
         }
         $columnsChoices = [];
@@ -918,7 +791,7 @@ protected function createDisplaySettingsForm(): void
     protected function load(): void
     {
         $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
-        $object = $session->get($this->sessionName); // Load from session
+        $object = $session->get($this->getSessionName()); // Load from session
 
         if (!empty($object)) {
             $this->sessionValues = $object;
@@ -929,19 +802,19 @@ protected function load(): void
 
         // If session is null => Assign default value
         $this->sessionValues = new CrudSession(
-            $this->defaultResultsPerPage,
+            $this->getDefaultMaxPerPage(),
             $this->getDefaultDisplayedColumns(),
-            $this->defaultSort,
-            $this->defaultSortDirection,
+            $this->getDefaultSort(),
+            $this->getDefaultSortDirection(),
             ($this->searchForm) ? $this->searchForm->getDefaultData() : null,
         );
 
         // If persistent settings is enabled -> Retrieve from database
-        if ($this->persistentSettings) {
+        if ($this->options['persistent_settings']) {
             $objectDatabase = $this->container->get('doctrine')->getRepository(UserCrudSettings::class)->findOneBy(
                 [
                     'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
-                    'crudName' => $this->sessionName,
+                    'crudName' => $this->getSessionName(),
                 ]
             );
             if ($objectDatabase) {
@@ -964,14 +837,14 @@ protected function save(): void
         if (\is_object($this->sessionValues->searchFormData)) {
             $sessionValues->searchFormData = clone $this->sessionValues->searchFormData;
         }
-        $session->set($this->sessionName, $sessionValues);
+        $session->set($this->getSessionName(), $sessionValues);
 
         // Save in database
-        if ($this->persistentSettings && $this->updateDatabase) {
+        if ($this->options['persistent_settings'] && $this->updateDatabase) {
             $objectDatabase = $this->container->get('doctrine')->getRepository(UserCrudSettings::class)->findOneBy(
                 [
                     'user' => $this->container->get('security.token_storage')->getToken()->getUser(),
-                    'crudName' => $this->sessionName,
+                    'crudName' => $this->getSessionName(),
                 ]
             );
             $em = $this->container->get('doctrine')->getManager();
@@ -983,13 +856,13 @@ protected function save(): void
             } else {
                 // Create object in database only if not default values
                 if ($this->sessionValues->displayedColumns != $this->getDefaultDisplayedColumns() ||
-                    $this->sessionValues->resultsPerPage != $this->defaultResultsPerPage ||
-                    $this->sessionValues->sortDirection != $this->defaultSortDirection ||
-                    $this->sessionValues->sort != $this->defaultSort
+                    $this->sessionValues->resultsPerPage != $this->getDefaultMaxPerPage() ||
+                    $this->sessionValues->sortDirection != $this->getDefaultSortDirection() ||
+                    $this->sessionValues->sort != $this->getDefaultSort()
                 ) {
                     $objectDatabase = new UserCrudSettings(
                         $this->container->get('security.token_storage')->getToken()->getUser(),
-                        $this->sessionName,
+                        $this->getSessionName(),
                         $this->sessionValues->resultsPerPage,
                         $this->sessionValues->displayedColumns,
                         $this->sessionValues->sort,
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index fa376be..d836345 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -15,6 +15,8 @@
 
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Validation;
 
 final class CrudColumn
 {
@@ -25,7 +27,7 @@ final class CrudColumn
      *     label: string,
      *     sortable: bool,
      *     displayed_by_default: bool,
-     *     alias_sort: string,
+     *     alias_sort: string|array,
      *     alias_search: string
      * }
      */
@@ -58,11 +60,14 @@ public function __construct(array $options)
             'alias_search' => fn (Options $options): string => $options['alias'],
         ]);
         $resolver->setAllowedTypes('id', 'string');
+        $resolver->setAllowedValues('id', Validation::createCallable(
+            new Length(max: 100, maxMessage: 'The column id "{{ value }}" is too long. It should have {{ limit }} character or less')
+        ));
         $resolver->setAllowedTypes('alias', 'string');
         $resolver->setAllowedTypes('label', 'string');
         $resolver->setAllowedTypes('sortable', 'bool');
         $resolver->setAllowedTypes('displayed_by_default', 'bool');
-        $resolver->setAllowedTypes('alias_sort', 'string');
+        $resolver->setAllowedTypes('alias_sort', ['string', 'array']);
         $resolver->setAllowedTypes('alias_search', 'string');
 
         $this->options = $resolver->resolve($options);
@@ -98,7 +103,7 @@ public function getAliasSearch(): string
         return $this->options['alias_search'];
     }
 
-    public function getAliasSort(): string
+    public function getAliasSort(): string|array
     {
         return $this->options['alias_sort'];
     }
diff --git a/src/Crud/CrudColumnReference.php b/src/Crud/CrudColumnReference.php
deleted file mode 100644
index bdad072..0000000
--- a/src/Crud/CrudColumnReference.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the EcommitCrudBundle package.
- *
- * (c) E-commit <contact@e-commit.fr>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Ecommit\CrudBundle\Crud;
-
-/**
- * @internal
- */
-final class CrudColumnReference
-{
-    public function __construct(public string $id)
-    {
-    }
-}
diff --git a/src/Crud/CrudConfig.php b/src/Crud/CrudConfig.php
new file mode 100644
index 0000000..5225a90
--- /dev/null
+++ b/src/Crud/CrudConfig.php
@@ -0,0 +1,251 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Crud;
+
+use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
+
+final class CrudConfig implements \ArrayAccess
+{
+    protected array $options = [];
+
+    public function __construct(?string $sessionName = null)
+    {
+        if (null !== $sessionName) {
+            $this->setSessionName($sessionName);
+        }
+    }
+
+    public function setSessionName(string $sessionName): self
+    {
+        $this->options['session_name'] = $sessionName;
+
+        return $this;
+    }
+
+    /**
+     * Usage:
+     *      ->addColumn(['id' => 'column_id', 'alias' => 'column_alias'])
+     *  Called with an array of options.
+     *
+     * @see CrudColumn for available options
+     * @psalm-suppress MissingParamType
+     */
+    public function addColumn(...$args): self
+    {
+        if (1 === \count($args)) {
+            $column = $args[0];
+        } elseif (3 === \count($args)) {
+            $column = [
+                'id' => $args[0],
+                'alias' => $args[1],
+                'label' => $args[2],
+            ];
+        } elseif (4 === \count($args) && \is_array($args[3])) {
+            $column = [
+                'id' => $args[0],
+                'alias' => $args[1],
+                'label' => $args[2],
+            ];
+            foreach ($args[3] as $optionName => $optionValue) {
+                $column[$optionName] = $optionValue;
+            }
+        } else {
+            throw new \Exception('Bad addColumn call');
+        }
+
+        if (!\array_key_exists('columns', $this->options)) {
+            $this->options['columns'] = [];
+        }
+        $this->options['columns'][] = $column;
+
+        return $this;
+    }
+
+    /**
+     * Usage:
+     *      ->addColumn(['id' => 'column_id', 'alias' => 'column_alias'])
+     *  Called with an array of options.
+     *
+     * @see CrudColumn for available options
+     * @psalm-suppress MissingParamType
+     */
+    public function addVirtualColumn(...$args): self
+    {
+        if (1 === \count($args)) {
+            $column = $args[0];
+        } elseif (2 === \count($args)) {
+            $column = [
+                'id' => $args[0],
+                'alias' => $args[1],
+            ];
+        } else {
+            throw new \Exception('Bad addVirtualColumn call');
+        }
+
+        if (!\array_key_exists('virtual_columns', $this->options)) {
+            $this->options['virtual_columns'] = [];
+        }
+        $this->options['virtual_columns'][] = $column;
+
+        return $this;
+    }
+
+    public function setMaxPerPage(array $choices, int $defaultValue): self
+    {
+        $this->options['max_per_page_choices'] = $choices;
+        $this->options['default_max_per_page'] = $defaultValue;
+
+        return $this;
+    }
+
+    /**
+     * Set the default sort.
+     *
+     * @param string $sort          Column id
+     * @param string $sortDirection Sort direction (Crud::ASC / Crud::DESC)
+     */
+    public function setDefaultSort(string $sort, string $sortDirection): self
+    {
+        $this->options['default_sort'] = $sort;
+        $this->options['default_sort_direction'] = $sortDirection;
+
+        return $this;
+    }
+
+    /**
+     * Set the default personalized sort.
+     *
+     * @param array $criterias Criterias :
+     *                         If key is defined: Key = Sort  Value = Sort direction
+     *                         If key is not defined: Value = Sort
+     */
+    public function setDefaultPersonalizedSort(array $criterias): self
+    {
+        $this->options['default_sort'] = 'defaultPersonalizedSort';
+        $this->options['default_personalized_sort'] = $criterias;
+
+        return $this;
+    }
+
+    public function setQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface $queryBuilder): self
+    {
+        $this->options['query_builder'] = $queryBuilder;
+
+        return $this;
+    }
+
+    public function setRoute(string $name, array $parameters = []): self
+    {
+        $this->options['route_name'] = $name;
+        $this->options['route_parameters'] = $parameters;
+
+        return $this;
+    }
+
+    public function createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = []): self
+    {
+        $this->options['search_form_data'] = $defaultData;
+        $this->options['search_form_type'] = $type;
+        $this->options['search_form_options'] = $options;
+
+        return $this;
+    }
+
+    public function setDisplayResultsOnlyIfSearch(bool $value): self
+    {
+        $this->options['display_results_only_if_search'] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Enables (or not) the auto build paginator.
+     */
+    public function setBuildPaginator(bool|\Closure|array $value): self
+    {
+        $this->options['build_paginator'] = $value;
+
+        return $this;
+    }
+
+    public function setPersistentSettings(bool $value): self
+    {
+        $this->options['persistent_settings'] = $value;
+
+        return $this;
+    }
+
+    public function setDivIdSearch(string $value): self
+    {
+        $this->options['div_id_search'] = $value;
+
+        return $this;
+    }
+
+    public function setDivIdList(string $value): self
+    {
+        $this->options['div_id_list'] = $value;
+
+        return $this;
+    }
+
+    public function setTwigFunctionsConfiguration(array $value): self
+    {
+        $this->options['twig_functions_configuration'] = $value;
+
+        return $this;
+    }
+
+    public function resetOptions(null|string|array $options = null): self
+    {
+        if (null === $options) {
+            $this->options = [];
+        }
+
+        $options = (\is_array($options)) ? $options : [$options];
+        foreach ($options as $option) {
+            if (\array_key_exists($option, $this->options)) {
+                unset($this->options[$option]);
+            }
+        }
+
+        return $this;
+    }
+
+    public function offsetExists(mixed $offset): bool
+    {
+        return \array_key_exists($offset, $this->options);
+    }
+
+    public function offsetGet(mixed $offset): mixed
+    {
+        return $this->options[$offset];
+    }
+
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+        /** @psalm-suppress PossiblyNullArrayOffset */
+        $this->options[$offset] = $value;
+    }
+
+    public function offsetUnset(mixed $offset): void
+    {
+        unset($this->options[$offset]);
+    }
+
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
+}
diff --git a/src/Crud/CrudFactory.php b/src/Crud/CrudFactory.php
index ae2c3de..3c4f401 100644
--- a/src/Crud/CrudFactory.php
+++ b/src/Crud/CrudFactory.php
@@ -21,8 +21,8 @@ public function __construct(protected ContainerInterface $container)
     {
     }
 
-    public function create(string $sessionName): Crud
+    public function create(array $options): Crud
     {
-        return new Crud($sessionName, $this->container);
+        return new Crud($options, $this->container);
     }
 }
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index 475bc49..898f144 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -91,7 +91,6 @@ protected function processCrud(Crud $crud, array $options): array
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
 
-        $crud->initIfNecessary();
         if ($request->query->has('search')) {
             $crud->processSearchForm();
         }
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index d694db5..eeb8b8a 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -80,8 +80,27 @@ public function addFilter(string $property, string $filter, array $options = [])
             'required' => false,
             'type_options' => [],
             'update_query_builder' => null,
-            'alias_search' => fn (Options $options) => new CrudColumnReference($options['column_id']),
-            'label' => fn (Options $options) => new CrudColumnReference($options['column_id']),
+            'alias_search' => function (Options $options) {
+                $columns = $this->crud->getColumns();
+                if (\array_key_exists($options['column_id'], $columns)) {
+                    return $columns[$options['column_id']]->getAliasSearch();
+                }
+
+                $virtualColumns = $this->crud->getVirtualColumns();
+                if (\array_key_exists($options['column_id'], $virtualColumns)) {
+                    return $virtualColumns[$options['column_id']]->getAliasSearch();
+                }
+
+                return null;
+            },
+            'label' => function (Options $options) {
+                $columns = $this->crud->getColumns();
+                if (\array_key_exists($options['column_id'], $columns)) {
+                    return $columns[$options['column_id']]->getLabel();
+                }
+
+                return null;
+            },
         ]);
         $resolver->setAllowedTypes('update_query_builder', ['null', 'callable']);
         $filterService->configureOptions($resolver);
@@ -115,7 +134,6 @@ public function getField(string $property): FormBuilderInterface|FormInterface|F
     public function createForm(): self
     {
         $this->defaultData->buildForm($this, $this->options);
-        $this->resolveFilters();
 
         // Add filters
         foreach ($this->filters as $property => $filter) {
@@ -138,30 +156,6 @@ public function createForm(): self
         return $this;
     }
 
-    protected function resolveFilters(): void
-    {
-        $columns = $this->crud->getColumns();
-        $virtualColumns = $this->crud->getVirtualColumns();
-
-        foreach ($this->filters as $property => $filter) {
-            if ($filter['options']['label'] instanceof CrudColumnReference) {
-                if (\array_key_exists($filter['options']['label']->id, $columns)) {
-                    $this->filters[$property]['options']['label'] = $columns[$filter['options']['label']->id]->getLabel();
-                } elseif (\array_key_exists($filter['options']['alias_search']->id, $virtualColumns)) {
-                    $this->filters[$property]['options']['label'] = null;
-                }
-            }
-
-            if ($filter['options']['alias_search'] instanceof CrudColumnReference) {
-                if (\array_key_exists($filter['options']['alias_search']->id, $columns)) {
-                    $this->filters[$property]['options']['alias_search'] = $columns[$filter['options']['alias_search']->id]->getAliasSearch();
-                } elseif (\array_key_exists($filter['options']['alias_search']->id, $virtualColumns)) {
-                    $this->filters[$property]['options']['alias_search'] = $virtualColumns[$filter['options']['alias_search']->id]->getAliasSearch();
-                }
-            }
-        }
-    }
-
     public function createFormView(): self
     {
         /** @psalm-suppress PossiblyUndefinedMethod */
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index dbc6940..e81eafa 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -262,7 +262,7 @@ public function crudPaginatorLinks(Environment $environment, Crud $crud, array $
         $options = $this->buildOptions('crud_paginator_links', $options, $crud);
 
         /** @psalm-suppress PossiblyNullArgument */
-        return $this->paginatorLinks($environment, $crud->getPaginator(), $crud->getRouteName(), $crud->getRouteParams(), $options);
+        return $this->paginatorLinks($environment, $crud->getPaginator(), $crud->getRouteName(), $crud->getRouteParameters(), $options);
     }
 
     /**
diff --git a/templates/Theme/base.html.twig b/templates/Theme/base.html.twig
index fc31339..13d9462 100644
--- a/templates/Theme/base.html.twig
+++ b/templates/Theme/base.html.twig
@@ -104,7 +104,7 @@
     {% set th_attr = th_attr.sortable_not_active|merge({class: (th_attr.sortable_not_active.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-not-active')|trim}) %}
     {% set a_attr = a_attr.sortable_not_active %}
     <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}>{{ label|trans }}</a>
+        <a href="{{ path(crud.routeName, crud.routeParameters|merge({('sort'): column.id})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}>{{ label|trans }}</a>
     </th>
 {% endblock %}
 
@@ -126,7 +126,7 @@
 
 {% block th_sortable_active %}
     <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-        <a href="{{ path(crud.routeName, crud.routeParams|merge({('sort'): column.id, 'sort-direction': new_sort_direction})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
+        <a href="{{ path(crud.routeName, crud.routeParameters|merge({('sort'): column.id, 'sort-direction': new_sort_direction})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
             {{- label|trans }} {{ crud_icon(icon_name) -}}
         </a>
     </th>
diff --git a/tests/Crud/AbstractCrudTest.php b/tests/Crud/AbstractCrudTest.php
new file mode 100644
index 0000000..146dcea
--- /dev/null
+++ b/tests/Crud/AbstractCrudTest.php
@@ -0,0 +1,104 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Crud;
+
+use Doctrine\Persistence\ManagerRegistry;
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudConfig;
+use Ecommit\CrudBundle\Crud\CrudFilters;
+use Ecommit\CrudBundle\Form\Filter\FilterInterface;
+use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
+use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\UserSearcher;
+use Psr\Container\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+
+abstract class AbstractCrudTest extends KernelTestCase
+{
+    protected function setUp(): void
+    {
+        self::bootKernel();
+    }
+
+    protected function createCrud(array|CrudConfig $crudConfig, array $filters = [], mixed $sessionValue = null): Crud
+    {
+        $session = $this->createMock(SessionInterface::class);
+        $session->expects($this->any())
+            ->method('get')
+            ->willReturn($sessionValue);
+        $session->expects($this->any())
+            ->method('set');
+
+        $request = new Request();
+        $request->setSession($session);
+        $requestStack = $this->createMock(RequestStack::class);
+        $requestStack->method('getCurrentRequest')
+            ->willReturn($request);
+
+        $crudFilters = $this->createMock(CrudFilters::class);
+        $crudFilters->method('has')->willReturnCallback(fn (string $name) => \array_key_exists($name, $filters) || static::getContainer()->get('ecommit_crud.filters')->has($name));
+        $crudFilters->method('get')->willReturnCallback(function (string $name) use ($filters): FilterInterface {
+            if (\array_key_exists($name, $filters)) {
+                return $filters[$name];
+            }
+
+            return static::getContainer()->get('ecommit_crud.filters')->get($name);
+        });
+
+        $container = $this->createMock(ContainerInterface::class);
+        $container->method('get')
+            ->willReturnCallback(function ($name) use ($requestStack, $crudFilters) {
+                if ('request_stack' === $name) {
+                    return $requestStack;
+                } elseif ('ecommit_crud.filters' === $name) {
+                    return $crudFilters;
+                }
+
+                return static::getContainer()->get('ecommit_crud.locator')->get($name);
+            });
+
+        if ($crudConfig instanceof CrudConfig) {
+            $crudConfig = $crudConfig->getOptions();
+        }
+        $crud = $this->getMockBuilder(Crud::class)
+            ->setConstructorArgs([$crudConfig, $container])
+            ->onlyMethods(['save'])
+            ->getMock();
+
+        return $crud;
+    }
+
+    protected function createValidCrudConfig(?CrudConfig $crudConfig = null, bool $withSearcher = false): CrudConfig
+    {
+        $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
+            ->createQueryBuilder('u')
+            ->select('u');
+
+        $crudConfig = ($crudConfig) ?: new CrudConfig('session_name');
+        $crudConfig->addColumn(['id' => 'username', 'alias' => 'u.username',  'label' => 'username', 'displayed_by_default' => false])
+            ->addColumn(['id' => 'firstName', 'alias' => 'u.firstName', 'label' => 'first_name'])
+            ->setQueryBuilder($queryBuilder)
+            ->setMaxPerPage([10, 50, 100], 50)
+            ->setDefaultSort('username', Crud::DESC)
+            ->setRoute('user_ajax_crud', ['param1' => 'val1'])
+        ;
+        if ($withSearcher) {
+            $crudConfig->createSearchForm(new UserSearcher());
+        }
+
+        return $crudConfig;
+    }
+}
diff --git a/tests/Crud/CrudColumnTest.php b/tests/Crud/CrudColumnTest.php
index e6df347..e3ce139 100644
--- a/tests/Crud/CrudColumnTest.php
+++ b/tests/Crud/CrudColumnTest.php
@@ -16,6 +16,7 @@
 use Ecommit\CrudBundle\Crud\CrudColumn;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+use Symfony\Component\Validator\Exception\ValidationFailedException;
 
 class CrudColumnTest extends TestCase
 {
@@ -28,6 +29,16 @@ public function testMissingIdOption(): void
         new CrudColumn($options);
     }
 
+    public function testIdTooLongOption(): void
+    {
+        $options = $this->createValidConfig();
+        $options['id'] = str_pad('', 101, 'a');
+
+        $this->expectException(ValidationFailedException::class);
+        $this->expectExceptionMessageMatches('/The column id ".+" is too long. It should have 100 character or less/');
+        new CrudColumn($options);
+    }
+
     public function testMissingAliasOption(): void
     {
         $options = $this->createValidConfig();
diff --git a/tests/Crud/CrudConfigTest.php b/tests/Crud/CrudConfigTest.php
new file mode 100644
index 0000000..01915fd
--- /dev/null
+++ b/tests/Crud/CrudConfigTest.php
@@ -0,0 +1,238 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Crud;
+
+use Doctrine\ORM\QueryBuilder;
+use Ecommit\CrudBundle\Crud\CrudConfig;
+use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
+use PHPUnit\Framework\TestCase;
+
+class CrudConfigTest extends TestCase
+{
+    public function testConstructorWithoutArgument(): void
+    {
+        $config = new CrudConfig();
+        $this->assertSame([], $config->getOptions());
+    }
+
+    public function testConstructorWithArgument(): void
+    {
+        $config = new CrudConfig('session');
+        $this->assertSame(['session_name' => 'session'], $config->getOptions());
+    }
+
+    public function testSetSessionName(): void
+    {
+        $config = (new CrudConfig())->setSessionName('session');
+        $this->assertSame(['session_name' => 'session'], $config->getOptions());
+    }
+
+    public function testAddColumn(): void
+    {
+        $config = (new CrudConfig())
+            ->addColumn('val1') // 1 argument
+            ->addColumn('id2', 'alias2', 'label2') // 3 arguments
+            ->addColumn('id3', 'alias3', 'label3', ['optionA' => 'valueA']); // 4 arguments
+        $expected = [
+            'columns' => [
+                'val1',
+                ['id' => 'id2', 'alias' => 'alias2', 'label' => 'label2'],
+                ['id' => 'id3', 'alias' => 'alias3', 'label' => 'label3', 'optionA' => 'valueA'],
+            ],
+        ];
+        $this->assertSame($expected, $config->getOptions());
+    }
+
+    public function testAddColumnWithoutArgument(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Bad addColumn call');
+        (new CrudConfig())->addColumn();
+    }
+
+    public function testAddColumnWithTooManyArguments(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Bad addColumn call');
+        (new CrudConfig())->addColumn(1, 2, 3, 4, 5);
+    }
+
+    public function testAddVirtualColumn(): void
+    {
+        $config = (new CrudConfig())
+            ->addVirtualColumn('val1') // 1 argument
+            ->addVirtualColumn('id2', 'alias2'); // 2 arguments
+        $expected = [
+            'virtual_columns' => [
+                'val1',
+                ['id' => 'id2', 'alias' => 'alias2'],
+            ],
+        ];
+        $this->assertSame($expected, $config->getOptions());
+    }
+
+    public function testAddVirtualColumnWithoutArgument(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Bad addVirtualColumn call');
+        (new CrudConfig())->addVirtualColumn();
+    }
+
+    public function testAddVirtualColumnWithTooManyArguments(): void
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Bad addVirtualColumn call');
+        (new CrudConfig())->addVirtualColumn(1, 2, 3);
+    }
+
+    public function testSetMaxPerPage(): void
+    {
+        $config = (new CrudConfig())->setMaxPerPage([10, 100], 100);
+        $this->assertSame(['max_per_page_choices' => [10, 100], 'default_max_per_page' => 100], $config->getOptions());
+    }
+
+    public function testSetDefaultSort(): void
+    {
+        $config = (new CrudConfig())->setDefaultSort('sort', 'direction');
+        $this->assertSame(['default_sort' => 'sort', 'default_sort_direction' => 'direction'], $config->getOptions());
+    }
+
+    public function testSetDefaultPersonalizedSort(): void
+    {
+        $config = (new CrudConfig())->setDefaultPersonalizedSort(['crit1', 'crit2']);
+        $this->assertSame(['default_sort' => 'defaultPersonalizedSort', 'default_personalized_sort' => ['crit1', 'crit2']], $config->getOptions());
+    }
+
+    public function testSetQueryBuilder(): void
+    {
+        $queryBuilder = $this->createMock(QueryBuilder::class);
+        $config = (new CrudConfig())->setQueryBuilder($queryBuilder);
+        $this->assertSame(['query_builder' => $queryBuilder], $config->getOptions());
+    }
+
+    public function testSetRoute(): void
+    {
+        $config = (new CrudConfig())->setRoute('route', ['params']);
+        $this->assertSame(['route_name' => 'route', 'route_parameters' => ['params']], $config->getOptions());
+    }
+
+    public function testCreateSearchForm(): void
+    {
+        $searchFormData = $this->createMock(SearcherInterface::class);
+        $config = (new CrudConfig())->createSearchForm($searchFormData, 'type', ['option1']);
+        $this->assertSame(['search_form_data' => $searchFormData, 'search_form_type' => 'type', 'search_form_options' => ['option1']], $config->getOptions());
+    }
+
+    public function testSetDisplayResultsOnlyIfSearch(): void
+    {
+        $config = (new CrudConfig())->setDisplayResultsOnlyIfSearch(true);
+        $this->assertSame(['display_results_only_if_search' => true], $config->getOptions());
+    }
+
+    public function testSetBuildPaginator(): void
+    {
+        $config = (new CrudConfig())->setBuildPaginator(false);
+        $this->assertSame(['build_paginator' => false], $config->getOptions());
+    }
+
+    public function testSetPersistentSettings(): void
+    {
+        $config = (new CrudConfig())->setPersistentSettings(true);
+        $this->assertSame(['persistent_settings' => true], $config->getOptions());
+    }
+
+    public function testSetDivIdSearch(): void
+    {
+        $config = (new CrudConfig())->setDivIdSearch('id');
+        $this->assertSame(['div_id_search' => 'id'], $config->getOptions());
+    }
+
+    public function testSetDivIdList(): void
+    {
+        $config = (new CrudConfig())->setDivIdList('id');
+        $this->assertSame(['div_id_list' => 'id'], $config->getOptions());
+    }
+
+    public function testSetTwigFunctionsConfiguration(): void
+    {
+        $config = (new CrudConfig())->setTwigFunctionsConfiguration(['val1']);
+        $this->assertSame(['twig_functions_configuration' => ['val1']], $config->getOptions());
+    }
+
+    /**
+     * @dataProvider getTestResetOptionsProvider
+     */
+    public function testResetOptions(mixed $value, array $expected): void
+    {
+        $config = (new CrudConfig())
+            ->setSessionName('session')
+            ->setDefaultSort('sort', 'direction')
+            ->resetOptions($value);
+        $this->assertSame($expected, $config->getOptions());
+    }
+
+    public function getTestResetOptionsProvider(): array
+    {
+        return [
+            [null, []],
+            ['default_sort', ['session_name' => 'session', 'default_sort_direction' => 'direction']],
+            [[], ['session_name' => 'session', 'default_sort' => 'sort', 'default_sort_direction' => 'direction']],
+            [['default_sort', 'default_sort_direction'], ['session_name' => 'session']],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestOffsetExistsProvider
+     */
+    public function testOffsetExists(string $offset, bool $expected): void
+    {
+        $config = (new CrudConfig())
+            ->setSessionName('session');
+
+        $this->assertSame($expected, $config->offsetExists($offset));
+    }
+
+    public function getTestOffsetExistsProvider(): array
+    {
+        return [
+            ['session_name', true],
+            ['bad_offset', false],
+        ];
+    }
+
+    public function testOffsetGet(): void
+    {
+        $config = (new CrudConfig())
+            ->setSessionName('session');
+
+        $this->assertSame('session', $config->offsetGet('session_name'));
+    }
+
+    public function testOffsetSet(): void
+    {
+        $config = new CrudConfig();
+        $config->offsetSet('session_name', 'session');
+
+        $this->assertSame(['session_name' => 'session'], $config->getOptions());
+    }
+
+    public function testOffsetUnset(): void
+    {
+        $config = (new CrudConfig())
+            ->setSessionName('session');
+        $config->offsetUnset('session_name');
+
+        $this->assertSame([], $config->getOptions());
+    }
+}
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 7938193..13335c9 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -14,82 +14,76 @@
 namespace Ecommit\CrudBundle\Tests\Crud;
 
 use Doctrine\ORM\QueryBuilder;
-use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Crud\CrudColumn;
-use Ecommit\CrudBundle\Crud\CrudFilters;
+use Ecommit\CrudBundle\Crud\CrudConfig;
 use Ecommit\CrudBundle\Crud\CrudSession;
 use Ecommit\CrudBundle\Crud\SearchFormBuilder;
-use Ecommit\CrudBundle\Form\Filter\FilterInterface;
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
-use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
 use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\UserSearcher;
 use Ecommit\DoctrineUtils\Paginator\DoctrineORMPaginator;
 use Ecommit\Paginator\PaginatorInterface;
-use Psr\Container\ContainerInterface;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
-use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
+use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+use Symfony\Component\Validator\Exception\ValidationFailedException;
 
-class CrudTest extends KernelTestCase
+class CrudTest extends AbstractCrudTest
 {
-    protected function setUp(): void
-    {
-        self::bootKernel();
-    }
-
     /**
      * @dataProvider getTestCrudWithInvalidSessionNameProvider
      */
-    public function testCrudWithInvalidSessionName(string $sessionName): void
+    public function testCrudWithInvalidSessionName(mixed $sessionName, string $expectedException, string $expectedExceptionMessage): void
     {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The session name format is invalid');
+        $this->expectException($expectedException);
+        $this->expectExceptionMessageMatches($expectedExceptionMessage);
 
-        $this->createCrud(sessionName: $sessionName);
+        $crudOptions = $this->createValidCrudConfig();
+        $crudOptions['session_name'] = $sessionName;
+        $this->createCrud($crudOptions);
     }
 
     public function getTestCrudWithInvalidSessionNameProvider(): array
     {
         return [
-            [''],
-            ['aa#bb'],
-            ['aa bb'],
-            [str_pad('', 101, 'a')],
+            ['', InvalidOptionsException::class, '/The option "session_name" with value ".*" is invalid/'],
+            ['aa#bb', ValidationFailedException::class, '/Invalid session_name format/'],
+            ['aa bb', ValidationFailedException::class, '/Invalid session_name format/'],
+            [str_pad('', 101, 'a'), ValidationFailedException::class, '/Invalid session_name format/'],
+            [1, InvalidOptionsException::class, '/The option "session_name" with value 1 is expected to be of type "string", but is of type "int"/'],
         ];
     }
 
     public function testGetSessionName(): void
     {
-        $crud = $this->createCrud(sessionName: 'session_name');
+        $crud = $this->createCrud($this->createValidCrudConfig());
         $this->assertSame('session_name', $crud->getSessionName());
     }
 
     public function testGetSessionValues(): void
     {
-        $crud = $this->createValidCrud()
-            ->init();
-
+        $crud = $this->createCrud($this->createValidCrudConfig());
         $this->assertInstanceOf(CrudSession::class, $crud->getSessionValues());
     }
 
     public function testColumns(): void
     {
-        $crud = $this->createCrud();
-
-        $this->assertSame([], $crud->getColumns());
-        $this->assertInstanceOf(Crud::class, $crud->addColumn('username', 'u.username', 'username'));
-        $this->assertInstanceOf(Crud::class, $crud->addColumn('firstName', 'u.firstName', 'first_name', [
-            'sortable' => false,
-            'default_displayed' => false,
-            'alias_search' => 'alias_search2',
-            'alias_sort' => 'alias_sort2',
-        ]));
+        $crudConfig = $this->createValidCrudConfig()
+            ->resetOptions('columns')
+            ->addColumn(['id' => 'username', 'alias' => 'u.username', 'label' => 'username'])
+            ->addColumn(new CrudColumn([
+                'id' => 'firstName',
+                'alias' => 'u.firstName',
+                'label' => 'first_name',
+                'sortable' => false,
+                'displayed_by_default' => false,
+                'alias_search' => 'alias_search2',
+                'alias_sort' => 'alias_sort2',
+            ]));
+
+        $crud = $this->createCrud($crudConfig);
         $column1 = new CrudColumn(['id' => 'username', 'alias' => 'u.username', 'label' => 'username']);
         $column2 = new CrudColumn(['id' => 'firstName', 'alias' => 'u.firstName', 'label' => 'first_name', 'sortable' => false, 'displayed_by_default' => false, 'alias_search' => 'alias_search2', 'alias_sort' => 'alias_sort2']);
         $this->assertEquals($column1, $crud->getColumn('username'));
@@ -103,100 +97,91 @@ public function testColumns(): void
 
     public function testAddColumnWithAliasSort(): void
     {
-        $crud = $this->createValidCrud()
+        $crudConfig = $this->createValidCrudConfig()
             ->addColumn('my_column', 'u.alias', 'My Column', ['alias_sort' => 'u.lastName'])
-            ->setDefaultSort('my_column', Crud::ASC)
-            ->init()
-            ->build();
+            ->setDefaultSort('my_column', Crud::ASC);
+        $crud = $this->createCrud($crudConfig)->build();
 
         $this->assertSame(['u.lastName ASC'], $crud->getQueryBuilder()->getDQLPart('orderBy')[0]->getParts());
     }
 
-    public function testAddColumnTooLong(): void
-    {
-        $columnId = str_pad('', 101, 'a');
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The column id "'.$columnId.'" is too long');
-
-        $crud = $this->createCrud();
-        $crud->addColumn($columnId, 'alias', 'label');
-    }
-
     /**
      * @dataProvider getTestAddColumnAlreadyExistsProvider
      */
     public function testAddColumnAlreadyExists(callable $callback): void
     {
+        $crudConfig = $this->createValidCrudConfig();
+        $callback($crudConfig);
+
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The column "column1" already exists');
-
-        $callback($this->createCrud());
+        $this->createCrud($crudConfig);
     }
 
     public function getTestAddColumnAlreadyExistsProvider(): array
     {
         return [
-            [function (Crud $crud): void {
-                $crud->addColumn('column1', 'alias1', 'label1')
-                    ->addColumn('column1', 'alias1', 'label1');
+            [function (CrudConfig $crudConfig): void {
+                $crudConfig->addColumn(['id' => 'column1', 'alias' => 'alias1'])
+                    ->addColumn(['id' => 'column1', 'alias' => 'alias1']);
             }],
-            [function (Crud $crud): void {
-                $crud->addVirtualColumn('column1', 'alias1', 'label1')
-                    ->addVirtualColumn('column1', 'alias1', 'label1');
+            [function (CrudConfig $crudConfig): void {
+                $crudConfig->addVirtualColumn(['id' => 'column1', 'alias' => 'alias1'])
+                    ->addVirtualColumn(['id' => 'column1', 'alias' => 'alias1']);
             }],
-            [function (Crud $crud): void {
-                $crud->addColumn('column1', 'alias1', 'label1')
-                    ->addVirtualColumn('column1', 'alias1', 'label1');
+            [function (CrudConfig $crudConfig): void {
+                $crudConfig->addColumn(['id' => 'column1', 'alias' => 'alias1'])
+                    ->addVirtualColumn(['id' => 'column1', 'alias' => 'alias1']);
             }],
-            [function (Crud $crud): void {
-                $crud->addVirtualColumn('column1', 'alias1', 'label1')
-                    ->addColumn('column1', 'alias1', 'label1');
+            [function (CrudConfig $crudConfig): void {
+                $crudConfig->addVirtualColumn(['id' => 'column1', 'alias' => 'alias1'])
+                    ->addColumn(['id' => 'column1', 'alias' => 'alias1']);
             }],
         ];
     }
 
-    public function testAddColumnWithInvalidOption(): void
+    public function testAddBadColumns(): void
     {
-        $this->expectException(UndefinedOptionsException::class);
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['columns'] = 'bad';
 
-        $crud = $this->createCrud();
-        $crud->addColumn('column1', 'alias1', 'label1', [
-            'bad_option' => 'value',
-        ]);
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "columns" with value "bad" is expected to be of type "array"');
+        $this->createCrud($crudConfig);
     }
 
-    public function testAddColumnWithInvalidTypeSortableOption(): void
+    public function testAddBadColumn(): void
     {
-        $this->expectException(InvalidOptionsException::class);
+        $crudConfig = $this->createValidCrudConfig()
+            ->addColumn('bad_value');
 
-        $crud = $this->createCrud();
-        $crud->addColumn('column1', 'alias1', 'label1', [
-            'sortable' => 'not_bool',
-        ]);
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('A column must be an array or a CrudColum instance');
+        $this->createCrud($crudConfig);
     }
 
-    public function testAddColumnWithInvalidTypeDefaultDisplayedOption(): void
+    public function testNoColumn(): void
     {
-        $this->expectException(InvalidOptionsException::class);
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['columns'] = [];
 
-        $crud = $this->createCrud();
-        $crud->addColumn('column1', 'alias1', 'label1', [
-            'default_displayed' => 'not_bool',
-        ]);
+        $this->expectException(ValidationFailedException::class);
+        $this->expectExceptionMessage('The CRUD should contain 1 column or more');
+        $this->createCrud($crudConfig);
     }
 
     public function testGetColumnNotExists(): void
     {
+        $crud = $this->createCrud($this->createValidCrudConfig());
+
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The column "invalid" does not exist');
-
-        $crud = $this->createCrud();
         $crud->getColumn('invalid');
     }
 
     public function testGetDefaultDisplayedColumns(): void
     {
-        $crud = $this->createValidCrud();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $this->assertSame(['firstName'], $crud->getDefaultDisplayedColumns());
     }
@@ -204,21 +189,22 @@ public function testGetDefaultDisplayedColumns(): void
     public function testGetDefaultDisplayedColumnsEmpty(): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('At least one column is required');
+        $this->expectExceptionMessage('The CRUD should contain 1 displayed column or more');
 
-        $crud = $this->createCrud();
-        $crud->getDefaultDisplayedColumns();
+        $crudConfig = $this->createValidCrudConfig();
+        $columns = $crudConfig['columns'];
+        $columns[1]['displayed_by_default'] = false;
+        $crudConfig['columns'] = $columns;
+        $this->createCrud($crudConfig);
     }
 
     public function testVirtualColumns(): void
     {
-        $crud = $this->createCrud();
-
-        $this->assertSame([], $crud->getVirtualColumns());
-
-        $this->assertInstanceOf(Crud::class, $crud->addVirtualColumn('columnv1', 'aliasv1'));
-        $this->assertInstanceOf(Crud::class, $crud->addVirtualColumn('columnv2', 'aliasv2'));
+        $crudConfig = $this->createValidCrudConfig()
+            ->addVirtualColumn(['id' => 'columnv1', 'alias' => 'aliasv1'])
+            ->addVirtualColumn(new CrudColumn(['id' => 'columnv2', 'alias' => 'aliasv2']));
 
+        $crud = $this->createCrud($crudConfig);
         $column1 = new CrudColumn(['id' => 'columnv1', 'alias' => 'aliasv1']);
         $column2 = new CrudColumn(['id' => 'columnv2', 'alias' => 'aliasv2']);
         $this->assertEquals($column1, $crud->getVirtualColumn('columnv1'));
@@ -231,124 +217,302 @@ public function testVirtualColumns(): void
         $this->assertEquals($columns, $crud->getVirtualColumns());
     }
 
+    public function testAddBadVirtualColumns(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['virtual_columns'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "virtual_columns" with value "bad" is expected to be of type "array"');
+        $this->createCrud($crudConfig);
+    }
+
+    public function testAddBadVirtualColumn(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->addVirtualColumn('bad');
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('A column must be an array or a CrudColum instance');
+        $this->createCrud($crudConfig);
+    }
+
     public function testGetVirtualColumnNotExists(): void
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The column "invalid" does not exist');
 
-        $crud = $this->createCrud();
+        $crud = $this->createCrud($this->createValidCrudConfig());
         $crud->getVirtualColumn('invalid');
     }
 
-    public function testQueryBuilder(): void
+    /**
+     * @dataProvider getTestQueryBuilderProvider
+     */
+    public function testQueryBuilder(mixed $queryBuilder): void
     {
-        $crud = $this->createCrud();
-
-        $this->assertNull($crud->getQueryBuilder());
-        $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
-            ->createQueryBuilder('u')
-            ->select('u');
-        $this->assertInstanceOf(Crud::class, $crud->setQueryBuilder($queryBuilder));
+        $crudConfig = $this->createValidCrudConfig()
+            ->setQueryBuilder($queryBuilder);
+        $crud = $this->createCrud($crudConfig);
         $this->assertSame($queryBuilder, $crud->getQueryBuilder());
     }
 
-    public function testAvailableResultsPerPage(): void
+    public function getTestQueryBuilderProvider(): array
     {
-        $crud = $this->createCrud();
+        return [
+            [$this->createMock(\Doctrine\ORM\QueryBuilder::class)],
+            [$this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class)],
+            [$this->createMock(\Ecommit\CrudBundle\Crud\QueryBuilderInterface::class)],
+        ];
+    }
 
-        $this->assertSame([], $crud->getAvailableResultsPerPage());
-        $this->assertNull($crud->getDefaultResultsPerPage());
-        $this->assertInstanceOf(Crud::class, $crud->setAvailableResultsPerPage([10, 50, 100], 50));
-        $this->assertSame([10, 50, 100], $crud->getAvailableResultsPerPage());
-        $this->assertSame(50, $crud->getDefaultResultsPerPage());
+    public function testSetBadQueryBuilder(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['query_builder'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "query_builder" with value "bad" is expected to be');
+        $this->createCrud($crudConfig);
     }
 
-    public function testSetAvailableResultsPerPageWithEmptyArray(): void
+    public function testMaxPerPage(): void
     {
-        $crud = $this->createCrud();
+        $crudConfig = $this->createValidCrudConfig()
+            ->setMaxPerPage([10, 50, 100], 50);
+        $crud = $this->createCrud($crudConfig);
 
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The 1st argument of the "setAvailableResultsPerPage" method must contain at least one integer');
+        $this->assertSame([10, 50, 100], $crud->getMaxPerPageChoices());
+        $this->assertSame(50, $crud->getDefaultMaxPerPage());
+    }
+
+    public function testSetMaxPerPageChoicesWithEmptyArray(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->setMaxPerPage([], 50);
 
-        $crud->setAvailableResultsPerPage([], 1);
+        $this->expectException(ValidationFailedException::class);
+        $this->expectExceptionMessage('The max_per_page_choices should contain 1 value or more');
+
+        $this->createCrud($crudConfig);
     }
 
-    public function testSetAvailableResultsPerPageWithNotInteger(): void
+    public function testAddBadMaxPerPageChoices(): void
     {
-        $crud = $this->createCrud();
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['max_per_page_choices'] = 'bad';
 
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The 1st argument of the "setAvailableResultsPerPage" method must contain only integers');
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "max_per_page_choices" with value "bad" is expected to be of type "int[]"');
+        $this->createCrud($crudConfig);
+    }
 
-        $crud->setAvailableResultsPerPage([1, '10'], 1);
+    public function testAddBadDefaultMaxPerPage(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['default_max_per_page'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "default_max_per_page" with value "bad" is expected to be of type "int"');
+        $this->createCrud($crudConfig);
     }
 
-    public function testSort(): void
+    public function testDefaultSort(): void
     {
-        $crud = $this->createCrud();
+        $crudConfig = $this->createValidCrudConfig()
+            ->setDefaultSort('username', Crud::DESC);
+        $crud = $this->createCrud($crudConfig);
 
-        $this->assertNull($crud->getDefaultSort());
-        $this->assertNull($crud->getDefaultSortDirection());
-        $this->assertInstanceOf(Crud::class, $crud->setDefaultSort('username', Crud::DESC));
         $this->assertSame('username', $crud->getDefaultSort());
         $this->assertSame(Crud::DESC, $crud->getDefaultSortDirection());
     }
 
-    public function testDefaultPersonalizedSort(): void
+    public function testAddBadDefaultSort(): void
     {
-        $crud = $this->createCrud();
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['default_sort'] = 1;
 
-        $this->assertSame([], $crud->getDefaultPersonalizedSort());
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "default_sort" with value 1 is expected to be of type "string"');
+        $this->createCrud($crudConfig);
+    }
 
-        $this->assertInstanceOf(Crud::class, $crud->setDefaultPersonalizedSort(['u.userId']));
+    public function testAddBadDefaultSortDirection(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['default_sort_direction'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "default_sort_direction" with value "bad" is invalid');
+        $this->createCrud($crudConfig);
+    }
+
+    public function testDefaultPersonalizedSort(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->setDefaultPersonalizedSort(['u.userId']);
+        $crud = $this->createCrud($crudConfig);
 
         $this->assertSame(['u.userId'], $crud->getDefaultPersonalizedSort());
         $this->assertSame('defaultPersonalizedSort', $crud->getDefaultSort());
-        $this->assertSame(Crud::ASC, $crud->getDefaultSortDirection());
+    }
+
+    public function testAddBadDefaultPersonalizedSort(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['default_personalized_sort'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "default_personalized_sort" with value "bad" is expected to be of type "string[]"');
+        $this->createCrud($crudConfig);
     }
 
     public function testRouting(): void
     {
-        $crud = $this->createCrud();
+        $crudConfig = $this->createValidCrudConfig()
+            ->setRoute('user_ajax_crud', ['param1' => 'val1']);
+        $crud = $this->createCrud($crudConfig);
 
-        $this->assertNull($crud->getRouteName());
-        $this->assertSame([], $crud->getRouteParams());
-        $this->assertInstanceOf(Crud::class, $crud->setRoute('user_ajax_crud', ['param1' => 'val1']));
         $this->assertSame('user_ajax_crud', $crud->getRouteName());
-        $this->assertSame(['param1' => 'val1'], $crud->getRouteParams());
+        $this->assertSame(['param1' => 'val1'], $crud->getRouteParameters());
         $this->assertSame('/user/ajax-crud?param1=val1', $crud->getUrl());
         $this->assertSame('/user/ajax-crud?param1=val1&param2=val2', $crud->getUrl(['param2' => 'val2']));
         $this->assertSame('/user/ajax-crud?param1=val1&search=1', $crud->getSearchUrl());
         $this->assertSame('/user/ajax-crud?param1=val1&search=1&param2=val2', $crud->getSearchUrl(['param2' => 'val2']));
     }
 
-    public function testCreateAndGetSearchForm(): void
+    public function testAddBadRouteName(): void
     {
-        $crud = $this->createValidCrud();
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['route_name'] = 1;
 
-        $this->assertNull($crud->getSearchForm());
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "route_name" with value 1 is expected to be of type "string"');
+        $this->createCrud($crudConfig);
+    }
+
+    public function testAddBadRouteParameters(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['route_parameters'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "route_parameters" with value "bad" is expected to be of type "array"');
+        $this->createCrud($crudConfig);
+    }
+
+    public function testCreateAndGetSearchForm(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->createSearchForm(new UserSearcher());
+        $crud = $this->createCrud($crudConfig);
 
-        $crud->createSearchForm(new UserSearcher());
         $this->assertInstanceOf(SearchFormBuilder::class, $crud->getSearchForm());
 
-        $crud->init()
-            ->createView();
+        $crud->createView();
         $this->assertInstanceOf(FormView::class, $crud->getSearchForm());
     }
 
-    public function testSetPersistentSettings(): void
+    public function testCreateAndGetNullSearchForm(): void
     {
-        $crud = $this->createCrud();
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['search_form_data'] = null;
+        $crud = $this->createCrud($crudConfig);
+
+        $this->assertNull($crud->getSearchForm());
 
-        $this->assertInstanceOf(Crud::class, $crud->setPersistentSettings(true));
+        $crud->createView();
+        $this->assertNull($crud->getSearchForm());
     }
 
-    public function testSetBuildPaginatorTrue(): void
+    public function testAddBadSearchFormData(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['search_form_data'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "search_form_data" with value "bad" is expected to be of type "null" or "Ecommit\CrudBundle\Form\Searcher\SearcherInterface"');
+        $this->createCrud($crudConfig);
+    }
+
+    public function testCreateSearchFormWithType(): void
     {
-        $crud = $this->createValidCrud();
+        $crudConfig = $this->createValidCrudConfig()
+            ->createSearchForm(new UserSearcher(), FormType::class, [
+                'form_options' => [
+                    'data_class' => UserSearcher::class,
+                ],
+            ]);
+        $crud = $this->createCrud($crudConfig);
 
-        $this->assertInstanceOf(Crud::class, $crud->setBuildPaginator(true));
-        $crud->init()
+        $this->assertInstanceOf(FormType::class, $crud->getSearchForm()->getForm()->getConfig()->getType()->getInnerType());
+    }
+
+    public function testCreateSearchFormWithBadType(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['search_form_type'] = 1;
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "search_form_type" with value 1 is expected to be of type "null" or "string"');
+        $this->createCrud($crudConfig);
+    }
+
+    public function testCreateSearchFormWithOptions(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->createSearchForm(new UserSearcher(), null, [
+                'validation_groups' => ['MyGroup'],
+            ]);
+        $crud = $this->createCrud($crudConfig);
+
+        $this->assertSame(['MyGroup'], $crud->getSearchForm()->getForm()->getConfig()->getOption('validation_groups'));
+    }
+
+    public function testCreateSearchFormWithBadOptions(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['search_form_options'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "search_form_options" with value "bad" is expected to be of type "array"');
+        $this->createCrud($crudConfig);
+    }
+
+    /**
+     * @dataProvider getBoolProvider
+     */
+    public function testSetPersistentSettings(bool $value): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->setPersistentSettings($value);
+        $this->createCrud($crudConfig);
+    }
+
+    public function testSetPersistentSettingsAutoFalse(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->setPersistentSettings(true);
+        $crud = $this->createCrud($crudConfig);
+
+        $this->assertFalse($crud->getOptions()['persistent_settings']);
+    }
+
+    public function testBadSetPersistentSettings(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['persistent_settings'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "persistent_settings" with value "bad" is expected to be of type "bool"');
+        $this->createCrud($crudConfig);
+    }
+
+    public function testSetBuildPaginatorTrue(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->setBuildPaginator(true);
+        $crud = $this->createCrud($crudConfig)
             ->build();
 
         $this->assertInstanceOf(DoctrineORMPaginator::class, $crud->getPaginator());
@@ -356,10 +520,9 @@ public function testSetBuildPaginatorTrue(): void
 
     public function testSetBuildPaginatorFalse(): void
     {
-        $crud = $this->createValidCrud();
-
-        $this->assertInstanceOf(Crud::class, $crud->setBuildPaginator(false));
-        $crud->init()
+        $crudConfig = $this->createValidCrudConfig()
+            ->setBuildPaginator(false);
+        $crud = $this->createCrud($crudConfig)
             ->build();
 
         $this->assertNull($crud->getPaginator());
@@ -367,142 +530,182 @@ public function testSetBuildPaginatorFalse(): void
 
     public function testSetBuildPaginatorClosure(): void
     {
-        $crud = $this->createValidCrud();
+        $paginator = $this->createMock(PaginatorInterface::class);
+        $crudConfig = $this->createValidCrudConfig()
+            ->setBuildPaginator(function (QueryBuilder $queryBuilder, int $page, int $resultsPerPage) use ($paginator) {
+                $this->assertInstanceOf(QueryBuilder::class, $queryBuilder);
+                $this->assertSame(1, $page);
+                $this->assertSame(50, $resultsPerPage);
 
-        $this->assertInstanceOf(Crud::class, $crud->setBuildPaginator(function (QueryBuilder $queryBuilder, int $page, int $resultsPerPage) {
-            $this->assertInstanceOf(QueryBuilder::class, $queryBuilder);
-            $this->assertSame(1, $page);
-            $this->assertSame(50, $resultsPerPage);
-
-            return $this->createMock(PaginatorInterface::class);
-        }));
-        $crud->init()
+                return $paginator;
+            });
+        $crud = $this->createCrud($crudConfig)
             ->build();
 
-        $this->assertInstanceOf(PaginatorInterface::class, $crud->getPaginator());
+        $this->assertSame($paginator, $crud->getPaginator());
+    }
+
+    public function testSetBadBuildPaginator(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['build_paginator'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "build_paginator" with value "bad" is expected to be of type "bool" or "Closure" or "array"');
+        $this->createCrud($crudConfig);
     }
 
     public function testBuild(): void
     {
-        $crud = $this->createValidCrud()
-            ->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $this->assertInstanceOf(Crud::class, $crud->build());
     }
 
     public function testDivIdList(): void
     {
-        $crud = $this->createCrud();
+        $crudConfig = $this->createValidCrudConfig()
+            ->setDivIdList('val');
+        $crud = $this->createCrud($crudConfig);
 
-        $this->assertSame('crud_list', $crud->getDivIdList());
-        $this->assertInstanceOf(Crud::class, $crud->setDivIdList('val'));
         $this->assertSame('val', $crud->getDivIdList());
     }
 
+    public function testSetBadDivIdList(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['div_id_list'] = 1;
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "div_id_list" with value 1 is expected to be of type "string"');
+        $this->createCrud($crudConfig);
+    }
+
     public function testDivIdSearch(): void
     {
-        $crud = $this->createCrud();
+        $crudConfig = $this->createValidCrudConfig()
+            ->setDivIdSearch('val');
+        $crud = $this->createCrud($crudConfig);
 
-        $this->assertSame('crud_search', $crud->getDivIdSearch());
-        $this->assertInstanceOf(Crud::class, $crud->setDivIdSearch('val'));
         $this->assertSame('val', $crud->getDivIdSearch());
     }
 
-    public function testDisplayResultsOnlyIfSearch(): void
+    public function testSetBadDivIdSearch(): void
     {
-        $crud = $this->createValidCrud(withSearcher: true);
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['div_id_search'] = 1;
 
-        $this->assertTrue($crud->getDisplayResults());
-        $this->assertFalse($crud->getDisplayResultsOnlyIfSearch());
-        $this->assertInstanceOf(Crud::class, $crud->setDisplayResultsOnlyIfSearch(true));
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "div_id_search" with value 1 is expected to be of type "string"');
+        $this->createCrud($crudConfig);
+    }
+
+    public function testDisplayResultsOnlyIfSearch(): void
+    {
+        $crudConfig = $this->createValidCrudConfig(withSearcher: true)
+            ->setDisplayResultsOnlyIfSearch(true);
+        $crud = $this->createCrud($crudConfig);
         $this->assertTrue($crud->getDisplayResultsOnlyIfSearch());
 
-        $crud->init()
-            ->build();
+        $crud->build();
+
         $this->assertFalse($crud->getDisplayResults());
         $this->assertNull($crud->getPaginator());
     }
 
     public function testDisplayResultsOnlyIfSearchWithoutSearcher(): void
     {
-        $crud = $this->createValidCrud();
-
-        $this->assertTrue($crud->getDisplayResults());
-        $this->assertFalse($crud->getDisplayResultsOnlyIfSearch());
-        $this->assertInstanceOf(Crud::class, $crud->setDisplayResultsOnlyIfSearch(true));
+        $crudConfig = $this->createValidCrudConfig(withSearcher: false)
+            ->setDisplayResultsOnlyIfSearch(true);
+        $crud = $this->createCrud($crudConfig);
         $this->assertTrue($crud->getDisplayResultsOnlyIfSearch());
 
-        $crud->init()
-            ->build();
+        $crud->build();
+
         $this->assertTrue($crud->getDisplayResults());
         $this->assertNotNull($crud->getPaginator());
     }
 
+    public function testSetBadDisplayResultsOnlyIfSearch(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['display_results_only_if_search'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "display_results_only_if_search" with value "bad" is expected to be of type "bool"');
+        $this->createCrud($crudConfig);
+    }
+
     public function testDisplayResultsTrue(): void
     {
-        $crud = $this->createValidCrud();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $this->assertTrue($crud->getDisplayResults());
         $this->assertInstanceOf(Crud::class, $crud->setDisplayResults(true));
 
-        $crud->init()
-            ->build();
+        $crud->build();
+
         $this->assertTrue($crud->getDisplayResults());
         $this->assertNotNull($crud->getPaginator());
     }
 
     public function testDisplayResultsFalse(): void
     {
-        $crud = $this->createValidCrud();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $this->assertTrue($crud->getDisplayResults());
         $this->assertInstanceOf(Crud::class, $crud->setDisplayResults(false));
 
-        $crud->init()
-            ->build();
-        $this->assertFalse($crud->getDisplayResults());
-        $this->assertNull($crud->getPaginator());
-    }
+        $crud->build();
 
-    public function testDisplayResultsFalseAfterInit(): void
-    {
-        $crud = $this->createValidCrud()
-            ->init()
-            ->build();
-
-        $this->assertInstanceOf(Crud::class, $crud->setDisplayResults(false));
         $this->assertFalse($crud->getDisplayResults());
         $this->assertNull($crud->getPaginator());
     }
 
     public function testTwigFunctionsConfiguration(): void
     {
-        $crud = $this->createCrud();
-
-        $this->assertSame([], $crud->getTwigFunctionsConfiguration());
         $config = [
             'function1' => ['val'],
         ];
-        $this->assertInstanceOf(Crud::class, $crud->setTwigFunctionsConfiguration($config));
+
+        $crudConfig = $this->createValidCrudConfig()
+            ->setTwigFunctionsConfiguration($config);
+        $crud = $this->createCrud($crudConfig);
+
         $this->assertSame($config, $crud->getTwigFunctionsConfiguration());
         $this->assertSame(['val'], $crud->getTwigFunctionConfiguration('function1'));
     }
 
     public function testGetTwigFunctionConfigurationNotExists(): void
     {
-        $crud = $this->createCrud();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $this->assertSame([], $crud->getTwigFunctionConfiguration('function1'));
     }
 
-    public function testPaginator(): void
+    public function testSetBadDTwigFunctionsConfiguration(): void
+    {
+        $crudConfig = $this->createValidCrudConfig();
+        $crudConfig['twig_functions_configuration'] = 'bad';
+
+        $this->expectException(InvalidOptionsException::class);
+        $this->expectExceptionMessage('The option "twig_functions_configuration" with value "bad" is expected to be of type "array"');
+        $this->createCrud($crudConfig);
+    }
+
+    public function testGetOptions(): void
     {
-        $crud = $this->createValidCrud();
+        $crud = $this->createCrud($this->createValidCrudConfig());
+
+        $this->assertIsArray($crud->getOptions());
+    }
 
+    public function testPaginator(): void
+    {
+        $crud = $this->createCrud($this->createValidCrudConfig());
         $this->assertNull($crud->getPaginator());
 
-        $crud->init()
-            ->build();
+        $crud->build();
         $this->assertInstanceOf(PaginatorInterface::class, $crud->getPaginator());
 
         $this->assertInstanceOf(Crud::class, $crud->setPaginator(null));
@@ -514,10 +717,7 @@ public function testPaginator(): void
 
     public function testGetDisplaySettingsForm(): void
     {
-        $crud = $this->createValidCrud();
-        $this->assertNull($crud->getDisplaySettingsForm());
-
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
         $this->assertInstanceOf(Form::class, $crud->getDisplaySettingsForm());
 
         $crud->createView();
@@ -525,207 +725,56 @@ public function testGetDisplaySettingsForm(): void
     }
 
     /**
-     * @dataProvider getTestIncompleteInitProvider
+     * @dataProvider getTestRequiredOptionsProvider
      */
-    public function testIncompleteInit(string $property, string $method, mixed $value): void
+    public function testRequiredOptions(string $option): void
     {
-        $crud = $this->createValidCrud();
-        $reflectionClass = new \ReflectionClass($crud);
-        $reflectionProperty = $reflectionClass->getProperty($property);
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($crud, $value);
-
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage($method);
+        $crudConfig = $this->createValidCrudConfig();
+        unset($crudConfig[$option]);
 
-        $crud->init();
+        $this->expectException(MissingOptionsException::class);
+        $this->expectExceptionMessage($option);
+        $this->createCrud($crudConfig);
     }
 
-    public function getTestIncompleteInitProvider(): array
+    public function getTestRequiredOptionsProvider(): array
     {
         return [
-            ['availableColumns', 'addColumn', []],
-            ['availableResultsPerPage', 'setAvailableResultsPerPage', []],
-            ['defaultResultsPerPage', 'setAvailableResultsPerPage', null],
-            ['defaultSort', 'setDefaultSort', null],
-            ['defaultSortDirection', 'setDefaultSort', null],
-            ['queryBuilder', 'setQueryBuilder', null],
-            ['routeName', 'setRoute', null],
+            ['session_name'],
+            ['columns'],
+            ['max_per_page_choices'],
+            ['default_max_per_page'],
+            ['default_sort'],
+            ['query_builder'],
+            ['route_name'],
         ];
     }
 
-    public function testInitIfNecessary(): void
-    {
-        $crud = $this->createValidCrud();
-        $this->assertFalse($crud->isInitialized());
-
-        $this->assertInstanceOf(Crud::class, $crud->initIfNecessary());
-        $this->assertTrue($crud->isInitialized());
-    }
-
-    public function testInitIfNecessaryAfterInit(): void
-    {
-        $crud = $this->createValidCrud()
-            ->init()
-            ->initIfNecessary();
-
-        $this->assertTrue($crud->isInitialized());
-    }
-
-    public function testInit(): void
-    {
-        $crud = $this->createValidCrud();
-        $this->assertFalse($crud->isInitialized());
-
-        $this->assertInstanceOf(Crud::class, $crud->init());
-        $this->assertTrue($crud->isInitialized());
-    }
-
-    public function testInitAfterInit(): void
-    {
-        $crud = $this->createValidCrud()
-            ->init();
-
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('CRUD already initialized');
-
-        $crud->init();
-    }
-
     public function testReset(): void
     {
-        $crud = $this->createValidCrud()
-            ->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $this->assertInstanceOf(Crud::class, $crud->reset());
     }
 
     public function testResetSort(): void
     {
-        $crud = $this->createValidCrud()
-            ->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $this->assertInstanceOf(Crud::class, $crud->resetSort());
     }
 
     public function testCreateView(): void
     {
-        $crud = $this->createValidCrud()
-            ->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $this->assertInstanceOf(Crud::class, $crud->createView());
     }
 
-    public function testCallCreateSearchFormBeforeRequiredOptions(): void
-    {
-        $filter = $this->createMock(FilterInterface::class);
-        $filter->expects($this->exactly(4))->method('buildForm')->willReturnCallback(function (SearchFormBuilder $builder, string $property, array $options): void {
-            if (\in_array($property, ['userId', 'lastName'])) { // Virtual columns
-                $this->assertNull($options['label']);
-            } else {
-                $expectedLabel = 'label_'.$property;
-                $this->assertSame($expectedLabel, $options['label']);
-            }
-        });
-        $filter->expects($this->exactly(4))->method('supportsQueryBuilder')->willReturn(true);
-        $filter->expects($this->exactly(4))->method('updateQueryBuilder')->willReturnCallback(function ($queryBuilder, string $property, $value, array $options): void {
-            $this->assertSame('u.'.$property, $options['alias_search']);
-        });
-
-        $searcherData = $this->getMockBuilder(SearcherInterface::class)
-            ->addMethods(['getUsername', 'getFirstName', 'getLastName', 'getUserId'])
-            ->onlyMethods(['buildForm', 'updateQueryBuilder', 'configureOptions'])
-            ->getMock();
-        $searcherData->expects($this->once())->method('buildForm')->willReturnCallback(function (SearchFormBuilder $builder, array $options): void {
-            $builder->addFilter('username', 'my_filter');
-            $builder->addFilter('userId', 'my_filter');
-        });
-        $searcherData->method('getUsername')->willReturn('val');
-        $searcherData->method('getFirstName')->willReturn('val');
-        $searcherData->method('getLastName')->willReturn('val');
-        $searcherData->method('getUserId')->willReturn('val');
-
-        $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
-            ->createQueryBuilder('u')
-            ->select('u');
-
-        $crud = $this->createCrud(filters: ['my_filter' => $filter])
-            ->createSearchForm($searcherData); // Call createSearchForm before setting options : alias_search and label are not known yet
-        $crud->getSearchForm()->addFilter('firstName', 'my_filter'); // Call addFilter before setting options : alias_search and label are not known yet
-        $crud->getSearchForm()->addFilter('lastName', 'my_filter'); // Call addFilter before setting options : alias_search and label are not known yet
-        $crud->addColumn('username', 'u.username', 'label_username')
-            ->addColumn('firstName', 'u.firstName', 'label_firstName')
-            ->addVirtualColumn('lastName', 'u.lastName')
-            ->addVirtualColumn('userId', 'u.userId')
-            ->setQueryBuilder($queryBuilder)
-            ->setAvailableResultsPerPage([10, 50, 100], 50)
-            ->setDefaultSort('username', Crud::ASC)
-            ->setRoute('user_ajax_crud')
-            ->init()
-            ->build();
-    }
-
-    /**
-     * @dataProvider getTestCallMethodNotAllowedBeforeInitializationProvider
-     */
-    public function testCallMethodNotAllowedBeforeInitialization(string $method, array $arguments = []): void
-    {
-        $crud = $this->createValidCrud(withSearcher: true);
-
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage(sprintf('The method "%s" cannot be called before CRUD initialization', $method));
-
-        $crud->$method(...$arguments);
-    }
-
-    public function getTestCallMethodNotAllowedBeforeInitializationProvider(): array
-    {
-        return [
-            ['getSessionValues'],
-            ['processSearchForm'],
-            ['build'],
-            ['createView'],
-        ];
-    }
-
-    /**
-     * @dataProvider getTestCallMethodNotAllowedAfterInitializationProvider
-     */
-    public function testCallMethodNotAllowedAfterInitialization(string $method, array $arguments = []): void
-    {
-        $crud = $this->createValidCrud(withSearcher: true)
-            ->init();
-
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage(sprintf('The method "%s" cannot be called after CRUD initialization', $method));
-
-        $crud->$method(...$arguments);
-    }
-
-    public function getTestCallMethodNotAllowedAfterInitializationProvider(): array
-    {
-        return [
-            ['addColumn', ['column', 'alias', 'label']],
-            ['addVirtualColumn', ['column', 'alias']],
-            ['setQueryBuilder', [$this->createMock(QueryBuilder::class)]],
-            ['setAvailableResultsPerPage', [[5, 10], 10]],
-            ['setDefaultSort', ['column', Crud::ASC]],
-            ['setDefaultPersonalizedSort', [[]]],
-            ['setRoute', ['route']],
-            ['setDisplayResultsOnlyIfSearch', [true]],
-            ['setBuildPaginator', [true]],
-            ['setPersistentSettings', [true]],
-            ['createSearchForm', [$this->createMock(SearcherInterface::class)]],
-            ['setDivIdSearch', ['div']],
-            ['setDivIdList', ['div']],
-        ];
-    }
-
     public function testLoadSessionWithSearchForm(): void
     {
         $sessionValue = new CrudSession(10, ['username'], 'firstName', Crud::ASC, new UserSearcher());
-        $crud = $this->createValidCrud(crud: $this->createCrud(sessionValue: clone $sessionValue), withSearcher: true);
-        $crud->init();
+        $crud = $this->createCrud(crudConfig: $this->createValidCrudConfig(withSearcher: true), sessionValue: clone $sessionValue);
 
         $this->assertEquals($sessionValue, $crud->getSessionValues());
     }
@@ -733,16 +782,14 @@ public function testLoadSessionWithSearchForm(): void
     public function testLoadSessionWithoutSearchForm(): void
     {
         $sessionValue = new CrudSession(10, ['username'], 'firstName', Crud::ASC);
-        $crud = $this->createValidCrud(crud: $this->createCrud(sessionValue: clone $sessionValue));
-        $crud->init();
+        $crud = $this->createCrud(crudConfig: $this->createValidCrudConfig(), sessionValue: clone $sessionValue);
 
         $this->assertEquals($sessionValue, $crud->getSessionValues());
     }
 
     public function testChangeNumberResultsDisplayed(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeNumberResultsDisplayed');
         $reflectionMethod->setAccessible(true);
@@ -752,8 +799,7 @@ public function testChangeNumberResultsDisplayed(): void
 
     public function testChangeNumberResultsDisplayedWithBadValue(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeNumberResultsDisplayed');
         $reflectionMethod->setAccessible(true);
@@ -763,8 +809,7 @@ public function testChangeNumberResultsDisplayedWithBadValue(): void
 
     public function testChangeColumnsDisplayed(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeColumnsDisplayed');
         $reflectionMethod->setAccessible(true);
@@ -777,8 +822,7 @@ public function testChangeColumnsDisplayed(): void
      */
     public function testChangeColumnsDisplayedWithBadValue(array $value): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeColumnsDisplayed');
         $reflectionMethod->setAccessible(true);
@@ -796,8 +840,7 @@ public function getTestChangeColumnsDisplayedWithBadValueProvider(): array
 
     public function testChangeSort(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
         $reflectionMethod->setAccessible(true);
@@ -810,9 +853,9 @@ public function testChangeSort(): void
      */
     public function testChangeSortWithBadValue(mixed $value): void
     {
-        $crud = $this->createValidCrud()
-            ->addColumn('column_not_sortable', 'alias', 'label', ['sortable' => false])
-            ->init();
+        $crudConfig = $this->createValidCrudConfig()
+            ->addColumn('column_not_sortable', 'alias', 'label', ['sortable' => false]);
+        $crud = $this->createCrud($crudConfig);
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
         $reflectionMethod->setAccessible(true);
@@ -833,9 +876,9 @@ public function getTestChangeSortWithBadValueProvider(): array
 
     public function testChangeSortPersonalizedSort(): void
     {
-        $crud = $this->createValidCrud()
-            ->setDefaultPersonalizedSort(['criteria'])
-            ->init();
+        $crudConfig = $this->createValidCrudConfig()
+            ->setDefaultPersonalizedSort(['criteria']);
+        $crud = $this->createCrud($crudConfig);
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
         $reflectionMethod->setAccessible(true);
@@ -848,9 +891,9 @@ public function testChangeSortPersonalizedSort(): void
      */
     public function testChangeSortPersonalizedSortWithBadValue(mixed $value): void
     {
-        $crud = $this->createValidCrud()
-            ->setDefaultPersonalizedSort(['criteria'])
-            ->init();
+        $crudConfig = $this->createValidCrudConfig()
+            ->setDefaultPersonalizedSort(['criteria']);
+        $crud = $this->createCrud($crudConfig);
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
         $reflectionMethod->setAccessible(true);
@@ -870,8 +913,7 @@ public function getTestChangeSortPersonalizedSortWithBadValueProvider(): array
 
     public function testChangeSortDirection(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSortDirection');
         $reflectionMethod->setAccessible(true);
@@ -884,8 +926,7 @@ public function testChangeSortDirection(): void
      */
     public function testChangeSortDirectionWithBadValue(mixed $value): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSortDirection');
         $reflectionMethod->setAccessible(true);
@@ -904,8 +945,7 @@ public function getTestChangeSortDirectionWithBadValueProvider(): array
 
     public function testChangeFilterValues(): void
     {
-        $crud = $this->createValidCrud(withSearcher: true);
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig(withSearcher: true));
 
         $value = new UserSearcher();
         $value->username = 'val';
@@ -921,8 +961,7 @@ public function testChangeFilterValues(): void
      */
     public function testChangeFilterValuesWithBadValue(?SearcherInterface $value): void
     {
-        $crud = $this->createValidCrud(withSearcher: true);
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig(withSearcher: true));
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
         $reflectionMethod->setAccessible(true);
@@ -941,8 +980,7 @@ public function getTestChangeFilterValuesWithBadValueProvider(): array
 
     public function testChangeFilterValuesWithoutSearchForm(): void
     {
-        $crud = $this->createValidCrud();
-        $crud->init();
+        $crud = $this->createCrud($this->createValidCrudConfig());
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
         $reflectionMethod->setAccessible(true);
@@ -950,69 +988,11 @@ public function testChangeFilterValuesWithoutSearchForm(): void
         $this->assertNull($crud->getSessionValues()->searchFormData);
     }
 
-    protected function createCrud(string $sessionName = 'session_name', array $filters = [], mixed $sessionValue = null): Crud
-    {
-        $session = $this->createMock(SessionInterface::class);
-        $session->expects($this->any())
-            ->method('get')
-            ->willReturn($sessionValue);
-        $session->expects($this->any())
-            ->method('set');
-
-        $request = new Request();
-        $request->setSession($session);
-        $requestStack = $this->createMock(RequestStack::class);
-        $requestStack->method('getCurrentRequest')
-            ->willReturn($request);
-
-        $crudFilters = $this->createMock(CrudFilters::class);
-        $crudFilters->method('has')->willReturnCallback(fn (string $name) => \array_key_exists($name, $filters) || static::getContainer()->get('ecommit_crud.filters')->has($name));
-        $crudFilters->method('get')->willReturnCallback(function (string $name) use ($filters): FilterInterface {
-            if (\array_key_exists($name, $filters)) {
-                return $filters[$name];
-            }
-
-            return static::getContainer()->get('ecommit_crud.filters')->get($name);
-        });
-
-        $container = $this->createMock(ContainerInterface::class);
-        $container->method('get')
-            ->willReturnCallback(function ($name) use ($requestStack, $crudFilters) {
-                if ('request_stack' === $name) {
-                    return $requestStack;
-                } elseif ('ecommit_crud.filters' === $name) {
-                    return $crudFilters;
-                }
-
-                return static::getContainer()->get('ecommit_crud.locator')->get($name);
-            });
-
-        $crud = $this->getMockBuilder(Crud::class)
-            ->setConstructorArgs([$sessionName, $container])
-            ->onlyMethods(['save'])
-            ->getMock();
-
-        return $crud;
-    }
-
-    protected function createValidCrud(?Crud $crud = null, bool $withSearcher = false): Crud
+    public function getBoolProvider(): array
     {
-        $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
-            ->createQueryBuilder('u')
-            ->select('u');
-
-        $crud = ($crud) ?: $this->createCrud('session_name');
-        $crud->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
-            ->addColumn('firstName', 'u.firstName', 'first_name')
-            ->setQueryBuilder($queryBuilder)
-            ->setAvailableResultsPerPage([10, 50, 100], 50)
-            ->setDefaultSort('username', Crud::DESC)
-            ->setRoute('user_ajax_crud', ['param1' => 'val1'])
-            ;
-        if ($withSearcher) {
-            $crud->createSearchForm(new UserSearcher());
-        }
-
-        return $crud;
+        return [
+            [true],
+            [false],
+        ];
     }
 }
diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
index bb675f3..58bb0d4 100644
--- a/tests/Crud/SearchFormBuilderTest.php
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -16,26 +16,19 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Ecommit\CrudBundle\Crud\Crud;
-use Ecommit\CrudBundle\Crud\CrudColumnReference;
 use Ecommit\CrudBundle\Crud\SearchFormBuilder;
 use Ecommit\CrudBundle\Form\Filter\FilterInterface;
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 use Ecommit\CrudBundle\Form\Type\FormSearchType;
 use Psr\Container\ContainerInterface;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 
-class SearchFormBuilderTest extends KernelTestCase
+class SearchFormBuilderTest extends AbstractCrudTest
 {
-    protected function setUp(): void
-    {
-        self::bootKernel();
-    }
-
     /**
      * @dataProvider getTestCreateFormBuilderProvider
      */
@@ -142,24 +135,15 @@ public function testAddFilterValidationGroupsDefaultValueFromBuilder(): void
 
     public function testAddFilterAliasSearch(): void
     {
-        $crud = $this->createCrud()
-            ->addColumn('column1', 'alias1', 'label1')
-            ->addColumn('column2', 'alias2', 'label1', [
-                'alias_search' => 'custom_alias2',
-            ])
+        $crudConfig = $this->createValidCrudConfig()
+            ->addColumn(['id' => 'column1', 'alias' => 'alias1'])
+            ->addColumn(['id' => 'column2', 'alias' => 'alias2', 'alias_search' => 'custom_alias2'])
             ->addVirtualColumn('virtual1', 'virtualalias1');
+        $crud = $this->createCrud($crudConfig);
         $searchFormBuilder = $this->createSearchFormBuilder(crud: $crud)
             ->addFilter('column1', 'my_filter')
             ->addFilter('column2', 'my_filter')
             ->addFilter('virtual1', 'my_filter');
-        $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
-        $this->assertEquals(new CrudColumnReference('column1'), $filters['column1']['options']['alias_search']);
-        $this->assertEquals(new CrudColumnReference('column2'), $filters['column2']['options']['alias_search']);
-        $this->assertEquals(new CrudColumnReference('virtual1'), $filters['virtual1']['options']['alias_search']);
-
-        // Resolve filters
-        $searchFormBuilder->createForm();
-
         $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
         $this->assertSame('alias1', $filters['column1']['options']['alias_search']);
         $this->assertSame('custom_alias2', $filters['column2']['options']['alias_search']);
@@ -168,19 +152,13 @@ public function testAddFilterAliasSearch(): void
 
     public function testAddFilterLabel(): void
     {
-        $crud = $this->createCrud()
-            ->addColumn('column1', 'alias1', 'label1')
-            ->addVirtualColumn('virtual1', 'virtualalias1');
+        $crudConfig = $this->createValidCrudConfig()
+            ->addColumn(['id' => 'column1', 'alias' => 'alias1', 'label' => 'label1'])
+            ->addVirtualColumn(['id' => 'virtual1', 'alias' => 'virtualalias1']);
+        $crud = $this->createCrud($crudConfig);
         $searchFormBuilder = $this->createSearchFormBuilder(crud: $crud)
             ->addFilter('column1', 'my_filter')
             ->addFilter('virtual1', 'my_filter');
-        $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
-        $this->assertEquals(new CrudColumnReference('column1'), $filters['column1']['options']['label']);
-        $this->assertEquals(new CrudColumnReference('virtual1'), $filters['virtual1']['options']['label']);
-
-        // Resolve filters
-        $searchFormBuilder->createForm();
-
         $filters = $this->getPrivateValue($searchFormBuilder, 'filters');
         $this->assertSame('label1', $filters['column1']['options']['label']);
         $this->assertNull($filters['virtual1']['options']['label']);
@@ -240,9 +218,10 @@ public function testCreateFormWithDefaultColumnId(): void
             [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'column1', self::callback(fn ($value): bool => \is_array($value))],
             [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'virtual1', self::callback(fn ($value): bool => \is_array($value))],
         );
-        $crud = $this->createCrud()
-            ->addColumn('column1', 'alias1', 'label1')
-            ->addVirtualColumn('virtual1', 'alias2');
+        $crudConfig = $this->createValidCrudConfig()
+            ->addColumn(['id' => 'column1', 'alias' => 'alias1'])
+            ->addVirtualColumn(['id' => 'virtual1', 'alias' => 'alias1']);
+        $crud = $this->createCrud($crudConfig);
         $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
             ->addFilter('column1', 'my_filter')
             ->addFilter('virtual1', 'my_filter')
@@ -256,9 +235,10 @@ public function testCreateFormWithColumnIdOption(): void
             [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'property1', self::callback(fn ($value): bool => \is_array($value))],
             [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'property2', self::callback(fn ($value): bool => \is_array($value))],
         );
-        $crud = $this->createCrud()
-            ->addColumn('column1', 'alias1', 'label1')
-            ->addVirtualColumn('virtual1', 'alias1');
+        $crudConfig = $this->createValidCrudConfig()
+            ->addColumn(['id' => 'column1', 'alias' => 'alias1'])
+            ->addVirtualColumn(['id' => 'virtual1', 'alias' => 'alias1']);
+        $crud = $this->createCrud($crudConfig);
         $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
             ->addFilter('property1', 'my_filter', [
                 'column_id' => 'column1',
@@ -273,7 +253,7 @@ public function testActionAfterCreateForm(): void
     {
         $searchFormBuilder = $this->createSearchFormBuilder();
         $searchFormBuilder->createForm();
-        $this->assertSame('/user/ajax-crud?search=1', $searchFormBuilder->getForm()->getConfig()->getAction());
+        $this->assertSame('/user/ajax-crud?param1=val1&search=1', $searchFormBuilder->getForm()->getConfig()->getAction());
     }
 
     public function testCreateFormView(): void
@@ -314,8 +294,9 @@ public function testUpdateQueryBuilder(): void
         );
         $filter->expects($this->once())->method('supportsQueryBuilder')->with($queryBuilder)->willReturn(true);
 
-        $crud = $this->createCrud()
-            ->addColumn('column1', 'alias1', 'label1');
+        $crudConfig = $this->createValidCrudConfig()
+            ->addColumn(['id' => 'column1', 'alias' => 'alias1']);
+        $crud = $this->createCrud($crudConfig);
         $searchFormBuilder = $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
             ->addFilter('property', 'my_filter', [
                 'column_id' => 'column1',
@@ -345,8 +326,9 @@ public function testUpdateQueryBuilderWithUpdateQueryBuilderOption(): void
             self::callback(fn ($value): bool => \is_array($value))
         );
 
-        $crud = $this->createCrud()
-            ->addColumn('column1', 'alias1', 'label1');
+        $crudConfig = $this->createValidCrudConfig()
+            ->addColumn(['id' => 'column1', 'alias' => 'alias1']);
+        $crud = $this->createCrud($crudConfig);
         $searchFormBuilder = $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
             ->addFilter('property', 'my_filter', [
                 'column_id' => 'column1',
@@ -371,8 +353,9 @@ public function testUpdateQueryBuilderNotSuported(): void
         $filter->expects($this->never())->method('updateQueryBuilder');
         $filter->expects($this->once())->method('supportsQueryBuilder')->with($queryBuilder)->willReturn(false);
 
-        $crud = $this->createCrud()
-            ->addColumn('column1', 'alias1', 'label1');
+        $crudConfig = $this->createValidCrudConfig()
+            ->addColumn(['id' => 'column1', 'alias' => 'alias1']);
+        $crud = $this->createCrud($crudConfig);
         $searchFormBuilder = $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
             ->addFilter('property', 'my_filter', [
                 'column_id' => 'column1',
@@ -407,21 +390,10 @@ protected function createCrudContainer(array $filters = []): ContainerInterface
         return $container;
     }
 
-    protected function createCrud(): Crud
-    {
-        $crud = $this->getMockBuilder(Crud::class)
-            ->setConstructorArgs(['session_name', static::getContainer()->get('ecommit_crud.locator')])
-            ->onlyMethods(['load', 'save'])
-            ->getMock();
-        $crud->setRoute('user_ajax_crud');
-
-        return $crud;
-    }
-
     protected function createSearchFormBuilder(?array $filters = null, ?Crud $crud = null, ?SearcherInterface $defaultData = null, ?string $type = null, array $options = []): SearchFormBuilder
     {
         $filters = (null !== $filters) ? $filters : ['my_filter' => $this->createMock(FilterInterface::class)];
-        $crud = ($crud) ?: $this->createCrud();
+        $crud = ($crud) ?: $this->createCrud($this->createValidCrudConfig());
         $defaultData = ($defaultData) ?: $this->createMock(SearcherInterface::class);
 
         return new SearchFormBuilder($this->createCrudContainer($filters), $crud, $defaultData, $type, $options);
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTest.php
index 3eadbb5..25aeaa4 100644
--- a/tests/Form/Filter/AbstractFilterTest.php
+++ b/tests/Form/Filter/AbstractFilterTest.php
@@ -17,6 +17,7 @@
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudConfig;
 use Ecommit\CrudBundle\Crud\CrudFactory;
 use Ecommit\CrudBundle\Tests\Functional\App\Entity\EntityManyToOne;
 use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\EntityToManyToOneSearcher;
@@ -78,7 +79,15 @@ protected function setUp(): void
                 return static::getContainer()->get('ecommit_crud.locator')->get($name);
             });
 
-        $this->crudFactory = new CrudFactory($container);
+        $this->crudFactory = $this->getMockBuilder(CrudFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->crudFactory->method('create')->willReturnCallback(function (array $options) use ($container) {
+            return $this->getMockBuilder(Crud::class)
+                ->setConstructorArgs([$options, $container])
+                ->onlyMethods(['save', 'buildSearchForm']) // buildSearchForm: Disable search form creation
+                ->getMock();
+        });
     }
 
     protected function tearDown(): void
@@ -88,35 +97,47 @@ protected function tearDown(): void
         $this->crudFactory = null;
     }
 
-    protected function createCrud(string $alias, $propertyData = null): Crud
+    protected function createCrudConfig(string $alias, $propertyData = null): CrudConfig
     {
         $searcher = new EntityToManyToOneSearcher();
         $searcher->propertyName = $propertyData;
 
         $queryBuilder = $this->em->getRepository(EntityManyToOne::class)->createQueryBuilder('e');
 
-        $crud = $this->crudFactory->create('session_name');
-        $crud->addColumn('propertyName', $alias, 'label1')
+        $crudConfig = new CrudConfig('session_name');
+        $crudConfig->addColumn('propertyName', $alias, 'label1')
             ->addColumn('id', 'e.id', 'id')
             ->setQueryBuilder($queryBuilder)
-            ->setAvailableResultsPerPage([5, 5, 10, 50], 5)
+            ->setMaxPerPage([5, 5, 10, 50], 5)
             ->setDefaultSort('id', Crud::ASC)
             ->createSearchForm($searcher)
             ->setRoute('user_ajax_crud');
 
-        return $crud;
+        return $crudConfig;
     }
 
-    protected function initCrudAndGetForm(Crud $crud): FormInterface
+    protected function createCrud(CrudConfig $crudConfig): Crud
     {
-        $crud->init();
+        return $this->crudFactory->create($crudConfig->getOptions());
+    }
+
+    protected function createForm(Crud $crud): void
+    {
+        // Replaces "Crud::buildSearchForm" mocked
+        $crud->getSearchForm()->createForm();
+        $crud->getSearchForm()->getForm()->setData(clone $crud->getSessionValues()->searchFormData);
+    }
+
+    protected function createAndGetForm(Crud $crud): FormInterface
+    {
+        $this->createForm($crud);
 
         return $crud->getSearchForm()->getForm();
     }
 
-    protected function initCrudAndGetFormView(Crud $crud): FormView
+    protected function createFormAndGetFormView(Crud $crud): FormView
     {
-        $crud->init();
+        $this->createForm($crud);
         $crud->getSearchForm()->createFormView();
 
         return $crud->getSearchForm()->getForm();
diff --git a/tests/Form/Filter/BooleanFilterTest.php b/tests/Form/Filter/BooleanFilterTest.php
index 3cef85c..ec8e7e3 100644
--- a/tests/Form/Filter/BooleanFilterTest.php
+++ b/tests/Form/Filter/BooleanFilterTest.php
@@ -22,9 +22,9 @@ class BooleanFilterTest extends AbstractFilterTest
      */
     public function testViewAndQueryBuilder($modelData, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
@@ -43,11 +43,9 @@ public function getTestViewAndQueryBuilderProvider(): array
 
     public function testInvalidInput(): void
     {
-        $crud = $this->createCrud('e.name', 'bad-value');
+        $crud = $this->createCrud($this->createCrudConfig('e.name', 'bad-value'));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
 
-        $crud->init();
-
         $this->checkQueryBuilder($crud, null, []);
     }
 
@@ -56,13 +54,11 @@ public function testInvalidInput(): void
      */
     public function testValueTrueOption($modelData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
             'value_true' => 'val',
         ]);
 
-        $crud->init();
-
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
@@ -81,13 +77,11 @@ public function getTestValueTrueOptionProvider(): array
      */
     public function testValueFalseOption($modelData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
             'value_false' => 'val',
         ]);
 
-        $crud->init();
-
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
@@ -106,13 +100,11 @@ public function getTestValueFalseOptionProvider(): array
      */
     public function testValueFalseNullOption($modelData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
             'value_false' => null,
         ]);
 
-        $crud->init();
-
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
@@ -131,13 +123,11 @@ public function getTestValueFalseNullOptionProvider(): array
      */
     public function testNotNullIsTrueOption($notNullIsTrue, $modelData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
             'not_null_is_true' => $notNullIsTrue,
         ]);
 
-        $crud->init();
-
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
@@ -161,13 +151,11 @@ public function getTestNotNullIsTrueOptionProvider(): array
      */
     public function testNullIsFalseOption($nullIsFalse, $modelData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
             'null_is_false' => $nullIsFalse,
         ]);
 
-        $crud->init();
-
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
@@ -191,10 +179,10 @@ public function getTestNullIsFalseOptionProvider(): array
      */
     public function testSubmit($submittedData, $expectedModelData, $expectedViewData): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -218,10 +206,10 @@ public function getTestSubmitProvider(): array
 
     public function testSubmitInvalidFormat(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => ['not-scalar'],
         ]);
@@ -234,10 +222,10 @@ public function testSubmitInvalidFormat(): void
 
     public function testSubmitBadChoice(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => 'bad-value',
         ]);
diff --git a/tests/Form/Filter/ChoiceFilterTest.php b/tests/Form/Filter/ChoiceFilterTest.php
index 5180f7d..1780595 100644
--- a/tests/Form/Filter/ChoiceFilterTest.php
+++ b/tests/Form/Filter/ChoiceFilterTest.php
@@ -23,12 +23,12 @@ class ChoiceFilterTest extends AbstractFilterTest
      */
     public function testViewAndQueryBuilder($modelData, bool $multiple, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.tag', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => $multiple,
         ]);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertEquals($expectedViewData, $view->children['propertyName']->vars['value']);
 
@@ -54,26 +54,24 @@ public function getTestViewAndQueryBuilderProvider(): array
 
     public function testInvalidMin(): void
     {
-        $crud = $this->createCrud('e.tag', ['1', '2']);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', ['1', '2']));
         $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
             'min' => 3,
         ]);
-        $crud->init();
 
         $this->checkQueryBuilder($crud, null, []);
     }
 
     public function testInvalidMax(): void
     {
-        $crud = $this->createCrud('e.tag', ['1', '2']);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', ['1', '2']));
         $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
             'max' => 1,
         ]);
-        $crud->init();
 
         $this->checkQueryBuilder($crud, null, []);
     }
@@ -83,13 +81,13 @@ public function testInvalidMax(): void
      */
     public function testSubmit($submittedData, bool $multiple, $expectedModelData, $expectedViewData): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => $multiple,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -121,13 +119,13 @@ public function getTestSubmitProvider(): array
      */
     public function testSubmitInvalidFormat($submittedData, bool $multiple): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => $multiple,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -151,14 +149,14 @@ public function getTestSubmitInvalidFormatProvider(): array
 
     public function testSubmitInvalidMinLength(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
             'min' => 3,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => ['1'],
         ]);
@@ -171,14 +169,14 @@ public function testSubmitInvalidMinLength(): void
 
     public function testSubmitInvalidMaxLength(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
             'max' => 1,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => ['1', '2'],
         ]);
@@ -191,7 +189,7 @@ public function testSubmitInvalidMaxLength(): void
 
     public function testSubmitWithoutValidation(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
@@ -199,7 +197,7 @@ public function testSubmitWithoutValidation(): void
             'autovalidate' => false,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => ['1'],
         ]);
@@ -213,12 +211,12 @@ public function testSubmitWithoutValidation(): void
 
     public function testWithType(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
             'type' => LanguageType::class,
         ]);
 
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $field = $view['propertyName'];
         $this->assertContains('language', $field->vars['block_prefixes']);
diff --git a/tests/Form/Filter/DateFilterTest.php b/tests/Form/Filter/DateFilterTest.php
index e4cdc40..96c2989 100644
--- a/tests/Form/Filter/DateFilterTest.php
+++ b/tests/Form/Filter/DateFilterTest.php
@@ -22,7 +22,7 @@ public function testOptionsAreRequired(): void
     {
         $this->expectException(MissingOptionsException::class);
 
-        $crud = $this->createCrud('e.createdAt');
+        $crud = $this->createCrud($this->createCrudConfig('e.createdAt'));
         $crud->getSearchForm()->addFilter('propertyName', DateFilter::class);
     }
 
@@ -31,12 +31,12 @@ public function testOptionsAreRequired(): void
      */
     public function testViewAndQueryBuilder($modelData, bool $withTime, string $comparator, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.createdAt', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.createdAt', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
             'comparator' => $comparator,
             'with_time' => $withTime,
         ]);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
@@ -85,13 +85,11 @@ public function getTestViewAndQueryBuilderProvider(): array
      */
     public function testInvalidInput($modelData): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
             'comparator' => DateFilter::GREATER_THAN,
         ]);
 
-        $crud->init();
-
         $this->checkQueryBuilder($crud, null, []);
     }
 
@@ -108,13 +106,13 @@ public function getTestInvalidInputProvider(): array
      */
     public function testSubmit($withTime, $submittedData, $expectedModelData, $expectedViewData): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
             'comparator' => DateFilter::GREATER_THAN,
             'with_time' => $withTime,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -146,12 +144,12 @@ public function getTestSubmitProvider(): array
      */
     public function testSubmitInvalidFormat($submittedData): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
             'comparator' => DateFilter::GREATER_THAN,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -175,7 +173,7 @@ public function getTestSubmitInvalidFormatProvider(): array
      */
     public function testViewAndQueryBuilderWithSingleTextWidget($modelData, bool $withTime, string $comparator, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.createdAt', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.createdAt', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
             'comparator' => $comparator,
             'with_time' => $withTime,
@@ -185,7 +183,7 @@ public function testViewAndQueryBuilderWithSingleTextWidget($modelData, bool $wi
                 'html5' => false,
             ],
         ]);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
@@ -212,7 +210,7 @@ public function getTestViewAndQueryBuilderWithSingleTextWidgetProvider(): array
      */
     public function testSubmitWithSingleTextWidget($withTime, $submittedData, $expectedModelData, $expectedViewData): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
             'comparator' => DateFilter::GREATER_THAN,
             'with_time' => $withTime,
@@ -223,7 +221,7 @@ public function testSubmitWithSingleTextWidget($withTime, $submittedData, $expec
             ],
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
diff --git a/tests/Form/Filter/EntityAjaxFilterTest.php b/tests/Form/Filter/EntityAjaxFilterTest.php
index e27b92d..af773f9 100644
--- a/tests/Form/Filter/EntityAjaxFilterTest.php
+++ b/tests/Form/Filter/EntityAjaxFilterTest.php
@@ -24,7 +24,7 @@ public function testOptionsAreRequired(): void
     {
         $this->expectException(MissingOptionsException::class);
 
-        $crud = $this->createCrud('e.tag');
+        $crud = $this->createCrud($this->createCrudConfig('e.tag'));
         $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class);
     }
 
@@ -33,13 +33,13 @@ public function testOptionsAreRequired(): void
      */
     public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
     {
-        $crud = $this->createCrud('e.tag', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
             'multiple' => $multiple,
         ]);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
@@ -74,14 +74,14 @@ public function getTestViewAndQueryBuilderProvider(): array
      */
     public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $expectedViewData): void
     {
-        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
         $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
             'multiple' => $multiple,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -114,7 +114,7 @@ public function getTestSubmitProvider(): array
      */
     public function testSubmitInvalid(bool $multiple, $submittedData): void
     {
-        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
         $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
@@ -122,7 +122,7 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
             'max' => 2,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -165,7 +165,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
                 ->andWhere('t.id > 2');
         }
 
-        $crud = $this->createCrud('e.tag', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
@@ -174,7 +174,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
                 'query_builder' => $queryBuilder,
             ],
         ]);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']); // Twig doesn't display invalid list
 
@@ -224,7 +224,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
                 ->andWhere('t.id > 2');
         }
 
-        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
         $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
@@ -234,7 +234,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
             ],
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
diff --git a/tests/Form/Filter/EntityFilterTest.php b/tests/Form/Filter/EntityFilterTest.php
index 38df880..faab558 100644
--- a/tests/Form/Filter/EntityFilterTest.php
+++ b/tests/Form/Filter/EntityFilterTest.php
@@ -24,7 +24,7 @@ public function testOptionsAreRequired(): void
     {
         $this->expectException(MissingOptionsException::class);
 
-        $crud = $this->createCrud('e.tag');
+        $crud = $this->createCrud($this->createCrudConfig('e.tag'));
         $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class);
     }
 
@@ -33,12 +33,12 @@ public function testOptionsAreRequired(): void
      */
     public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
     {
-        $crud = $this->createCrud('e.tag', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
         ]);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
@@ -73,13 +73,13 @@ public function getTestViewAndQueryBuilderProvider(): array
      */
     public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $expectedViewData): void
     {
-        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
         $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -111,13 +111,13 @@ public function getTestSubmitProvider(): array
      */
     public function testSubmitInvalid(bool $multiple, $submittedData): void
     {
-        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
         $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -142,14 +142,14 @@ public function getTestSubmitInvalidProvider(): array
 
     public function testSubmitInvalidMaxCount(): void
     {
-        $crud = $this->createCrud('e.tag', []);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', []));
         $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => true,
             'max' => 2,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => ['1', '2', '3'],
         ]);
@@ -176,7 +176,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
                 ->andWhere('t.id > 2');
         }
 
-        $crud = $this->createCrud('e.tag', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
@@ -184,7 +184,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
                 'query_builder' => $queryBuilder,
             ],
         ]);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
@@ -234,7 +234,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
                 ->andWhere('t.id > 2');
         }
 
-        $crud = $this->createCrud('e.tag', ($multiple) ? [] : null);
+        $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
         $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
@@ -243,7 +243,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
             ],
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
diff --git a/tests/Form/Filter/IntegerFilterTest.php b/tests/Form/Filter/IntegerFilterTest.php
index 51d5283..8af94e3 100644
--- a/tests/Form/Filter/IntegerFilterTest.php
+++ b/tests/Form/Filter/IntegerFilterTest.php
@@ -24,7 +24,7 @@ public function testOptionsAreRequired(): void
     {
         $this->expectException(MissingOptionsException::class);
 
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER);
     }
 
@@ -33,11 +33,11 @@ public function testOptionsAreRequired(): void
      */
     public function testViewAndQueryBuilder($modelData, string $comparator, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
             'comparator' => $comparator,
         ]);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
@@ -72,13 +72,11 @@ public function getTestViewAndQueryBuilderProvider(): array
 
     public function testInvalidInput(): void
     {
-        $crud = $this->createCrud('e.name', ['not-scalar']);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', ['not-scalar']));
         $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
             'comparator' => IntegerFilter::GREATER_THAN,
         ]);
 
-        $crud->init();
-
         $this->checkQueryBuilder($crud, null, []);
     }
 
@@ -87,12 +85,12 @@ public function testInvalidInput(): void
      */
     public function testSubmit($submittedData, $expectedModelData, $expectedViewData): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
             'comparator' => IntegerFilter::GREATER_THAN,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -118,12 +116,12 @@ public function getTestSubmitProvider(): array
      */
     public function testSubmitInvalidFormat($submittedData): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
             'comparator' => IntegerFilter::GREATER_THAN,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
diff --git a/tests/Form/Filter/NullFilterTest.php b/tests/Form/Filter/NullFilterTest.php
index ee11e86..e5d37f8 100644
--- a/tests/Form/Filter/NullFilterTest.php
+++ b/tests/Form/Filter/NullFilterTest.php
@@ -24,9 +24,9 @@ class NullFilterTest extends AbstractFilterTest
      */
     public function testViewAndQueryBuilder($modelData, $expectedChecked, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame('1', $view->children['propertyName']->vars['value']);
         $this->assertSame($expectedChecked, $view->children['propertyName']->vars['checked']);
@@ -53,10 +53,10 @@ public function getTestViewAndQueryBuilderProvider(): array
      */
     public function testSubmit($submittedData, $expectedModelData): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
diff --git a/tests/Form/Filter/TextFilterTest.php b/tests/Form/Filter/TextFilterTest.php
index 4e7cd92..c32eb83 100644
--- a/tests/Form/Filter/TextFilterTest.php
+++ b/tests/Form/Filter/TextFilterTest.php
@@ -23,12 +23,12 @@ class TextFilterTest extends AbstractFilterTest
      */
     public function testViewAndQueryBuilder($modelData, bool $mustBegin, bool $mustEnd, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
-        $crud = $this->createCrud('e.name', $modelData);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
         $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
             'must_begin' => $mustBegin,
             'must_end' => $mustEnd,
         ]);
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
 
@@ -63,11 +63,9 @@ public function getTestViewAndQueryBuilderProvider(): array
 
     public function testInvalidInput(): void
     {
-        $crud = $this->createCrud('e.name', ['not-scalar']);
+        $crud = $this->createCrud($this->createCrudConfig('e.name', ['not-scalar']));
         $crud->getSearchForm()->addFilter('propertyName', TextFilter::class);
 
-        $crud->init();
-
         $this->checkQueryBuilder($crud, null, []);
     }
 
@@ -76,10 +74,10 @@ public function testInvalidInput(): void
      */
     public function testSubmit($submittedData, $expectedModelData, $expectedViewData): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', TextFilter::class);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => $submittedData,
         ]);
@@ -102,10 +100,10 @@ public function getTestSubmitProvider(): array
 
     public function testSubmitInvalidFormat(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', TextFilter::class);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => ['not-scalar'],
         ]);
@@ -118,12 +116,12 @@ public function testSubmitInvalidFormat(): void
 
     public function testSubmitInvalidMinLength(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
             'min_length' => 5,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => 'val',
         ]);
@@ -136,12 +134,12 @@ public function testSubmitInvalidMinLength(): void
 
     public function testSubmitInvalidMaxLength(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
             'max_length' => 2,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => 'val',
         ]);
@@ -154,13 +152,13 @@ public function testSubmitInvalidMaxLength(): void
 
     public function testSubmitWithoutValidation(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
             'max_length' => 2,
             'autovalidate' => false,
         ]);
 
-        $form = $this->initCrudAndGetForm($crud);
+        $form = $this->createAndGetForm($crud);
         $form->submit([
             'propertyName' => 'val',
         ]);
@@ -174,12 +172,12 @@ public function testSubmitWithoutValidation(): void
 
     public function testWithType(): void
     {
-        $crud = $this->createCrud('e.name');
+        $crud = $this->createCrud($this->createCrudConfig('e.name'));
         $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
             'type' => TextareaType::class,
         ]);
 
-        $view = $this->initCrudAndGetFormView($crud);
+        $view = $this->createFormAndGetFormView($crud);
 
         $field = $view['propertyName'];
         $this->assertContains('textarea', $field->vars['block_prefixes']);
diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index 8b921c3..1733b27 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -20,7 +20,7 @@
 
 class UserController extends AbstractCrudController
 {
-    protected function getCrud(): Crud
+    protected function getCrudOptions(): array
     {
         $em = $this->container->get('doctrine')->getManager();
 
@@ -28,17 +28,22 @@ protected function getCrud(): Crud
             ->createQueryBuilder('u')
             ->select('u');
 
-        $crud = $this->createCrud(static::getCrudName());
-        $crud->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
+        $crudConfig = $this->createCrudConfig(static::getCrudName())
+            ->addColumn('username', 'u.username', 'username', ['displayed_by_default' => false])
             ->addColumn('firstName', 'u.firstName', 'first_name')
             ->addColumn('lastName', 'u.lastName', 'last_name')
             ->setQueryBuilder($queryBuilder)
-            ->setAvailableResultsPerPage([5, 10, 50], 5)
+            ->setMaxPerPage([5, 10, 50], 5)
             ->setDefaultSort('firstName', Crud::ASC)
             ->createSearchForm(new UserSearcher())
             ->setRoute(static::getCrudRouteName(), static::getCrudRouteParams())
             ->setPersistentSettings(static::getPersistentSettings());
 
+        return $crudConfig->getOptions();
+    }
+
+    protected function beforeBuild(Crud $crud, array $data): array
+    {
         $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('manual-reset')) {
             $crud->reset();
@@ -47,7 +52,7 @@ protected function getCrud(): Crud
             $crud->resetSort();
         }
 
-        return $crud;
+        return $data;
     }
 
     public function getCrudName(): string
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index 538f6d9..111b801 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -15,6 +15,7 @@
 
 use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudConfig;
 use Ecommit\CrudBundle\Crud\CrudFactory;
 use Ecommit\CrudBundle\Crud\CrudResponseGenerator;
 use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
@@ -32,16 +33,17 @@ protected function getCrud(string $sessionName, array $routeParams = []): Crud
             ->createQueryBuilder('u')
             ->select('u');
 
-        $crud = $this->container->get(CrudFactory::class)->create($sessionName);
-        $crud->addColumn('username', 'u.username', 'username', ['default_displayed' => false])
+        $crudConfig = new CrudConfig($sessionName);
+        $crudConfig->addColumn('username', 'u.username', 'username', ['displayed_by_default' => false])
             ->addColumn('firstName', 'u.firstName', 'first_name')
             ->addColumn('lastName', 'u.lastName', 'last_name')
             ->setQueryBuilder($queryBuilder)
-            ->setAvailableResultsPerPage([5, 5, 10, 50], 5)
+            ->setMaxPerPage([5, 5, 10, 50], 5)
             ->setDefaultSort('firstName', Crud::ASC)
             ->createSearchForm(new UserSearcher())
             ->setRoute('user_without_trait_ajax_crud', $routeParams)
             ->setPersistentSettings(true);
+        $crud = $this->container->get(CrudFactory::class)->create($crudConfig->getOptions());
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
         if ($request->query->has('manual-reset')) {
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index da7b017..8123150 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -437,12 +437,12 @@ public function testCrudPaginatorLinks(): void
 
         $crud = $this->getMockBuilder(Crud::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getDivIdList', 'getPaginator', 'getRouteName', 'getRouteParams'])
+            ->onlyMethods(['getDivIdList', 'getPaginator', 'getRouteName', 'getRouteParameters'])
             ->getMock();
         $crud->expects($this->once())->method('getDivIdList')->willReturn('myId');
         $crud->expects($this->once())->method('getPaginator')->willReturn($paginator);
         $crud->expects($this->once())->method('getRouteName')->willReturn('user_crud');
-        $crud->expects($this->once())->method('getRouteParams')->willReturn([]);
+        $crud->expects($this->once())->method('getRouteParameters')->willReturn([]);
 
         $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
         $result = $this->crudExtension->crudPaginatorLinks($this->environment, $crud, [
@@ -752,15 +752,12 @@ protected function createCrud(string $sort = 'column1', string $sortDirection =
 
         $crud = $this->getMockBuilder(Crud::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getDivIdList', 'getRouteName', 'getRouteParams', 'getSessionValues', 'getColumn'])
+            ->onlyMethods(['getSessionName', 'getDivIdList', 'getRouteName', 'getRouteParameters', 'getSessionValues', 'getColumn'])
             ->getMock();
-        $reflection = new \ReflectionClass($crud);
-        $reflectionProperty = $reflection->getProperty('sessionName');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($crud, 'session_name');
+        $crud->expects($this->any())->method('getSessionName')->willReturn('sessionName');
         $crud->expects($this->any())->method('getDivIdList')->willReturn('myId');
         $crud->expects($this->any())->method('getRouteName')->willReturn('user_crud');
-        $crud->expects($this->any())->method('getRouteParams')->willReturn([]);
+        $crud->expects($this->any())->method('getRouteParameters')->willReturn([]);
         $crud->expects($this->any())->method('getSessionValues')->willReturn($crudSession);
         $crud->expects($this->any())->method('getColumn')->willReturnCallback(fn ($columnId) => $columns[$columnId]);
 

From bb1166e95b1fa9a31dc607707beb291abbb3edd6 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 4 May 2022 11:58:45 +0200
Subject: [PATCH 175/264] Improve form getters

---
 doc/upgrade/3.0.md                         |  6 +-
 psalm.xml                                  |  1 -
 src/Crud/Crud.php                          | 82 ++++++++++++------
 src/Crud/SearchFormBuilder.php             | 49 +++++++++--
 src/Twig/CrudExtension.php                 |  3 +
 tests/Crud/CrudTest.php                    | 44 ++++++++--
 tests/Crud/SearchFormBuilderTest.php       | 96 ++++++++++++++++++++--
 tests/Form/Filter/AbstractFilterTest.php   | 10 +--
 tests/Form/Filter/BooleanFilterTest.php    | 20 ++---
 tests/Form/Filter/ChoiceFilterTest.php     | 18 ++--
 tests/Form/Filter/DateFilterTest.php       | 14 ++--
 tests/Form/Filter/EntityAjaxFilterTest.php | 12 +--
 tests/Form/Filter/EntityFilterTest.php     | 14 ++--
 tests/Form/Filter/IntegerFilterTest.php    | 10 +--
 tests/Form/Filter/NullFilterTest.php       |  4 +-
 tests/Form/Filter/TextFilterTest.php       | 16 ++--
 16 files changed, 287 insertions(+), 112 deletions(-)

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index bcb9564..2ed8e56 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -91,9 +91,9 @@
     * Utilisation d'un locator
 * La méthode `init` de `Crud` n'est plus publique.
 * Les méthodes suivantes de `Crud` sont supprimées:
-    * `getSearcherForm`. Elle est remplacée par la méthode `getSearchForm`. Cette nouvelle méthode retourne :
-        * Soit un objet `SearchFormBuilder`, avant que la méthode `createView` soit appelée
-        * Soit un objet `FormView`, après que la méthode `createView` soit appelée
+    * `getSearcherForm`. Elle est remplacée par les méthodes suivantes :
+        * `getSearchFormBuilder` : Retourne un objet `SearchFormBuilder` (peut être appelée uniquement avant que la méthode `createView` soit appelée)
+        * `getSearchForm` : Retourne un objet `FormView` (peut être appelée uniquement après que la méthode `createView` soit appelée)
     * `setUseDbal`
     * `configureTemplate`, `getTemplateConfiguration` et `validateConfigureTemplateFunctionName`: Voir l'alternative avec
       [le nouveau système](../cookbook/template_configuration.md).
diff --git a/psalm.xml b/psalm.xml
index 730625c..1213754 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -30,7 +30,6 @@
 
         <PossiblyUndefinedMethod>
             <errorLevel type="suppress">
-                <file name="src/Crud/Crud.php" />
                 <file name="src/DependencyInjection/Configuration.php" />
                 <directory name="src/Form/Filter" />
             </errorLevel>
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index bcbb4d4..634d9cc 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -67,6 +67,7 @@ final class Crud
     protected bool $updateDatabase = false;
     protected ?PaginatorInterface $paginator = null;
     protected bool $displayResults = true;
+    protected bool $viewCreated = false;
 
     public function __construct(array $options, protected ContainerInterface $container)
     {
@@ -225,11 +226,12 @@ protected function createSearchForm(): void
 
     protected function buildSearchForm(): void
     {
-        if (!$this->searchForm) {
+        $searchFormBuilder = $this->getSearchFormBuilder();
+        if (!$searchFormBuilder) {
             return;
         }
 
-        $this->searchForm->createForm();
+        $searchFormBuilder->createForm();
 
         // Allocates object
         if ($this->container->get('request_stack')->getCurrentRequest()->query->has('reset')) {
@@ -242,7 +244,7 @@ protected function buildSearchForm(): void
         /** @psalm-suppress PossiblyInvalidClone */
         $values = clone $this->sessionValues->searchFormData;
         try {
-            $this->searchForm->getForm()->setData($values);
+            $searchFormBuilder->setData($values);
         } catch (TransformationFailedException $exception) {
             // Avoid error if data stored in session is invalid
         }
@@ -405,12 +407,26 @@ public function getSessionValues(): CrudSession
         return $this->sessionValues;
     }
 
-    /**
-     * Returns the search form (SearchFormBuilder object before createView or FormView object after createView).
-     */
-    public function getSearchForm(): SearchFormBuilder|FormView|null
+    public function getSearchFormBuilder(): ?SearchFormBuilder
+    {
+        if (null === $this->searchForm) {
+            return null;
+        } elseif ($this->searchForm instanceof SearchFormBuilder) {
+            return $this->searchForm;
+        }
+
+        throw new \Exception('The object "SearchFormBuilder" no longer exists since the call of the method "Crud::createView".');
+    }
+
+    public function getSearchForm(): ?FormView
     {
-        return $this->searchForm;
+        if (null === $this->searchForm) {
+            return null;
+        } elseif ($this->searchForm instanceof FormView) {
+            return $this->searchForm;
+        }
+
+        throw new \Exception('The object "FormView" exists only after the call of the method "Crud::createView".');
     }
 
     public function getDivIdSearch(): string
@@ -425,7 +441,8 @@ public function getDivIdList(): string
 
     public function processSearchForm(): self
     {
-        if (!$this->searchForm) {
+        $searchFormBuilder = $this->getSearchFormBuilder();
+        if (!$searchFormBuilder) {
             throw new NotFoundHttpException('Crud: Search form does not exist.');
         }
 
@@ -437,7 +454,7 @@ public function processSearchForm(): self
             if ($this->getDisplayResultsOnlyIfSearch()) {
                 $this->displayResults = false;
             }
-            $searchForm = $this->searchForm->getForm();
+            $searchForm = $searchFormBuilder->getForm();
             $searchForm->handleRequest($request);
             if ($searchForm->isSubmitted() && $searchForm->isValid() && false !== $this->options['build_paginator']) {
                 $this->displayResults = true;
@@ -489,9 +506,10 @@ protected function updateQueryBuilder(): void
         }
 
         // Adds form searcher filters
-        if ($this->searchForm) {
+        $searchFormBuilder = $this->getSearchFormBuilder();
+        if ($searchFormBuilder) {
             /** @psalm-suppress PossiblyNullArgument */
-            $this->searchForm->updateQueryBuilder($this->getQueryBuilder(), $this->sessionValues->searchFormData);
+            $searchFormBuilder->updateQueryBuilder($this->getQueryBuilder(), $this->sessionValues->searchFormData);
         }
     }
 
@@ -531,10 +549,11 @@ protected function buildPaginator(): void
      */
     public function reset(): self
     {
-        if ($this->searchForm) {
-            $newValue = clone $this->searchForm->getDefaultData();
+        $searchFormBuilder = $this->getSearchFormBuilder();
+        if ($searchFormBuilder) {
+            $newValue = clone $searchFormBuilder->getDefaultData();
             $this->changeFilterValues($newValue);
-            $this->searchForm->getForm()->setData(clone $newValue);
+            $searchFormBuilder->setData(clone $newValue);
             $this->sessionValues->searchFormIsSubmittedAndValid = false;
         }
         $this->changePage(1);
@@ -576,11 +595,18 @@ protected function resetDisplaySettings(): void
 
     public function createView(): self
     {
-        if ($this->searchForm) {
-            $this->searchForm->createFormView();
-            $this->searchForm = $this->searchForm->getForm();
+        if ($this->viewCreated) {
+            throw new \Exception('Crud::createView has already been called.');
+        }
+        $searchFormBuilder = $this->getSearchFormBuilder();
+        if ($searchFormBuilder) {
+            $searchFormBuilder->createFormView();
+            $this->searchForm = $searchFormBuilder->getFormView();
         }
-        $this->displaySettingsForm = $this->displaySettingsForm->createView();
+        /** @var FormInterface $displaySettingsForm */
+        $displaySettingsForm = $this->displaySettingsForm;
+        $this->displaySettingsForm = $displaySettingsForm->createView();
+        $this->viewCreated = true;
 
         return $this;
     }
@@ -691,15 +717,16 @@ protected function changeSortDirection(mixed $value): void
      */
     protected function changeFilterValues(?SearcherInterface $value): void
     {
-        if (!$this->searchForm) {
+        $searchFormBuilder = $this->getSearchFormBuilder();
+        if (!$searchFormBuilder) {
             $this->sessionValues->searchFormData = null;
 
             return;
         }
-        if (null !== $value && $value::class === \get_class($this->searchForm->getDefaultData())) {
+        if (null !== $value && $value::class === \get_class($searchFormBuilder->getDefaultData())) {
             $this->sessionValues->searchFormData = $value;
         } else {
-            $this->sessionValues->searchFormData = clone $this->searchForm->getDefaultData();
+            $this->sessionValues->searchFormData = clone $searchFormBuilder->getDefaultData();
         }
     }
 
@@ -736,9 +763,11 @@ protected function processRequest(): void
             return;
         }
 
-        $this->displaySettingsForm->handleRequest($request);
-        if ($this->displaySettingsForm->isSubmitted() && $this->displaySettingsForm->isValid()) {
-            $displaySettingsData = $this->displaySettingsForm->getData();
+        /** @var FormInterface $displaySettingsForm */
+        $displaySettingsForm = $this->displaySettingsForm;
+        $displaySettingsForm->handleRequest($request);
+        if ($displaySettingsForm->isSubmitted() && $displaySettingsForm->isValid()) {
+            $displaySettingsData = $displaySettingsForm->getData();
             $this->changeColumnsDisplayed($displaySettingsData['displayedColumns']);
             $this->changeNumberResultsDisplayed($displaySettingsData['resultsPerPage']);
         }
@@ -801,12 +830,13 @@ protected function load(): void
         }
 
         // If session is null => Assign default value
+        $searchFormBuilder = $this->getSearchFormBuilder();
         $this->sessionValues = new CrudSession(
             $this->getDefaultMaxPerPage(),
             $this->getDefaultDisplayedColumns(),
             $this->getDefaultSort(),
             $this->getDefaultSortDirection(),
-            ($this->searchForm) ? $this->searchForm->getDefaultData() : null,
+            ($searchFormBuilder) ? $searchFormBuilder->getDefaultData() : null,
         );
 
         // If persistent settings is enabled -> Retrieve from database
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index eeb8b8a..021cb77 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -116,8 +116,7 @@ public function addFilter(string $property, string $filter, array $options = [])
 
     public function addField(string $property, string $type, array $options = []): self
     {
-        /** @psalm-suppress PossiblyUndefinedMethod */
-        $this->form->add($property, $type, $options);
+        $this->getFormBuilder()->add($property, $type, $options);
 
         return $this;
     }
@@ -148,24 +147,45 @@ public function createForm(): self
             $filterService->buildForm($this, $property, $filter['options']);
         }
 
-        /** @psalm-suppress PossiblyUndefinedMethod */
-        $this->form->setAction($this->crud->getSearchUrl());
-        /** @psalm-suppress PossiblyUndefinedMethod */
-        $this->form = $this->form->getForm();
+        $this->getFormBuilder()->setAction($this->crud->getSearchUrl());
+        $this->form = $this->getFormBuilder()->getForm();
 
         return $this;
     }
 
     public function createFormView(): self
     {
-        /** @psalm-suppress PossiblyUndefinedMethod */
-        $this->form = $this->form->createView();
+        $this->form = $this->getForm()->createView();
 
         return $this;
     }
 
-    public function getForm(): FormBuilderInterface|FormInterface|FormView
+    public function getFormBuilder(): FormBuilderInterface
     {
+        if (!$this->form instanceof FormBuilderInterface) {
+            throw new \Exception('The object "FormBuilderInterface" no longer exists since the call of the method "SearchFormBuilder::createForm".');
+        }
+
+        return $this->form;
+    }
+
+    public function getForm(): FormInterface
+    {
+        if ($this->form instanceof FormBuilderInterface) {
+            throw new \Exception('The object "FormInterface" exists only after the call of the method "SearchFormBuilder::createForm".');
+        } elseif (!$this->form instanceof FormInterface) {
+            throw new \Exception('The object "FormInterface" no longer exists since the call of the method "SearchFormBuilder::createFormView"');
+        }
+
+        return $this->form;
+    }
+
+    public function getFormView(): FormView
+    {
+        if (!$this->form instanceof FormView) {
+            throw new \Exception('The object "FormView" exists only after the call of the method "SearchFormBuilder::createFormView".');
+        }
+
         return $this->form;
     }
 
@@ -174,6 +194,17 @@ public function getDefaultData(): SearcherInterface
         return $this->defaultData;
     }
 
+    public function setData(SearcherInterface $data): self
+    {
+        if ($this->form instanceof FormView) {
+            throw new \Exception('The method "SearchFormBuilder::setData" cannot be called after "SearchFormBuilder::createFormView".');
+        }
+
+        $this->form->setData($data);
+
+        return $this;
+    }
+
     public function updateQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface $queryBuilder, SearcherInterface $searcher): self
     {
         $searcher->updateQueryBuilder($queryBuilder, $this->options);
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index e81eafa..8cc666f 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -447,6 +447,9 @@ public function displaySettings(Environment $environment, Crud $crud, array $opt
         $options = $resolver->resolve($this->buildOptions('crud_display_settings', $options, $crud));
 
         $form = $crud->getDisplaySettingsForm();
+        if (!$form instanceof FormView) {
+            throw new \Exception('Method "Crud::createView" must be called before using Twig function "crud_display_settings"');
+        }
 
         if ($options['render']) {
             return $environment->render($options['render'], [
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 13335c9..2982c2c 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -401,30 +401,53 @@ public function testAddBadRouteParameters(): void
         $this->createCrud($crudConfig);
     }
 
-    public function testCreateAndGetSearchForm(): void
+    public function testCreateAndGetSearchFormMethods(): void
     {
         $crudConfig = $this->createValidCrudConfig()
             ->createSearchForm(new UserSearcher());
         $crud = $this->createCrud($crudConfig);
 
-        $this->assertInstanceOf(SearchFormBuilder::class, $crud->getSearchForm());
+        $this->assertInstanceOf(SearchFormBuilder::class, $crud->getSearchFormBuilder());
 
         $crud->createView();
         $this->assertInstanceOf(FormView::class, $crud->getSearchForm());
     }
 
-    public function testCreateAndGetNullSearchForm(): void
+    public function testCreateAndGetNullSearchFormMethods(): void
     {
         $crudConfig = $this->createValidCrudConfig();
         $crudConfig['search_form_data'] = null;
         $crud = $this->createCrud($crudConfig);
 
-        $this->assertNull($crud->getSearchForm());
+        $this->assertNull($crud->getSearchFormBuilder());
 
         $crud->createView();
         $this->assertNull($crud->getSearchForm());
     }
 
+    public function testGetSearchFormBuilderAfterCreateView(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->createSearchForm(new UserSearcher());
+        $crud = $this->createCrud($crudConfig);
+        $crud->createView();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The object "SearchFormBuilder" no longer exists since the call of the method "Crud::createView"');
+        $crud->getSearchFormBuilder();
+    }
+
+    public function testGetSearchFormBeforeCreateView(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->createSearchForm(new UserSearcher());
+        $crud = $this->createCrud($crudConfig);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The object "FormView" exists only after the call of the method "Crud::createView"');
+        $crud->getSearchForm();
+    }
+
     public function testAddBadSearchFormData(): void
     {
         $crudConfig = $this->createValidCrudConfig();
@@ -445,7 +468,7 @@ public function testCreateSearchFormWithType(): void
             ]);
         $crud = $this->createCrud($crudConfig);
 
-        $this->assertInstanceOf(FormType::class, $crud->getSearchForm()->getForm()->getConfig()->getType()->getInnerType());
+        $this->assertInstanceOf(FormType::class, $crud->getSearchFormBuilder()->getForm()->getConfig()->getType()->getInnerType());
     }
 
     public function testCreateSearchFormWithBadType(): void
@@ -466,7 +489,7 @@ public function testCreateSearchFormWithOptions(): void
             ]);
         $crud = $this->createCrud($crudConfig);
 
-        $this->assertSame(['MyGroup'], $crud->getSearchForm()->getForm()->getConfig()->getOption('validation_groups'));
+        $this->assertSame(['MyGroup'], $crud->getSearchFormBuilder()->getForm()->getConfig()->getOption('validation_groups'));
     }
 
     public function testCreateSearchFormWithBadOptions(): void
@@ -771,6 +794,15 @@ public function testCreateView(): void
         $this->assertInstanceOf(Crud::class, $crud->createView());
     }
 
+    public function testCreateViewAlreadyDone(): void
+    {
+        $crud = $this->createCrud($this->createValidCrudConfig())->createView();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Crud::createView has already been called');
+        $crud->createView();
+    }
+
     public function testLoadSessionWithSearchForm(): void
     {
         $sessionValue = new CrudSession(10, ['username'], 'firstName', Crud::ASC, new UserSearcher());
diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
index 58bb0d4..47fa5e5 100644
--- a/tests/Crud/SearchFormBuilderTest.php
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -35,8 +35,8 @@ class SearchFormBuilderTest extends AbstractCrudTest
     public function testCreateFormBuilder(?string $type, string $expectedName, string $expectedType): void
     {
         $searchFormBuilder = $this->createSearchFormBuilder(type: $type);
-        $this->assertSame($expectedName, $searchFormBuilder->getForm()->getFormConfig()->getName());
-        $this->assertInstanceOf($expectedType, $searchFormBuilder->getForm()->getFormConfig()->getType()->getInnerType());
+        $this->assertSame($expectedName, $searchFormBuilder->getFormBuilder()->getFormConfig()->getName());
+        $this->assertInstanceOf($expectedType, $searchFormBuilder->getFormBuilder()->getFormConfig()->getType()->getInnerType());
     }
 
     public function getTestCreateFormBuilderProvider(): array
@@ -57,7 +57,7 @@ public function testCreateFormBuilderWithFormOptions(?string $type, string $expe
                 'attr' => ['class' => 'myclass'],
             ],
         ]);
-        $this->assertSame(['class' => 'myclass'], $searchFormBuilder->getForm()->getFormConfig()->getOption('attr'));
+        $this->assertSame(['class' => 'myclass'], $searchFormBuilder->getFormBuilder()->getFormConfig()->getOption('attr'));
     }
 
     /**
@@ -68,7 +68,7 @@ public function testCreateFormBuilderWithValidationGroups(?string $type, string
         $searchFormBuilder = $this->createSearchFormBuilder(type: $type, options: [
             'validation_groups' => ['my_group'],
         ]);
-        $this->assertSame(['my_group'], $searchFormBuilder->getForm()->getFormConfig()->getOption('validation_groups'));
+        $this->assertSame(['my_group'], $searchFormBuilder->getFormBuilder()->getFormConfig()->getOption('validation_groups'));
     }
 
     /**
@@ -82,7 +82,7 @@ public function testCreateFormBuilderWithValidationGroupsAndFormOptions(?string
                 'validation_groups' => ['my_group2'],
             ],
         ]);
-        $this->assertSame(['my_group2'], $searchFormBuilder->getForm()->getFormConfig()->getOption('validation_groups'));
+        $this->assertSame(['my_group2'], $searchFormBuilder->getFormBuilder()->getFormConfig()->getOption('validation_groups'));
     }
 
     public function testAddFilterFormAlreadyCreated(): void
@@ -262,16 +262,65 @@ public function testCreateFormView(): void
         $this->assertSame($searchFormBuilder, $searchFormBuilder->createFormView());
     }
 
-    public function testGetForm(): void
+    public function testGetFormMethods(): void
     {
         $searchFormBuilder = $this->createSearchFormBuilder();
-        $this->assertInstanceOf(FormBuilderInterface::class, $searchFormBuilder->getForm());
+        $this->assertInstanceOf(FormBuilderInterface::class, $searchFormBuilder->getFormBuilder());
 
         $searchFormBuilder->createForm();
         $this->assertInstanceOf(FormInterface::class, $searchFormBuilder->getForm());
 
         $searchFormBuilder->createFormView();
-        $this->assertInstanceOf(FormView::class, $searchFormBuilder->getForm());
+        $this->assertInstanceOf(FormView::class, $searchFormBuilder->getFormView());
+    }
+
+    public function testGetFormBuilderAfterCreateForm(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $searchFormBuilder->createForm();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The object "FormBuilderInterface" no longer exists since the call of the method "SearchFormBuilder::createForm"');
+        $searchFormBuilder->getFormBuilder();
+    }
+
+    public function testGetFormBeforeCreateForm(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The object "FormInterface" exists only after the call of the method "SearchFormBuilder::createForm"');
+        $searchFormBuilder->getForm();
+    }
+
+    public function testGetFormAfterCreateFormView(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $searchFormBuilder->createForm();
+        $searchFormBuilder->createFormView();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The object "FormInterface" no longer exists since the call of the method "SearchFormBuilder::createFormView"');
+        $searchFormBuilder->getForm();
+    }
+
+    public function testGetFormViewBeforeCreateForm(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The object "FormView" exists only after the call of the method "SearchFormBuilder::createFormView".');
+        $searchFormBuilder->getFormView();
+    }
+
+    public function testGetFormViewBeforeCreateFormView(): void
+    {
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $searchFormBuilder->createForm();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The object "FormView" exists only after the call of the method "SearchFormBuilder::createFormView".');
+        $searchFormBuilder->getFormView();
     }
 
     public function testGetDefaultData(): void
@@ -281,6 +330,37 @@ public function testGetDefaultData(): void
         $this->assertSame($defaultData, $searchFormBuilder->getDefaultData());
     }
 
+    public function testSetDataWithFormBuilder(): void
+    {
+        $data = $this->createMock(SearcherInterface::class);
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $searchFormBuilder->setData($data);
+
+        $this->assertSame($data, $searchFormBuilder->getFormBuilder()->getData());
+    }
+
+    public function testSetDataWithForm(): void
+    {
+        $data = $this->createMock(SearcherInterface::class);
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $searchFormBuilder->createForm();
+        $searchFormBuilder->setData($data);
+
+        $this->assertSame($data, $searchFormBuilder->getForm()->getData());
+    }
+
+    public function testSetDataWithFormView(): void
+    {
+        $data = $this->createMock(SearcherInterface::class);
+        $searchFormBuilder = $this->createSearchFormBuilder();
+        $searchFormBuilder->createForm();
+        $searchFormBuilder->createFormView();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The method "SearchFormBuilder::setData" cannot be called after "SearchFormBuilder::createFormView"');
+        $searchFormBuilder->setData($data);
+    }
+
     public function testUpdateQueryBuilder(): void
     {
         $queryBuilder = $this->createMock(QueryBuilder::class);
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTest.php
index 25aeaa4..05f264a 100644
--- a/tests/Form/Filter/AbstractFilterTest.php
+++ b/tests/Form/Filter/AbstractFilterTest.php
@@ -124,23 +124,23 @@ protected function createCrud(CrudConfig $crudConfig): Crud
     protected function createForm(Crud $crud): void
     {
         // Replaces "Crud::buildSearchForm" mocked
-        $crud->getSearchForm()->createForm();
-        $crud->getSearchForm()->getForm()->setData(clone $crud->getSessionValues()->searchFormData);
+        $crud->getSearchFormBuilder()->createForm();
+        $crud->getSearchFormBuilder()->getForm()->setData(clone $crud->getSessionValues()->searchFormData);
     }
 
     protected function createAndGetForm(Crud $crud): FormInterface
     {
         $this->createForm($crud);
 
-        return $crud->getSearchForm()->getForm();
+        return $crud->getSearchFormBuilder()->getForm();
     }
 
     protected function createFormAndGetFormView(Crud $crud): FormView
     {
         $this->createForm($crud);
-        $crud->getSearchForm()->createFormView();
+        $crud->getSearchFormBuilder()->createFormView();
 
-        return $crud->getSearchForm()->getForm();
+        return $crud->getSearchFormBuilder()->getFormView();
     }
 
     protected function checkQueryBuilder(Crud $crud, ?string $whereExpected, array $parametersExpected = []): void
diff --git a/tests/Form/Filter/BooleanFilterTest.php b/tests/Form/Filter/BooleanFilterTest.php
index ec8e7e3..4bca3b8 100644
--- a/tests/Form/Filter/BooleanFilterTest.php
+++ b/tests/Form/Filter/BooleanFilterTest.php
@@ -23,7 +23,7 @@ class BooleanFilterTest extends AbstractFilterTest
     public function testViewAndQueryBuilder($modelData, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class);
         $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame($expectedViewData, $view->children['propertyName']->vars['value']);
@@ -44,7 +44,7 @@ public function getTestViewAndQueryBuilderProvider(): array
     public function testInvalidInput(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', 'bad-value'));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class);
 
         $this->checkQueryBuilder($crud, null, []);
     }
@@ -55,7 +55,7 @@ public function testInvalidInput(): void
     public function testValueTrueOption($modelData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class, [
             'value_true' => 'val',
         ]);
 
@@ -78,7 +78,7 @@ public function getTestValueTrueOptionProvider(): array
     public function testValueFalseOption($modelData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class, [
             'value_false' => 'val',
         ]);
 
@@ -101,7 +101,7 @@ public function getTestValueFalseOptionProvider(): array
     public function testValueFalseNullOption($modelData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class, [
             'value_false' => null,
         ]);
 
@@ -124,7 +124,7 @@ public function getTestValueFalseNullOptionProvider(): array
     public function testNotNullIsTrueOption($notNullIsTrue, $modelData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class, [
             'not_null_is_true' => $notNullIsTrue,
         ]);
 
@@ -152,7 +152,7 @@ public function getTestNotNullIsTrueOptionProvider(): array
     public function testNullIsFalseOption($nullIsFalse, $modelData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class, [
             'null_is_false' => $nullIsFalse,
         ]);
 
@@ -180,7 +180,7 @@ public function getTestNullIsFalseOptionProvider(): array
     public function testSubmit($submittedData, $expectedModelData, $expectedViewData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class);
 
         $form = $this->createAndGetForm($crud);
         $form->submit([
@@ -207,7 +207,7 @@ public function getTestSubmitProvider(): array
     public function testSubmitInvalidFormat(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class);
 
         $form = $this->createAndGetForm($crud);
         $form->submit([
@@ -223,7 +223,7 @@ public function testSubmitInvalidFormat(): void
     public function testSubmitBadChoice(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', BooleanFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', BooleanFilter::class);
 
         $form = $this->createAndGetForm($crud);
         $form->submit([
diff --git a/tests/Form/Filter/ChoiceFilterTest.php b/tests/Form/Filter/ChoiceFilterTest.php
index 1780595..844acd2 100644
--- a/tests/Form/Filter/ChoiceFilterTest.php
+++ b/tests/Form/Filter/ChoiceFilterTest.php
@@ -24,7 +24,7 @@ class ChoiceFilterTest extends AbstractFilterTest
     public function testViewAndQueryBuilder($modelData, bool $multiple, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => $multiple,
         ]);
@@ -55,7 +55,7 @@ public function getTestViewAndQueryBuilderProvider(): array
     public function testInvalidMin(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', ['1', '2']));
-        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
             'min' => 3,
@@ -67,7 +67,7 @@ public function testInvalidMin(): void
     public function testInvalidMax(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', ['1', '2']));
-        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
             'max' => 1,
@@ -82,7 +82,7 @@ public function testInvalidMax(): void
     public function testSubmit($submittedData, bool $multiple, $expectedModelData, $expectedViewData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => $multiple,
         ]);
@@ -120,7 +120,7 @@ public function getTestSubmitProvider(): array
     public function testSubmitInvalidFormat($submittedData, bool $multiple): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => $multiple,
         ]);
@@ -150,7 +150,7 @@ public function getTestSubmitInvalidFormatProvider(): array
     public function testSubmitInvalidMinLength(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
             'min' => 3,
@@ -170,7 +170,7 @@ public function testSubmitInvalidMinLength(): void
     public function testSubmitInvalidMaxLength(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
             'max' => 1,
@@ -190,7 +190,7 @@ public function testSubmitInvalidMaxLength(): void
     public function testSubmitWithoutValidation(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', ChoiceFilter::class, [
             'choices' => ['val1' => '1', 'val2' => '2'],
             'multiple' => true,
             'min' => 3,
@@ -212,7 +212,7 @@ public function testSubmitWithoutValidation(): void
     public function testWithType(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', ChoiceFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', ChoiceFilter::class, [
             'type' => LanguageType::class,
         ]);
 
diff --git a/tests/Form/Filter/DateFilterTest.php b/tests/Form/Filter/DateFilterTest.php
index 96c2989..361afc1 100644
--- a/tests/Form/Filter/DateFilterTest.php
+++ b/tests/Form/Filter/DateFilterTest.php
@@ -23,7 +23,7 @@ public function testOptionsAreRequired(): void
         $this->expectException(MissingOptionsException::class);
 
         $crud = $this->createCrud($this->createCrudConfig('e.createdAt'));
-        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', DateFilter::class);
     }
 
     /**
@@ -32,7 +32,7 @@ public function testOptionsAreRequired(): void
     public function testViewAndQueryBuilder($modelData, bool $withTime, string $comparator, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.createdAt', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', DateFilter::class, [
             'comparator' => $comparator,
             'with_time' => $withTime,
         ]);
@@ -86,7 +86,7 @@ public function getTestViewAndQueryBuilderProvider(): array
     public function testInvalidInput($modelData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', DateFilter::class, [
             'comparator' => DateFilter::GREATER_THAN,
         ]);
 
@@ -107,7 +107,7 @@ public function getTestInvalidInputProvider(): array
     public function testSubmit($withTime, $submittedData, $expectedModelData, $expectedViewData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', DateFilter::class, [
             'comparator' => DateFilter::GREATER_THAN,
             'with_time' => $withTime,
         ]);
@@ -145,7 +145,7 @@ public function getTestSubmitProvider(): array
     public function testSubmitInvalidFormat($submittedData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', DateFilter::class, [
             'comparator' => DateFilter::GREATER_THAN,
         ]);
 
@@ -174,7 +174,7 @@ public function getTestSubmitInvalidFormatProvider(): array
     public function testViewAndQueryBuilderWithSingleTextWidget($modelData, bool $withTime, string $comparator, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.createdAt', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', DateFilter::class, [
             'comparator' => $comparator,
             'with_time' => $withTime,
             'type_options' => [
@@ -211,7 +211,7 @@ public function getTestViewAndQueryBuilderWithSingleTextWidgetProvider(): array
     public function testSubmitWithSingleTextWidget($withTime, $submittedData, $expectedModelData, $expectedViewData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', DateFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', DateFilter::class, [
             'comparator' => DateFilter::GREATER_THAN,
             'with_time' => $withTime,
             'type_options' => [
diff --git a/tests/Form/Filter/EntityAjaxFilterTest.php b/tests/Form/Filter/EntityAjaxFilterTest.php
index af773f9..2a4eb54 100644
--- a/tests/Form/Filter/EntityAjaxFilterTest.php
+++ b/tests/Form/Filter/EntityAjaxFilterTest.php
@@ -25,7 +25,7 @@ public function testOptionsAreRequired(): void
         $this->expectException(MissingOptionsException::class);
 
         $crud = $this->createCrud($this->createCrudConfig('e.tag'));
-        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityAjaxFilter::class);
     }
 
     /**
@@ -34,7 +34,7 @@ public function testOptionsAreRequired(): void
     public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
             'multiple' => $multiple,
@@ -75,7 +75,7 @@ public function getTestViewAndQueryBuilderProvider(): array
     public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $expectedViewData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
-        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
             'multiple' => $multiple,
@@ -115,7 +115,7 @@ public function getTestSubmitProvider(): array
     public function testSubmitInvalid(bool $multiple, $submittedData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
-        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
             'multiple' => $multiple,
@@ -166,7 +166,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
         }
 
         $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
             'multiple' => $multiple,
@@ -225,7 +225,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
         }
 
         $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
-        $crud->getSearchForm()->addFilter('propertyName', EntityAjaxFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityAjaxFilter::class, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
             'multiple' => $multiple,
diff --git a/tests/Form/Filter/EntityFilterTest.php b/tests/Form/Filter/EntityFilterTest.php
index faab558..2df7ab3 100644
--- a/tests/Form/Filter/EntityFilterTest.php
+++ b/tests/Form/Filter/EntityFilterTest.php
@@ -25,7 +25,7 @@ public function testOptionsAreRequired(): void
         $this->expectException(MissingOptionsException::class);
 
         $crud = $this->createCrud($this->createCrudConfig('e.tag'));
-        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityFilter::class);
     }
 
     /**
@@ -34,7 +34,7 @@ public function testOptionsAreRequired(): void
     public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
         ]);
@@ -74,7 +74,7 @@ public function getTestViewAndQueryBuilderProvider(): array
     public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $expectedViewData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
-        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
         ]);
@@ -112,7 +112,7 @@ public function getTestSubmitProvider(): array
     public function testSubmitInvalid(bool $multiple, $submittedData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
-        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
         ]);
@@ -143,7 +143,7 @@ public function getTestSubmitInvalidProvider(): array
     public function testSubmitInvalidMaxCount(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.tag', []));
-        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => true,
             'max' => 2,
@@ -177,7 +177,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
         }
 
         $crud = $this->createCrud($this->createCrudConfig('e.tag', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
             'type_options' => [
@@ -235,7 +235,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
         }
 
         $crud = $this->createCrud($this->createCrudConfig('e.tag', ($multiple) ? [] : null));
-        $crud->getSearchForm()->addFilter('propertyName', EntityFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', EntityFilter::class, [
             'class' => Tag::class,
             'multiple' => $multiple,
             'type_options' => [
diff --git a/tests/Form/Filter/IntegerFilterTest.php b/tests/Form/Filter/IntegerFilterTest.php
index 8af94e3..82287b0 100644
--- a/tests/Form/Filter/IntegerFilterTest.php
+++ b/tests/Form/Filter/IntegerFilterTest.php
@@ -25,7 +25,7 @@ public function testOptionsAreRequired(): void
         $this->expectException(MissingOptionsException::class);
 
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', static::TEST_FILTER);
     }
 
     /**
@@ -34,7 +34,7 @@ public function testOptionsAreRequired(): void
     public function testViewAndQueryBuilder($modelData, string $comparator, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', static::TEST_FILTER, [
             'comparator' => $comparator,
         ]);
         $view = $this->createFormAndGetFormView($crud);
@@ -73,7 +73,7 @@ public function getTestViewAndQueryBuilderProvider(): array
     public function testInvalidInput(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', ['not-scalar']));
-        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', static::TEST_FILTER, [
             'comparator' => IntegerFilter::GREATER_THAN,
         ]);
 
@@ -86,7 +86,7 @@ public function testInvalidInput(): void
     public function testSubmit($submittedData, $expectedModelData, $expectedViewData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', static::TEST_FILTER, [
             'comparator' => IntegerFilter::GREATER_THAN,
         ]);
 
@@ -117,7 +117,7 @@ public function getTestSubmitProvider(): array
     public function testSubmitInvalidFormat($submittedData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', static::TEST_FILTER, [
             'comparator' => IntegerFilter::GREATER_THAN,
         ]);
 
diff --git a/tests/Form/Filter/NullFilterTest.php b/tests/Form/Filter/NullFilterTest.php
index e5d37f8..e151325 100644
--- a/tests/Form/Filter/NullFilterTest.php
+++ b/tests/Form/Filter/NullFilterTest.php
@@ -25,7 +25,7 @@ class NullFilterTest extends AbstractFilterTest
     public function testViewAndQueryBuilder($modelData, $expectedChecked, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', static::TEST_FILTER);
         $view = $this->createFormAndGetFormView($crud);
 
         $this->assertSame('1', $view->children['propertyName']->vars['value']);
@@ -54,7 +54,7 @@ public function getTestViewAndQueryBuilderProvider(): array
     public function testSubmit($submittedData, $expectedModelData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', static::TEST_FILTER);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', static::TEST_FILTER);
 
         $form = $this->createAndGetForm($crud);
         $form->submit([
diff --git a/tests/Form/Filter/TextFilterTest.php b/tests/Form/Filter/TextFilterTest.php
index c32eb83..739644d 100644
--- a/tests/Form/Filter/TextFilterTest.php
+++ b/tests/Form/Filter/TextFilterTest.php
@@ -24,7 +24,7 @@ class TextFilterTest extends AbstractFilterTest
     public function testViewAndQueryBuilder($modelData, bool $mustBegin, bool $mustEnd, $expectedViewData, ?string $whereExpected, array $parametersExpected): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', $modelData));
-        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', TextFilter::class, [
             'must_begin' => $mustBegin,
             'must_end' => $mustEnd,
         ]);
@@ -64,7 +64,7 @@ public function getTestViewAndQueryBuilderProvider(): array
     public function testInvalidInput(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name', ['not-scalar']));
-        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', TextFilter::class);
 
         $this->checkQueryBuilder($crud, null, []);
     }
@@ -75,7 +75,7 @@ public function testInvalidInput(): void
     public function testSubmit($submittedData, $expectedModelData, $expectedViewData): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', TextFilter::class);
 
         $form = $this->createAndGetForm($crud);
         $form->submit([
@@ -101,7 +101,7 @@ public function getTestSubmitProvider(): array
     public function testSubmitInvalidFormat(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class);
+        $crud->getSearchFormBuilder()->addFilter('propertyName', TextFilter::class);
 
         $form = $this->createAndGetForm($crud);
         $form->submit([
@@ -117,7 +117,7 @@ public function testSubmitInvalidFormat(): void
     public function testSubmitInvalidMinLength(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', TextFilter::class, [
             'min_length' => 5,
         ]);
 
@@ -135,7 +135,7 @@ public function testSubmitInvalidMinLength(): void
     public function testSubmitInvalidMaxLength(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', TextFilter::class, [
             'max_length' => 2,
         ]);
 
@@ -153,7 +153,7 @@ public function testSubmitInvalidMaxLength(): void
     public function testSubmitWithoutValidation(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', TextFilter::class, [
             'max_length' => 2,
             'autovalidate' => false,
         ]);
@@ -173,7 +173,7 @@ public function testSubmitWithoutValidation(): void
     public function testWithType(): void
     {
         $crud = $this->createCrud($this->createCrudConfig('e.name'));
-        $crud->getSearchForm()->addFilter('propertyName', TextFilter::class, [
+        $crud->getSearchFormBuilder()->addFilter('propertyName', TextFilter::class, [
             'type' => TextareaType::class,
         ]);
 

From dc00d615de2bcd5a81883fd00498b46a8792e23f Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 4 May 2022 19:25:14 +0200
Subject: [PATCH 176/264] Replace CrudSession public properties by protected
 properties.

Add CrudSession methods
Remove UserCrudSettings::transformToCrudSession and UserCrudSettings::updateFromSessionManager
---
 doc/upgrade/3.0.md                       |   7 +-
 src/Crud/Crud.php                        | 114 +++++-----
 src/Crud/CrudSession.php                 | 173 ++++++++++++++-
 src/Crud/SearchFormBuilder.php           |   2 +-
 src/Entity/UserCrudSettings.php          |  25 ---
 src/Twig/CrudExtension.php               |   4 +-
 tests/Crud/CrudSessionTest.php           | 254 +++++++++++++++++++++++
 tests/Crud/CrudTest.php                  |  28 +--
 tests/Form/Filter/AbstractFilterTest.php |   2 +-
 9 files changed, 494 insertions(+), 115 deletions(-)
 create mode 100644 tests/Crud/CrudSessionTest.php

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 2ed8e56..b32a548 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -29,6 +29,9 @@
   la base de données
 * La colonne `displayed_columns` de la table `user_crud_settings` a maintenant un type `JSON`. Mettre à jour la base de données
 * La colonne `sense` de la table `user_crud_settings` est remplacée par la colonne `sort_direction`. Mettre à jour la base de données
+* Les methodes suivantes sont supprimées :
+  * `transformToCrudSession`
+  * `updateFromSessionManager`
 
 
 
@@ -130,10 +133,10 @@
     * Utilisation d'un locator
 * Toutes les données membres de `CrudFactory` sont supprimées. Un locator est utilisé à la place.
 * La méthode `create` de `CrudFactory`  possède maintenant un unique argument d'options.
-* La donnée membre `$formSearcherData` de `CrudSession` est supprimée. Elle est remplacée par `$searchFormData`
+* Les données membres publiques de `CrudSession` n'existent plus (`formSearcherData`, `resultsPerPage`, `displayedColumns`, `sort`, `sense`, `page`). Utiliser à la place les fonctions getters (modification des valeurs impossible).
   qui est une instance de `SearcherInterface` ou nulle.
 * Le constructeur de `CrudColumn` possède maintenant un unique argument d'options.
-* Les données membres publiques de `CrudColumn` n'existent plus (`id`, `alias`, `aliasSearch`, `aliasSort`, `label`, `sortable`, `defaultDisplayed`). Utiliser à la place les fonctions getters (modificaton des valeurs impossible).
+* Les données membres publiques de `CrudColumn` n'existent plus (`id`, `alias`, `aliasSearch`, `aliasSort`, `label`, `sortable`, `defaultDisplayed`). Utiliser à la place les fonctions getters (modification des valeurs impossible).
 
 
 
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 634d9cc..96c7d63 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -203,7 +203,7 @@ protected function init(): void
 
         // Display or not results
         if ($this->searchForm && $this->getDisplayResultsOnlyIfSearch()) {
-            $this->displayResults = $this->sessionValues->searchFormIsSubmittedAndValid;
+            $this->displayResults = $this->sessionValues->isSearchFormIsSubmittedAndValid();
         }
 
         $this->createDisplaySettingsForm();
@@ -237,14 +237,8 @@ protected function buildSearchForm(): void
         if ($this->container->get('request_stack')->getCurrentRequest()->query->has('reset')) {
             return;
         }
-        // IMPORTANT
-        // We have not to allocate directelly the "$this->sessionValues->searchFormData" object
-        // because otherwise it will be linked to form, and will be updated when the "bind" function will
-        // be called (If form is not valid, the session values will still be updated: Undesirable behavior)
-        /** @psalm-suppress PossiblyInvalidClone */
-        $values = clone $this->sessionValues->searchFormData;
         try {
-            $searchFormBuilder->setData($values);
+            $searchFormBuilder->setData($this->sessionValues->getSearchFormData());
         } catch (TransformationFailedException $exception) {
             // Avoid error if data stored in session is invalid
         }
@@ -458,7 +452,7 @@ public function processSearchForm(): self
             $searchForm->handleRequest($request);
             if ($searchForm->isSubmitted() && $searchForm->isValid() && false !== $this->options['build_paginator']) {
                 $this->displayResults = true;
-                $this->sessionValues->searchFormIsSubmittedAndValid = true;
+                $this->sessionValues = $this->sessionValues->setSearchFormIsSubmittedAndValid(true);
                 $this->changeFilterValues($searchForm->getData());
                 $this->changePage(1);
                 $this->save();
@@ -479,7 +473,7 @@ public function build(): self
     protected function updateQueryBuilder(): void
     {
         // Builds query
-        $columnSortId = $this->sessionValues->sort;
+        $columnSortId = $this->sessionValues->getSort();
         if ('defaultPersonalizedSort' == $columnSortId) {
             // Default personalised sort is used
             foreach ($this->getDefaultPersonalizedSort() as $key => $value) {
@@ -497,11 +491,11 @@ protected function updateQueryBuilder(): void
             if (\is_array($columnSortAlias)) {
                 // Sort alias in many columns
                 foreach ($columnSortAlias as $oneColumnSortAlias) {
-                    $this->getQueryBuilder()->addOrderBy($oneColumnSortAlias, $this->sessionValues->sortDirection);
+                    $this->getQueryBuilder()->addOrderBy($oneColumnSortAlias, $this->sessionValues->getSortDirection());
                 }
             } else {
                 // Sort alias in one column
-                $this->getQueryBuilder()->orderBy($columnSortAlias, $this->sessionValues->sortDirection);
+                $this->getQueryBuilder()->orderBy($columnSortAlias, $this->sessionValues->getSortDirection());
             }
         }
 
@@ -509,7 +503,7 @@ protected function updateQueryBuilder(): void
         $searchFormBuilder = $this->getSearchFormBuilder();
         if ($searchFormBuilder) {
             /** @psalm-suppress PossiblyNullArgument */
-            $searchFormBuilder->updateQueryBuilder($this->getQueryBuilder(), $this->sessionValues->searchFormData);
+            $searchFormBuilder->updateQueryBuilder($this->getQueryBuilder(), $this->sessionValues->getSearchFormData());
         }
     }
 
@@ -523,8 +517,8 @@ protected function buildPaginator(): void
             // Case: Manual paginator (by closure) is enabled
             $this->paginator = $this->options['build_paginator']->__invoke(
                 $this->getQueryBuilder(),
-                $this->sessionValues->page,
-                $this->sessionValues->resultsPerPage
+                $this->sessionValues->getPage(),
+                $this->sessionValues->getMaxPerPage()
             );
 
             return;
@@ -538,8 +532,8 @@ protected function buildPaginator(): void
 
         $this->paginator = DoctrinePaginatorBuilder::createDoctrinePaginator(
             $this->getQueryBuilder(),
-            $this->sessionValues->page,
-            $this->sessionValues->resultsPerPage,
+            $this->sessionValues->getPage(),
+            $this->sessionValues->getMaxPerPage(),
             $paginatorOptions
         );
     }
@@ -554,7 +548,7 @@ public function reset(): self
             $newValue = clone $searchFormBuilder->getDefaultData();
             $this->changeFilterValues($newValue);
             $searchFormBuilder->setData(clone $newValue);
-            $this->sessionValues->searchFormIsSubmittedAndValid = false;
+            $this->sessionValues = $this->sessionValues->setSearchFormIsSubmittedAndValid(false);
         }
         $this->changePage(1);
         $this->save();
@@ -568,8 +562,8 @@ public function reset(): self
 
     public function resetSort(): self
     {
-        $this->sessionValues->sortDirection = $this->getDefaultSortDirection();
-        $this->sessionValues->sort = $this->getDefaultSort();
+        $this->sessionValues = $this->sessionValues->setSortDirection($this->getDefaultSortDirection());
+        $this->sessionValues = $this->sessionValues->setSort($this->getDefaultSort());
         $this->save();
 
         return $this;
@@ -577,10 +571,10 @@ public function resetSort(): self
 
     protected function resetDisplaySettings(): void
     {
-        $this->sessionValues->displayedColumns = $this->getDefaultDisplayedColumns();
-        $this->sessionValues->resultsPerPage = $this->getDefaultMaxPerPage();
-        $this->sessionValues->sortDirection = $this->getDefaultSortDirection();
-        $this->sessionValues->sort = $this->getDefaultSort();
+        $this->sessionValues = $this->sessionValues->setDisplayedColumns($this->getDefaultDisplayedColumns());
+        $this->sessionValues = $this->sessionValues->setMaxPerPage($this->getDefaultMaxPerPage());
+        $this->sessionValues = $this->sessionValues->setSortDirection($this->getDefaultSortDirection());
+        $this->sessionValues = $this->sessionValues->setSort($this->getDefaultSort());
 
         if ($this->options['persistent_settings']) {
             // Remove settings in database
@@ -638,12 +632,12 @@ protected function testIfDatabaseMustMeUpdated(mixed $oldValue, mixed $newValue)
     protected function checkCrudSession(): void
     {
         // Forces change => checks
-        $this->changeNumberResultsDisplayed($this->sessionValues->resultsPerPage);
-        $this->changeColumnsDisplayed($this->sessionValues->displayedColumns);
-        $this->changeSort($this->sessionValues->sort);
-        $this->changeSortDirection($this->sessionValues->sortDirection);
-        $this->changeFilterValues($this->sessionValues->searchFormData);
-        $this->changePage($this->sessionValues->page);
+        $this->changeNumberResultsDisplayed($this->sessionValues->getMaxPerPage());
+        $this->changeColumnsDisplayed($this->sessionValues->getDisplayedColumns());
+        $this->changeSort($this->sessionValues->getSort());
+        $this->changeSortDirection($this->sessionValues->getSortDirection());
+        $this->changeFilterValues($this->sessionValues->getSearchFormData());
+        $this->changePage($this->sessionValues->getPage());
     }
 
     /**
@@ -651,11 +645,11 @@ protected function checkCrudSession(): void
      */
     protected function changeNumberResultsDisplayed(int $value): void
     {
-        $oldValue = $this->sessionValues->resultsPerPage;
+        $oldValue = $this->sessionValues->getMaxPerPage();
         if (\in_array($value, $this->getMaxPerPageChoices())) {
-            $this->sessionValues->resultsPerPage = $value;
+            $this->sessionValues = $this->sessionValues->setMaxPerPage($value);
         } else {
-            $this->sessionValues->resultsPerPage = $this->getDefaultMaxPerPage();
+            $this->sessionValues = $this->sessionValues->setMaxPerPage($this->getDefaultMaxPerPage());
         }
         $this->testIfDatabaseMustMeUpdated($oldValue, $value);
     }
@@ -665,7 +659,7 @@ protected function changeNumberResultsDisplayed(int $value): void
      */
     protected function changeColumnsDisplayed(array $value): void
     {
-        $oldValue = $this->sessionValues->displayedColumns;
+        $oldValue = $this->sessionValues->getDisplayedColumns();
         $newDisplayedColumns = [];
         $columns = $this->getColumns();
         foreach ($value as $columnName) {
@@ -676,7 +670,7 @@ protected function changeColumnsDisplayed(array $value): void
         if (0 == \count($newDisplayedColumns)) {
             $newDisplayedColumns = $this->getDefaultDisplayedColumns();
         }
-        $this->sessionValues->displayedColumns = $newDisplayedColumns;
+        $this->sessionValues = $this->sessionValues->setDisplayedColumns($newDisplayedColumns);
         $this->testIfDatabaseMustMeUpdated($oldValue, $newDisplayedColumns);
     }
 
@@ -685,14 +679,14 @@ protected function changeColumnsDisplayed(array $value): void
      */
     protected function changeSort(mixed $value): void
     {
-        $oldValue = $this->sessionValues->sort;
+        $oldValue = $this->sessionValues->getSort();
         $columns = $this->getColumns();
         if ((\is_string($value) && \array_key_exists($value, $columns) && $columns[$value]->isSortable())
             || (\is_string($value) && 'defaultPersonalizedSort' === $value && $this->getDefaultPersonalizedSort())) {
-            $this->sessionValues->sort = $value;
+            $this->sessionValues = $this->sessionValues->setSort($value);
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
-            $this->sessionValues->sort = $this->getDefaultSort();
+            $this->sessionValues = $this->sessionValues->setSort($this->getDefaultSort());
             $this->testIfDatabaseMustMeUpdated($oldValue, $this->getDefaultSort());
         }
     }
@@ -702,12 +696,12 @@ protected function changeSort(mixed $value): void
      */
     protected function changeSortDirection(mixed $value): void
     {
-        $oldValue = $this->sessionValues->sortDirection;
+        $oldValue = $this->sessionValues->getSortDirection();
         if (\is_string($value) && (self::ASC === $value || self::DESC === $value)) {
-            $this->sessionValues->sortDirection = $value;
+            $this->sessionValues = $this->sessionValues->setSortDirection($value);
             $this->testIfDatabaseMustMeUpdated($oldValue, $value);
         } else {
-            $this->sessionValues->sortDirection = $this->getDefaultSortDirection();
+            $this->sessionValues = $this->sessionValues->setSortDirection($this->getDefaultSortDirection());
             $this->testIfDatabaseMustMeUpdated($oldValue, $this->getDefaultSortDirection());
         }
     }
@@ -719,14 +713,14 @@ protected function changeFilterValues(?SearcherInterface $value): void
     {
         $searchFormBuilder = $this->getSearchFormBuilder();
         if (!$searchFormBuilder) {
-            $this->sessionValues->searchFormData = null;
+            $this->sessionValues = $this->sessionValues->setSearchFormData(null);
 
             return;
         }
         if (null !== $value && $value::class === \get_class($searchFormBuilder->getDefaultData())) {
-            $this->sessionValues->searchFormData = $value;
+            $this->sessionValues = $this->sessionValues->setSearchFormData($value);
         } else {
-            $this->sessionValues->searchFormData = clone $searchFormBuilder->getDefaultData();
+            $this->sessionValues = $this->sessionValues->setSearchFormData($searchFormBuilder->getDefaultData());
         }
     }
 
@@ -742,7 +736,7 @@ protected function changePage(mixed $value): void
         if ($value > 1000000000000) {
             $value = 1;
         }
-        $this->sessionValues->page = $value;
+        $this->sessionValues = $this->sessionValues->setPage($value);
     }
 
     /**
@@ -801,8 +795,8 @@ protected function createDisplaySettingsForm(): void
             $columnsChoices[$column->getId()] = $column->getLabel();
         }
         $data = [
-            'resultsPerPage' => $this->getSessionValues()->resultsPerPage,
-            'displayedColumns' => $this->getSessionValues()->displayedColumns,
+            'resultsPerPage' => $this->getSessionValues()->getMaxPerPage(),
+            'displayedColumns' => $this->getSessionValues()->getDisplayedColumns(),
         ];
         $formName = sprintf('crud_display_settings_%s', $this->getSessionName());
 
@@ -848,7 +842,7 @@ protected function load(): void
                 ]
             );
             if ($objectDatabase) {
-                $this->sessionValues = $objectDatabase->transformToCrudSession($this->sessionValues);
+                $this->sessionValues = $this->sessionValues->updateFromUserCrudSettings($objectDatabase);
                 $this->checkCrudSession();
 
                 return;
@@ -863,11 +857,7 @@ protected function save(): void
     {
         // Save in session
         $session = $this->container->get('request_stack')->getCurrentRequest()->getSession();
-        $sessionValues = clone $this->sessionValues;
-        if (\is_object($this->sessionValues->searchFormData)) {
-            $sessionValues->searchFormData = clone $this->sessionValues->searchFormData;
-        }
-        $session->set($this->getSessionName(), $sessionValues);
+        $session->set($this->getSessionName(), clone $this->sessionValues);
 
         // Save in database
         if ($this->options['persistent_settings'] && $this->updateDatabase) {
@@ -881,22 +871,22 @@ protected function save(): void
 
             if ($objectDatabase) {
                 // Update object in database
-                $objectDatabase->updateFromSessionManager($this->sessionValues);
+                $this->sessionValues->updateUserCrudSettings($objectDatabase);
                 $em->flush();
             } else {
                 // Create object in database only if not default values
-                if ($this->sessionValues->displayedColumns != $this->getDefaultDisplayedColumns() ||
-                    $this->sessionValues->resultsPerPage != $this->getDefaultMaxPerPage() ||
-                    $this->sessionValues->sortDirection != $this->getDefaultSortDirection() ||
-                    $this->sessionValues->sort != $this->getDefaultSort()
+                if ($this->sessionValues->getDisplayedColumns() != $this->getDefaultDisplayedColumns() ||
+                    $this->sessionValues->getMaxPerPage() != $this->getDefaultMaxPerPage() ||
+                    $this->sessionValues->getSortDirection() != $this->getDefaultSortDirection() ||
+                    $this->sessionValues->getSort() != $this->getDefaultSort()
                 ) {
                     $objectDatabase = new UserCrudSettings(
                         $this->container->get('security.token_storage')->getToken()->getUser(),
                         $this->getSessionName(),
-                        $this->sessionValues->resultsPerPage,
-                        $this->sessionValues->displayedColumns,
-                        $this->sessionValues->sort,
-                        $this->sessionValues->sortDirection
+                        $this->sessionValues->getMaxPerPage(),
+                        $this->sessionValues->getDisplayedColumns(),
+                        $this->sessionValues->getSort(),
+                        $this->sessionValues->getSortDirection()
                     );
                     $em->persist($objectDatabase);
                     $em->flush();
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index a7cdd34..ee1e737 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -13,19 +13,176 @@
 
 namespace Ecommit\CrudBundle\Crud;
 
+use Ecommit\CrudBundle\Entity\UserCrudSettings;
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 
-/**
- * @internal
- *
- * $searchFormData: Search's object (used by "setData" inside the form). Used to save the data of the search form.
- */
 final class CrudSession
 {
-    public int $page = 1;
-    public bool $searchFormIsSubmittedAndValid = false;
+    /**
+     * Search's object (used by "setData" inside the form). Used to save the data of the search form.
+     */
+    protected ?SearcherInterface $searchFormData;
+
+    protected int $page = 1;
+    protected bool $searchFormIsSubmittedAndValid = false;
+
+    /**
+     * @internal
+     */
+    public function __construct(protected int $maxPerPage, protected array $displayedColumns, protected string $sort, protected string $sortDirection, ?SearcherInterface $searchFormData = null)
+    {
+        $this->searchFormData = ($searchFormData) ? clone $searchFormData : null; // Avoid modification by reference (by the user or an invalid form)
+    }
+
+    public function __clone()
+    {
+        if (null !== $this->searchFormData) {
+            $this->searchFormData = clone $this->searchFormData; // Avoid modification by reference (by the user or an invalid form)
+        }
+    }
+
+    /**
+     * @internal
+     */
+    public function updateFromUserCrudSettings(UserCrudSettings $crudSettings): self
+    {
+        $instance = clone $this; // Avoid modification by reference (by the user or an invalid form)
+        $instance->maxPerPage = $crudSettings->getResultsDisplayed();
+        $instance->displayedColumns = $crudSettings->getDisplayedColumns();
+        $instance->sort = $crudSettings->getSort();
+        $instance->sortDirection = $crudSettings->getSortDirection();
+
+        return $instance;
+    }
+
+    /**
+     * @internal
+     */
+    public function updateUserCrudSettings(UserCrudSettings $crudSettings): void
+    {
+        $crudSettings->setResultsDisplayed($this->maxPerPage);
+        $crudSettings->setDisplayedColumns($this->displayedColumns);
+        $crudSettings->setSort($this->sort);
+        $crudSettings->setSortDirection($this->sortDirection);
+    }
 
-    public function __construct(public int $resultsPerPage, public array $displayedColumns, public string $sort, public string $sortDirection, public ?SearcherInterface $searchFormData = null)
+    public function getMaxPerPage(): int
     {
+        return $this->maxPerPage;
+    }
+
+    /**
+     * @internal
+     */
+    public function setMaxPerPage(int $maxPerPage): self
+    {
+        $instance = clone $this; // Avoid modification by reference (by the user or an invalid form)
+        $instance->maxPerPage = $maxPerPage;
+
+        return $instance;
+    }
+
+    public function getDisplayedColumns(): array
+    {
+        return $this->displayedColumns;
+    }
+
+    /**
+     * @internal
+     */
+    public function setDisplayedColumns(array $displayedColumns): self
+    {
+        $instance = clone $this; // Avoid modification by reference (by the user or an invalid form)
+        $instance->displayedColumns = $displayedColumns;
+
+        return $instance;
+    }
+
+    public function getSort(): string
+    {
+        return $this->sort;
+    }
+
+    /**
+     * @internal
+     */
+    public function setSort(string $sort): self
+    {
+        $instance = clone $this; // Avoid modification by reference (by the user or an invalid form)
+        $instance->sort = $sort;
+
+        return $instance;
+    }
+
+    public function getSortDirection(): string
+    {
+        return $this->sortDirection;
+    }
+
+    /**
+     * @internal
+     */
+    public function setSortDirection(string $sortDirection): self
+    {
+        $instance = clone $this; // Avoid modification by reference (by the user or an invalid form)
+        $instance->sortDirection = $sortDirection;
+
+        return $instance;
+    }
+
+    public function getSearchFormData(): ?SearcherInterface
+    {
+        if (null === $this->searchFormData) {
+            return null;
+        }
+
+        return clone $this->searchFormData; // Avoid modification by reference (by the user or an invalid form)
+    }
+
+    /**
+     * @internal
+     */
+    public function setSearchFormData(?SearcherInterface $searchFormData): self
+    {
+        $instance = clone $this; // Avoid modification by reference (by the user or an invalid form)
+        if (null === $searchFormData) {
+            $instance->searchFormData = null;
+        } else {
+            $instance->searchFormData = clone $searchFormData; // Avoid modification by reference (by the user or an invalid form)
+        }
+
+        return $instance;
+    }
+
+    public function getPage(): int
+    {
+        return $this->page;
+    }
+
+    /**
+     * @internal
+     */
+    public function setPage(int $page): self
+    {
+        $instance = clone $this; // Avoid modification by reference (by the user or an invalid form)
+        $instance->page = $page;
+
+        return $instance;
+    }
+
+    public function isSearchFormIsSubmittedAndValid(): bool
+    {
+        return $this->searchFormIsSubmittedAndValid;
+    }
+
+    /**
+     * @internal
+     */
+    public function setSearchFormIsSubmittedAndValid(bool $searchFormIsSubmittedAndValid): self
+    {
+        $instance = clone $this; // Avoid modification by reference (by the user or an invalid form)
+        $instance->searchFormIsSubmittedAndValid = $searchFormIsSubmittedAndValid;
+
+        return $instance;
     }
 }
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index 021cb77..fd84008 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -194,7 +194,7 @@ public function getDefaultData(): SearcherInterface
         return $this->defaultData;
     }
 
-    public function setData(SearcherInterface $data): self
+    public function setData(?SearcherInterface $data): self
     {
         if ($this->form instanceof FormView) {
             throw new \Exception('The method "SearchFormBuilder::setData" cannot be called after "SearchFormBuilder::createFormView".');
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index ff0eead..1cb5560 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -14,7 +14,6 @@
 namespace Ecommit\CrudBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Ecommit\CrudBundle\Crud\CrudSession;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'user_crud_settings')]
@@ -121,28 +120,4 @@ public function getUser(): \Ecommit\CrudBundle\Entity\UserCrudInterface
     {
         return $this->user;
     }
-
-    /**
-     * Create CrudSession from this object.
-     */
-    public function transformToCrudSession(CrudSession $crudSessionManager): CrudSession
-    {
-        $crudSessionManager->displayedColumns = $this->displayedColumns;
-        $crudSessionManager->resultsPerPage = $this->resultsDisplayed;
-        $crudSessionManager->sortDirection = $this->sortDirection;
-        $crudSessionManager->sort = $this->sort;
-
-        return $crudSessionManager;
-    }
-
-    /**
-     * Update this object from CrudSession.
-     */
-    public function updateFromSessionManager(CrudSession $crudSessionManager): void
-    {
-        $this->displayedColumns = $crudSessionManager->displayedColumns;
-        $this->resultsDisplayed = $crudSessionManager->resultsPerPage;
-        $this->sortDirection = $crudSessionManager->sortDirection;
-        $this->sort = $crudSessionManager->sort;
-    }
 }
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 8cc666f..95ca1c1 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -333,7 +333,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
 
         // If the column is not to be shown, returns empty
         $sessionValues = $crud->getSessionValues();
-        if (!\in_array($columnId, $sessionValues->displayedColumns)) {
+        if (!\in_array($columnId, $sessionValues->getDisplayedColumns())) {
             return '';
         }
         $column = $crud->getColumn($columnId);
@@ -390,7 +390,7 @@ public function td(Environment $environment, string $columnId, Crud $crud, mixed
 
         // If the column is not to be shown, returns empty
         $sessionValues = $crud->getSessionValues();
-        if (!\in_array($columnId, $sessionValues->displayedColumns)) {
+        if (!\in_array($columnId, $sessionValues->getDisplayedColumns())) {
             return '';
         }
         $column = $crud->getColumn($columnId);
diff --git a/tests/Crud/CrudSessionTest.php b/tests/Crud/CrudSessionTest.php
new file mode 100644
index 0000000..005a19e
--- /dev/null
+++ b/tests/Crud/CrudSessionTest.php
@@ -0,0 +1,254 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ecommit\CrudBundle\Tests\Crud;
+
+use Ecommit\CrudBundle\Crud\Crud;
+use Ecommit\CrudBundle\Crud\CrudSession;
+use Ecommit\CrudBundle\Entity\UserCrudInterface;
+use Ecommit\CrudBundle\Entity\UserCrudSettings;
+use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\UserSearcher;
+use PHPUnit\Framework\TestCase;
+
+class CrudSessionTest extends TestCase
+{
+    public function testCloneSearchFormDataInConstructor(): void
+    {
+        $searcherFormData = $this->createSearcher();
+        $crudSession = $this->createCrudSession($searcherFormData);
+        $this->assertNotSame($searcherFormData, $this->getPropertyWithoutGetter($crudSession, 'searchFormData'));
+    }
+
+    public function testCloneSearchFormDataInConstructorWithNullValue(): void
+    {
+        $searcherFormData = null;
+        $crudSession = $this->createCrudSession($searcherFormData);
+        $this->assertSame($searcherFormData, $this->getPropertyWithoutGetter($crudSession, 'searchFormData'));
+    }
+
+    public function testClone(): void
+    {
+        $crudSession1 = $this->createCrudSession($this->createSearcher());
+        $crudSession2 = clone $crudSession1;
+
+        $this->assertNotSame($crudSession1, $crudSession2);
+        $this->assertEquals($crudSession1, $crudSession2);
+
+        $this->assertNotSame(
+            $this->getPropertyWithoutGetter($crudSession1, 'searchFormData'),
+            $this->getPropertyWithoutGetter($crudSession2, 'searchFormData')
+        );
+        $this->assertEquals(
+            $this->getPropertyWithoutGetter($crudSession1, 'searchFormData'),
+            $this->getPropertyWithoutGetter($crudSession2, 'searchFormData')
+        );
+
+        $newSearcherFormData = $this->createSearcher('username2');
+        $this->setPropertyWithoutGetter($crudSession1, 'searchFormData', $newSearcherFormData);
+        $this->assertSame(
+            $newSearcherFormData,
+            $this->getPropertyWithoutGetter($crudSession1, 'searchFormData')
+        );
+        $this->assertNotSame(
+            $newSearcherFormData,
+            $this->getPropertyWithoutGetter($crudSession2, 'searchFormData')
+        );
+        $this->assertEquals(
+            $newSearcherFormData,
+            $this->getPropertyWithoutGetter($crudSession1, 'searchFormData')
+        );
+        $this->assertNotEquals(
+            $newSearcherFormData,
+            $this->getPropertyWithoutGetter($crudSession2, 'searchFormData')
+        );
+
+        $newDisplayedColumns = ['new'];
+        $this->setPropertyWithoutGetter($crudSession1, 'displayedColumns', $newDisplayedColumns);
+        $this->assertSame(
+            $newDisplayedColumns,
+            $this->getPropertyWithoutGetter($crudSession1, 'displayedColumns')
+        );
+        $this->assertNotSame(
+            $newDisplayedColumns,
+            $this->getPropertyWithoutGetter($crudSession2, 'displayedColumns')
+        );
+    }
+
+    public function testUpdateFromUserCrudSettings(): void
+    {
+        $crudSession = $this->createCrudSession($this->createSearcher());
+
+        $userCrudSettings = new UserCrudSettings(
+            $this->createMock(UserCrudInterface::class),
+            'crud_name',
+            10,
+            ['col2'],
+            'sort2',
+            Crud::DESC,
+        );
+
+        $newCrudSession = $crudSession->updateFromUserCrudSettings($userCrudSettings);
+        $this->assertNotSame($crudSession, $newCrudSession);
+
+        $this->assertSame(100, $this->getPropertyWithoutGetter($crudSession, 'maxPerPage'));
+        $this->assertSame(10, $this->getPropertyWithoutGetter($newCrudSession, 'maxPerPage'));
+        $this->assertSame(['col1'], $this->getPropertyWithoutGetter($crudSession, 'displayedColumns'));
+        $this->assertSame(['col2'], $this->getPropertyWithoutGetter($newCrudSession, 'displayedColumns'));
+        $this->assertSame('sort1', $this->getPropertyWithoutGetter($crudSession, 'sort'));
+        $this->assertSame('sort2', $this->getPropertyWithoutGetter($newCrudSession, 'sort'));
+        $this->assertSame(Crud::ASC, $this->getPropertyWithoutGetter($crudSession, 'sortDirection'));
+        $this->assertSame(Crud::DESC, $this->getPropertyWithoutGetter($newCrudSession, 'sortDirection'));
+        $this->assertNotSame(
+            $this->getPropertyWithoutGetter($crudSession, 'searchFormData'),
+            $this->getPropertyWithoutGetter($newCrudSession, 'searchFormData')
+        );
+        $this->assertEquals(
+            $this->getPropertyWithoutGetter($crudSession, 'searchFormData'),
+            $this->getPropertyWithoutGetter($newCrudSession, 'searchFormData')
+        );
+    }
+
+    public function testUpdateUserCrudSettings(): void
+    {
+        $crudSession = $this->createCrudSession($this->createSearcher());
+
+        $userCrudSettings = new UserCrudSettings(
+            $this->createMock(UserCrudInterface::class),
+            'crud_name',
+            10,
+            ['col2'],
+            'sort2',
+            Crud::DESC,
+        );
+        $crudSession->updateUserCrudSettings($userCrudSettings);
+
+        $this->assertSame(100, $userCrudSettings->getResultsDisplayed());
+        $this->assertSame(['col1'], $userCrudSettings->getDisplayedColumns());
+        $this->assertSame('sort1', $userCrudSettings->getSort());
+        $this->assertSame(Crud::ASC, $userCrudSettings->getSortDirection());
+    }
+
+    public function testMaxPerPage(): void
+    {
+        $crudSession = $this->createCrudSession();
+        $newCrudSession = $crudSession->setMaxPerPage(1000);
+
+        $this->assertNotSame($crudSession, $newCrudSession);
+        $this->assertSame(100, $crudSession->getMaxPerPage());
+        $this->assertSame(1000, $newCrudSession->getMaxPerPage());
+    }
+
+    public function testDisplayedColumns(): void
+    {
+        $crudSession = $this->createCrudSession();
+        $newCrudSession = $crudSession->setDisplayedColumns(['new_column']);
+
+        $this->assertNotSame($crudSession, $newCrudSession);
+        $this->assertSame(['col1'], $crudSession->getDisplayedColumns());
+        $this->assertSame(['new_column'], $newCrudSession->getDisplayedColumns());
+    }
+
+    public function testSort(): void
+    {
+        $crudSession = $this->createCrudSession();
+        $newCrudSession = $crudSession->setSort('new_sort');
+
+        $this->assertNotSame($crudSession, $newCrudSession);
+        $this->assertSame('sort1', $crudSession->getSort());
+        $this->assertSame('new_sort', $newCrudSession->getSort());
+    }
+
+    public function testSortDirection(): void
+    {
+        $crudSession = $this->createCrudSession();
+        $newCrudSession = $crudSession->setSortDirection(Crud::DESC);
+
+        $this->assertNotSame($crudSession, $newCrudSession);
+        $this->assertSame(Crud::ASC, $crudSession->getSortDirection());
+        $this->assertSame(Crud::DESC, $newCrudSession->getSortDirection());
+    }
+
+    public function testSearchFormData(): void
+    {
+        $searcherFormData = $this->createSearcher();
+        $crudSession = $this->createCrudSession($searcherFormData);
+
+        $this->assertNotSame($searcherFormData, $crudSession->getSearchFormData());
+        $this->assertEquals($searcherFormData, $crudSession->getSearchFormData());
+
+        $newSearcherFormData = $this->createSearcher('username2');
+        $newCrudSession = $crudSession->setSearchFormData($newSearcherFormData);
+
+        $this->assertNotSame($crudSession, $newCrudSession);
+        $this->assertNotSame($searcherFormData, $crudSession->getSearchFormData());
+        $this->assertEquals($searcherFormData, $crudSession->getSearchFormData());
+        $this->assertNotSame($newSearcherFormData, $newCrudSession->getSearchFormData());
+        $this->assertEquals($newSearcherFormData, $newCrudSession->getSearchFormData());
+    }
+
+    public function testGetSearchFormDataNull(): void
+    {
+        $crudSession = $this->createCrudSession();
+
+        $this->assertNull($crudSession->getSearchFormData());
+    }
+
+    public function testPage(): void
+    {
+        $crudSession = $this->createCrudSession();
+        $newCrudSession = $crudSession->setPage(2);
+
+        $this->assertNotSame($crudSession, $newCrudSession);
+        $this->assertSame(1, $crudSession->getPage());
+        $this->assertSame(2, $newCrudSession->getPage());
+    }
+
+    public function testSearchFormIsSubmittedAndValid(): void
+    {
+        $crudSession = $this->createCrudSession();
+        $newCrudSession = $crudSession->setSearchFormIsSubmittedAndValid(true);
+
+        $this->assertNotSame($crudSession, $newCrudSession);
+        $this->assertFalse($crudSession->isSearchFormIsSubmittedAndValid());
+        $this->assertTrue($newCrudSession->isSearchFormIsSubmittedAndValid());
+    }
+
+    protected function getPropertyWithoutGetter(CrudSession $crudSession, string $property): mixed
+    {
+        $reflectionMethod = (new \ReflectionClass(CrudSession::class))->getProperty($property);
+        $reflectionMethod->setAccessible(true);
+
+        return $reflectionMethod->getValue($crudSession);
+    }
+
+    protected function setPropertyWithoutGetter(CrudSession $crudSession, string $property, mixed $value): void
+    {
+        $reflectionMethod = (new \ReflectionClass(CrudSession::class))->getProperty($property);
+        $reflectionMethod->setAccessible(true);
+
+        $reflectionMethod->setValue($crudSession, $value);
+    }
+
+    protected function createCrudSession(?UserSearcher $searchFormData = null): CrudSession
+    {
+        return new CrudSession(100, ['col1'], 'sort1', Crud::ASC, $searchFormData);
+    }
+
+    protected function createSearcher(?string $username = 'username'): UserSearcher
+    {
+        $searcher = new UserSearcher();
+        $searcher->username = $username;
+
+        return $searcher;
+    }
+}
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 2982c2c..107da45 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -826,7 +826,7 @@ public function testChangeNumberResultsDisplayed(): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeNumberResultsDisplayed');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, 10);
-        $this->assertSame(10, $crud->getSessionValues()->resultsPerPage);
+        $this->assertSame(10, $crud->getSessionValues()->getMaxPerPage());
     }
 
     public function testChangeNumberResultsDisplayedWithBadValue(): void
@@ -836,7 +836,7 @@ public function testChangeNumberResultsDisplayedWithBadValue(): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeNumberResultsDisplayed');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, 99);
-        $this->assertSame(50, $crud->getSessionValues()->resultsPerPage);
+        $this->assertSame(50, $crud->getSessionValues()->getMaxPerPage());
     }
 
     public function testChangeColumnsDisplayed(): void
@@ -846,7 +846,7 @@ public function testChangeColumnsDisplayed(): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeColumnsDisplayed');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, ['username']);
-        $this->assertSame(['username'], $crud->getSessionValues()->displayedColumns);
+        $this->assertSame(['username'], $crud->getSessionValues()->getDisplayedColumns());
     }
 
     /**
@@ -859,7 +859,7 @@ public function testChangeColumnsDisplayedWithBadValue(array $value): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeColumnsDisplayed');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, $value);
-        $this->assertSame(['firstName'], $crud->getSessionValues()->displayedColumns);
+        $this->assertSame(['firstName'], $crud->getSessionValues()->getDisplayedColumns());
     }
 
     public function getTestChangeColumnsDisplayedWithBadValueProvider(): array
@@ -877,7 +877,7 @@ public function testChangeSort(): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, 'firstName');
-        $this->assertSame('firstName', $crud->getSessionValues()->sort);
+        $this->assertSame('firstName', $crud->getSessionValues()->getSort());
     }
 
     /**
@@ -892,7 +892,7 @@ public function testChangeSortWithBadValue(mixed $value): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, $value);
-        $this->assertSame('username', $crud->getSessionValues()->sort);
+        $this->assertSame('username', $crud->getSessionValues()->getSort());
     }
 
     public function getTestChangeSortWithBadValueProvider(): array
@@ -915,7 +915,7 @@ public function testChangeSortPersonalizedSort(): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, 'defaultPersonalizedSort');
-        $this->assertSame('defaultPersonalizedSort', $crud->getSessionValues()->sort);
+        $this->assertSame('defaultPersonalizedSort', $crud->getSessionValues()->getSort());
     }
 
     /**
@@ -930,7 +930,7 @@ public function testChangeSortPersonalizedSortWithBadValue(mixed $value): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSort');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, $value);
-        $this->assertSame('defaultPersonalizedSort', $crud->getSessionValues()->sort);
+        $this->assertSame('defaultPersonalizedSort', $crud->getSessionValues()->getSort());
     }
 
     public function getTestChangeSortPersonalizedSortWithBadValueProvider(): array
@@ -950,7 +950,7 @@ public function testChangeSortDirection(): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSortDirection');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, Crud::ASC);
-        $this->assertSame(Crud::ASC, $crud->getSessionValues()->sortDirection);
+        $this->assertSame(Crud::ASC, $crud->getSessionValues()->getSortDirection());
     }
 
     /**
@@ -963,7 +963,7 @@ public function testChangeSortDirectionWithBadValue(mixed $value): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSortDirection');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, $value);
-        $this->assertSame(Crud::DESC, $crud->getSessionValues()->sortDirection);
+        $this->assertSame(Crud::DESC, $crud->getSessionValues()->getSortDirection());
     }
 
     public function getTestChangeSortDirectionWithBadValueProvider(): array
@@ -985,7 +985,7 @@ public function testChangeFilterValues(): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, $value);
-        $this->assertEquals($value, $crud->getSessionValues()->searchFormData);
+        $this->assertEquals($value, $crud->getSessionValues()->getSearchFormData());
     }
 
     /**
@@ -998,8 +998,8 @@ public function testChangeFilterValuesWithBadValue(?SearcherInterface $value): v
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, $value);
-        $this->assertNotEquals($value, $crud->getSessionValues()->searchFormData);
-        $this->assertEquals(new UserSearcher(), $crud->getSessionValues()->searchFormData);
+        $this->assertNotEquals($value, $crud->getSessionValues()->getSearchFormData());
+        $this->assertEquals(new UserSearcher(), $crud->getSessionValues()->getSearchFormData());
     }
 
     public function getTestChangeFilterValuesWithBadValueProvider(): array
@@ -1017,7 +1017,7 @@ public function testChangeFilterValuesWithoutSearchForm(): void
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, new UserSearcher());
-        $this->assertNull($crud->getSessionValues()->searchFormData);
+        $this->assertNull($crud->getSessionValues()->getSearchFormData());
     }
 
     public function getBoolProvider(): array
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTest.php
index 05f264a..f35b1e3 100644
--- a/tests/Form/Filter/AbstractFilterTest.php
+++ b/tests/Form/Filter/AbstractFilterTest.php
@@ -125,7 +125,7 @@ protected function createForm(Crud $crud): void
     {
         // Replaces "Crud::buildSearchForm" mocked
         $crud->getSearchFormBuilder()->createForm();
-        $crud->getSearchFormBuilder()->getForm()->setData(clone $crud->getSessionValues()->searchFormData);
+        $crud->getSearchFormBuilder()->getForm()->setData(clone $crud->getSessionValues()->getSearchFormData());
     }
 
     protected function createAndGetForm(Crud $crud): FormInterface

From 29f8f40638c5c31c862b24ae801f83f27474aac0 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 4 May 2022 19:37:37 +0200
Subject: [PATCH 177/264] [UserCrudSettings] Replace resultsDisplayed by
 maxPerPage

---
 doc/upgrade/3.0.md                            |  7 ++++--
 src/Crud/CrudSession.php                      |  4 ++--
 src/Entity/UserCrudSettings.php               | 16 +++++++-------
 tests/Crud/CrudSessionTest.php                |  2 +-
 ...udControllerWithPersistentSettingsTest.php | 22 +++++++++----------
 5 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index b32a548..9620fcb 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -27,8 +27,11 @@
 
 * La colonne `sort` de la table `user_crud_settings` a maintenant une longueur de 100 caractères (30 avant). Mettre à jour
   la base de données
-* La colonne `displayed_columns` de la table `user_crud_settings` a maintenant un type `JSON`. Mettre à jour la base de données
-* La colonne `sense` de la table `user_crud_settings` est remplacée par la colonne `sort_direction`. Mettre à jour la base de données
+* La colonne `displayed_columns` de la table `user_crud_settings` a maintenant un type `JSON`. Mettre à jour la base de données.
+* La colonne `sense` de la table `user_crud_settings` est remplacée par la colonne `sort_direction`. Mettre à jour la base de données.
+* La colonne `results_displayed` de la table `user_crud_settings` est remplacée par la colonne `max_per_page`. Mettre à jour la base de données.
+* La méthode `getSense` de `UserCrudSettings` est remplacée par `getSortDirection`.
+* La méthode `getResultsDisplayed` est remplacée par `getMaxPerPage`.
 * Les methodes suivantes sont supprimées :
   * `transformToCrudSession`
   * `updateFromSessionManager`
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index ee1e737..5e96581 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -47,7 +47,7 @@ public function __clone()
     public function updateFromUserCrudSettings(UserCrudSettings $crudSettings): self
     {
         $instance = clone $this; // Avoid modification by reference (by the user or an invalid form)
-        $instance->maxPerPage = $crudSettings->getResultsDisplayed();
+        $instance->maxPerPage = $crudSettings->getMaxPerPage();
         $instance->displayedColumns = $crudSettings->getDisplayedColumns();
         $instance->sort = $crudSettings->getSort();
         $instance->sortDirection = $crudSettings->getSortDirection();
@@ -60,7 +60,7 @@ public function updateFromUserCrudSettings(UserCrudSettings $crudSettings): self
      */
     public function updateUserCrudSettings(UserCrudSettings $crudSettings): void
     {
-        $crudSettings->setResultsDisplayed($this->maxPerPage);
+        $crudSettings->setMaxPerPage($this->maxPerPage);
         $crudSettings->setDisplayedColumns($this->displayedColumns);
         $crudSettings->setSort($this->sort);
         $crudSettings->setSortDirection($this->sortDirection);
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index 1cb5560..f85ff4d 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -27,8 +27,8 @@ class UserCrudSettings
     #[ORM\Column(type: 'string', length: 255, name: 'crud_name')]
     protected string $crudName;
 
-    #[ORM\Column(type: 'integer', name: 'results_displayed')]
-    protected int $resultsDisplayed;
+    #[ORM\Column(type: 'integer', name: 'max_per_page')]
+    protected int $maxPerPage;
 
     #[ORM\Column(type: 'json', name: 'displayed_columns')]
     protected array $displayedColumns = [];
@@ -39,11 +39,11 @@ class UserCrudSettings
     #[ORM\Column(type: 'string', length: 4)]
     protected string $sortDirection;
 
-    public function __construct(UserCrudInterface $user, string $crudName, int $resultsDisplayed, array $displayedColumns, string $sort, string $sortDirection)
+    public function __construct(UserCrudInterface $user, string $crudName, int $maxPerPage, array $displayedColumns, string $sort, string $sortDirection)
     {
         $this->user = $user;
         $this->crudName = $crudName;
-        $this->resultsDisplayed = $resultsDisplayed;
+        $this->maxPerPage = $maxPerPage;
         $this->displayedColumns = $displayedColumns;
         $this->sort = $sort;
         $this->sortDirection = $sortDirection;
@@ -61,16 +61,16 @@ public function getCrudName(): string
         return $this->crudName;
     }
 
-    public function setResultsDisplayed(int $resultsDisplayed): self
+    public function setMaxPerPage(int $maxPerPage): self
     {
-        $this->resultsDisplayed = $resultsDisplayed;
+        $this->maxPerPage = $maxPerPage;
 
         return $this;
     }
 
-    public function getResultsDisplayed(): int
+    public function getMaxPerPage(): int
     {
-        return $this->resultsDisplayed;
+        return $this->maxPerPage;
     }
 
     public function setDisplayedColumns(array $displayedColumns): self
diff --git a/tests/Crud/CrudSessionTest.php b/tests/Crud/CrudSessionTest.php
index 005a19e..6cdb020 100644
--- a/tests/Crud/CrudSessionTest.php
+++ b/tests/Crud/CrudSessionTest.php
@@ -132,7 +132,7 @@ public function testUpdateUserCrudSettings(): void
         );
         $crudSession->updateUserCrudSettings($userCrudSettings);
 
-        $this->assertSame(100, $userCrudSettings->getResultsDisplayed());
+        $this->assertSame(100, $userCrudSettings->getMaxPerPage());
         $this->assertSame(['col1'], $userCrudSettings->getDisplayedColumns());
         $this->assertSame('sort1', $userCrudSettings->getSort());
         $this->assertSame(Crud::ASC, $userCrudSettings->getSortDirection());
diff --git a/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
index f08e8c9..ecf7fd9 100644
--- a/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
+++ b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
@@ -41,7 +41,7 @@ public function testListWithUserWithoutPersistent(): Client
 
         $this->checkUserCrudSettingsDatabase(
             username: 'EveReste',
-            resultsDisplayed: 50,
+            maxPerPage: 50,
             displayedColumns: ['username', 'firstName'],
             sort: 'firstName',
             sortDirection: Crud::DESC
@@ -67,7 +67,7 @@ public function testChangeSettingsWithUserWithoutPersistent($client): Client
 
         $this->checkUserCrudSettingsDatabase(
             username: 'EveReste',
-            resultsDisplayed: 50,
+            maxPerPage: 50,
             displayedColumns: ['username', 'firstName'],
             sort: 'firstName',
             sortDirection: Crud::DESC
@@ -85,7 +85,7 @@ public function testResetSettingsWithUserWithoutPersistent($client): Client
 
         $this->checkUserCrudSettingsDatabase(
             username: 'EveReste',
-            resultsDisplayed: 50,
+            maxPerPage: 50,
             displayedColumns: ['username', 'firstName'],
             sort: 'firstName',
             sortDirection: Crud::DESC
@@ -110,7 +110,7 @@ public function testListWithUserWithPersistent(Client $client): Client
 
         $this->checkUserCrudSettingsDatabase(
             username: 'EveReste',
-            resultsDisplayed: 50,
+            maxPerPage: 50,
             displayedColumns: ['username', 'firstName'],
             sort: 'firstName',
             sortDirection: Crud::DESC
@@ -136,7 +136,7 @@ public function testChangeSettingsWithUserWithPersistent($client): Client
 
         $this->checkUserCrudSettingsDatabase(
             username: 'EveReste',
-            resultsDisplayed: 10,
+            maxPerPage: 10,
             displayedColumns: ['username', 'firstName', 'lastName'],
             sort: 'username',
             sortDirection: Crud::ASC
@@ -178,7 +178,7 @@ public function testCreateSettingsWithUserWithPersistent($client): Client
 
         $this->checkUserCrudSettingsDatabase(
             username: 'EveReste',
-            resultsDisplayed: 10,
+            maxPerPage: 10,
             displayedColumns: ['firstName', 'lastName', 'username'],
             sort: 'lastName',
             sortDirection: Crud::DESC
@@ -202,7 +202,7 @@ public function testListWithoutUserWithPersistent(Client $client): Client
 
         $this->checkUserCrudSettingsDatabase(
             username: 'EveReste',
-            resultsDisplayed: 10,
+            maxPerPage: 10,
             displayedColumns: ['firstName', 'lastName', 'username'],
             sort: 'lastName',
             sortDirection: Crud::DESC
@@ -228,7 +228,7 @@ public function testChangeSettingsWithoutUserWithPersistent($client): Client
 
         $this->checkUserCrudSettingsDatabase(
             username: 'EveReste',
-            resultsDisplayed: 10,
+            maxPerPage: 10,
             displayedColumns: ['firstName', 'lastName', 'username'],
             sort: 'lastName',
             sortDirection: Crud::DESC
@@ -246,7 +246,7 @@ public function testResetSettingsWithoutUserWithPersistent($client): Client
 
         $this->checkUserCrudSettingsDatabase(
             username: 'EveReste',
-            resultsDisplayed: 10,
+            maxPerPage: 10,
             displayedColumns: ['firstName', 'lastName', 'username'],
             sort: 'lastName',
             sortDirection: Crud::DESC
@@ -306,10 +306,10 @@ protected function resetSettings(Client $client): void
         $this->waitForAjax($client);
     }
 
-    protected function checkUserCrudSettingsDatabase(string $username, int $resultsDisplayed, array $displayedColumns, string $sort, string $sortDirection): void
+    protected function checkUserCrudSettingsDatabase(string $username, int $maxPerPage, array $displayedColumns, string $sort, string $sortDirection): void
     {
         $userCrudSettings = $this->getUserCrudSettings($username);
-        $this->assertSame($resultsDisplayed, $userCrudSettings->getResultsDisplayed());
+        $this->assertSame($maxPerPage, $userCrudSettings->getMaxPerPage());
         $this->assertSame($displayedColumns, $userCrudSettings->getDisplayedColumns());
         $this->assertSame($sort, $userCrudSettings->getSort());
         $this->assertSame($sortDirection, $userCrudSettings->getSortDirection());

From 209fcf9e117553539a0f0981b511aaf84fa37b22 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 4 May 2022 20:00:17 +0200
Subject: [PATCH 178/264] Rename CRUD methods

changeFilterValues -> changeSearchFormData
changeNumberResultsDisplayed -> changeMaxPerPage
---
 src/Crud/Crud.php       | 14 +++++++-------
 tests/Crud/CrudTest.php | 24 ++++++++++++------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 96c7d63..09ab85b 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -453,7 +453,7 @@ public function processSearchForm(): self
             if ($searchForm->isSubmitted() && $searchForm->isValid() && false !== $this->options['build_paginator']) {
                 $this->displayResults = true;
                 $this->sessionValues = $this->sessionValues->setSearchFormIsSubmittedAndValid(true);
-                $this->changeFilterValues($searchForm->getData());
+                $this->changeSearchFormData($searchForm->getData());
                 $this->changePage(1);
                 $this->save();
             }
@@ -546,7 +546,7 @@ public function reset(): self
         $searchFormBuilder = $this->getSearchFormBuilder();
         if ($searchFormBuilder) {
             $newValue = clone $searchFormBuilder->getDefaultData();
-            $this->changeFilterValues($newValue);
+            $this->changeSearchFormData($newValue);
             $searchFormBuilder->setData(clone $newValue);
             $this->sessionValues = $this->sessionValues->setSearchFormIsSubmittedAndValid(false);
         }
@@ -632,18 +632,18 @@ protected function testIfDatabaseMustMeUpdated(mixed $oldValue, mixed $newValue)
     protected function checkCrudSession(): void
     {
         // Forces change => checks
-        $this->changeNumberResultsDisplayed($this->sessionValues->getMaxPerPage());
+        $this->changeMaxPerPage($this->sessionValues->getMaxPerPage());
         $this->changeColumnsDisplayed($this->sessionValues->getDisplayedColumns());
         $this->changeSort($this->sessionValues->getSort());
         $this->changeSortDirection($this->sessionValues->getSortDirection());
-        $this->changeFilterValues($this->sessionValues->getSearchFormData());
+        $this->changeSearchFormData($this->sessionValues->getSearchFormData());
         $this->changePage($this->sessionValues->getPage());
     }
 
     /**
      * User Action: Changes number of displayed results.
      */
-    protected function changeNumberResultsDisplayed(int $value): void
+    protected function changeMaxPerPage(int $value): void
     {
         $oldValue = $this->sessionValues->getMaxPerPage();
         if (\in_array($value, $this->getMaxPerPageChoices())) {
@@ -709,7 +709,7 @@ protected function changeSortDirection(mixed $value): void
     /**
      * User action: Changes search form values.
      */
-    protected function changeFilterValues(?SearcherInterface $value): void
+    protected function changeSearchFormData(?SearcherInterface $value): void
     {
         $searchFormBuilder = $this->getSearchFormBuilder();
         if (!$searchFormBuilder) {
@@ -763,7 +763,7 @@ protected function processRequest(): void
         if ($displaySettingsForm->isSubmitted() && $displaySettingsForm->isValid()) {
             $displaySettingsData = $displaySettingsForm->getData();
             $this->changeColumnsDisplayed($displaySettingsData['displayedColumns']);
-            $this->changeNumberResultsDisplayed($displaySettingsData['resultsPerPage']);
+            $this->changeMaxPerPage($displaySettingsData['resultsPerPage']);
         }
         if ($request->query->has('sort')) {
             $this->changeSort($request->query->get('sort'));
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 107da45..4170a99 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -819,21 +819,21 @@ public function testLoadSessionWithoutSearchForm(): void
         $this->assertEquals($sessionValue, $crud->getSessionValues());
     }
 
-    public function testChangeNumberResultsDisplayed(): void
+    public function testChangeMaxPerPage(): void
     {
         $crud = $this->createCrud($this->createValidCrudConfig());
 
-        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeNumberResultsDisplayed');
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeMaxPerPage');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, 10);
         $this->assertSame(10, $crud->getSessionValues()->getMaxPerPage());
     }
 
-    public function testChangeNumberResultsDisplayedWithBadValue(): void
+    public function testChangeMaxPerPageWithBadValue(): void
     {
         $crud = $this->createCrud($this->createValidCrudConfig());
 
-        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeNumberResultsDisplayed');
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeMaxPerPage');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, 99);
         $this->assertSame(50, $crud->getSessionValues()->getMaxPerPage());
@@ -975,34 +975,34 @@ public function getTestChangeSortDirectionWithBadValueProvider(): array
         ];
     }
 
-    public function testChangeFilterValues(): void
+    public function testChangeSearchFormData(): void
     {
         $crud = $this->createCrud($this->createValidCrudConfig(withSearcher: true));
 
         $value = new UserSearcher();
         $value->username = 'val';
 
-        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSearchFormData');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, $value);
         $this->assertEquals($value, $crud->getSessionValues()->getSearchFormData());
     }
 
     /**
-     * @dataProvider getTestChangeFilterValuesWithBadValueProvider
+     * @dataProvider getTestChangeSearchFormDataWithBadValueProvider
      */
-    public function testChangeFilterValuesWithBadValue(?SearcherInterface $value): void
+    public function testChangeSearchFormDataWithBadValue(?SearcherInterface $value): void
     {
         $crud = $this->createCrud($this->createValidCrudConfig(withSearcher: true));
 
-        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSearchFormData');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, $value);
         $this->assertNotEquals($value, $crud->getSessionValues()->getSearchFormData());
         $this->assertEquals(new UserSearcher(), $crud->getSessionValues()->getSearchFormData());
     }
 
-    public function getTestChangeFilterValuesWithBadValueProvider(): array
+    public function getTestChangeSearchFormDataWithBadValueProvider(): array
     {
         return [
             [null],
@@ -1010,11 +1010,11 @@ public function getTestChangeFilterValuesWithBadValueProvider(): array
         ];
     }
 
-    public function testChangeFilterValuesWithoutSearchForm(): void
+    public function testChangeSearchFormDataWithoutSearchForm(): void
     {
         $crud = $this->createCrud($this->createValidCrudConfig());
 
-        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeFilterValues');
+        $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSearchFormData');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($crud, new UserSearcher());
         $this->assertNull($crud->getSessionValues()->getSearchFormData());

From 28c228fbabea82633a5f236a4f3138ae67f3e559 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 4 May 2022 21:42:53 +0200
Subject: [PATCH 179/264] Fix Psalm issues

---
 psalm.xml                                     | 22 -------------------
 .../Compiler/TwigFormPass.php                 |  5 +----
 src/DependencyInjection/Configuration.php     |  3 ++-
 src/Entity/UserCrudSettings.php               |  3 +++
 src/EventListener/MappingEntities.php         |  3 +++
 .../Entity/EntityToChoiceTransformer.php      |  2 +-
 src/Form/Filter/EntityAjaxFilter.php          |  9 +++++---
 src/Form/Filter/EntityFilter.php              |  9 +++++---
 src/Twig/CrudExtension.php                    |  4 +++-
 tests/Twig/CrudExtensionTest.php              | 13 ++++++++++-
 10 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/psalm.xml b/psalm.xml
index 1213754..6e637d0 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -13,26 +13,4 @@
             <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
-
-    <issueHandlers>
-        <ArgumentTypeCoercion>
-            <errorLevel type="suppress">
-                <file name="src/Entity/UserCrudSettings.php" />
-                <file name="src/EventListener/MappingEntities.php" />
-            </errorLevel>
-        </ArgumentTypeCoercion>
-
-        <PossiblyNullReference>
-            <errorLevel type="suppress">
-                <file name="src/DependencyInjection/Configuration.php" />
-            </errorLevel>
-        </PossiblyNullReference>
-
-        <PossiblyUndefinedMethod>
-            <errorLevel type="suppress">
-                <file name="src/DependencyInjection/Configuration.php" />
-                <directory name="src/Form/Filter" />
-            </errorLevel>
-        </PossiblyUndefinedMethod>
-    </issueHandlers>
 </psalm>
diff --git a/src/DependencyInjection/Compiler/TwigFormPass.php b/src/DependencyInjection/Compiler/TwigFormPass.php
index ca5b402..9c425bc 100644
--- a/src/DependencyInjection/Compiler/TwigFormPass.php
+++ b/src/DependencyInjection/Compiler/TwigFormPass.php
@@ -18,13 +18,10 @@
 
 class TwigFormPass implements CompilerPassInterface
 {
-    /**
-     * @psalm-suppress PossiblyInvalidArgument
-     */
     public function process(ContainerBuilder $container): void
     {
         $container->setParameter('twig.form.resources', array_merge(
-            $container->getParameter('twig.form.resources'),
+            (array) $container->getParameter('twig.form.resources'),
             [
                 '@EcommitCrud/Form/entity_ajax.html.twig',
             ]
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 5da11f2..50798a6 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -25,7 +25,8 @@
 class Configuration implements ConfigurationInterface
 {
     /**
-     * {@inheritdoc}
+     * @psalm-suppress PossiblyUndefinedMethod
+     * @psalm-suppress PossiblyNullReference
      */
     public function getConfigTreeBuilder()
     {
diff --git a/src/Entity/UserCrudSettings.php b/src/Entity/UserCrudSettings.php
index f85ff4d..8b20dae 100644
--- a/src/Entity/UserCrudSettings.php
+++ b/src/Entity/UserCrudSettings.php
@@ -15,6 +15,9 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
+/**
+ * @psalm-suppress ArgumentTypeCoercion
+ */
 #[ORM\Entity]
 #[ORM\Table(name: 'user_crud_settings')]
 class UserCrudSettings
diff --git a/src/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
index 69d24f2..a3a211c 100644
--- a/src/EventListener/MappingEntities.php
+++ b/src/EventListener/MappingEntities.php
@@ -20,6 +20,9 @@ final class MappingEntities
 {
     protected bool $isLoad = false;
 
+    /**
+     * @psalm-suppress ArgumentTypeCoercion
+     */
     public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
         $metadata = $eventArgs->getClassMetadata();
diff --git a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
index 300c825..099a271 100644
--- a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
@@ -32,7 +32,7 @@ public function transform(mixed $value)
         $identifier = (string) $this->accessor->getValue($value, $this->identifier);
         $label = $this->extractLabel($value);
 
-        /** @psalm-suppress PossiblyUndefinedVariable */
+        $results = [];
         $results[$identifier] = $label;
 
         return $results;
diff --git a/src/Form/Filter/EntityAjaxFilter.php b/src/Form/Filter/EntityAjaxFilter.php
index 700579a..790ee08 100644
--- a/src/Form/Filter/EntityAjaxFilter.php
+++ b/src/Form/Filter/EntityAjaxFilter.php
@@ -17,6 +17,7 @@
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntitiesToIdsTransformer;
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
 use Ecommit\CrudBundle\Form\Type\EntityAjaxType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\ReversedTransformer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -35,15 +36,17 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
 
         $builder->addField($property, EntityAjaxType::class, $typeOptions);
 
-        $typeOptions = $builder->getField($property)->getOptions();
+        /** @var FormBuilderInterface $field */
+        $field = $builder->getField($property);
+        $typeOptions = $field->getOptions();
         if ($options['multiple']) {
-            $builder->getField($property)->addModelTransformer(
+            $field->addModelTransformer(
                 new ReversedTransformer(
                     new EntitiesToIdsTransformer($typeOptions['query_builder'], $typeOptions['identifier'], $typeOptions['choice_label'], false, $typeOptions['max_elements'])
                 )
             );
         } else {
-            $builder->getField($property)->addModelTransformer(
+            $field->addModelTransformer(
                 new ReversedTransformer(
                     new EntityToIdTransformer($typeOptions['query_builder'], $typeOptions['identifier'], $typeOptions['choice_label'], false)
                 )
diff --git a/src/Form/Filter/EntityFilter.php b/src/Form/Filter/EntityFilter.php
index af14ed9..16425ff 100644
--- a/src/Form/Filter/EntityFilter.php
+++ b/src/Form/Filter/EntityFilter.php
@@ -19,6 +19,7 @@
 use Ecommit\CrudBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Exception\InvalidConfigurationException;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\ReversedTransformer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -39,7 +40,9 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
 
         $builder->addField($property, EntityType::class, $typeOptions);
 
-        $typeOptions = $builder->getField($property)->getOptions();
+        /** @var FormBuilderInterface $field */
+        $field = $builder->getField($property);
+        $typeOptions = $field->getOptions();
 
         $em = $typeOptions['em'];
         $identifiers = $em->getClassMetadata($options['class'])->getIdentifierFieldNames();
@@ -49,13 +52,13 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         $identifier = $identifiers[0];
 
         if ($options['multiple']) {
-            $builder->getField($property)->addModelTransformer(
+            $field->addModelTransformer(
                 new ReversedTransformer(
                     new EntitiesToIdsTransformer($typeOptions['query_builder'], $identifier, $typeOptions['choice_label'], false, $options['max'])
                 )
             );
         } else {
-            $builder->getField($property)->addModelTransformer(
+            $field->addModelTransformer(
                 new ReversedTransformer(
                     new EntityToIdTransformer($typeOptions['query_builder'], $identifier, $typeOptions['choice_label'], false)
                 )
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 95ca1c1..52d816b 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -255,13 +255,15 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
      */
     public function crudPaginatorLinks(Environment $environment, Crud $crud, array $options = []): string
     {
+        if (!$crud->getPaginator()) {
+            throw new \Exception('The paginator is not defined');
+        }
         if (!isset($options['ajax_options']['update'])) {
             $options['ajax_options']['update'] = '#'.$crud->getDivIdList();
         }
 
         $options = $this->buildOptions('crud_paginator_links', $options, $crud);
 
-        /** @psalm-suppress PossiblyNullArgument */
         return $this->paginatorLinks($environment, $crud->getPaginator(), $crud->getRouteName(), $crud->getRouteParameters(), $options);
     }
 
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 8123150..b3c5df1 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -440,7 +440,7 @@ public function testCrudPaginatorLinks(): void
             ->onlyMethods(['getDivIdList', 'getPaginator', 'getRouteName', 'getRouteParameters'])
             ->getMock();
         $crud->expects($this->once())->method('getDivIdList')->willReturn('myId');
-        $crud->expects($this->once())->method('getPaginator')->willReturn($paginator);
+        $crud->expects($this->exactly(2))->method('getPaginator')->willReturn($paginator);
         $crud->expects($this->once())->method('getRouteName')->willReturn('user_crud');
         $crud->expects($this->once())->method('getRouteParameters')->willReturn([]);
 
@@ -453,6 +453,17 @@ public function testCrudPaginatorLinks(): void
         $this->assertSame($expected, $result);
     }
 
+    public function testCrudPaginatorLinksWithoutPaginator(): void
+    {
+        $crud = $this->getMockBuilder(Crud::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The paginator is not defined');
+        $this->crudExtension->crudPaginatorLinks($this->environment, $crud);
+    }
+
     public function testThColumnNotDisplayed(): void
     {
         $html = $this->crudExtension->th($this->environment, 'column4', $this->createCrud());

From f553e82a9105d2effb978d0a1a9809d63c69c423 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 4 May 2022 22:08:59 +0200
Subject: [PATCH 180/264] [Psalm] Remove phpVersion option

---
 psalm.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/psalm.xml b/psalm.xml
index 6e637d0..365ac90 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -5,7 +5,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    phpVersion="8.1"
 >
     <projectFiles>
         <directory name="src"/>

From 2f6c8e7e7d14c7791826cb45cbbf45cc8fb9e503 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 5 May 2022 12:17:22 +0200
Subject: [PATCH 181/264] Fix Crud::buildPaginator with QueryBuilderInterface

---
 src/Crud/Crud.php       |  7 ++++++-
 tests/Crud/CrudTest.php | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 09ab85b..fbbf7e5 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -524,6 +524,11 @@ protected function buildPaginator(): void
             return;
         }
 
+        $queryBuilder = $this->getQueryBuilder();
+        if ($queryBuilder instanceof QueryBuilderInterface) {
+            throw new \Exception('Doctrine paginator is not compatible with Ecommit\CrudBundle\Crud\QueryBuilderInterface query builder');
+        }
+
         // Case: Auto paginator is enabled
         $paginatorOptions = [];
         if (\is_array($this->options['build_paginator'])) {
@@ -531,7 +536,7 @@ protected function buildPaginator(): void
         }
 
         $this->paginator = DoctrinePaginatorBuilder::createDoctrinePaginator(
-            $this->getQueryBuilder(),
+            $queryBuilder,
             $this->sessionValues->getPage(),
             $this->sessionValues->getMaxPerPage(),
             $paginatorOptions
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 4170a99..00cef67 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -18,6 +18,7 @@
 use Ecommit\CrudBundle\Crud\CrudColumn;
 use Ecommit\CrudBundle\Crud\CrudConfig;
 use Ecommit\CrudBundle\Crud\CrudSession;
+use Ecommit\CrudBundle\Crud\QueryBuilderInterface;
 use Ecommit\CrudBundle\Crud\SearchFormBuilder;
 use Ecommit\CrudBundle\Form\Searcher\SearcherInterface;
 use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\UserSearcher;
@@ -738,6 +739,17 @@ public function testPaginator(): void
         $this->assertInstanceOf(PaginatorInterface::class, $crud->getPaginator());
     }
 
+    public function testPaginatorWithoutDoctrineAndPaginatorNotDefined(): void
+    {
+        $crudConfig = $this->createValidCrudConfig()
+            ->setQueryBuilder($this->createMock(QueryBuilderInterface::class));
+        $crud = $this->createCrud($crudConfig);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Doctrine paginator is not compatible with Ecommit\CrudBundle\Crud\QueryBuilderInterface query builder');
+        $crud->build();
+    }
+
     public function testGetDisplaySettingsForm(): void
     {
         $crud = $this->createCrud($this->createValidCrudConfig());

From c17d388bcf4af3df5c4c2eab4a41927b819cac5c Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 5 May 2022 12:39:53 +0200
Subject: [PATCH 182/264] [CS] Fix phpdoc_to_comment rule

---
 .php-cs-fixer.dist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 209f0d2..55777ed 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -37,7 +37,7 @@
         'phpdoc_order' => true,
         'protected_to_private' => false,
         'fully_qualified_strict_types' => false,
-        'phpdoc_to_comment' => false, // PSALM comments
+        'phpdoc_to_comment' => ['ignored_tags' => ['psalm-suppress']],
     ])
     ->setFinder($finder)
 ;

From 96deb2b5c7408cd0faa9bfb138ad0267acf2ac1a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 5 May 2022 12:49:30 +0200
Subject: [PATCH 183/264] Use PHP 8.0 for Psalm (min PHP version)

---
 .github/workflows/tests.yml | 4 ++--
 psalm.xml                   | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 20a51db..af9b274 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -40,8 +40,8 @@ jobs:
                         description: 'with Coding Standards'
                         coding-standards: true
 
-                    #Static Analysis
-                    -   php-version: '8.1'
+                    #Static Analysis (min PHP version)
+                    -   php-version: '8.0'
                         description: 'with Static Analysis'
                         static-analysis: true
 
diff --git a/psalm.xml b/psalm.xml
index 365ac90..8280a17 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -12,4 +12,13 @@
             <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
+
+    <issueHandlers>
+        <UndefinedDocblockClass>
+            <errorLevel type="suppress">
+                <!-- These classes have been added in PHP 8.1 and used by Symfony -->
+                <referencedClass name="UnitEnum"/>
+            </errorLevel>
+        </UndefinedDocblockClass>
+    </issueHandlers>
 </psalm>

From 2dc7089d9a67d720b18bb8c584dba9bfd17279ad Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 5 May 2022 19:31:53 +0200
Subject: [PATCH 184/264] [EntityAjaxType] Replace route_params option by
 route_parameters

---
 doc/references/entity_ajax_type.md     | 2 +-
 doc/references/filters.md              | 2 +-
 src/Form/Filter/EntityAjaxFilter.php   | 4 ++--
 src/Form/Type/EntityAjaxType.php       | 4 ++--
 tests/Form/Type/EntityAjaxTypeTest.php | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/references/entity_ajax_type.md b/doc/references/entity_ajax_type.md
index 1fcb753..2bcf29e 100644
--- a/doc/references/entity_ajax_type.md
+++ b/doc/references/entity_ajax_type.md
@@ -18,5 +18,5 @@ Peut être par exemple utilisé avec [Select2](https://select2.org/)
 | em | Entity Manager Doctrine à utiliser | Non | Entity Manager par défaut en fonction de l'option `class` |
 | query_builder | Query Builder à utiliser | Non | |
 | choice_label | Rendu des labels | Non | |
-| route_params | Paramètres de la route Symfony pour la requête Ajax | Non | [ ] |
+| route_parameters | Paramètres de la route Symfony pour la requête Ajax | Non | [ ] |
 | max_elements | Nombre d'éléments maxi pouvant être sélectionnés | Non | 10000 |
diff --git a/doc/references/filters.md b/doc/references/filters.md
index ab3a724..ecd1a06 100644
--- a/doc/references/filters.md
+++ b/doc/references/filters.md
@@ -104,7 +104,7 @@ Voir aussi les [options générales](#options-générales-pour-tous-les-filtres)
 | max | Nombre mini d'éléments sélectionnables | Non | 1000 |
 | class | Classe de l'entité Doctrine | Oui | |
 | route_name | Route à utiliser pour la recherche Ajax | Oui | |
-| route_params | Paramètres à utiliser pour la recherche Ajax | Non | [ ] |
+| route_parameters | Paramètres à utiliser pour la recherche Ajax | Non | [ ] |
 
 Voir aussi les [options générales](#options-générales-pour-tous-les-filtres) 
 
diff --git a/src/Form/Filter/EntityAjaxFilter.php b/src/Form/Filter/EntityAjaxFilter.php
index 790ee08..20ac176 100644
--- a/src/Form/Filter/EntityAjaxFilter.php
+++ b/src/Form/Filter/EntityAjaxFilter.php
@@ -30,7 +30,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
         $typeOptions = $this->getTypeOptions($options, array_merge($this->getCollectionTypeOptions($options), [
             'class' => $options['class'],
             'route_name' => $options['route_name'],
-            'route_params' => $options['route_params'],
+            'route_parameters' => $options['route_parameters'],
             'max_elements' => $options['max'],
         ]));
 
@@ -63,7 +63,7 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $this->configureCollectionOptions($resolver);
         $resolver->setDefaults([
-            'route_params' => [],
+            'route_parameters' => [],
         ]);
         $resolver->setRequired([
             'class',
diff --git a/src/Form/Type/EntityAjaxType.php b/src/Form/Type/EntityAjaxType.php
index a3cdc69..f33546d 100644
--- a/src/Form/Type/EntityAjaxType.php
+++ b/src/Form/Type/EntityAjaxType.php
@@ -61,7 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
 
     public function buildView(FormView $view, FormInterface $form, array $options): void
     {
-        $view->vars['url'] = $this->router->generate($options['route_name'], $options['route_params']);
+        $view->vars['url'] = $this->router->generate($options['route_name'], $options['route_parameters']);
         $view->vars['multiple'] = $options['multiple'];
 
         if ($options['multiple']) {
@@ -81,7 +81,7 @@ public function configureOptions(OptionsResolver $resolver): void
             'em' => null,
             'query_builder' => null,
             'choice_label' => null,
-            'route_params' => [],
+            'route_parameters' => [],
             'max_elements' => 10000,
             'identifier' => null, // Internal
         ]);
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index 1348e56..3831d4e 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -251,14 +251,14 @@ public function getTestViewWithChoiceLabelProvider(): array
         ];
     }
 
-    public function testViewWithRouteParams(): void
+    public function testViewWithRouteParameters(): void
     {
         $tag = $this->em->getRepository(Tag::class)->find(2);
 
         $field = $this->factory->create(EntityAjaxType::class, $tag, [
             'class' => Tag::class,
             'route_name' => 'fake_route',
-            'route_params' => ['param1' => 'value1'],
+            'route_parameters' => ['param1' => 'value1'],
             'data_class' => null,
         ]);
         $view = $field->createView();
@@ -266,7 +266,7 @@ public function testViewWithRouteParams(): void
         $this->assertSame('/fake?param1=value1', $view->vars['url']);
     }
 
-    public function testViewWithEmParams(): void
+    public function testViewWithEmParameter(): void
     {
         $tag = $this->em->getRepository(Tag::class)->find(2);
 

From 4fc71b19ab385cb59bb4ce047bb5173dfb179ba0 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 5 May 2022 19:38:00 +0200
Subject: [PATCH 185/264] [paginatorLinks] Replace route_params  by
 route_parameters

---
 doc/upgrade/3.0.md             |  2 +-
 src/Twig/CrudExtension.php     | 38 +++++++++++++++++-----------------
 templates/Theme/base.html.twig |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 9620fcb..817b4ea 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -273,7 +273,7 @@ Si vous utilisez l'une de ces classes, voici la migration à effectuer :
     * `bootstrap_size`
 * La signature de la fonction Twig `paginator_links` est modifiée:
     * Avant `paginator_links(AbstractPaginator $paginator, $routeName, $routeParams, $options)`
-    * Maintenant: `paginator_links(PaginatorInterface $paginator, string $routeName, array $routeParams = [], array $options = [])`
+    * Maintenant: `paginator_links(PaginatorInterface $paginator, string $routeName, array $routeParameters = [], array $options = [])`
 * La signature de la fonction Twig `crud_paginator_links` est modifiée:
     * Avant: `crud_paginator_links(Crud $crud, $options = [], $ajaxOptions = [])`
     * Maintenant: `crud_paginator_links(Crud $crud, array $options = [])`
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 52d816b..a5d0c3f 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -130,23 +130,23 @@ public function getFunctions()
     /**
      * Displays links paginator.
      *
-     * @param string $routeName   Route name
-     * @param array  $routeParams Route parameters
-     * @param array  $options     Options:
-     *                            * ajax_options: Ajax Options. If null, Ajax is not used. Default: null
-     *                            * attribute_page: Attribute inside url. Default: page
-     *                            * type: Type of links paginator: elastic (all links) or sliding. Default: sliding
-     *                            * max_pages_before: Max links before current page (only if sliding type is used). Default: 3
-     *                            * max_pages_after: Max links after current page (only if sliding type is used). Default: 3
-     *                            * nav_attr: "nav" attributes
-     *                            * ul_attr: "ul" attributes
-     *                            * li_attr: "li" attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
-     *                            * a_attr: "a" CSS attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
-     *                            * render: Template used for generation without the default process. If null, default process is used
-     *                            * theme: Theme used. If null, default theme is used
-     *                            * block: Twig block used. Default: paginator_links
+     * @param string $routeName       Route name
+     * @param array  $routeParameters Route parameters
+     * @param array  $options         Options:
+     *                                * ajax_options: Ajax Options. If null, Ajax is not used. Default: null
+     *                                * attribute_page: Attribute inside url. Default: page
+     *                                * type: Type of links paginator: elastic (all links) or sliding. Default: sliding
+     *                                * max_pages_before: Max links before current page (only if sliding type is used). Default: 3
+     *                                * max_pages_after: Max links after current page (only if sliding type is used). Default: 3
+     *                                * nav_attr: "nav" attributes
+     *                                * ul_attr: "ul" attributes
+     *                                * li_attr: "li" attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
+     *                                * a_attr: "a" CSS attributes for each page type (sub arrays: first_page, previous_page, current_page, next_page, last_page, other_page)
+     *                                * render: Template used for generation without the default process. If null, default process is used
+     *                                * theme: Theme used. If null, default theme is used
+     *                                * block: Twig block used. Default: paginator_links
      */
-    public function paginatorLinks(Environment $environment, PaginatorInterface $paginator, string $routeName, array $routeParams = [], array $options = []): string
+    public function paginatorLinks(Environment $environment, PaginatorInterface $paginator, string $routeName, array $routeParameters = [], array $options = []): string
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
@@ -207,8 +207,8 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
         if ($options['render']) {
             return $environment->render($options['render'], [
                 'paginator' => $paginator,
-                'routeName' => $routeName,
-                'routeParams' => $routeParams,
+                'route_name' => $routeName,
+                'route_parameters' => $routeParameters,
                 'options' => $options,
             ]);
         }
@@ -243,7 +243,7 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
             'paginator' => $paginator,
             'pages' => $pages,
             'route_name' => $routeName,
-            'route_params' => $routeParams,
+            'route_parameters' => $routeParameters,
             'options' => $options,
         ]));
     }
diff --git a/templates/Theme/base.html.twig b/templates/Theme/base.html.twig
index 13d9462..29e03b6 100644
--- a/templates/Theme/base.html.twig
+++ b/templates/Theme/base.html.twig
@@ -74,7 +74,7 @@
         {% set li_attr_child = li_attr_child|default([]) %}
         {% set a_attr_child = a_attr_child|default([]) %}
         <li{% with { attr: li_attr_child } %}{{ block('attributes', template_name) }}{% endwith %}>
-            <a href="{{ path(route_name, route_params|merge({(attribute_page): page})) }}"{% with { attr: a_attr_child } %}{{ block('attributes', template_name) }}{% endwith %}>{{ page_label }}</a>
+            <a href="{{ path(route_name, route_parameters|merge({(attribute_page): page})) }}"{% with { attr: a_attr_child } %}{{ block('attributes', template_name) }}{% endwith %}>{{ page_label }}</a>
         </li>
     {% endif %}
 {% endblock %}

From 3585a48f9fc921fdb4f2e850a1da0774fbc3cf27 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 5 May 2022 19:43:32 +0200
Subject: [PATCH 186/264] Rename test methods

---
 tests/Functional/App/Controller/UserController.php            | 4 ++--
 .../App/Controller/UserWithPersistentSettingsController.php   | 2 +-
 .../Functional/App/Controller/UserWithoutTraitController.php  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index 1733b27..d56cd8c 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -36,7 +36,7 @@ protected function getCrudOptions(): array
             ->setMaxPerPage([5, 10, 50], 5)
             ->setDefaultSort('firstName', Crud::ASC)
             ->createSearchForm(new UserSearcher())
-            ->setRoute(static::getCrudRouteName(), static::getCrudRouteParams())
+            ->setRoute(static::getCrudRouteName(), static::getCrudRouteParameters())
             ->setPersistentSettings(static::getPersistentSettings());
 
         return $crudConfig->getOptions();
@@ -65,7 +65,7 @@ public function getCrudRouteName(): string
         return 'user_ajax_crud';
     }
 
-    public function getCrudRouteParams(): array
+    public function getCrudRouteParameters(): array
     {
         return [];
     }
diff --git a/tests/Functional/App/Controller/UserWithPersistentSettingsController.php b/tests/Functional/App/Controller/UserWithPersistentSettingsController.php
index 5c0a058..5738312 100644
--- a/tests/Functional/App/Controller/UserWithPersistentSettingsController.php
+++ b/tests/Functional/App/Controller/UserWithPersistentSettingsController.php
@@ -27,7 +27,7 @@ public function getCrudRouteName(): string
         return 'user_with_persistent_settings_ajax_crud';
     }
 
-    public function getCrudRouteParams(): array
+    public function getCrudRouteParameters(): array
     {
         return [
             'scope' => $this->container->get('request_stack')->getCurrentRequest()->attributes->get('scope'),
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index 111b801..2a77209 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -25,7 +25,7 @@
 
 class UserWithoutTraitController extends AbstractController
 {
-    protected function getCrud(string $sessionName, array $routeParams = []): Crud
+    protected function getCrud(string $sessionName, array $routeParameters = []): Crud
     {
         $em = $this->container->get('doctrine')->getManager();
 
@@ -41,7 +41,7 @@ protected function getCrud(string $sessionName, array $routeParams = []): Crud
             ->setMaxPerPage([5, 5, 10, 50], 5)
             ->setDefaultSort('firstName', Crud::ASC)
             ->createSearchForm(new UserSearcher())
-            ->setRoute('user_without_trait_ajax_crud', $routeParams)
+            ->setRoute('user_without_trait_ajax_crud', $routeParameters)
             ->setPersistentSettings(true);
         $crud = $this->container->get(CrudFactory::class)->create($crudConfig->getOptions());
 

From 47833431cc9041e6f5ae2ab251bb2b2d1a30598e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 27 May 2022 11:46:18 +0200
Subject: [PATCH 187/264] [CI] Add Symfony 6.1 tests

---
 .github/workflows/tests.yml            | 8 ++++++++
 tests/Crud/Http/QueryBuilderTest.php   | 8 +++++---
 tests/Form/Type/EntityAjaxTypeTest.php | 1 -
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index af9b274..48ba971 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,6 +22,11 @@ jobs:
                         symfony-version: '6.0.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 6.0.* lowest'
+                    -   php-version: '8.1'
+                        symfony-version: '6.1.*'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with SF 6.1.* lowest'
+
 
                     #Symfony versions
                     -   php-version: '8.1'
@@ -30,6 +35,9 @@ jobs:
                     -   php-version: '8.1'
                         symfony-version: '6.0.*'
                         description: 'with SF 6.0.*'
+                    -   php-version: '8.1'
+                        symfony-version: '6.1.*'
+                        description: 'with SF 6.1.*'
 
                     #PHP versions
                     -   php-version: '8.0'
diff --git a/tests/Crud/Http/QueryBuilderTest.php b/tests/Crud/Http/QueryBuilderTest.php
index 285f519..ffa4b7e 100644
--- a/tests/Crud/Http/QueryBuilderTest.php
+++ b/tests/Crud/Http/QueryBuilderTest.php
@@ -209,7 +209,9 @@ public function testFull(): void
             'method' => 'POST',
             'url' => 'http://test/url?queryparam1=queryparamval1&page=10&per_page=100&sort=col1&sort-direction=ASC',
             'body' => 'bodyparam1=bodyparamval1',
-            'headers' => ['headerparam1: headerparamval1'],
+            'headers' => [
+                'headerparam1: headerparamval1',
+            ],
         ]);
     }
 
@@ -260,9 +262,9 @@ protected function checkRequest(ResponseInterface $response, array $options): vo
         ksort($expectedOptions);
         ksort($options);
 
-        // Remove Content-Length header
+        // Remove Content-Length and Content-Type headers
         foreach ($options['headers'] as $index => $header) {
-            if (preg_match('/^Content-Length/', $header)) {
+            if (preg_match('/^Content-(Length|Type)/', $header)) {
                 unset($options['headers'][$index]);
             }
         }
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index 3831d4e..257767b 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -151,7 +151,6 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
         $this->assertFalse($field->isSynchronized());
         $this->assertFalse($field->isValid());
         $this->assertNull($field->getData());
-        $this->assertSame($submittedData, $field->getViewData()); // Twig doesn't display invalid list
     }
 
     public function getTestSubmitInvalidProvider(): array

From dca19fbc9ec0be32be2a0834cb7c49928af1fafe Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 15 Jun 2022 14:41:45 +0200
Subject: [PATCH 188/264] [Crud] Change build_paginator closure signature

---
 doc/upgrade/3.0.md      | 2 +-
 src/Crud/Crud.php       | 2 +-
 tests/Crud/CrudTest.php | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/upgrade/3.0.md b/doc/upgrade/3.0.md
index 817b4ea..2795fd8 100644
--- a/doc/upgrade/3.0.md
+++ b/doc/upgrade/3.0.md
@@ -72,7 +72,7 @@
     * `setRoute`
     * `createSearchForm` (anciennement `createSearcherForm`)
     * `setDisplayResultsOnlyIfSearch`
-    * `setBuildPaginator`
+    * `setBuildPaginator` (si fonction anonyme comme valeur, le 1er argument de celle-ci n'est plus un objet `QueryBuilder` mais `Crud`)
     * `setPersistentSettings`
     * `setDivIdSearch`
     * `setDivIdList`
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index fbbf7e5..1f74f7d 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -516,7 +516,7 @@ protected function buildPaginator(): void
         if ($this->options['build_paginator'] instanceof \Closure) {
             // Case: Manual paginator (by closure) is enabled
             $this->paginator = $this->options['build_paginator']->__invoke(
-                $this->getQueryBuilder(),
+                $this,
                 $this->sessionValues->getPage(),
                 $this->sessionValues->getMaxPerPage()
             );
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 00cef67..69fed9d 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -13,7 +13,6 @@
 
 namespace Ecommit\CrudBundle\Tests\Crud;
 
-use Doctrine\ORM\QueryBuilder;
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Crud\CrudColumn;
 use Ecommit\CrudBundle\Crud\CrudConfig;
@@ -556,8 +555,8 @@ public function testSetBuildPaginatorClosure(): void
     {
         $paginator = $this->createMock(PaginatorInterface::class);
         $crudConfig = $this->createValidCrudConfig()
-            ->setBuildPaginator(function (QueryBuilder $queryBuilder, int $page, int $resultsPerPage) use ($paginator) {
-                $this->assertInstanceOf(QueryBuilder::class, $queryBuilder);
+            ->setBuildPaginator(function (Crud $crud, int $page, int $resultsPerPage) use ($paginator) {
+                $this->assertInstanceOf(Crud::class, $crud);
                 $this->assertSame(1, $page);
                 $this->assertSame(50, $resultsPerPage);
 

From abe2f102df9e0196037fc4751b0732bcfc361134 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 27 Jun 2022 16:36:03 +0200
Subject: [PATCH 189/264] Fix Bootstrap templates

---
 templates/Theme/bootstrap4.html.twig | 4 ++--
 templates/Theme/bootstrap5.html.twig | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/Theme/bootstrap4.html.twig b/templates/Theme/bootstrap4.html.twig
index efa5d4e..ebd642f 100644
--- a/templates/Theme/bootstrap4.html.twig
+++ b/templates/Theme/bootstrap4.html.twig
@@ -77,7 +77,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                {{ form_widget(form.reset, {'attr': {'class': 'btn-outline-secondary'}}) }}
+                {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class ~ ' btn-outline-secondary'}}) }}
                 {{ form_widget(form.save, {'attr': {'class': 'btn-success'}}) }}
             </div>
             {{ form_end(form) }}
@@ -103,7 +103,7 @@
         </div>
 
         <div style="text-align: center;">
-            {{ form_row(form.reset, {'attr': {'class': 'btn-outline-secondary'}}) }}
+            {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class ~ ' btn-outline-secondary'}}) }}
             {{ form_row(form.save, {'attr': {'class': 'btn-success'}}) }}
         </div>
         {{ form_end(form) }}
diff --git a/templates/Theme/bootstrap5.html.twig b/templates/Theme/bootstrap5.html.twig
index 9a45aa0..50a03e8 100644
--- a/templates/Theme/bootstrap5.html.twig
+++ b/templates/Theme/bootstrap5.html.twig
@@ -75,7 +75,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                {{ form_widget(form.reset, {'attr': {'class': 'btn-outline-secondary'}}) }}
+                {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class ~ ' btn-outline-secondary'}}) }}
                 {{ form_widget(form.save, {'attr': {'class': 'btn-success'}}) }}
             </div>
             {{ form_end(form) }}
@@ -101,7 +101,7 @@
         </div>
 
         <div style="text-align: center;">
-            {{ form_row(form.reset, {'attr': {'class': 'btn-outline-secondary'}}) }}
+            {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class ~ ' btn-outline-secondary'}}) }}
             {{ form_row(form.save, {'attr': {'class': 'btn-success'}}) }}
         </div>
         {{ form_end(form) }}

From c9299de9f09f8d4ee0520ee7a35da4c152eece5b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 26 Jul 2022 12:34:36 +0200
Subject: [PATCH 190/264] Upgrade symfony/webpack-encore 3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8ad83ae..dc027e6 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   },
   "devDependencies": {
     "@ecommit/crud-bundle": "link:assets",
-    "@symfony/webpack-encore": "^1.8",
+    "@symfony/webpack-encore": "^3.0",
     "core-js": "^3.0.0",
     "eslint": "^8.0",
     "eslint-config-standard": "^16.0.3",

From 8b704bb0a229a48e1df4b86d2b5fca1fb1b0182b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 26 Jul 2022 23:16:50 +0200
Subject: [PATCH 191/264] Use stable releases

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 8be944a..eac0682 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
         "doctrine/doctrine-bundle": "^2.4.5",
         "doctrine/orm": "^2.9",
         "doctrine/persistence": "^1.3|^2.0|^3.0",
-        "ecommit/doctrine-utils": "1.0.x-dev",
-        "ecommit/paginator": "1.0.x-dev",
+        "ecommit/doctrine-utils": "^1.0",
+        "ecommit/paginator": "^1.0",
         "ecommit/scalar-values": "^1.0",
         "psr/container": "^1.1|^2.0",
         "symfony/asset": "^5.4|^6.0",

From 861a47422d89fa0c3ca764c98a9a9bb7de659991 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 29 Jul 2022 10:07:25 +0200
Subject: [PATCH 192/264] Fix update form after resetDisplaySettings

---
 src/Crud/Crud.php                                      | 2 ++
 tests/Functional/Controller/TestCrudControllerTest.php | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 1f74f7d..462cdf7 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -590,6 +590,8 @@ protected function resetDisplaySettings(): void
                 ->getQuery()
                 ->execute();
         }
+
+        $this->createDisplaySettingsForm();
     }
 
     public function createView(): self
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 2ef301f..8b7565f 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -269,6 +269,8 @@ public function testSessionValuesAfterResetSearch(Client $client): Client
      */
     public function testResetSettings(Client $client): Client
     {
+        $this->assertSame(['username', 'firstName', 'lastName'], $this->getCheckedColumns($client->getCrawler()));
+
         $button = $client->getCrawler()->filterXPath('//button[contains(., "Display Settings")]');
         $button->first()->click();
 
@@ -281,6 +283,7 @@ public function testResetSettings(Client $client): Client
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
         $this->assertSame('AudeJavel', $this->getFirstUsername($client->getCrawler()));
         $this->checkBeforeAndAfterBuild($client->getCrawler());
+        $this->assertSame(['firstName', 'lastName'], $this->getCheckedColumns($client->getCrawler()));
 
         return $client;
     }
@@ -292,6 +295,7 @@ public function testSessionValuesAfterResetSettings(Client $client): Client
     {
         $client->request('GET', static::URL);
 
+        $this->assertSame(['firstName', 'lastName'], $this->getCheckedColumns($client->getCrawler()));
         $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
@@ -381,4 +385,9 @@ protected function checkBeforeAndAfterBuild(Crawler $crawler): void
 
         $this->assertCount(1, $crawler->filterXPath('//div[contains(text(), "TEST BEFORE AFTER BUILD '.static::SEARCH_IN_LIST.'")]'));
     }
+
+    protected function getCheckedColumns(Crawler $crawler): array
+    {
+        return $crawler->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::input[@type="checkbox" and @checked]')->extract(['value']);
+    }
 }

From 7fd8fd346b19e25144cc756e8e827e96575de2e4 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 6 Sep 2022 18:11:07 +0200
Subject: [PATCH 193/264] Fix CS

---
 src/Crud/CrudConfig.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Crud/CrudConfig.php b/src/Crud/CrudConfig.php
index 5225a90..f480b87 100644
--- a/src/Crud/CrudConfig.php
+++ b/src/Crud/CrudConfig.php
@@ -39,6 +39,7 @@ public function setSessionName(string $sessionName): self
      *  Called with an array of options.
      *
      * @see CrudColumn for available options
+     *
      * @psalm-suppress MissingParamType
      */
     public function addColumn(...$args): self
@@ -78,6 +79,7 @@ public function addColumn(...$args): self
      *  Called with an array of options.
      *
      * @see CrudColumn for available options
+     *
      * @psalm-suppress MissingParamType
      */
     public function addVirtualColumn(...$args): self

From 958a4061d0bfe9299c4f23e0482d56d0f92ac989 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 2 Nov 2022 14:19:20 +0100
Subject: [PATCH 194/264] Fix attr merge with class

---
 src/Twig/CrudExtension.php       |  8 ++++++--
 tests/Twig/CrudExtensionTest.php | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index a5d0c3f..2eaea5a 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -494,7 +494,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
             /** @var FormView $searchForm */
             $searchForm = $crud->getSearchForm();
 
-            return array_merge(
+            $attr = array_merge(
                 [
                     'data-crud-search-id' => $crud->getDivIdSearch(),
                     'data-crud-list-id' => $crud->getDivIdList(),
@@ -502,8 +502,10 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
                 $searchForm->vars['attr'],
                 $value,
                 $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
-                ['class' => (isset($value['class'])) ? $value['class'].' ec-crud-search-form' : 'ec-crud-search-form'],
             );
+            $attr['class'] = (isset($attr['class'])) ? $attr['class'].' ec-crud-search-form' : 'ec-crud-search-form';
+
+            return $attr;
         });
         $options = $resolver->resolve($this->buildOptions('crud_search_form_start', $options, $crud));
 
@@ -620,6 +622,8 @@ public function formStartAjax(FormView $formView, array $options = []): string
         }
         if (isset($options['attr']['class']) && null !== $options['attr']['class']) {
             $options['attr']['class'] = sprintf('%s %s', $autoClass, $options['attr']['class']);
+        } elseif (isset($formView->vars['attr']['class']) && null !== $formView->vars['attr']['class']) {
+            $options['attr']['class'] = sprintf('%s %s', $autoClass, $formView->vars['attr']['class']);
         } else {
             $options['attr']['class'] = $autoClass;
         }
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index b3c5df1..5147161 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -83,6 +83,22 @@ public function testFormStartAjaxWithClassAttr(): void
         $this->assertMatchesXpath($html, $xpath);
     }
 
+    public function testFormStartAjaxWithClassAttrInFormView(): void
+    {
+        $builder = $this->formFactory->createBuilder(FormType::class, null, [
+            'action' => '/url',
+            'method' => 'POST',
+            'csrf_protection' => false,
+            'attr' => [
+                'class' => 'my-class',
+            ],
+        ]);
+        $html = $this->crudExtension->formStartAjax($builder->getForm()->createView());
+
+        $xpath = '//form[(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and contains(concat(" ", normalize-space(@class), " "), " my-class ")]';
+        $this->assertMatchesXpath($html, $xpath);
+    }
+
     public function testFormStartAjaxWithAjaxOptions(): void
     {
         $html = $this->crudExtension->formStartAjax($this->createFormView(), [

From 46345fe3254dddc74ee126ccbbd5910a7671ae33 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 3 Dec 2022 18:24:31 +0100
Subject: [PATCH 195/264] Add Symfony 6.2 tests

---
 .github/workflows/tests.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 48ba971..321c55a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,6 +26,10 @@ jobs:
                         symfony-version: '6.1.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 6.1.* lowest'
+                    -   php-version: '8.1'
+                        symfony-version: '6.2.*'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with SF 6.2.* lowest'
 
 
                     #Symfony versions
@@ -38,6 +42,9 @@ jobs:
                     -   php-version: '8.1'
                         symfony-version: '6.1.*'
                         description: 'with SF 6.1.*'
+                    -   php-version: '8.1'
+                        symfony-version: '6.2.*'
+                        description: 'with SF 6.2.*'
 
                     #PHP versions
                     -   php-version: '8.0'

From e663bbb00ce8e05f498dae095350e4b8cbcdc4cf Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 8 Dec 2022 21:40:01 +0100
Subject: [PATCH 196/264] Add PHP 8.2 tests

---
 .github/workflows/tests.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 321c55a..13a9296 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,22 +33,23 @@ jobs:
 
 
                     #Symfony versions
-                    -   php-version: '8.1'
+                    -   php-version: '8.2'
                         symfony-version: '5.4.*'
                         description: 'with SF 5.4.*'
-                    -   php-version: '8.1'
+                    -   php-version: '8.2'
                         symfony-version: '6.0.*'
                         description: 'with SF 6.0.*'
-                    -   php-version: '8.1'
+                    -   php-version: '8.2'
                         symfony-version: '6.1.*'
                         description: 'with SF 6.1.*'
-                    -   php-version: '8.1'
+                    -   php-version: '8.2'
                         symfony-version: '6.2.*'
                         description: 'with SF 6.2.*'
 
                     #PHP versions
                     -   php-version: '8.0'
                     -   php-version: '8.1'
+                    -   php-version: '8.2'
 
                     #CS
                     -   php-version: '8.1'

From 4de05e2a3afb663606123da37cef9dc4e00643d1 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 2 Nov 2022 12:25:58 +0100
Subject: [PATCH 197/264] [Ajax] Replace jquery by Fetch

---
 assets/js/ajax.js                           |  230 +++-
 assets/js/crud.js                           |   15 +-
 doc/install.md                              |    4 +
 doc/references/ajax.md                      |   61 +-
 package.json                                |    3 +-
 src/Crud/CrudResponseGenerator.php          |    4 -
 src/Twig/CrudExtension.php                  |    8 +-
 tests/Twig/CrudExtensionTest.php            |    4 +-
 tests/assets/js/ajax.spec.js                | 1081 ++++++++++++++++---
 tests/assets/js/main.js                     |    4 +
 tests/assets/js/modal/modal-manager.spec.js |   96 +-
 tests/assets/js/wait.js                     |   34 +
 12 files changed, 1301 insertions(+), 243 deletions(-)
 create mode 100644 tests/assets/js/wait.js

diff --git a/assets/js/ajax.js b/assets/js/ajax.js
index 74802a9..8b6b808 100644
--- a/assets/js/ajax.js
+++ b/assets/js/ajax.js
@@ -20,7 +20,7 @@ $(function () {
       return
     }
 
-    click(this)
+    click(this).catch((error) => console.error(error))
   })
 
   $(document).on('click', 'a.ec-crud-ajax-link-auto', function (event) {
@@ -31,7 +31,7 @@ $(function () {
       return
     }
 
-    link(this)
+    link(this).catch((error) => console.error(error))
   })
 
   $(document).on('submit', 'form.ec-crud-ajax-form-auto', function (event) {
@@ -42,11 +42,24 @@ $(function () {
       return
     }
 
-    sendForm(this)
+    sendForm(this).catch((error) => console.error(error))
   })
 })
 
 export function sendRequest (options) {
+  const eventBeginning = new CustomEvent('ec-crud-ajax', {
+    cancelable: true,
+    detail: {
+      options: options
+    }
+  })
+  document.dispatchEvent(eventBeginning)
+  if (eventBeginning.defaultPrevented) {
+    return new Promise((resolve, reject) => {
+      resolve(null)
+    })
+  }
+
   options = optionsResolver.resolve(
     {
       url: null,
@@ -56,59 +69,138 @@ export function sendRequest (options) {
       onSuccess: null,
       onError: null,
       onComplete: null,
-      dataType: 'html',
+      responseDataType: 'text',
       method: 'POST',
-      data: null,
+      query: {},
+      body: null,
+      successfulResponseRequired: false,
       cache: false,
       options: {}
     },
     options
   )
 
-  options = $.extend({}, options, options.options)
-
   if (optionsResolver.isNotBlank(options.url) === false) {
-    console.error('Value required: url')
-
-    return
+    return new Promise((resolve, reject) => {
+      reject(new TypeError('Value required: url'))
+    })
   }
 
-  if (optionsResolver.isNotBlank(options.onBeforeSend)) {
-    runCallback(options.onBeforeSend, options)
-  }
-  if (options.stop !== undefined && options.stop === true) {
-    return
-  }
+  options.urlResolved = resolveUrl(options)
 
   const callbacksSuccess = []
   if (optionsResolver.isNotBlank(options.update)) {
     callbacksSuccess.push({
       priority: 10,
-      callback: function (data, textStatus, jqXHR) {
-        updateDom(options.update, options.updateMode, data)
-      }
+      callback: (data, response) => updateDom(options.update, options.updateMode, data)
     })
   }
   if (optionsResolver.isNotBlank(options.onSuccess)) {
     callbacksSuccess.push(options.onSuccess)
   }
 
-  $.ajax({
-    url: options.url,
-    type: options.method,
-    dataType: options.dataType,
-    cache: options.cache,
-    data: options.data,
-    success: function (data, textStatus, jqXHR) {
-      runCallback(callbacksSuccess, data, textStatus, jqXHR)
-    },
-    error: function (jqXHR, textStatus, errorThrown) {
-      runCallback(options.onError, jqXHR, textStatus, errorThrown)
-    },
-    complete: function (jqXHR, textStatus) {
-      runCallback(options.onComplete, jqXHR, textStatus)
+  let fetchOptions = {
+    method: options.method
+  }
+  if (options.body) {
+    if (typeof options.body === 'string' || options.body instanceof String || options.body instanceof FormData) {
+      fetchOptions.body = options.body
+    } else if (options.body instanceof Object) {
+      const formData = new FormData()
+      Object.entries(options.body).forEach(entry => {
+        if (Array.isArray(entry[1])) {
+          entry[1].forEach(subEntry => {
+            formData.append(entry[0], subEntry)
+          })
+        } else {
+          formData.append(entry[0], entry[1])
+        }
+      })
+      fetchOptions.body = formData
+    } else if (options.body !== null) {
+      return new Promise((resolve, reject) => {
+        reject(new TypeError('Bad type for option "body"'))
+      })
+    }
+  }
+
+  const eventBeforeSend = new CustomEvent('ec-crud-ajax-before-send', {
+    cancelable: true,
+    detail: {
+      options: options
     }
   })
+  document.dispatchEvent(eventBeforeSend)
+  if (eventBeforeSend.defaultPrevented) {
+    return new Promise((resolve, reject) => {
+      resolve(null)
+    })
+  }
+  if (optionsResolver.isNotBlank(options.onBeforeSend)) {
+    runCallback(options.onBeforeSend, options)
+  }
+  if (options.stop !== undefined && options.stop === true) {
+    return new Promise((resolve, reject) => {
+      resolve(null)
+    })
+  }
+
+  fetchOptions = $.extend(fetchOptions, options.options)
+
+  const fetchPromise = fetch(options.urlResolved, fetchOptions)
+  const ajaxPromise = new Promise((resolve, reject) => {
+    fetchPromise.then(response => {
+      if (response.ok) {
+        // Response OK (status in the range 200 – 299)
+
+        let dataPromise
+        if (options.responseDataType === 'text' || options.responseDataType === 'json') {
+          // Using a clone avoids "TypeError: Already read" when response read is read a 2nd time later
+          const responseCloned = response.clone()
+
+          try {
+            if (options.responseDataType === 'text') {
+              dataPromise = responseCloned.text()
+            } else if (options.responseDataType === 'json') {
+              dataPromise = responseCloned.json()
+            }
+          } catch (e) {
+          }
+        } else {
+          dataPromise = new Promise((resolve, reject) => {
+            resolve(null)
+          })
+        }
+
+        dataPromise.then(data => {
+          executeEventsAndCallbacksSuccess(callbacksSuccess, options, data, response)
+          resolve(response)
+        })
+
+        dataPromise.catch(error => {
+          error = 'Error during fetching response body: ' + error
+          executeEventsAndCallbacksError(options, error, response)
+          reject(error)
+        })
+      } else {
+        // Response not OK (status not in the range 200 – 299)
+        executeEventsAndCallbacksError(options, response.statusText, response)
+        if (options.successfulResponseRequired) {
+          reject(new Error('The response is not successful: ' + response.statusText))
+        } else {
+          resolve(response)
+        }
+      }
+    })
+
+    fetchPromise.catch(error => {
+      error = 'Error during query execution: ' + error
+      executeEventsAndCallbacksError(options, error, null)
+      reject(error)
+    })
+  })
+
+  return ajaxPromise
 }
 
 export function click (element, options) {
@@ -118,7 +210,7 @@ export function click (element, options) {
     optionsResolver.getDataAttributes(element, 'ecCrudAjax')
   )
 
-  sendRequest(options)
+  return sendRequest(options)
 }
 
 export function link (link, options) {
@@ -134,7 +226,7 @@ export function link (link, options) {
     )
   )
 
-  sendRequest(options)
+  return sendRequest(options)
 }
 
 export function sendForm (form, options) {
@@ -144,7 +236,7 @@ export function sendForm (form, options) {
     {
       url: $(form).attr('action'),
       method: $(form).attr('method'),
-      data: $(form).serialize()
+      body: new FormData($(form).get(0))
     },
     optionsResolver.resolve(
       options,
@@ -152,7 +244,7 @@ export function sendForm (form, options) {
     )
   )
 
-  sendRequest(options)
+  return sendRequest(options)
 }
 
 export function updateDom (element, updateMode, content) {
@@ -191,3 +283,67 @@ export function updateDom (element, updateMode, content) {
   })
   $(element).trigger(eventAfter)
 }
+
+function resolveUrl (options) {
+  const url = new URL(options.url, window.location.origin)
+  const searchParams = url.searchParams
+
+  Object.entries(options.query).forEach(entry => {
+    if (Array.isArray(entry[1])) {
+      if (searchParams.has(entry[0])) {
+        searchParams.delete(entry[0])
+      }
+      entry[1].forEach(subEntry => {
+        searchParams.append(entry[0], subEntry)
+      })
+    } else {
+      searchParams.set(entry[0], entry[1])
+    }
+  })
+
+  if (!options.cache && !searchParams.has('_')) {
+    searchParams.set('_', Date.now())
+  }
+
+  return url.toString()
+}
+
+function executeEventsAndCallbacksSuccess (callbacksSuccess, options, data, response) {
+  const eventOnSuccess = new CustomEvent('ec-crud-ajax-on-success', {
+    detail: {
+      data: data,
+      response: response
+    }
+  })
+  document.dispatchEvent(eventOnSuccess)
+  runCallback(callbacksSuccess, data, response)
+
+  const eventOnComplete = new CustomEvent('ec-crud-ajax-on-complete', {
+    detail: {
+      statusText: response.statusText,
+      response: response
+    }
+  })
+  document.dispatchEvent(eventOnComplete)
+  runCallback(options.onComplete, response.statusText, response)
+}
+
+function executeEventsAndCallbacksError (options, statusText, response) {
+  const eventOnError = new CustomEvent('ec-crud-ajax-on-error', {
+    detail: {
+      statusText: statusText,
+      response: response
+    }
+  })
+  document.dispatchEvent(eventOnError)
+  runCallback(options.onError, statusText, response)
+
+  const eventOnComplete = new CustomEvent('ec-crud-ajax-on-complete', {
+    detail: {
+      statusText: statusText,
+      response: response
+    }
+  })
+  document.dispatchEvent(eventOnComplete)
+  runCallback(options.onComplete, statusText, response)
+}
diff --git a/assets/js/crud.js b/assets/js/crud.js
index 873d54a..d257798 100644
--- a/assets/js/crud.js
+++ b/assets/js/crud.js
@@ -18,9 +18,8 @@ $(document).on('submit', 'form.ec-crud-search-form', function (event) {
   const listId = $(this).attr('data-crud-list-id')
 
   sendForm(this, {
-    onSuccess: function (data, textStatus, jqXHR) {
-      const json = $.parseJSON(data)
-
+    responseDataType: 'json',
+    onSuccess: function (json, response) {
       updateDom($('#' + searchId), 'update', json.render_search)
       updateDom($('#' + listId), 'update', json.render_list)
     }
@@ -32,9 +31,8 @@ $(document).on('click', 'button.ec-crud-search-reset', function (event) {
   const listId = $(this).attr('data-crud-list-id')
 
   click(this, {
-    onSuccess: function (data, textStatus, jqXHR) {
-      const json = $.parseJSON(data)
-
+    responseDataType: 'json',
+    onSuccess: function (json, response) {
       updateDom($('#' + searchId), 'update', json.render_search)
       updateDom($('#' + listId), 'update', json.render_list)
     }
@@ -93,9 +91,8 @@ $(document).on('submit', '.ec-crud-display-settings form', function (event) {
   closeDisplaySettings($('#' + displaySettingsContainerId))
 
   sendForm(this, {
-    onSuccess: function (data, textStatus, jqXHR) {
-      const json = $.parseJSON(data)
-
+    responseDataType: 'json',
+    onSuccess: function (json, response) {
       updateDom($('#' + listId), 'update', json.render_list)
       if (!json.form_is_valid) {
         openDisplaySettings($('#' + displaySettingsContainerId))
diff --git a/doc/install.md b/doc/install.md
index a8a9256..c128019 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -6,6 +6,10 @@ Prérequis :
 * Yarn
 * Webpack Encore
 * jQuery
+* Pour une compatibilité avec un maximum de navigateurs Internet, il est conseillé :
+  * De configurer Webpack Encore pour activer Babel et core-js
+  * D'utiliser un [polyfill pour Fetch](https://github.com/github/fetch)
+  * D'utiliser un [polyfill pour FormData](https://github.com/jimmywarting/FormData)
 * Un gestionnaire de thème chargé par Webpack Encore parmi :
     * Bootstrap 3
     * Votre thème personnalisé (créer un thème Twig qui hérite `@EcommitCrud/Theme/base.html.twig`)
diff --git a/doc/references/ajax.md b/doc/references/ajax.md
index 372d676..f2c365d 100644
--- a/doc/references/ajax.md
+++ b/doc/references/ajax.md
@@ -15,22 +15,49 @@ ajax.sendRequest({
 });
 ```
 
-Options :
-
-| Option | Description | Requis  | Valeur par défaut |
-| ------ | ----------- | --------| ----------------- |
-| url | Url de l'action Ajax | Oui |  |
-| update | Si défini, mise à jour du DOM avec le résultat. (voir doc de la fonction `updateDom` plus bas) | Non | |
-| updateMode | Méthode à utiliser pour la mise à jour du DOM (voir doc de la fonction `updateDom` plus bas) | Non | update |
-| onBeforeSend | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant l'envoi de la requête. `Function(options)`. Dans le callback peut passer `options.stop = false` pour annuler la requête. | Non | |
-| onSuccess | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas de succès de la réponse. `Function(data, textStatus, jqXHR)` | Non | |
-| onError | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas d'erreur lors de la réponse. `Function(jqXHR, textStatus, errorThrown)` | Non | |
-| onComplete | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) après réponse. `Function(jqXHR, textStatus)` | Non | |
-| dataType | Type de données attendu (html, xml, json, jsonp, text) | Non | html |
-| method | Méthode HTTP | Non | POST |
-| data | Données envoyées dans la requête | Non | |
-| cache | Utilise ou non le cache | Non | false |
-| options | Tableau d'options de la fonction `ajax` de jQuery | Non | { } |
+**Options :**
+
+| Option                     | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Requis | Valeur par défaut |
+|----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------|-------------------|
+| url                        | Url de l'action Ajax                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Oui    |                   |
+| update                     | Si défini, mise à jour du DOM avec le résultat. (voir doc de la fonction `updateDom` plus bas)                                                                                                                                                                                                                                                                                                                                                                                                      | Non    |                   |
+| updateMode                 | Méthode à utiliser pour la mise à jour du DOM (voir doc de la fonction `updateDom` plus bas)                                                                                                                                                                                                                                                                                                                                                                                                        | Non    | update            |
+| onBeforeSend               | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) avant l'envoi de la requête. `Function(options)`. Dans le callback peut passer `options.stop = false` pour annuler la requête.                                                                                                                                                                                                                                                                                                     | Non    |                   |
+| onSuccess                  | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas de succès (code de réponse HTTP 200-299). `Function(data, response)`. <ul><li>`data`: Donnée de la réponse. Voir option `responseDataType` pour le format attendu</li><li>`response`: Objet de type [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response)</li></ul>                                                                                                                                         | Non    |                   |
+| onError                    | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) en cas d'erreur (code de réponse HTTP ≠ 200-299 ou erreur avant la réponse). `Function(statusText, response)` <ul><li>`statusText`: [statusText](https://developer.mozilla.org/en-US/docs/Web/API/Response/statusText) de la réponse (si réponse). Sinon mesage d'erreur au format string</li><li>`response`: Objet de type [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) si réponse, nulm sinon</li></ul> | Non    |                   |
+| onComplete                 | [Callback(s)](js-callbacks.md#définition-des-callbacks) lancé(s) après les callbacks `onSuccess` ou `onError`. `Function(statusText, response)`. Voir options `onSuccess` et `onError` pour détails sur `statusText` et `response`                                                                                                                                                                                                                                                                  | Non    |                   |
+| successfulResponseRequired | En cas de code de réponse HTTP ≠ 200-299: <ul><li>Si cette option est vraie, la promesse est alors rejetée</li><li>Sinon elle est résolue</ul>                                                                                                                                                                                                                                                                                                                                                      | Non    | false             |
+| responseDataType           | Format de donnée de réponse attendu dans le callback `OnSuccess`. Valeurs disponibles: <ul><li>`text`: Format string</li><li>`json`: Objet JavaScript converti depuis une réponse JSON</li><li>Autre valeur: NULL (donnée de réponse à récupérer manuellement dans l'objet Response)</li></ul>                                                                                                                                                                                                      | Non    | text              |
+| method                     | Méthode HTTP                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Non    | POST              |
+| body                       | Données envoyées dans le corps de la requête. Types de données acceptés: <ul><li>String</li><li>[FormData](https://developer.mozilla.org/en-US/docs/Web/API/FormData)</li><li>Objet</li></ul>                                                                                                                                                                                                                                                                                                       | Non    |                   |
+| query                      | Paramètres à rajouter dans l'URL                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Non    | { }               |
+| cache                      | Utilise ou non le cache                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Non    | false             |
+| options                    | Tableau d'options de la fonction [Fetch](https://developer.mozilla.org/en-US/docs/Web/API/fetch)                                                                                                                                                                                                                                                                                                                                                                                                    | Non    | { }               |
+
+**Promesses :**
+
+La fonction `sendRequest` retourne une promesse.
+* En cas de code de réponse HTTP 200-299, la promesse résout l'objet [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) représentant la réponse à la requête.
+* En cas de code de réponse HTTP autre 200-299:
+  * Si l'option `successfulResponseRequired` est à `false`, alors la promesse résout l'objet [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) représentant la réponse à la requête.
+  * Sinon la promesse est rejetée.
+* En cas d'annulation de la requête (par le callback `onBeforeSend` ou les événements `ec-crud-ajax` / `ec-crud-ajax-before-send`), la promesse résout une valeur nulle.
+* En cas d'erreur lors de l'exécution de la requête, la promesse est rejetée.
+* En cas d'erreur lors la lecture de la réponse, la promesse est rejetée.
+* En cas d'erreur de configuration, la promesse est rejetée.
+
+
+**Événements :**
+
+| Événement                | Objet                                                                                    | Description                                                                                                                    | Propriétés disponibles                                                    |
+|--------------------------|------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------|
+| ec-crud-ajax             | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent) (cancelable) | Appelé avant l'exécution de la requête, avant la résolution des options. Peut annuler la requête avec `event.preventDefault()` | <ul><li>event.details.options</li></ul>                                   |
+| ec-crud-ajax-before-send | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent) (cancelable) | Appelé avant l'exécution de la requête, après la résolution des options. Peut annuler la requête avec `event.preventDefault()` | <ul><li>event.details.options</li></ul>                                   |
+| ec-crud-ajax-on-success  | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent)              | Même fonctionnement que callback `onSuccess`                                                                                   | <ul><li>event.details.data</li><li>event.details.response</li></ul>       |
+| ec-crud-ajax-on-error    | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent)              | Même fonctionnement que callback `onError`                                                                                     | <ul><li>event.details.statusText</li><li>event.details.response</li></ul> |
+| ec-crud-ajax-on-complete | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent)              | Même fonctionnement que callback `onComplete`                                                                                  | <ul><li>event.details.statusText</li><li>event.details.response</li></ul> |
+
+
 
 ### click
 
@@ -94,6 +121,7 @@ ajax.link($('#linkToTest'), {
     * Ou la valeur de l'option `url` de la fonction `link` (si présent)
     * Ou la valeur de `href`
 * Les attributs `data-ec-crud-ajax-*` (si présents) écrasent les options de la fonction `link` (si présent)
+* La fonction retourne la promesse générée par `sendRequest`
 
 ### sendForm
 
@@ -154,6 +182,7 @@ ajax.sendForm($('#formToTest'), {
     * Ou la valeur de l'option `data` de la fonction `sendForm` (si présent)
     * Ou les données du formulaire
 * Les attributs `data-ec-crud-ajax-*` (si présents) écrasent les options de la fonction `sendForm` (si présent)
+* La fonction retourne la promesse générée par `sendRequest`
 
 
 ### updateDom
diff --git a/package.json b/package.json
index dc027e6..26a770f 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
     "karma-jasmine-ajax": "^0.1.13",
     "karma-spec-reporter": "^0.0.32",
     "karma-webpack": "^5.0",
-    "webpack-notifier": "^1.6.0"
+    "webpack-notifier": "^1.6.0",
+    "whatwg-fetch": "^3.6.2"
   },
   "private": true
 }
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index 898f144..3ec2384 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -18,7 +18,6 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 use Twig\Environment;
@@ -40,9 +39,6 @@ public function getResponse(Crud $crud, array $options = []): Response
     public function getAjaxResponse(Crud $crud, array $options = []): Response
     {
         $masterRequest = $this->container->get('request_stack')->getMainRequest();
-        if (!$masterRequest->isXmlHttpRequest()) {
-            throw new NotFoundHttpException('Ajax is required');
-        }
 
         $options = $this->getOptions($options);
         $data = $this->processCrud($crud, $options);
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 2eaea5a..c373282 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -651,9 +651,9 @@ public function formStartAjax(FormView $formView, array $options = []): string
      *                           * on_success: Callback
      *                           * on_error: Callback
      *                           * on_complete: Callback
-     *                           * data_type: Request type. Default: html
      *                           * method: Resquest method: Default: POST
-     *                           * data: Data sent
+     *                           * query: Query string parameters (GET)
+     *                           * body: Request body
      *                           * cache: Use cache. Default: false
      *                           * options: Array of options
      */
@@ -681,9 +681,9 @@ protected function validateAjaxOptions(array $options, array $requiredOptions =
             'on_success' => null,
             'on_error' => null,
             'on_complete' => null,
-            'data_type' => null,
             'method' => null,
-            'data' => null,
+            'query' => null,
+            'body' => null,
             'cache' => null,
             'options' => null,
         ]);
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 5147161..e621cc1 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -165,10 +165,10 @@ public function getTestAjaxAttributesProvider(): array
             [[], ''],
             [['url' => '/url?id=a'], ' data-ec-crud-ajax-url="/url?id=a"'],
             [['url' => '/url?id=a', 'method' => 'GET'], ' data-ec-crud-ajax-url="/url?id=a" data-ec-crud-ajax-method="GET"'],
-            [['data' => '<script>ValueToEscape</script>'], ' data-ec-crud-ajax-data="&lt;script&gt;ValueToEscape&lt;/script&gt;"'],
+            [['body' => '<script>ValueToEscape</script>'], ' data-ec-crud-ajax-body="&lt;script&gt;ValueToEscape&lt;/script&gt;"'],
             [['cache' => true], ' data-ec-crud-ajax-cache="true"'],
             [['cache' => false], ' data-ec-crud-ajax-cache="false"'],
-            [['data' => ['var1' => 'value1']], ' data-ec-crud-ajax-data="{&quot;var1&quot;:&quot;value1&quot;}"'],
+            [['body' => ['var1' => 'value1']], ' data-ec-crud-ajax-body="{&quot;var1&quot;:&quot;value1&quot;}"'],
         ];
     }
 
diff --git a/tests/assets/js/ajax.spec.js b/tests/assets/js/ajax.spec.js
index da7b2f9..caef555 100644
--- a/tests/assets/js/ajax.spec.js
+++ b/tests/assets/js/ajax.spec.js
@@ -10,95 +10,302 @@
 import * as ajax from '@ecommit/crud-bundle/js/ajax'
 import * as callbackManager from '@ecommit/crud-bundle/js/callback-manager'
 import $ from 'jquery'
+import wait from './wait'
 
 describe('Test Ajax.sendRequest', function () {
   beforeEach(function () {
     jasmine.Ajax.install()
+    addJasmineAjaxFormDataSupport()
 
-    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+    jasmine.Ajax.stubRequest(/goodRequest/).andReturn({
       status: 200,
-      responseText: 'OK'
+      statusText: 'OK',
+      response: 'CONTENT',
+      responseText: 'CONTENT'
     })
 
-    jasmine.Ajax.stubRequest('/resultJS').andReturn({
+    jasmine.Ajax.stubRequest(/resultJSON/).andReturn({
       status: 200,
+      statusText: 'OK',
+      response: '{"var1": "value1", "var2": "value2"}',
+      responseText: '{"var1": "value1", "var2": "value2"}'
+    })
+
+    jasmine.Ajax.stubRequest(/badJSON/).andReturn({
+      status: 200,
+      statusText: 'OK',
+      response: '{"var1":',
+      responseText: '{"var1":'
+    })
+
+    jasmine.Ajax.stubRequest(/resultJavaScript/).andReturn({
+      status: 200,
+      statusText: 'OK',
+      response: '<div id="subcontent">BEFORE</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script>',
       responseText: '<div id="subcontent">BEFORE</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script>'
     })
 
-    jasmine.Ajax.stubRequest('/error404').andReturn({
+    jasmine.Ajax.stubRequest(/error404/).andReturn({
       status: 404,
+      statusText: 'Not Found',
+      response: 'Page not found !',
       responseText: 'Page not found !'
     })
+
+    jasmine.Ajax.stubRequest(/failure/).andError()
   })
 
   afterEach(function () {
     jasmine.Ajax.uninstall()
     $('.html-test').remove()
     callbackManager.clear()
+    $(document).off('ec-crud-ajax-on-success')
+    $(document).off('ec-crud-ajax-on-error')
+    $(document).off('ec-crud-ajax-on-complete')
   })
 
-  it('Send request', function () {
+  it('Send request', async function () {
     const callbackSuccess = jasmine.createSpy('success')
     const callbackError = jasmine.createSpy('error')
     const callbackComplete = jasmine.createSpy('complete')
+    const callbackCatch = jasmine.createSpy('catch')
+    const eventSuccess = jasmine.createSpy('event-success')
+    const eventError = jasmine.createSpy('event-error')
+    const eventComplete = jasmine.createSpy('event-complete')
+
+    $(document).on('ec-crud-ajax-on-success', function (event) {
+      expect(event.detail.data).toEqual('CONTENT')
+      expect(event.detail.response).toBeInstanceOf(Response)
+      eventSuccess()
+    })
+    $(document).on('ec-crud-ajax-on-error', function (event) {
+      eventError()
+    })
+    $(document).on('ec-crud-ajax-on-complete', function (event) {
+      expect(event.detail.statusText).toEqual('OK')
+      expect(event.detail.response).toBeInstanceOf(Response)
+      eventComplete()
+    })
 
-    ajax.sendRequest({
+    const promise = ajax.sendRequest({
       url: '/goodRequest',
-      onComplete: function (jqXHR, textStatus) {
+      onComplete: function (statusText, response) {
+        expect(statusText).toEqual('OK')
+        expect(response).toBeInstanceOf(Response)
         callbackComplete()
       },
-      onSuccess: function (data, textStatus, jqXHR) {
-        callbackSuccess(data)
+      onSuccess: function (data, response) {
+        expect(data).toEqual('CONTENT')
+        expect(response).toBeInstanceOf(Response)
+        callbackSuccess()
       },
-      onError: function (jqXHR, textStatus, errorThrown) {
-        callbackError(jqXHR.responseText)
+      onError: function (statusText, response) {
+        callbackError()
       }
+    }).catch(() => {
+      callbackCatch()
     })
+    expect(promise).toBeInstanceOf(Promise)
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
-    expect(callbackSuccess).toHaveBeenCalledWith('OK')
+    expect(callbackSuccess).toHaveBeenCalledBefore(callbackComplete)
     expect(callbackError).not.toHaveBeenCalled()
     expect(callbackComplete).toHaveBeenCalled()
+    expect(callbackCatch).not.toHaveBeenCalled()
+    expect(eventSuccess).toHaveBeenCalledBefore(eventComplete)
+    expect(eventError).not.toHaveBeenCalled()
+    expect(eventComplete).toHaveBeenCalled()
+  })
+
+  it('Send bad request', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackComplete = jasmine.createSpy('complete')
+    const callbackCatch = jasmine.createSpy('catch')
+    const eventSuccess = jasmine.createSpy('event-success')
+    const eventError = jasmine.createSpy('event-error')
+    const eventComplete = jasmine.createSpy('event-complete')
+
+    $(document).on('ec-crud-ajax-on-success', function (event) {
+      eventSuccess()
+    })
+    $(document).on('ec-crud-ajax-on-error', function (event) {
+      expect(event.detail.statusText).toEqual('Not Found')
+      expect(event.detail.response).toBeInstanceOf(Response)
+      eventError()
+    })
+    $(document).on('ec-crud-ajax-on-complete', function (event) {
+      expect(event.detail.statusText).toEqual('Not Found')
+      expect(event.detail.response).toBeInstanceOf(Response)
+      eventComplete()
+    })
+
+    const promise = ajax.sendRequest({
+      url: '/error404',
+      onComplete: function (statusText, response) {
+        expect(statusText).toEqual('Not Found')
+        expect(response).toBeInstanceOf(Response)
+        callbackComplete()
+      },
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      },
+      onError: function (statusText, response) {
+        expect(statusText).toEqual('Not Found')
+        expect(response).toBeInstanceOf(Response)
+        callbackError()
+      }
+    }).catch(() => {
+      callbackCatch()
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/error404')
+    expect(callbackSuccess).not.toHaveBeenCalled()
+    expect(callbackError).toHaveBeenCalledBefore(callbackComplete)
+    expect(callbackComplete).toHaveBeenCalled()
+    expect(callbackCatch).not.toHaveBeenCalled()
+    expect(eventSuccess).not.toHaveBeenCalled()
+    expect(eventError).toHaveBeenCalledBefore(eventComplete)
+    expect(eventComplete).toHaveBeenCalled()
   })
 
-  it('Send bad request', function () {
+  it('Send bad request with successfulResponseRequired', async function () {
     const callbackSuccess = jasmine.createSpy('success')
     const callbackError = jasmine.createSpy('error')
     const callbackComplete = jasmine.createSpy('complete')
+    const callbackCatch = jasmine.createSpy('catch')
+    const eventSuccess = jasmine.createSpy('event-success')
+    const eventError = jasmine.createSpy('event-error')
+    const eventComplete = jasmine.createSpy('event-complete')
 
-    ajax.sendRequest({
+    $(document).on('ec-crud-ajax-on-success', function (event) {
+      eventSuccess()
+    })
+    $(document).on('ec-crud-ajax-on-error', function (event) {
+      expect(event.detail.statusText).toEqual('Not Found')
+      expect(event.detail.response).toBeInstanceOf(Response)
+      eventError()
+    })
+    $(document).on('ec-crud-ajax-on-complete', function (event) {
+      expect(event.detail.statusText).toEqual('Not Found')
+      expect(event.detail.response).toBeInstanceOf(Response)
+      eventComplete()
+    })
+
+    const promise = ajax.sendRequest({
       url: '/error404',
-      onComplete: function (jqXHR, textStatus) {
+      successfulResponseRequired: true,
+      onComplete: function (statusText, response) {
+        expect(statusText).toEqual('Not Found')
+        expect(response).toBeInstanceOf(Response)
+        callbackComplete()
+      },
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      },
+      onError: function (statusText, response) {
+        expect(statusText).toEqual('Not Found')
+        expect(response).toBeInstanceOf(Response)
+        callbackError()
+      }
+    }).catch(error => {
+      expect(error).toBeInstanceOf(Error)
+      expect(error.message).toEqual('The response is not successful: Not Found')
+      callbackCatch()
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeUndefined()
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/error404')
+    expect(callbackSuccess).not.toHaveBeenCalled()
+    expect(callbackError).toHaveBeenCalledBefore(callbackComplete)
+    expect(callbackComplete).toHaveBeenCalled()
+    expect(callbackCatch).toHaveBeenCalled()
+    expect(eventSuccess).not.toHaveBeenCalled()
+    expect(eventError).toHaveBeenCalledBefore(eventComplete)
+    expect(eventComplete).toHaveBeenCalled()
+  })
+
+  it('Send bad request with fetch error', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackComplete = jasmine.createSpy('complete')
+    const callbackCatch = jasmine.createSpy('catch')
+    const eventSuccess = jasmine.createSpy('event-success')
+    const eventError = jasmine.createSpy('event-error')
+    const eventComplete = jasmine.createSpy('event-complete')
+
+    $(document).on('ec-crud-ajax-on-success', function (event) {
+      eventSuccess()
+    })
+    $(document).on('ec-crud-ajax-on-error', function (event) {
+      expect(event.detail.statusText).toMatch(/Error during query execution:.+failed/)
+      expect(event.detail.response).toBeNull()
+      eventError()
+    })
+    $(document).on('ec-crud-ajax-on-complete', function (event) {
+      expect(event.detail.statusText).toMatch(/Error during query execution:.+failed/)
+      expect(event.detail.response).toBeNull()
+      eventComplete()
+    })
+
+    const promise = ajax.sendRequest({
+      url: '/failure',
+      onComplete: function (statusText, response) {
+        expect(statusText).toMatch('failed')
+        expect(response).toBeNull()
         callbackComplete()
       },
-      onSuccess: function (data, textStatus, jqXHR) {
-        callbackSuccess(data)
+      onSuccess: function (data, response) {
+        callbackSuccess()
       },
-      onError: function (jqXHR, textStatus, errorThrown) {
-        callbackError(jqXHR.responseText)
+      onError: function (statusText, response) {
+        expect(statusText).toMatch(/Error during query execution:.+failed/)
+        expect(response).toBeNull()
+        callbackError()
       }
+    }).catch(error => {
+      expect(error).toMatch(/Error during query execution:.+failed/)
+      callbackCatch()
     })
+    expect(promise).toBeInstanceOf(Promise)
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/error404')
+    const response = await promise
+
+    expect(response).toBeUndefined()
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/failure')
     expect(callbackSuccess).not.toHaveBeenCalled()
-    expect(callbackError).toHaveBeenCalledWith('Page not found !')
+    expect(callbackError).toHaveBeenCalledBefore(callbackComplete)
     expect(callbackComplete).toHaveBeenCalled()
+    expect(callbackCatch).toHaveBeenCalled()
+    expect(eventSuccess).not.toHaveBeenCalled()
+    expect(eventError).toHaveBeenCalledBefore(eventComplete)
+    expect(eventComplete).toHaveBeenCalled()
   })
 
-  it('Send request with callback priorities', function () {
+  it('Send request with callback priorities', async function () {
     const callbackSuccess1 = jasmine.createSpy('success1')
     const callbackSuccess2 = jasmine.createSpy('success2')
 
-    ajax.sendRequest({
+    await ajax.sendRequest({
       url: '/goodRequest',
       onSuccess: [
-        function (data, textStatus, jqXHR) {
+        function (data, response) {
           callbackSuccess1()
         },
         {
           priority: 99,
-          callback: function (data, textStatus, jqXHR) {
+          callback: function (data, response) {
             callbackSuccess2()
           }
         }
@@ -109,20 +316,287 @@ describe('Test Ajax.sendRequest', function () {
     expect(callbackSuccess2).toHaveBeenCalledBefore(callbackSuccess1)
   })
 
-  it('Send request without URL', function () {
-    spyOn(window.console, 'error')
-    ajax.sendRequest({})
-    expect(window.console.error).toHaveBeenCalledWith('Value required: url')
+  it('Send request without URL', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackComplete = jasmine.createSpy('complete')
+    const callbackCatch = jasmine.createSpy('catch')
+
+    const promise = ajax.sendRequest({
+      onComplete: function (statusText, response) {
+        callbackComplete()
+      },
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      },
+      onError: function (statusText, response) {
+        callbackError()
+      }
+    }).catch(error => {
+      expect(error).toBeInstanceOf(TypeError)
+      expect(error.message).toEqual('Value required: url')
+      callbackCatch()
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeUndefined()
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
+    expect(callbackSuccess).not.toHaveBeenCalled()
+    expect(callbackError).not.toHaveBeenCalled()
+    expect(callbackComplete).not.toHaveBeenCalled()
+    expect(callbackCatch).toHaveBeenCalled()
+  })
+
+  it('Send request with string body', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackComplete = jasmine.createSpy('complete')
+    const callbackCatch = jasmine.createSpy('catch')
+
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      body: 'body-content',
+      onComplete: function (statusText, response) {
+        callbackComplete()
+      },
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      },
+      onError: function (statusText, response) {
+        callbackError()
+      }
+    }).catch(() => {
+      callbackCatch()
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().params).toEqual('body-content')
+    expect(callbackSuccess).toHaveBeenCalled()
+    expect(callbackError).not.toHaveBeenCalled()
+    expect(callbackComplete).toHaveBeenCalled()
+    expect(callbackCatch).not.toHaveBeenCalled()
+  })
+
+  it('Send request with FormData body', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackComplete = jasmine.createSpy('complete')
+    const callbackCatch = jasmine.createSpy('catch')
+
+    const formData = new FormData()
+    formData.append('var1', 'My value 1')
+    formData.append('var2[]', 'val2A')
+    formData.append('var2[]', 'val2C')
+
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      body: formData,
+      onComplete: function (statusText, response) {
+        callbackComplete()
+      },
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      },
+      onError: function (statusText, response) {
+        callbackError()
+      }
+    }).catch(() => {
+      callbackCatch()
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2[]', 'val2A'], ['var2[]', 'val2C']]) // Parsed by addJasmineAjaxFormDataSupport
+    expect(callbackSuccess).toHaveBeenCalled()
+    expect(callbackError).not.toHaveBeenCalled()
+    expect(callbackComplete).toHaveBeenCalled()
+    expect(callbackCatch).not.toHaveBeenCalled()
+  })
+
+  it('Send request with object body', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackComplete = jasmine.createSpy('complete')
+    const callbackCatch = jasmine.createSpy('catch')
+
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      body: {
+        var1: 'My value 1',
+        'var2[]': ['val2A', 'val2C']
+      },
+      onComplete: function (statusText, response) {
+        callbackComplete()
+      },
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      },
+      onError: function (statusText, response) {
+        callbackError()
+      }
+    }).catch(() => {
+      callbackCatch()
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2[]', 'val2A'], ['var2[]', 'val2C']]) // Parsed by addJasmineAjaxFormDataSupport
+    expect(callbackSuccess).toHaveBeenCalled()
+    expect(callbackError).not.toHaveBeenCalled()
+    expect(callbackComplete).toHaveBeenCalled()
+    expect(callbackCatch).not.toHaveBeenCalled()
+  })
+
+  it('Send request with bad body', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackComplete = jasmine.createSpy('complete')
+    const callbackCatch = jasmine.createSpy('catch')
+
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      body: true,
+      onComplete: function (statusText, response) {
+        callbackComplete()
+      },
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      },
+      onError: function (statusText, response) {
+        callbackError()
+      }
+    }).catch(error => {
+      expect(error).toBeInstanceOf(TypeError)
+      expect(error.message).toEqual('Bad type for option "body"')
+      callbackCatch()
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeUndefined()
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
+    expect(callbackSuccess).not.toHaveBeenCalled()
+    expect(callbackError).not.toHaveBeenCalled()
+    expect(callbackComplete).not.toHaveBeenCalled()
+    expect(callbackCatch).toHaveBeenCalled()
+  })
+
+  it('Send request with query option', async function () {
+    const promise = ajax.sendRequest({
+      url: '/goodRequest?var1=val1&var2[]=val2a&var3=val3',
+      query: {
+        var1: 'new1', // override
+        'var2[]': ['new2a', 'new2b'], // override
+        var4: 'new4'
+      },
+      cache: true
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toEqual('http://localhost:9876/goodRequest?var1=new1&var3=val3&var2%5B%5D=new2a&var2%5B%5D=new2b&var4=new4')
+  })
+
+  it('Send request with cache', async function () {
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      cache: true
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch(/goodRequest$/)
+  })
+
+  it('Send request with default cache', async function () {
+    const promise = ajax.sendRequest({
+      url: '/goodRequest'
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch(/goodRequest\?_=\d+$/)
+  })
+
+  it('Send request without cache', async function () {
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      cache: false
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch(/goodRequest\?_=\d+$/)
+  })
+
+  it('Send request without cache but param is already used', async function () {
+    const promise = ajax.sendRequest({
+      url: '/goodRequest?_=val',
+      cache: false
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch(/goodRequest\?_=val$/)
+  })
+
+  it('Send request with relative URL', async function () {
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      cache: true
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toEqual('http://localhost:9876/goodRequest')
+  })
+
+  it('Send request with absolute URL', async function () {
+    const promise = ajax.sendRequest({
+      url: 'http://test.demo/goodRequest',
+      cache: true
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toEqual('http://test.demo/goodRequest')
   })
 
-  it('Send request and update DOM with default mode', function () {
+  it('Send request and update DOM with default mode', async function () {
     $('body').append('<div id="ajax-result" class="html-test"><div class="content"></div></div>')
     const callbackSuccess = jasmine.createSpy('success')
 
-    ajax.sendRequest({
+    await ajax.sendRequest({
       url: '/goodRequest',
       onSuccess: {
-        callback: function (data, textStatus, jqXHR) {
+        callback: function (data, response) {
           callbackSuccess($('#ajax-result').html())
         },
         priority: -99
@@ -130,37 +604,37 @@ describe('Test Ajax.sendRequest', function () {
       update: '#ajax-result .content'
     })
 
-    expect(callbackSuccess).toHaveBeenCalledWith('<div class="content">OK</div>')
+    expect(callbackSuccess).toHaveBeenCalledWith('<div class="content">CONTENT</div>')
   })
 
-  it('Send request and update DOM with "update" mode', function () {
-    testUpdate('update', '<div class="content">OK</div>')
+  it('Send request and update DOM with "update" mode', async function () {
+    await testUpdate('update', '<div class="content">CONTENT</div>')
   })
 
-  it('Send request and update DOM with "before" mode', function () {
-    testUpdate('before', 'OK<div class="content">X</div>')
+  it('Send request and update DOM with "before" mode', async function () {
+    await testUpdate('before', 'CONTENT<div class="content">X</div>')
   })
 
-  it('Send request and update DOM with "after" mode', function () {
-    testUpdate('after', '<div class="content">X</div>OK')
+  it('Send request and update DOM with "after" mode', async function () {
+    await testUpdate('after', '<div class="content">X</div>CONTENT')
   })
 
-  it('Send request and update DOM with "prepend" mode', function () {
-    testUpdate('prepend', '<div class="content">OKX</div>')
+  it('Send request and update DOM with "prepend" mode', async function () {
+    await testUpdate('prepend', '<div class="content">CONTENTX</div>')
   })
 
-  it('Send request and update DOM with "append" mode', function () {
-    testUpdate('append', '<div class="content">XOK</div>')
+  it('Send request and update DOM with "append" mode', async function () {
+    await testUpdate('append', '<div class="content">XCONTENT</div>')
   })
 
-  it('Send request and update DOM with bad mode', function () {
+  it('Send request and update DOM with bad mode', async function () {
     spyOn(window.console, 'error')
-    testUpdate('badMode', '<div class="content">X</div>')
+    await testUpdate('badMode', '<div class="content">X</div>')
     expect(window.console.error).toHaveBeenCalledWith('Bad updateMode: badMode')
   })
 
-  it('Send request with method option', function () {
-    ajax.sendRequest({
+  it('Send request with method option', async function () {
+    await ajax.sendRequest({
       url: '/goodRequest',
       method: 'GET'
     })
@@ -168,65 +642,271 @@ describe('Test Ajax.sendRequest', function () {
     expect(jasmine.Ajax.requests.mostRecent().method).toEqual('GET')
   })
 
-  it('Send request with onBeforeSend option', function () {
+  it('Send request with onBeforeSend option', async function () {
     const callbackSuccess = jasmine.createSpy('success')
     const callbackBeforeSend = jasmine.createSpy('beforeSend')
 
-    ajax.sendRequest({
+    const promise = ajax.sendRequest({
       url: '/goodRequest',
       onBeforeSend: function (options) {
+        expect(options).toBeInstanceOf(Object)
+        expect(options.url).toEqual('/goodRequest')
         callbackBeforeSend()
       },
-      onSuccess: function (data, textStatus, jqXHR) {
+      onSuccess: function (data, response) {
         callbackSuccess()
       }
     })
 
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
     expect(callbackSuccess).toHaveBeenCalled()
     expect(callbackBeforeSend).toHaveBeenCalledBefore(callbackSuccess)
   })
 
-  it('Send request canceled by onBeforeSend option', function () {
+  it('Send request canceled by onBeforeSend option', async function () {
     const callbackSuccess = jasmine.createSpy('success')
     const callbackBeforeSend = jasmine.createSpy('beforeSend')
 
-    ajax.sendRequest({
+    const promise = ajax.sendRequest({
       url: '/goodRequest',
       onBeforeSend: function (options) {
+        expect(options).toBeInstanceOf(Object)
+        expect(options.url).toEqual('/goodRequest')
         callbackBeforeSend()
         options.stop = true
       },
-      onSuccess: function (data, textStatus, jqXHR) {
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+
+    const response = await promise
+
+    expect(response).toBeNull()
+    expect(callbackSuccess).not.toHaveBeenCalled()
+    expect(callbackBeforeSend).toHaveBeenCalled()
+  })
+
+  it('Test ec-crud-ajax-before-send event', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackBeforeSend = jasmine.createSpy('beforeSend')
+
+    $(document).on('ec-crud-ajax-before-send', function (event) {
+      expect(event.detail.options).toBeInstanceOf(Object)
+      expect(event.detail.options.url).toEqual('/goodRequest')
+      callbackBeforeSend()
+    })
+
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(callbackSuccess).toHaveBeenCalled()
+    expect(callbackBeforeSend).toHaveBeenCalledBefore(callbackSuccess)
+
+    $(document).off('ec-crud-ajax-before-send')
+  })
+
+  it('Send request canceled by ec-crud-ajax-before-send event', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackBeforeSend = jasmine.createSpy('beforeSend')
+
+    $(document).on('ec-crud-ajax-before-send', function (event) {
+      expect(event.detail.options).toBeInstanceOf(Object)
+      expect(event.detail.options.url).toEqual('/goodRequest')
+      event.preventDefault()
+      callbackBeforeSend()
+    })
+
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      onSuccess: function (data, response) {
         callbackSuccess()
       }
     })
 
+    const response = await promise
+
+    expect(response).toBeNull()
     expect(callbackSuccess).not.toHaveBeenCalled()
     expect(callbackBeforeSend).toHaveBeenCalled()
+
+    $(document).off('ec-crud-ajax-before-send')
+  })
+
+  it('Test ec-crud-ajax event', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackBeginning = jasmine.createSpy('beginning')
+
+    $(document).on('ec-crud-ajax', function (event) {
+      expect(event.detail.options).toBeInstanceOf(Object)
+      expect(event.detail.options.url).toEqual('/goodRequest')
+      callbackBeginning()
+    })
+
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(callbackSuccess).toHaveBeenCalled()
+    expect(callbackBeginning).toHaveBeenCalled()
+
+    $(document).off('ec-crud-ajax')
   })
 
-  it('Send request with data option', function () {
-    ajax.sendRequest({
+  it('Send request canceled by ec-crud-ajax event', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackBeginning = jasmine.createSpy('beginning')
+
+    $(document).on('ec-crud-ajax', function (event) {
+      expect(event.detail.options).toBeInstanceOf(Object)
+      expect(event.detail.options.url).toEqual('/goodRequest')
+      event.preventDefault()
+      callbackBeginning()
+    })
+
+    const promise = ajax.sendRequest({
       url: '/goodRequest',
-      data: {
-        var1: 'value1',
-        var2: 'value2'
+      onSuccess: function (data, response) {
+        callbackSuccess()
       }
     })
 
-    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-      var1: ['value1'], var2: ['value2']
+    const response = await promise
+
+    expect(response).toBeNull()
+    expect(callbackSuccess).not.toHaveBeenCalled()
+    expect(callbackBeginning).toHaveBeenCalled()
+
+    $(document).off('ec-crud-ajax')
+  })
+
+  it('Send request with options changed by ec-crud-ajax event', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackBeginning = jasmine.createSpy('beginning')
+
+    $(document).on('ec-crud-ajax', function (event) {
+      expect(event.detail.options).toBeInstanceOf(Object)
+      expect(event.detail.options.body).toBeUndefined()
+      event.detail.options.body = 'BODY ADDED BY EVENT'
+      callbackBeginning()
+    })
+
+    const promise = ajax.sendRequest({
+      url: '/goodRequest',
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
     })
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().params).toEqual('BODY ADDED BY EVENT')
+    expect(callbackSuccess).toHaveBeenCalled()
+    expect(callbackBeginning).toHaveBeenCalled()
+
+    $(document).off('ec-crud-ajax')
   })
 
-  it('Send request with JS in response', function () {
+  it('Send request with text responseDataType', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+
+    await ajax.sendRequest({
+      url: '/goodRequest',
+      responseDataType: 'text',
+      onSuccess: function (data, response) {
+        expect(data).toBeInstanceOf(String)
+        expect(data).toEqual('CONTENT')
+        expect(response).toBeInstanceOf(Response)
+        callbackSuccess()
+      }
+    })
+
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with json responseDataType', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+
+    await ajax.sendRequest({
+      url: '/resultJSON',
+      responseDataType: 'json',
+      onSuccess: function (data, response) {
+        expect(data).not.toBeInstanceOf(String)
+        expect(data).toEqual({ var1: 'value1', var2: 'value2' })
+        expect(response).toBeInstanceOf(Response)
+        callbackSuccess()
+      }
+    })
+
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with json responseDataType and bad result', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+    const callbackError = jasmine.createSpy('error')
+    const callbackCatch = jasmine.createSpy('catch')
+
+    await ajax.sendRequest({
+      url: '/badJSON',
+      responseDataType: 'json',
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      },
+      onError: function (statusText, response) {
+        expect(statusText).toMatch(/Error during fetching response body:.+JSON\.parse/)
+        expect(response).toBeInstanceOf(Response)
+        callbackError()
+      }
+    }).catch(error => {
+      expect(error).toMatch(/Error during fetching response body:.+JSON\.parse/)
+      callbackCatch()
+    })
+
+    expect(callbackSuccess).not.toHaveBeenCalled()
+    expect(callbackError).toHaveBeenCalled()
+    expect(callbackCatch).toHaveBeenCalled()
+  })
+
+  it('Send request with no responseDataType', async function () {
+    const callbackSuccess = jasmine.createSpy('success')
+
+    await ajax.sendRequest({
+      url: '/goodRequest',
+      responseDataType: null,
+      onSuccess: function (data, response) {
+        expect(data).toBeNull()
+        expect(response).toBeInstanceOf(Response)
+        callbackSuccess()
+      }
+    })
+
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with JS in response', async function () {
     $('body').append('<div id="ajax-result" class="html-test"><div class="content">X</div></div>')
     const callbackSuccess = jasmine.createSpy('success')
 
-    ajax.sendRequest({
-      url: '/resultJS',
+    await ajax.sendRequest({
+      url: '/resultJavaScript',
       onSuccess: {
-        callback: function (data, textStatus, jqXHR) {
+        callback: function (data, response) {
           callbackSuccess($('#ajax-result').html())
         },
         priority: -99
@@ -237,14 +917,14 @@ describe('Test Ajax.sendRequest', function () {
     expect(callbackSuccess).toHaveBeenCalledWith('<div class="content"><div id="subcontent">AFTER</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script></div>')
   })
 
-  function testUpdate (updateMode, expectedContent) {
+  async function testUpdate (updateMode, expectedContent) {
     $('body').append('<div id="ajax-result" class="html-test"><div class="content">X</div></div>')
     const callbackSuccess = jasmine.createSpy('success')
 
-    ajax.sendRequest({
+    await ajax.sendRequest({
       url: '/goodRequest',
       onSuccess: {
-        callback: function (data, textStatus, jqXHR) {
+        callback: function (data, response) {
           callbackSuccess($('#ajax-result').html())
         },
         priority: -99
@@ -260,10 +940,11 @@ describe('Test Ajax.sendRequest', function () {
 describe('Test Ajax.click', function () {
   beforeEach(function () {
     jasmine.Ajax.install()
+    addJasmineAjaxFormDataSupport()
 
-    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+    jasmine.Ajax.stubRequest(/goodRequest/).andReturn({
       status: 200,
-      responseText: 'OK'
+      responseText: 'CONTENT'
     })
   })
 
@@ -273,75 +954,83 @@ describe('Test Ajax.click', function () {
     callbackManager.clear()
   })
 
-  it('Send request with button', function () {
+  it('Send request with button', async function () {
     $('body').append('<button class="html-test" id="buttonToTest">Go !</button>')
 
     const callbackSuccess = jasmine.createSpy('success')
 
-    ajax.click($('#buttonToTest'), {
+    const promise = ajax.click($('#buttonToTest'), {
       url: '/goodRequest',
-      onSuccess: function (data, textStatus, jqXHR) {
+      onSuccess: function (data, response) {
         callbackSuccess()
       }
     })
+    expect(promise).toBeInstanceOf(Promise)
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(callbackSuccess).toHaveBeenCalled()
   })
 
-  it('Send request with button and data-*', function () {
+  it('Send request with button and data-*', async function () {
     $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-success="my_callback_on_success">Go !</button>')
 
     const callbackSuccess = jasmine.createSpy('success')
 
-    callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
+    callbackManager.registerCallback('my_callback_on_success', function (data, response) {
       callbackSuccess()
     })
 
-    ajax.click($('#buttonToTest'))
+    await ajax.click($('#buttonToTest'))
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(callbackSuccess).toHaveBeenCalled()
   })
 
-  it('Send request with button and data-* and options', function () {
+  it('Send request with button and data-* and options', async function () {
     $('body').append('<button id="buttonToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>')
 
     const callbackSuccess1 = jasmine.createSpy('success1')
     const callbackSuccess2 = jasmine.createSpy('success2')
     const callbackComplete = jasmine.createSpy('complete')
 
-    callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
+    callbackManager.registerCallback('my_callback_on_success_1', function (data, response) {
       callbackSuccess1()
     })
 
-    ajax.click($('#buttonToTest'), {
+    await ajax.click($('#buttonToTest'), {
       url: '/badRequest', // overridden by data-ec-crud-ajax-url
       method: 'GET', // overridden by data-ec-crud-ajax-method
-      onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
+      onSuccess: function (data, response) { // overridden by data-ec-crud-ajax-on-success
         callbackSuccess2()
       },
-      onComplete: function (jqXHR, textStatus) {
+      onComplete: function (statusText, response) {
         callbackComplete()
       }
     })
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
     expect(callbackSuccess1).toHaveBeenCalled()
     expect(callbackSuccess2).not.toHaveBeenCalled()
     expect(callbackComplete).toHaveBeenCalled()
   })
 
-  it('Send auto-request with button', function () {
+  it('Send auto-request with button', async function () {
     $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="buttonToTest" data-ec-crud-ajax-url="/goodRequest">Go !</a>')
 
     $('#buttonToTest').click()
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    await wait(() => {
+      return false
+    }, 500)
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
   })
 
-  it('Send auto-request with button canceled', function () {
+  it('Send auto-request with button canceled', async function () {
     $(document).on('ec-crud-ajax-click-auto-before', '#clickToTest', function (event) {
       event.preventDefault()
     })
@@ -349,12 +1038,16 @@ describe('Test Ajax.click', function () {
 
     $('#clickToTest').click()
 
+    await wait(() => {
+      return false
+    }, 500)
+
     expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
 
     $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest')
   })
 
-  it('Send auto-request canceled by onBeforeSend option', function () {
+  it('Send auto-request canceled by onBeforeSend option', async function () {
     $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="my_callback_on_before_send">Go !</button>')
 
     callbackManager.registerCallback('my_callback_on_before_send', function (options) {
@@ -363,19 +1056,38 @@ describe('Test Ajax.click', function () {
 
     $('#clickToTest').click()
 
+    await wait(() => {
+      return false
+    }, 500)
+
     expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
 
     $(document).off('ec-crud-ajax-click-auto-before', '#clickToTest')
   })
+
+  it('Send auto-request with button and error', async function () {
+    $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="buttonToTest">Go !</a>')
+    spyOn(window.console, 'error')
+
+    $('#buttonToTest').click()
+
+    await wait(() => {
+      return false
+    }, 500)
+
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
+    expect(window.console.error).toHaveBeenCalledWith(new TypeError('Value required: url'))
+  })
 })
 
 describe('Test Ajax.link', function () {
   beforeEach(function () {
     jasmine.Ajax.install()
+    addJasmineAjaxFormDataSupport()
 
-    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+    jasmine.Ajax.stubRequest(/goodRequest/).andReturn({
       status: 200,
-      responseText: 'OK'
+      responseText: 'CONTENT'
     })
   })
 
@@ -385,37 +1097,41 @@ describe('Test Ajax.link', function () {
     callbackManager.clear()
   })
 
-  it('Send request with link', function () {
+  it('Send request with link', async function () {
     $('body').append('<a href="/goodRequest" class="html-test" id="linkToTest">Go !</a>')
 
     const callbackSuccess = jasmine.createSpy('success')
 
-    ajax.link($('#linkToTest'), {
-      onSuccess: function (data, textStatus, jqXHR) {
+    const promise = ajax.link($('#linkToTest'), {
+      onSuccess: function (data, response) {
         callbackSuccess()
       }
     })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(callbackSuccess).toHaveBeenCalled()
   })
 
-  it('Send request with link and data-*', function () {
+  it('Send request with link and data-*', async function () {
     $('body').append('<a href="/goodRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success">Go !</a>')
 
     const callbackSuccess = jasmine.createSpy('success')
 
-    callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
+    callbackManager.registerCallback('my_callback_on_success', function (data, response) {
       callbackSuccess()
     })
 
-    ajax.link($('#linkToTest'))
+    await ajax.link($('#linkToTest'))
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(callbackSuccess).toHaveBeenCalled()
   })
 
-  it('Send request with link and data-* and options', function () {
+  it('Send request with link and data-* and options', async function () {
     $('body').append('<a href="/badRequest" id="linkToTest" class="html-test" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest">Go !</a>')
     // href is overridden by url option
 
@@ -423,37 +1139,41 @@ describe('Test Ajax.link', function () {
     const callbackSuccess2 = jasmine.createSpy('success2')
     const callbackComplete = jasmine.createSpy('complete')
 
-    callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
+    callbackManager.registerCallback('my_callback_on_success_1', function (data, response) {
       callbackSuccess1()
     })
 
-    ajax.link($('#linkToTest'), {
+    await ajax.link($('#linkToTest'), {
       url: '/badRequest', // overridden by data-ec-crud-ajax-url
       method: 'GET', // overridden by data-ec-crud-ajax-method
-      onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
+      onSuccess: function (data, response) { // overridden by data-ec-crud-ajax-on-success
         callbackSuccess2()
       },
-      onComplete: function (jqXHR, textStatus) {
+      onComplete: function (statusText, response) {
         callbackComplete()
       }
     })
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
     expect(callbackSuccess1).toHaveBeenCalled()
     expect(callbackSuccess2).not.toHaveBeenCalled()
     expect(callbackComplete).toHaveBeenCalled()
   })
 
-  it('Send auto-request with link', function () {
+  it('Send auto-request with link', async function () {
     $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
 
     $('#linkToTest').click()
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    await wait(() => {
+      return false
+    }, 500)
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
   })
 
-  it('Send auto-request with link canceled', function () {
+  it('Send auto-request with link canceled', async function () {
     $(document).on('ec-crud-ajax-link-auto-before', '#linkToTest', function (event) {
       event.preventDefault()
     })
@@ -461,19 +1181,38 @@ describe('Test Ajax.link', function () {
 
     $('#linkToTest').click()
 
+    await wait(() => {
+      return false
+    }, 500)
+
     expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
 
     $(document).off('ec-crud-ajax-link-auto-before', '#linkToTest')
   })
+
+  it('Send auto-request with link and error', async function () {
+    $('body').append('<a class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
+    spyOn(window.console, 'error')
+
+    $('#linkToTest').click()
+
+    await wait(() => {
+      return false
+    }, 500)
+
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
+    expect(window.console.error).toHaveBeenCalledWith(new TypeError('Value required: url'))
+  })
 })
 
 describe('Test Ajax.form', function () {
   beforeEach(function () {
     jasmine.Ajax.install()
+    addJasmineAjaxFormDataSupport()
 
-    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+    jasmine.Ajax.stubRequest(/goodRequest/).andReturn({
       status: 200,
-      responseText: 'OK'
+      responseText: 'CONTENT'
     })
   })
 
@@ -483,69 +1222,87 @@ describe('Test Ajax.form', function () {
     callbackManager.clear()
   })
 
-  it('Send request with form', function () {
+  it('Send request with form', async function () {
     $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
     const callbackSuccess = jasmine.createSpy('success')
 
-    ajax.sendForm($('#formToTest'), {
-      onSuccess: function (data, textStatus, jqXHR) {
+    const promise = ajax.sendForm($('#formToTest'), {
+      onSuccess: function (data, response) {
         callbackSuccess()
       }
     })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
-    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-      var1: ['My value 1'], var2: ['My value 2']
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with form with multi values', async function () {
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><select name="var2[]" multiple><option value="val2A">val2A</option><option value="val2B">val2B</option><option value="val2C">val2C</option></select></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest option[value=val2A]').prop('selected', true)
+    $('#formToTest option[value=val2C]').prop('selected', true)
+
+    const callbackSuccess = jasmine.createSpy('success')
+
+    await ajax.sendForm($('#formToTest'), {
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
     })
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2[]', 'val2A'], ['var2[]', 'val2C']]) // Parsed by addJasmineAjaxFormDataSupport
     expect(callbackSuccess).toHaveBeenCalled()
   })
 
-  it('Send request with PUT form', function () {
+  it('Send request with PUT form', async function () {
     $('body').append('<form action="/goodRequest" method="PUT" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
     const callbackSuccess = jasmine.createSpy('success')
 
-    ajax.sendForm($('#formToTest'), {
-      onSuccess: function (data, textStatus, jqXHR) {
+    await ajax.sendForm($('#formToTest'), {
+      onSuccess: function (data, response) {
         callbackSuccess()
       }
     })
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
-    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-      var1: ['My value 1'], var2: ['My value 2']
-    })
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
     expect(callbackSuccess).toHaveBeenCalled()
   })
 
-  it('Send request with form and data-*', function () {
+  it('Send request with form and data-*', async function () {
     $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="my_callback_on_success"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
     const callbackSuccess = jasmine.createSpy('success')
-    callbackManager.registerCallback('my_callback_on_success', function (data, textStatus, jqXHR) {
+    callbackManager.registerCallback('my_callback_on_success', function (data, response) {
       callbackSuccess()
     })
 
-    ajax.sendForm($('#formToTest'))
+    await ajax.sendForm($('#formToTest'))
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
-    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-      var1: ['My value 1'], var2: ['My value 2']
-    })
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
     expect(callbackSuccess).toHaveBeenCalled()
   })
 
-  it('Send request with form and data-* and options', function () {
+  it('Send request with form and data-* and options', async function () {
     $('body').append('<form action="/badRequest" method="POST" class="html-test" id="formToTest" data-ec-crud-ajax-on-success="my_callback_on_success_1" data-ec-crud-ajax-method="PUT" data-ec-crud-ajax-url="/goodRequest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
     // action is overridden by url option
     $('#formToTest input[name=var1]').val('My value 1')
@@ -555,48 +1312,46 @@ describe('Test Ajax.form', function () {
     const callbackSuccess2 = jasmine.createSpy('success2')
     const callbackComplete = jasmine.createSpy('complete')
 
-    callbackManager.registerCallback('my_callback_on_success_1', function (data, textStatus, jqXHR) {
+    callbackManager.registerCallback('my_callback_on_success_1', function (data, response) {
       callbackSuccess1()
     })
 
-    ajax.sendForm($('#formToTest'), {
+    await ajax.sendForm($('#formToTest'), {
       url: '/badRequest', // overridden by data-ec-crud-ajax-url
       method: 'GET', // overridden by data-ec-crud-ajax-method
-      onSuccess: function (data, textStatus, jqXHR) { // overridden by data-ec-crud-ajax-on-success
+      onSuccess: function (data, response) { // overridden by data-ec-crud-ajax-on-success
         callbackSuccess2()
       },
-      onComplete: function (jqXHR, textStatus) {
+      onComplete: function (statusText, response) {
         callbackComplete()
       }
     })
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
-    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-      var1: ['My value 1'],
-      var2: ['My value 2']
-    })
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
     expect(callbackSuccess1).toHaveBeenCalled()
     expect(callbackSuccess2).not.toHaveBeenCalled()
     expect(callbackComplete).toHaveBeenCalled()
   })
 
-  it('Send auto-request with form', function () {
+  it('Send auto-request with form', async function () {
     $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
     $('#formToTest').submit()
 
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    await wait(() => {
+      return false
+    }, 500)
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
-    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual({
-      var1: ['My value 1'],
-      var2: ['My value 2']
-    })
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
   })
 
-  it('Send auto-request with form canceled', function () {
+  it('Send auto-request with form canceled', async function () {
     $(document).on('ec-crud-ajax-form-auto-before', '#formToTest', function (event) {
       event.preventDefault()
     })
@@ -606,10 +1361,28 @@ describe('Test Ajax.form', function () {
 
     $('#formToTest').submit()
 
+    await wait(() => {
+      return false
+    }, 500)
+
     expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
 
     $(document).off('ec-crud-ajax-form-auto-before', '#formToTest')
   })
+
+  it('Send auto-request with form and error', async function () {
+    $('body').append('<form  method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /></form>')
+    spyOn(window.console, 'error')
+
+    $('#formToTest').submit()
+
+    await wait(() => {
+      return false
+    }, 500)
+
+    expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
+    expect(window.console.error).toHaveBeenCalledWith(new TypeError('Value required: url'))
+  })
 })
 
 describe('Test Ajax.updateDom', function () {
@@ -710,3 +1483,19 @@ describe('Test Ajax.updateDom', function () {
     expect($('#container').html()).toEqual('<div class="content">X</div>')
   })
 })
+
+function addJasmineAjaxFormDataSupport () {
+  jasmine.Ajax.addCustomParamParser({
+    test: function (xhr) {
+      return xhr.params instanceof FormData
+    },
+    parse: function (params) {
+      const array = []
+      params.forEach((value, key) => {
+        array.push([key, value])
+      })
+
+      return array
+    }
+  })
+}
diff --git a/tests/assets/js/main.js b/tests/assets/js/main.js
index 5cd6ea8..86d7edf 100644
--- a/tests/assets/js/main.js
+++ b/tests/assets/js/main.js
@@ -7,5 +7,9 @@
  * file that was distributed with this source code.
  */
 
+// Use fetch with jasmine-ajax
+window.fetch = undefined
+require('whatwg-fetch')
+
 const testsContext = require.context('.', true, /\.spec\.js$/)
 testsContext.keys().forEach(testsContext)
diff --git a/tests/assets/js/modal/modal-manager.spec.js b/tests/assets/js/modal/modal-manager.spec.js
index 4193966..747b9da 100644
--- a/tests/assets/js/modal/modal-manager.spec.js
+++ b/tests/assets/js/modal/modal-manager.spec.js
@@ -9,6 +9,7 @@
 
 import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager'
 import $ from 'jquery'
+import wait from './../wait'
 const testEngine = require('./engine/test')
 const bootstrap3Engine = require('@ecommit/crud-bundle/js/modal/engine/bootstrap3')
 
@@ -26,19 +27,23 @@ it('Get engine when not defined', function () {
 describe('Test Modal-manager with spy engine', function () {
   beforeEach(function () {
     this.spyEngine = {
+      opened: false,
       openModal: function (options) {
+        this.opened = true
       },
       closeModal: function (element) {
+        this.opened = false
       }
     }
-    spyOn(this.spyEngine, 'openModal')
-    spyOn(this.spyEngine, 'closeModal')
+    spyOn(this.spyEngine, 'openModal').and.callThrough()
+    spyOn(this.spyEngine, 'closeModal').and.callThrough()
 
     modalManager.defineEngine(this.spyEngine)
 
     jasmine.Ajax.install()
-    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+    jasmine.Ajax.stubRequest(/goodRequest/).andReturn({
       status: 200,
+      response: 'OK',
       responseText: 'OK'
     })
   })
@@ -93,46 +98,58 @@ describe('Test Modal-manager with spy engine', function () {
     $(document).off('ec-crud-modal-auto-before', '#linkToTest')
   })
 
-  it('Test auto openRemoteModal - link', function () {
+  it('Test auto openRemoteModal - link', async function () {
     $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
     $('#linkToTest').click()
+    await wait(() => {
+      return this.spyEngine.opened
+    })
 
     expect(this.spyEngine.openModal).toHaveBeenCalled()
     expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
   })
 
-  it('Test auto openRemoteModal - link with href', function () {
+  it('Test auto openRemoteModal - link with href', async function () {
     $('body').append('<a href="/goodRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content">Go !</a>')
 
     $('#linkToTest').click()
+    await wait(() => {
+      return this.spyEngine.opened
+    })
 
     expect(this.spyEngine.openModal).toHaveBeenCalled()
     expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
   })
 
-  it('Test auto openRemoteModal - link - prioriry url attr', function () {
+  it('Test auto openRemoteModal - link - prioriry url attr', async function () {
     $('body').append('<a href="/badRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
     $('#linkToTest').click()
+    await wait(() => {
+      return this.spyEngine.opened
+    })
 
     expect(this.spyEngine.openModal).toHaveBeenCalled()
     expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
   })
 
-  it('Test auto openRemoteModal - link - canceled', function () {
+  it('Test auto openRemoteModal - link - canceled', async function () {
     $(document).on('ec-crud-remote-modal-auto-before', '#linkToTest', function (event) {
       event.preventDefault()
     })
     $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
     $('#linkToTest').click()
+    await wait(() => {
+      return this.spyEngine.opened
+    }, 500)
 
     expect(this.spyEngine.openModal).not.toHaveBeenCalled()
     expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
@@ -141,24 +158,30 @@ describe('Test Modal-manager with spy engine', function () {
     $(document).off('ec-crud-remote-modal-auto-before', '#linkToTest')
   })
 
-  it('Test auto openRemoteModal - button', function () {
+  it('Test auto openRemoteModal - button', async function () {
     $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
 
     $('#buttonToTest').click()
+    await wait(() => {
+      return this.spyEngine.opened
+    })
 
     expect(this.spyEngine.openModal).toHaveBeenCalled()
     expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
-    expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
   })
 
-  it('Test auto openRemoteModal - button - canceled', function () {
+  it('Test auto openRemoteModal - button - canceled', async function () {
     $(document).on('ec-crud-remote-modal-auto-before', '#buttonToTest', function (event) {
       event.preventDefault()
     })
     $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
 
     $('#buttonToTest').click()
+    await wait(() => {
+      return this.spyEngine.opened
+    }, 500)
 
     expect(this.spyEngine.openModal).not.toHaveBeenCalled()
     expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
@@ -174,12 +197,14 @@ describe('Test Modal-manager with test engine', function () {
     $('body').append('<div id="test-modal"><div class="content"></div></div>')
 
     jasmine.Ajax.install()
-    jasmine.Ajax.stubRequest('/goodRequest').andReturn({
+    jasmine.Ajax.stubRequest(/goodRequest/).andReturn({
       status: 200,
+      response: 'OK',
       responseText: 'OK'
     })
-    jasmine.Ajax.stubRequest('/error404').andReturn({
+    jasmine.Ajax.stubRequest(/error404/).andReturn({
       status: 404,
+      response: 'Page not found !',
       responseText: 'Page not found !'
     })
   })
@@ -199,20 +224,27 @@ describe('Test Modal-manager with test engine', function () {
       expect(modalManager.getEngine()).toEqual(bootstrap3Engine)
     })
 
-    it('Test openModal with onOpen and onClose options', function () {
+    it('Test openModal with onOpen and onClose options', async function () {
       const callbackOpen = jasmine.createSpy('open')
       const callbackClose = jasmine.createSpy('close')
+      let opened = false
 
       modalManager.openModal({
         element: '#test-modal',
         onOpen: function (element) {
           callbackOpen(element)
+          opened = true
         },
         onClose: function (element) {
           callbackClose(element)
+          opened = false
         }
       })
 
+      await wait(() => {
+        return opened
+      })
+
       expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'))
       expect(callbackClose).not.toHaveBeenCalled()
 
@@ -224,7 +256,7 @@ describe('Test Modal-manager with test engine', function () {
   })
 
   describe('Test Modal-manager.openRemoteModal', function () {
-    it('Test openRemoteModal', function () {
+    it('Test openRemoteModal', async function () {
       const callbackOpen = jasmine.createSpy('open')
       const callbackClose = jasmine.createSpy('close')
 
@@ -240,9 +272,13 @@ describe('Test Modal-manager with test engine', function () {
         }
       })
 
+      await wait(() => {
+        return $('#test-modal .content').text().length > 0
+      })
+
       expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'))
       expect(callbackClose).not.toHaveBeenCalled()
-      expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+      expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
       expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
       expect($('#test-modal .content').html()).toBe('OK')
     })
@@ -277,7 +313,7 @@ describe('Test Modal-manager with test engine', function () {
       expect(jasmine.Ajax.requests.mostRecent()).toBeUndefined()
     })
 
-    it('Test openRemoteModal with ajaxOptions.onSuccess', function () {
+    it('Test openRemoteModal with ajaxOptions.onSuccess', async function () {
       const callbackOpen = jasmine.createSpy('open')
       const callbackClose = jasmine.createSpy('close')
       const callbackSuccess1 = jasmine.createSpy('success1')
@@ -311,16 +347,20 @@ describe('Test Modal-manager with test engine', function () {
         }
       })
 
+      await wait(() => {
+        return $('#test-modal .content').text().length > 0
+      })
+
       expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'))
       expect(callbackSuccess1).toHaveBeenCalledBefore(callbackOpen)
       expect(callbackOpen).toHaveBeenCalledBefore(callbackSuccess2)
       expect(callbackClose).not.toHaveBeenCalled()
-      expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+      expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
       expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
       expect($('#test-modal .content').html()).toBe('OK')
     })
 
-    it('Test openRemoteModal with method option', function () {
+    it('Test openRemoteModal with method option', async function () {
       const callbackOpen = jasmine.createSpy('open')
       const callbackClose = jasmine.createSpy('close')
 
@@ -337,14 +377,18 @@ describe('Test Modal-manager with test engine', function () {
         method: 'PUT'
       })
 
+      await wait(() => {
+        return $('#test-modal .content').text().length > 0
+      })
+
       expect(callbackOpen).toHaveBeenCalledWith($('#test-modal'))
       expect(callbackClose).not.toHaveBeenCalled()
-      expect(jasmine.Ajax.requests.mostRecent().url).toBe('/goodRequest')
+      expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
       expect(jasmine.Ajax.requests.mostRecent().method).toBe('PUT')
       expect($('#test-modal .content').html()).toBe('OK')
     })
 
-    it('Test openRemoteModal with bad request', function () {
+    it('Test openRemoteModal with bad request', async function () {
       const callbackOpen = jasmine.createSpy('open')
       const callbackClose = jasmine.createSpy('close')
 
@@ -360,9 +404,13 @@ describe('Test Modal-manager with test engine', function () {
         }
       })
 
+      await wait(() => {
+        return false
+      }, 500)
+
       expect(callbackOpen).not.toHaveBeenCalled()
       expect(callbackClose).not.toHaveBeenCalled()
-      expect(jasmine.Ajax.requests.mostRecent().url).toBe('/error404')
+      expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/error404')
       expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
       expect($('#test-modal .content').html()).toBe('')
     })
diff --git a/tests/assets/js/wait.js b/tests/assets/js/wait.js
new file mode 100644
index 0000000..f148ec9
--- /dev/null
+++ b/tests/assets/js/wait.js
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+export default function (stopCondition, timeout = 10000) {
+  const dateTimeout = Date.now() + timeout
+
+  return new Promise(resolve => {
+    testCondition(stopCondition, dateTimeout, resolve)
+  })
+}
+
+function testCondition (stopCondition, dateTimeout, resolve) {
+  if (Date.now() > dateTimeout) {
+    resolve('timeout')
+
+    return
+  }
+
+  if (stopCondition()) {
+    resolve('ok')
+
+    return
+  }
+
+  setTimeout(() => {
+    testCondition(stopCondition, dateTimeout, resolve)
+  }, 1000)
+}

From c52048e0b2ebaefe2264da668d230af7b3ca7311 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 28 Dec 2022 17:28:25 +0100
Subject: [PATCH 198/264] Fix install.md

---
 doc/install.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/install.md b/doc/install.md
index c128019..8bb0425 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -12,6 +12,8 @@ Prérequis :
   * D'utiliser un [polyfill pour FormData](https://github.com/jimmywarting/FormData)
 * Un gestionnaire de thème chargé par Webpack Encore parmi :
     * Bootstrap 3
+    * Bootstrap 4
+    * Bootstrap 5
     * Votre thème personnalisé (créer un thème Twig qui hérite `@EcommitCrud/Theme/base.html.twig`)
 * Un gestionnaire d'icones chargé par Webpack Encore parmi :
     * Fontawesome 4

From 726df5d48cb0fb729b3cab8411e1871c5f075100 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 29 Dec 2022 11:30:14 +0100
Subject: [PATCH 199/264] Remove jquery dependency (except for tests)

---
 assets/js/ajax.js                           | 136 +++++++++-----
 assets/js/callback.js                       |   7 +-
 assets/js/crud.js                           | 149 ++++++++++------
 assets/js/modal/engine/bootstrap5.js        |  22 ++-
 assets/js/modal/engine/empty.js             |  18 ++
 assets/js/modal/modal-manager.js            |  97 ++++++----
 assets/js/options-resolver.js               |  66 ++++++-
 doc/install.md                              |   2 -
 doc/references/ajax.md                      |  18 +-
 package.json                                |   4 +-
 tests/Functional/App/assets/js/app.js       |   2 +-
 tests/assets/js/ajax.spec.js                | 186 +++++++++++++++++---
 tests/assets/js/modal/modal-manager.spec.js |  38 ++--
 tests/assets/js/options-resolver.spec.js    | 122 ++++++++++++-
 webpack-encore-config.js                    |   1 -
 15 files changed, 652 insertions(+), 216 deletions(-)
 create mode 100644 assets/js/modal/engine/empty.js

diff --git a/assets/js/ajax.js b/assets/js/ajax.js
index 8b6b808..c3aea7d 100644
--- a/assets/js/ajax.js
+++ b/assets/js/ajax.js
@@ -7,44 +7,73 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery'
 import * as optionsResolver from './options-resolver'
 import runCallback from './callback'
 
-$(function () {
-  $(document).on('click', '.ec-crud-ajax-click-auto', function (event) {
-    event.preventDefault()
-    const eventBefore = $.Event('ec-crud-ajax-click-auto-before')
-    $(this).trigger(eventBefore)
-    if (eventBefore.isDefaultPrevented()) {
-      return
+const ready = (callback) => {
+  if (document.readyState !== 'loading') callback()
+  else document.addEventListener('DOMContentLoaded', callback)
+}
+
+ready(function () {
+  document.addEventListener('click', function (event) {
+    if (event.target.matches('.ec-crud-ajax-click-auto')) {
+      onClickAuto(event)
     }
 
-    click(this).catch((error) => console.error(error))
+    if (event.target.matches('a.ec-crud-ajax-link-auto')) {
+      onClickLinkAuto(event)
+    }
   })
 
-  $(document).on('click', 'a.ec-crud-ajax-link-auto', function (event) {
-    event.preventDefault()
-    const eventBefore = $.Event('ec-crud-ajax-link-auto-before')
-    $(this).trigger(eventBefore)
-    if (eventBefore.isDefaultPrevented()) {
-      return
+  document.addEventListener('submit', function (event) {
+    if (event.target.matches('form.ec-crud-ajax-form-auto')) {
+      onSubmitFormAuto(event)
     }
+  })
+})
 
-    link(this).catch((error) => console.error(error))
+function onClickAuto (event) {
+  event.preventDefault()
+  const eventBefore = new CustomEvent('ec-crud-ajax-click-auto-before', {
+    bubbles: true,
+    cancelable: true
   })
+  event.target.dispatchEvent(eventBefore)
+  if (eventBefore.defaultPrevented) {
+    return
+  }
 
-  $(document).on('submit', 'form.ec-crud-ajax-form-auto', function (event) {
-    event.preventDefault()
-    const eventBefore = $.Event('ec-crud-ajax-form-auto-before')
-    $(this).trigger(eventBefore)
-    if (eventBefore.isDefaultPrevented()) {
-      return
-    }
+  click(event.target).catch((error) => console.error(error))
+}
 
-    sendForm(this).catch((error) => console.error(error))
+function onClickLinkAuto (event) {
+  event.preventDefault()
+  const eventBefore = new CustomEvent('ec-crud-ajax-link-auto-before', {
+    bubbles: true,
+    cancelable: true
   })
-})
+  event.target.dispatchEvent(eventBefore)
+  if (eventBefore.defaultPrevented) {
+    return
+  }
+
+  link(event.target).catch((error) => console.error(error))
+}
+
+function onSubmitFormAuto (event) {
+  event.preventDefault()
+  const eventBefore = new CustomEvent('ec-crud-ajax-form-auto-before', {
+    bubbles: true,
+    cancelable: true
+  })
+  event.target.dispatchEvent(eventBefore)
+  if (eventBefore.defaultPrevented) {
+    return
+  }
+
+  sendForm(event.target).catch((error) => console.error(error))
+}
 
 export function sendRequest (options) {
   const eventBeginning = new CustomEvent('ec-crud-ajax', {
@@ -145,7 +174,7 @@ export function sendRequest (options) {
     })
   }
 
-  fetchOptions = $.extend(fetchOptions, options.options)
+  fetchOptions = optionsResolver.extend(fetchOptions, options.options)
 
   const fetchPromise = fetch(options.urlResolved, fetchOptions)
   const ajaxPromise = new Promise((resolve, reject) => {
@@ -214,11 +243,12 @@ export function click (element, options) {
 }
 
 export function link (link, options) {
+  link = optionsResolver.getElement(link)
   // Options in data-* override options argument
   // Option argument override href
   options = optionsResolver.resolve(
     {
-      url: $(link).attr('href')
+      url: link.getAttribute('href')
     },
     optionsResolver.resolve(
       options,
@@ -230,13 +260,14 @@ export function link (link, options) {
 }
 
 export function sendForm (form, options) {
+  form = optionsResolver.getElement(form)
   // Options in data-* override options argument
   // Option argument override action, method and data form
   options = optionsResolver.resolve(
     {
-      url: $(form).attr('action'),
-      method: $(form).attr('method'),
-      body: new FormData($(form).get(0))
+      url: form.getAttribute('action'),
+      method: form.getAttribute('method'),
+      body: new FormData(form)
     },
     optionsResolver.resolve(
       options,
@@ -248,40 +279,49 @@ export function sendForm (form, options) {
 }
 
 export function updateDom (element, updateMode, content) {
-  const eventBefore = $.Event('ec-crud-ajax-update-dom-before', {
-    element: element,
-    updateMode: updateMode,
-    content: content
+  const originElement = element
+  element = optionsResolver.getElement(element)
+  const eventBefore = new CustomEvent('ec-crud-ajax-update-dom-before', {
+    bubbles: true,
+    cancelable: true,
+    detail: {
+      element: originElement,
+      updateMode: updateMode,
+      content: content
+    }
   })
-  $(element).trigger(eventBefore)
-  if (eventBefore.isDefaultPrevented()) {
+  element.dispatchEvent(eventBefore)
+  if (eventBefore.defaultPrevented) {
     return
   }
-  updateMode = eventBefore.updateMode
-  content = eventBefore.content
+  updateMode = eventBefore.detail.updateMode
+  content = eventBefore.detail.content
 
   if (updateMode === 'update') {
-    $(element).html(content)
+    element.innerHTML = content
   } else if (updateMode === 'before') {
-    $(element).before(content)
+    element.outerHTML = content + element.outerHTML
   } else if (updateMode === 'after') {
-    $(element).after(content)
+    element.outerHTML = element.outerHTML + content
   } else if (updateMode === 'prepend') {
-    $(element).prepend(content)
+    element.innerHTML = content + element.innerHTML
   } else if (updateMode === 'append') {
-    $(element).append(content)
+    element.innerHTML = element.innerHTML + content
   } else {
     console.error('Bad updateMode: ' + updateMode)
 
     return
   }
 
-  const eventAfter = $.Event('ec-crud-ajax-update-dom-after', {
-    element: element,
-    updateMode: updateMode,
-    content: content
+  const eventAfter = new CustomEvent('ec-crud-ajax-update-dom-after', {
+    bubbles: true,
+    detail: {
+      element: originElement,
+      updateMode: updateMode,
+      content: content
+    }
   })
-  $(element).trigger(eventAfter)
+  element.dispatchEvent(eventAfter)
 }
 
 function resolveUrl (options) {
diff --git a/assets/js/callback.js b/assets/js/callback.js
index 0b32719..14fa7e3 100644
--- a/assets/js/callback.js
+++ b/assets/js/callback.js
@@ -7,7 +7,6 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery'
 import * as callbackManager from './callback-manager'
 
 export default function (callbacks, ...args) {
@@ -24,7 +23,7 @@ export default function (callbacks, ...args) {
   }
 
   const newCallbacks = []
-  $.each(callbacks, function (key, value) {
+  callbacks.forEach((value) => {
     addCallbacksToStack(value, newCallbacks)
   })
 
@@ -36,7 +35,7 @@ export default function (callbacks, ...args) {
     return 1
   })
 
-  $.each(newCallbacks, function (key, value) {
+  newCallbacks.forEach((value) => {
     processCallback(value.callback, args)
   })
 }
@@ -48,7 +47,7 @@ function addCallbacksToStack (value, stack) {
       priority: 0
     })
   } else if (Array === value.constructor) {
-    $.each(value, function (key, subValue) {
+    value.forEach((subValue) => {
       addCallbacksToStack(subValue, stack)
     })
   } else if (undefined !== value.callback) {
diff --git a/assets/js/crud.js b/assets/js/crud.js
index d257798..7f94e66 100644
--- a/assets/js/crud.js
+++ b/assets/js/crud.js
@@ -7,117 +7,162 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery'
 import { click, sendForm, sendRequest, updateDom } from './ajax'
 import { closeModal, openModal } from './modal/modal-manager'
+import { getElement } from './options-resolver'
 
-$(document).on('submit', 'form.ec-crud-search-form', function (event) {
+const ready = (callback) => {
+  if (document.readyState !== 'loading') callback()
+  else document.addEventListener('DOMContentLoaded', callback)
+}
+
+ready(function () {
+  document.addEventListener('submit', function (event) {
+    if (event.target.matches('form.ec-crud-search-form')) {
+      onSubmitCrudSearchForm(event)
+    }
+
+    if (event.target.matches('.ec-crud-display-settings form')) {
+      onCrudDisplaySettingsSubmit(event)
+    }
+  })
+
+  document.addEventListener('click', function (event) {
+    if (event.target.matches('button.ec-crud-search-reset')) {
+      onResetCrudSearchForm(event)
+    }
+
+    if (event.target.matches('button.ec-crud-display-settings-button')) {
+      onCrudDisplaySettingsOpen(event)
+    }
+
+    if (event.target.matches('button.ec-crud-display-settings-check-all-columns')) {
+      onCrudDisplaySettingsCheckAllColumns(event)
+    }
+
+    if (event.target.matches('button.ec-crud-display-settings-uncheck-all-columns')) {
+      onCrudDisplaySettingsUncheckAllColumns(event)
+    }
+
+    if (event.target.matches('button.ec-crud-display-settings-reset')) {
+      onCrudDisplaySettingsReset(event)
+    }
+  })
+})
+
+function onSubmitCrudSearchForm (event) {
   event.preventDefault()
 
-  const searchId = $(this).attr('data-crud-search-id')
-  const listId = $(this).attr('data-crud-list-id')
+  const form = event.target
+  const searchContainer = getElement('#' + form.getAttribute('data-crud-search-id'))
+  const listContainer = getElement('#' + form.getAttribute('data-crud-list-id'))
 
-  sendForm(this, {
+  sendForm(form, {
     responseDataType: 'json',
     onSuccess: function (json, response) {
-      updateDom($('#' + searchId), 'update', json.render_search)
-      updateDom($('#' + listId), 'update', json.render_list)
+      updateDom(searchContainer, 'update', json.render_search)
+      updateDom(listContainer, 'update', json.render_list)
     }
   })
-})
+}
 
-$(document).on('click', 'button.ec-crud-search-reset', function (event) {
-  const searchId = $(this).attr('data-crud-search-id')
-  const listId = $(this).attr('data-crud-list-id')
+function onResetCrudSearchForm (event) {
+  const button = event.target
+  const searchContainer = getElement('#' + button.getAttribute('data-crud-search-id'))
+  const listContainer = getElement('#' + button.getAttribute('data-crud-list-id'))
 
-  click(this, {
+  click(button, {
     responseDataType: 'json',
     onSuccess: function (json, response) {
-      updateDom($('#' + searchId), 'update', json.render_search)
-      updateDom($('#' + listId), 'update', json.render_list)
+      updateDom(searchContainer, 'update', json.render_search)
+      updateDom(listContainer, 'update', json.render_list)
     }
   })
-})
+}
 
-$(document).on('click', 'button.ec-crud-display-settings-button', function (event) {
-  const displaySettingsContainerId = $(this).attr('data-display-settings')
-  const isModal = $('#' + displaySettingsContainerId).attr('data-modal') === '1'
+function onCrudDisplaySettingsOpen (event) {
+  const button = event.target
+  const displaySettingsContainer = getElement('#' + button.getAttribute('data-display-settings'))
+  const isModal = displaySettingsContainer.getAttribute('data-modal') === '1'
 
   if (isModal) {
-    openDisplaySettings($('#' + displaySettingsContainerId))
+    openDisplaySettings(displaySettingsContainer)
 
     return
   }
 
-  if ($('#' + displaySettingsContainerId).is(':visible')) {
-    closeDisplaySettings($('#' + displaySettingsContainerId))
+  if (displaySettingsContainer.offsetWidth > 0 && displaySettingsContainer.offsetHeight > 0) { // is visible ?
+    closeDisplaySettings(displaySettingsContainer)
   } else {
-    openDisplaySettings($('#' + displaySettingsContainerId))
+    openDisplaySettings(displaySettingsContainer)
   }
-})
+}
 
-$(document).on('click', 'button.ec-crud-display-settings-check-all-columns', function (event) {
-  $(this).parents('div.ec-crud-display-settings').find('input[type=checkbox]').each(function () {
-    $(this).prop('checked', true)
+function onCrudDisplaySettingsCheckAllColumns (event) {
+  const button = event.target
+  button.parentNode.closest('div.ec-crud-display-settings').querySelectorAll('input[type=checkbox]').forEach(checkbox => {
+    checkbox.checked = true
   })
-})
+}
 
-$(document).on('click', 'button.ec-crud-display-settings-uncheck-all-columns', function (event) {
-  $(this).parents('div.ec-crud-display-settings').find('input[type=checkbox]').each(function () {
-    $(this).prop('checked', false)
+function onCrudDisplaySettingsUncheckAllColumns (event) {
+  const button = event.target
+  button.parentNode.closest('div.ec-crud-display-settings').querySelectorAll('input[type=checkbox]').forEach(checkbox => {
+    checkbox.checked = false
   })
-})
+}
 
-$(document).on('click', 'button.ec-crud-display-settings-reset', function (event) {
-  const displaySettingsContainer = $(this).parents('div.ec-crud-display-settings')
-  const displaySettingsContainerId = $(displaySettingsContainer).attr('id')
-  const listId = $(displaySettingsContainer).attr('data-crud-list-id')
+function onCrudDisplaySettingsReset (event) {
+  const button = event.target
+  const displaySettingsContainer = button.parentNode.closest('div.ec-crud-display-settings')
+  const listContainer = getElement('#' + displaySettingsContainer.getAttribute('data-crud-list-id'))
 
-  closeDisplaySettings($('#' + displaySettingsContainerId))
+  closeDisplaySettings(displaySettingsContainer)
 
   sendRequest({
-    url: $(this).attr('data-reset-url'),
-    update: $('#' + listId)
+    url: button.getAttribute('data-reset-url'),
+    update: listContainer
   })
-})
+}
 
-$(document).on('submit', '.ec-crud-display-settings form', function (event) {
+function onCrudDisplaySettingsSubmit (event) {
   event.preventDefault()
+  const form = event.target
 
-  const displaySettingsContainer = $(this).parents('div.ec-crud-display-settings')
-  const displaySettingsContainerId = $(displaySettingsContainer).attr('id')
-  const listId = $(displaySettingsContainer).attr('data-crud-list-id')
+  const displaySettingsContainer = form.parentNode.closest('div.ec-crud-display-settings')
+  const listContainer = getElement('#' + displaySettingsContainer.getAttribute('data-crud-list-id'))
 
-  closeDisplaySettings($('#' + displaySettingsContainerId))
+  closeDisplaySettings(displaySettingsContainer)
 
-  sendForm(this, {
+  sendForm(form, {
     responseDataType: 'json',
     onSuccess: function (json, response) {
-      updateDom($('#' + listId), 'update', json.render_list)
+      const displaySettingsContainerId = displaySettingsContainer.getAttribute('id') // Backup before deletion (by updateDom)
+      updateDom(listContainer, 'update', json.render_list)
       if (!json.form_is_valid) {
-        openDisplaySettings($('#' + displaySettingsContainerId))
+        openDisplaySettings(getElement('#' + displaySettingsContainerId))
       }
     }
   })
-})
+}
 
 function openDisplaySettings (displaySettingsContainer) {
-  const isModal = $(displaySettingsContainer).attr('data-modal') === '1'
+  const isModal = displaySettingsContainer.getAttribute('data-modal') === '1'
   if (isModal) {
     openModal({
       element: displaySettingsContainer
     })
   } else {
-    $(displaySettingsContainer).show()
+    displaySettingsContainer.style.display = 'block'
   }
 }
 
 function closeDisplaySettings (displaySettingsContainer) {
-  const isModal = $(displaySettingsContainer).attr('data-modal') === '1'
+  const isModal = displaySettingsContainer.getAttribute('data-modal') === '1'
 
   if (isModal) {
     closeModal(displaySettingsContainer)
   } else {
-    $(displaySettingsContainer).hide()
+    displaySettingsContainer.style.display = 'none'
   }
 }
diff --git a/assets/js/modal/engine/bootstrap5.js b/assets/js/modal/engine/bootstrap5.js
index 01c0c39..08e56b2 100644
--- a/assets/js/modal/engine/bootstrap5.js
+++ b/assets/js/modal/engine/bootstrap5.js
@@ -7,30 +7,28 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery'
 import { Modal } from 'bootstrap'
 import runCallback from '../../callback'
+import { getElement } from '../../options-resolver'
 
 export function openModal (options) {
-  // Suppression des événements
-  $(options.element).off('shown.bs.modal')
-  $(options.element).off('hide.bs.modal')
+  const element = getElement(options.element)
 
-  $(options.element).on('shown.bs.modal', function (e) {
-    runCallback(options.onOpen, $(options.element))
-  })
+  element.addEventListener('shown.bs.modal', e => {
+    runCallback(options.onOpen, element)
+  }, { once: true })
 
-  $(options.element).on('hide.bs.modal', function (e) {
-    runCallback(options.onClose, $(options.element))
-  })
+  element.addEventListener('hide.bs.modal', e => {
+    runCallback(options.onClose, element)
+  }, { once: true })
 
-  const modal = new Modal($(options.element), {
+  const modal = new Modal(element, {
     focus: true
   })
   modal.show()
 }
 
 export function closeModal (element) {
-  const modal = Modal.getInstance($(element))
+  const modal = Modal.getInstance(getElement(element))
   modal.hide()
 }
diff --git a/assets/js/modal/engine/empty.js b/assets/js/modal/engine/empty.js
new file mode 100644
index 0000000..8865495
--- /dev/null
+++ b/assets/js/modal/engine/empty.js
@@ -0,0 +1,18 @@
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import runCallback from '../../callback'
+
+export function openModal (options) {
+  runCallback(options.onOpen, options.element)
+}
+
+export function closeModal (element) {
+  runCallback(element)
+}
diff --git a/assets/js/modal/modal-manager.js b/assets/js/modal/modal-manager.js
index f5f9123..ac3de0b 100644
--- a/assets/js/modal/modal-manager.js
+++ b/assets/js/modal/modal-manager.js
@@ -8,7 +8,6 @@
  */
 
 import * as optionsResolver from '../options-resolver'
-import $ from 'jquery'
 import * as ajax from '../ajax'
 
 const ENGINE_KEY = Symbol.for('ecommit.crudbundle.modalengine')
@@ -17,48 +16,76 @@ if (globalSymbols.indexOf(ENGINE_KEY) === -1) {
   global[ENGINE_KEY] = null
 }
 
-$(function () {
-  $(document).on('click', '.ec-crud-modal-auto', function (event) {
-    event.preventDefault()
-    const eventBefore = $.Event('ec-crud-modal-auto-before')
-    $(this).trigger(eventBefore)
-    if (eventBefore.isDefaultPrevented()) {
-      return
+const ready = (callback) => {
+  if (document.readyState !== 'loading') callback()
+  else document.addEventListener('DOMContentLoaded', callback)
+}
+
+ready(function () {
+  document.addEventListener('click', function (event) {
+    if (event.target.matches('.ec-crud-modal-auto')) {
+      onClickModalAuto(event)
     }
 
-    openModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'))
-  })
+    if (event.target.matches('button.ec-crud-remote-modal-auto')) {
+      onClickButtonRemoteModalAuto(event)
+    }
 
-  $(document).on('click', 'button.ec-crud-remote-modal-auto', function (event) {
-    event.preventDefault()
-    const eventBefore = $.Event('ec-crud-remote-modal-auto-before')
-    $(this).trigger(eventBefore)
-    if (eventBefore.isDefaultPrevented()) {
-      return
+    if (event.target.matches('a.ec-crud-remote-modal-auto')) {
+      onClickLinkRemoteModalAuto(event)
     }
+  })
+})
 
-    openRemoteModal(optionsResolver.getDataAttributes(this, 'ecCrudModal'))
+function onClickModalAuto (event) {
+  event.preventDefault()
+  const eventBefore = new CustomEvent('ec-crud-modal-auto-before', {
+    bubbles: true,
+    cancelable: true
   })
+  event.target.dispatchEvent(eventBefore)
+  if (eventBefore.defaultPrevented) {
+    return
+  }
 
-  $(document).on('click', 'a.ec-crud-remote-modal-auto', function (event) {
-    event.preventDefault()
-    const eventBefore = $.Event('ec-crud-remote-modal-auto-before')
-    $(this).trigger(eventBefore)
-    if (eventBefore.isDefaultPrevented()) {
-      return
-    }
+  openModal(optionsResolver.getDataAttributes(event.target, 'ecCrudModal'))
+}
+
+function onClickButtonRemoteModalAuto (event) {
+  event.preventDefault()
+  const eventBefore = new CustomEvent('ec-crud-remote-modal-auto-before', {
+    bubbles: true,
+    cancelable: true
+  })
+  event.target.dispatchEvent(eventBefore)
+  if (eventBefore.defaultPrevented) {
+    return
+  }
 
-    // Options in data-* override href
-    const options = optionsResolver.resolve(
-      {
-        url: $(this).attr('href')
-      },
-      optionsResolver.getDataAttributes(this, 'ecCrudModal')
-    )
+  openRemoteModal(optionsResolver.getDataAttributes(event.target, 'ecCrudModal'))
+}
 
-    openRemoteModal(options)
+function onClickLinkRemoteModalAuto (event) {
+  event.preventDefault()
+  const eventBefore = new CustomEvent('ec-crud-remote-modal-auto-before', {
+    bubbles: true,
+    cancelable: true
   })
-})
+  event.target.dispatchEvent(eventBefore)
+  if (eventBefore.defaultPrevented) {
+    return
+  }
+
+  // Options in data-* override href
+  const options = optionsResolver.resolve(
+    {
+      url: event.target.getAttribute('href')
+    },
+    optionsResolver.getDataAttributes(event.target, 'ecCrudModal')
+  )
+
+  openRemoteModal(options)
+}
 
 export function defineEngine (newEngine) {
   global[ENGINE_KEY] = newEngine
@@ -107,8 +134,8 @@ export function openRemoteModal (options) {
     options
   )
 
-  let hasError = false
-  $.each(['url', 'element', 'elementContent', 'method'], function (index, value) {
+  let hasError = false;
+  ['url', 'element', 'elementContent', 'method'].forEach((value) => {
     if (optionsResolver.isNotBlank(options[value]) === false) {
       console.error('Value required: ' + value)
       hasError = true
diff --git a/assets/js/options-resolver.js b/assets/js/options-resolver.js
index b96e928..6425220 100644
--- a/assets/js/options-resolver.js
+++ b/assets/js/options-resolver.js
@@ -7,29 +7,56 @@
  * file that was distributed with this source code.
  */
 
-import $ from 'jquery'
-
 export function resolve (defaultOptions, options) {
   Object.keys(options).forEach(key => options[key] === undefined ? delete options[key] : {})
 
-  return $.extend({}, defaultOptions, options)
+  return extend({}, defaultOptions, options)
 }
 
 export function getDataAttributes (element, prefix) {
   const prefixLength = prefix.length
   const attributes = {}
 
-  $.each($(element).data(), function (index, value) {
+  element = getElement(element)
+  if (!element) {
+    return attributes
+  }
+
+  Object.entries(element.dataset).forEach((property) => {
+    const index = property[0]
+    const value = property[1]
     if (index.length > prefixLength && index.substr(0, prefixLength) === prefix) {
       let newIndex = index.substr(prefixLength)
       newIndex = newIndex.charAt(0).toLowerCase() + newIndex.slice(1)
-      attributes[newIndex] = value
+      attributes[newIndex] = transformDataValue(value)
     }
   })
 
   return attributes
 }
 
+function transformDataValue (value) {
+  if (value.length === 0) {
+    return null
+  }
+
+  if (/^\d+$/.test(value)) {
+    return parseInt(value, 10)
+  } else if (/^true$/i.test(value)) {
+    return true
+  } else if (/^false$/i.test(value)) {
+    return false
+  } else if (/^[[{]/i.test(value)) {
+    try {
+      return JSON.parse(value)
+    } catch (e) {
+      return value
+    }
+  }
+
+  return value
+}
+
 export function isNotBlank (value) {
   if (undefined === value || value === null || value.length === 0) {
     return false
@@ -37,3 +64,32 @@ export function isNotBlank (value) {
 
   return true
 }
+
+export function getElement (element) {
+  if (element === null) {
+    return null
+  } else if (typeof element === 'string' || element instanceof String) {
+    return document.querySelector(element)
+  } else if (element instanceof Element) {
+    return element
+  } else if (typeof element === 'object' && element.jquery !== undefined) {
+    const elementByJquery = element.get(0)
+    if (elementByJquery instanceof Element) {
+      return elementByJquery
+    }
+  }
+
+  return null
+}
+
+export function extend () {
+  for (let i = 1; i < arguments.length; i++) {
+    for (const key in arguments[i]) {
+      if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
+        arguments[0][key] = arguments[i][key]
+      }
+    }
+  }
+
+  return arguments[0]
+}
diff --git a/doc/install.md b/doc/install.md
index 8bb0425..528c6e7 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -5,11 +5,9 @@ Prérequis :
 * Entité utilisateur avec Doctrine
 * Yarn
 * Webpack Encore
-* jQuery
 * Pour une compatibilité avec un maximum de navigateurs Internet, il est conseillé :
   * De configurer Webpack Encore pour activer Babel et core-js
   * D'utiliser un [polyfill pour Fetch](https://github.com/github/fetch)
-  * D'utiliser un [polyfill pour FormData](https://github.com/jimmywarting/FormData)
 * Un gestionnaire de thème chargé par Webpack Encore parmi :
     * Bootstrap 3
     * Bootstrap 4
diff --git a/doc/references/ajax.md b/doc/references/ajax.md
index f2c365d..1769965 100644
--- a/doc/references/ajax.md
+++ b/doc/references/ajax.md
@@ -200,10 +200,14 @@ ajax.updateDom($('#myDiv'), 'update', 'Hello world');
 
 Méthodes disponibles pour la mise à jour :
 
-| Méthode | Description |
-| ------- | ----------- |
-| update | Utilise le fonction  [`html` de jQuery](https://api.jquery.com/html/) |
-| before | Utilise le fonction  [`before` de jQuery](https://api.jquery.com/before/) |
-| after | Utilise le fonction  [`after` de jQuery](https://api.jquery.com/after/) |
-| prepend | Utilise le fonction  [`prepend` de jQuery](https://api.jquery.com/prepend/) |
-| append | Utilise le fonction  [`append` de jQuery](https://api.jquery.com/append/) |
+| Méthode | Description                                                             |
+|---------|-------------------------------------------------------------------------|
+| update  | Modifie le contenu de l'élément par le nouveau contenu                  |
+| before  | Ajoute le nouveau contenu avant l'élément                               |
+| after   | Ajoute le nouveau contenu après l'élément                               |
+| prepend | Modifie le contenu de l'élément en ajoutant le nouveau contenu au début |
+| append  | Modifie le contenu de l'élément en ajoutant le nouveau contenu à la fin |
+
+La mise à jour du DOM utilise la fonction [innerHTML](https://developer.mozilla.org/en-US/docs/Web/API/Element/innerHTML).
+Si le nouveau contenu contient des balises `<script>`, celles-ci ne seront pas exécutées. Cependant, cele ne protège pas
+contre les failles XSS. [En savoir plus](https://developer.mozilla.org/en-US/docs/Web/API/Element/innerHTML#security_considerations)
diff --git a/package.json b/package.json
index 26a770f..9b9cf13 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,4 @@
 {
-  "dependencies": {
-    "jquery": "^3"
-  },
   "devDependencies": {
     "@ecommit/crud-bundle": "link:assets",
     "@symfony/webpack-encore": "^3.0",
@@ -13,6 +10,7 @@
     "eslint-plugin-promise": "^6.0",
     "install": "^0.13.0",
     "jasmine": "^4.0",
+    "jquery": "^3",
     "karma": "^6.0",
     "karma-firefox-launcher": "^2.0",
     "karma-jasmine": "^4.0",
diff --git a/tests/Functional/App/assets/js/app.js b/tests/Functional/App/assets/js/app.js
index 5d6a910..dfd2f6d 100644
--- a/tests/Functional/App/assets/js/app.js
+++ b/tests/Functional/App/assets/js/app.js
@@ -1,5 +1,5 @@
 import '@ecommit/crud-bundle/js/crud';
 import * as modalManager from '@ecommit/crud-bundle/js/modal/modal-manager';
-var modalEngine = require('@ecommit/crud-bundle/js/modal/engine/bootstrap3');
+var modalEngine = require('@ecommit/crud-bundle/js/modal/engine/empty');
 
 modalManager.defineEngine(modalEngine);
diff --git a/tests/assets/js/ajax.spec.js b/tests/assets/js/ajax.spec.js
index caef555..8061da0 100644
--- a/tests/assets/js/ajax.spec.js
+++ b/tests/assets/js/ajax.spec.js
@@ -899,7 +899,7 @@ describe('Test Ajax.sendRequest', function () {
     expect(callbackSuccess).toHaveBeenCalled()
   })
 
-  it('Send request with JS in response', async function () {
+  it('Send request with SCRIPT tag in response', async function () {
     $('body').append('<div id="ajax-result" class="html-test"><div class="content">X</div></div>')
     const callbackSuccess = jasmine.createSpy('success')
 
@@ -914,7 +914,7 @@ describe('Test Ajax.sendRequest', function () {
       update: '#ajax-result .content'
     })
 
-    expect(callbackSuccess).toHaveBeenCalledWith('<div class="content"><div id="subcontent">AFTER</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script></div>')
+    expect(callbackSuccess).toHaveBeenCalledWith('<div class="content"><div id="subcontent">BEFORE</div><script>document.getElementById("subcontent").innerHTML="AFTER"</script></div>')
   })
 
   async function testUpdate (updateMode, expectedContent) {
@@ -959,6 +959,46 @@ describe('Test Ajax.click', function () {
 
     const callbackSuccess = jasmine.createSpy('success')
 
+    const promise = ajax.click('#buttonToTest', {
+      url: '/goodRequest',
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with button and Element', async function () {
+    $('body').append('<button class="html-test" id="buttonToTest">Go !</button>')
+
+    const callbackSuccess = jasmine.createSpy('success')
+
+    const promise = ajax.click(document.querySelector('#buttonToTest'), {
+      url: '/goodRequest',
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with button and jQuery', async function () {
+    $('body').append('<button class="html-test" id="buttonToTest">Go !</button>')
+
+    const callbackSuccess = jasmine.createSpy('success')
+
     const promise = ajax.click($('#buttonToTest'), {
       url: '/goodRequest',
       onSuccess: function (data, response) {
@@ -983,7 +1023,7 @@ describe('Test Ajax.click', function () {
       callbackSuccess()
     })
 
-    await ajax.click($('#buttonToTest'))
+    await ajax.click('#buttonToTest')
 
     expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(callbackSuccess).toHaveBeenCalled()
@@ -1000,7 +1040,7 @@ describe('Test Ajax.click', function () {
       callbackSuccess1()
     })
 
-    await ajax.click($('#buttonToTest'), {
+    await ajax.click('#buttonToTest', {
       url: '/badRequest', // overridden by data-ec-crud-ajax-url
       method: 'GET', // overridden by data-ec-crud-ajax-method
       onSuccess: function (data, response) { // overridden by data-ec-crud-ajax-on-success
@@ -1021,7 +1061,7 @@ describe('Test Ajax.click', function () {
   it('Send auto-request with button', async function () {
     $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="buttonToTest" data-ec-crud-ajax-url="/goodRequest">Go !</a>')
 
-    $('#buttonToTest').click()
+    $('#buttonToTest').get(0).click()
 
     await wait(() => {
       return false
@@ -1036,7 +1076,7 @@ describe('Test Ajax.click', function () {
     })
     $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest">Go !</button>')
 
-    $('#clickToTest').click()
+    $('#clickToTest').get(0).click()
 
     await wait(() => {
       return false
@@ -1054,7 +1094,7 @@ describe('Test Ajax.click', function () {
       options.stop = true
     })
 
-    $('#clickToTest').click()
+    $('#clickToTest').get(0).click()
 
     await wait(() => {
       return false
@@ -1069,7 +1109,7 @@ describe('Test Ajax.click', function () {
     $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="buttonToTest">Go !</a>')
     spyOn(window.console, 'error')
 
-    $('#buttonToTest').click()
+    $('#buttonToTest').get(0).click()
 
     await wait(() => {
       return false
@@ -1102,6 +1142,44 @@ describe('Test Ajax.link', function () {
 
     const callbackSuccess = jasmine.createSpy('success')
 
+    const promise = ajax.link('#linkToTest', {
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with link and Element', async function () {
+    $('body').append('<a href="/goodRequest" class="html-test" id="linkToTest">Go !</a>')
+
+    const callbackSuccess = jasmine.createSpy('success')
+
+    const promise = ajax.link(document.querySelector('#linkToTest'), {
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with link and jQuery', async function () {
+    $('body').append('<a href="/goodRequest" class="html-test" id="linkToTest">Go !</a>')
+
+    const callbackSuccess = jasmine.createSpy('success')
+
     const promise = ajax.link($('#linkToTest'), {
       onSuccess: function (data, response) {
         callbackSuccess()
@@ -1125,7 +1203,7 @@ describe('Test Ajax.link', function () {
       callbackSuccess()
     })
 
-    await ajax.link($('#linkToTest'))
+    await ajax.link('#linkToTest')
 
     expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(callbackSuccess).toHaveBeenCalled()
@@ -1143,7 +1221,7 @@ describe('Test Ajax.link', function () {
       callbackSuccess1()
     })
 
-    await ajax.link($('#linkToTest'), {
+    await ajax.link('#linkToTest', {
       url: '/badRequest', // overridden by data-ec-crud-ajax-url
       method: 'GET', // overridden by data-ec-crud-ajax-method
       onSuccess: function (data, response) { // overridden by data-ec-crud-ajax-on-success
@@ -1164,7 +1242,7 @@ describe('Test Ajax.link', function () {
   it('Send auto-request with link', async function () {
     $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
 
-    $('#linkToTest').click()
+    $('#linkToTest').get(0).click()
 
     await wait(() => {
       return false
@@ -1179,7 +1257,7 @@ describe('Test Ajax.link', function () {
     })
     $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
 
-    $('#linkToTest').click()
+    $('#linkToTest').get(0).click()
 
     await wait(() => {
       return false
@@ -1194,7 +1272,7 @@ describe('Test Ajax.link', function () {
     $('body').append('<a class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
     spyOn(window.console, 'error')
 
-    $('#linkToTest').click()
+    $('#linkToTest').get(0).click()
 
     await wait(() => {
       return false
@@ -1229,6 +1307,52 @@ describe('Test Ajax.form', function () {
 
     const callbackSuccess = jasmine.createSpy('success')
 
+    const promise = ajax.sendForm('#formToTest', {
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with form with Element', async function () {
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    const callbackSuccess = jasmine.createSpy('success')
+
+    const promise = ajax.sendForm(document.querySelector('#formToTest'), {
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
+    expect(callbackSuccess).toHaveBeenCalled()
+  })
+
+  it('Send request with form with jQuery', async function () {
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    const callbackSuccess = jasmine.createSpy('success')
+
     const promise = ajax.sendForm($('#formToTest'), {
       onSuccess: function (data, response) {
         callbackSuccess()
@@ -1253,7 +1377,7 @@ describe('Test Ajax.form', function () {
 
     const callbackSuccess = jasmine.createSpy('success')
 
-    await ajax.sendForm($('#formToTest'), {
+    await ajax.sendForm('#formToTest', {
       onSuccess: function (data, response) {
         callbackSuccess()
       }
@@ -1272,7 +1396,7 @@ describe('Test Ajax.form', function () {
 
     const callbackSuccess = jasmine.createSpy('success')
 
-    await ajax.sendForm($('#formToTest'), {
+    await ajax.sendForm('#formToTest', {
       onSuccess: function (data, response) {
         callbackSuccess()
       }
@@ -1294,7 +1418,7 @@ describe('Test Ajax.form', function () {
       callbackSuccess()
     })
 
-    await ajax.sendForm($('#formToTest'))
+    await ajax.sendForm('#formToTest')
 
     expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
@@ -1316,7 +1440,7 @@ describe('Test Ajax.form', function () {
       callbackSuccess1()
     })
 
-    await ajax.sendForm($('#formToTest'), {
+    await ajax.sendForm('#formToTest', {
       url: '/badRequest', // overridden by data-ec-crud-ajax-url
       method: 'GET', // overridden by data-ec-crud-ajax-method
       onSuccess: function (data, response) { // overridden by data-ec-crud-ajax-on-success
@@ -1336,11 +1460,11 @@ describe('Test Ajax.form', function () {
   })
 
   it('Send auto-request with form', async function () {
-    $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /><button type="submit"></button></form>')
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
-    $('#formToTest').submit()
+    $('#formToTest button[type="submit"]').get(0).click()
 
     await wait(() => {
       return false
@@ -1355,11 +1479,11 @@ describe('Test Ajax.form', function () {
     $(document).on('ec-crud-ajax-form-auto-before', '#formToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /><button type="submit"></button></form>')
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
-    $('#formToTest').submit()
+    $('#formToTest button[type="submit"]').get(0).click()
 
     await wait(() => {
       return false
@@ -1371,10 +1495,10 @@ describe('Test Ajax.form', function () {
   })
 
   it('Send auto-request with form and error', async function () {
-    $('body').append('<form  method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /></form>')
+    $('body').append('<form  method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><button type="submit"></button></form>')
     spyOn(window.console, 'error')
 
-    $('#formToTest').submit()
+    $('#formToTest button[type="submit"]').get(0).click()
 
     await wait(() => {
       return false
@@ -1419,7 +1543,7 @@ describe('Test Ajax.updateDom', function () {
 
   it('Update with "update" mode and ec-crud-ajax-update-dom-before event - change updateMode', function () {
     $(document).on('ec-crud-ajax-update-dom-before', function (event) {
-      event.updateMode = 'append'
+      event.detail.updateMode = 'append'
     })
 
     testUpdateDom('update', '<div class="content">XOK</div>')
@@ -1427,7 +1551,7 @@ describe('Test Ajax.updateDom', function () {
 
   it('Update with "update" mode and ec-crud-ajax-update-dom-before event - change content', function () {
     $(document).on('ec-crud-ajax-update-dom-before', function (event) {
-      event.content = 'NEW OK'
+      event.detail.content = 'NEW OK'
     })
 
     testUpdateDom('update', '<div class="content">NEW OK</div>')
@@ -1443,7 +1567,7 @@ describe('Test Ajax.updateDom', function () {
 
   it('Update with "update" mode and ec-crud-ajax-update-dom-after event', function () {
     $(document).on('ec-crud-ajax-update-dom-after', function (event) {
-      $(event.element).find('.content').html('OK')
+      $(event.detail.element).find('.content').html('OK')
     })
 
     ajax.updateDom('#container .content', 'update', '<div><span class="content"></span></div>')
@@ -1482,6 +1606,16 @@ describe('Test Ajax.updateDom', function () {
     expect(window.console.error).toHaveBeenCalledWith('Bad updateMode: badMode')
     expect($('#container').html()).toEqual('<div class="content">X</div>')
   })
+
+  it('Update with "update" mode and Element', function () {
+    ajax.updateDom(document.querySelector('#container .content'), 'update', 'OK')
+    expect($('#container').html()).toEqual('<div class="content">OK</div>')
+  })
+
+  it('Update with "update" mode and jQuery', function () {
+    ajax.updateDom($('#container .content'), 'update', 'OK')
+    expect($('#container').html()).toEqual('<div class="content">OK</div>')
+  })
 })
 
 function addJasmineAjaxFormDataSupport () {
diff --git a/tests/assets/js/modal/modal-manager.spec.js b/tests/assets/js/modal/modal-manager.spec.js
index 747b9da..bdc8418 100644
--- a/tests/assets/js/modal/modal-manager.spec.js
+++ b/tests/assets/js/modal/modal-manager.spec.js
@@ -26,6 +26,7 @@ it('Get engine when not defined', function () {
 
 describe('Test Modal-manager with spy engine', function () {
   beforeEach(function () {
+    $('body').append('<div id="test-modal"><div class="content"></div></div>')
     this.spyEngine = {
       opened: false,
       openModal: function (options) {
@@ -50,12 +51,13 @@ describe('Test Modal-manager with spy engine', function () {
 
   afterEach(function () {
     $('.html-test').remove()
+    $('#test-modal').remove()
     jasmine.Ajax.uninstall()
   })
 
   it('Test openModal', function () {
     modalManager.openModal({
-      element: '#myId'
+      element: '#test-modal'
     })
 
     expect(this.spyEngine.openModal).toHaveBeenCalled()
@@ -69,16 +71,16 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test closeModal', function () {
-    modalManager.closeModal('#myId')
+    modalManager.closeModal('#test-modal')
 
     expect(this.spyEngine.openModal).not.toHaveBeenCalled()
     expect(this.spyEngine.closeModal).toHaveBeenCalled()
   })
 
   it('Test auto openModal', function () {
-    $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId">Go !</a>')
+    $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal">Go !</a>')
 
-    $('#linkToTest').click()
+    $('#linkToTest').get(0).click()
 
     expect(this.spyEngine.openModal).toHaveBeenCalled()
     expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
@@ -88,9 +90,9 @@ describe('Test Modal-manager with spy engine', function () {
     $(document).on('ec-crud-modal-auto-before', '#linkToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId">Go !</a>')
+    $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal">Go !</a>')
 
-    $('#linkToTest').click()
+    $('#linkToTest').get(0).click()
 
     expect(this.spyEngine.openModal).not.toHaveBeenCalled()
     expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
@@ -99,9 +101,9 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test auto openRemoteModal - link', async function () {
-    $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
+    $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
-    $('#linkToTest').click()
+    $('#linkToTest').get(0).click()
     await wait(() => {
       return this.spyEngine.opened
     })
@@ -113,9 +115,9 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test auto openRemoteModal - link with href', async function () {
-    $('body').append('<a href="/goodRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content">Go !</a>')
+    $('body').append('<a href="/goodRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content">Go !</a>')
 
-    $('#linkToTest').click()
+    $('#linkToTest').get(0).click()
     await wait(() => {
       return this.spyEngine.opened
     })
@@ -127,9 +129,9 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test auto openRemoteModal - link - prioriry url attr', async function () {
-    $('body').append('<a href="/badRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
+    $('body').append('<a href="/badRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
-    $('#linkToTest').click()
+    $('#linkToTest').get(0).click()
     await wait(() => {
       return this.spyEngine.opened
     })
@@ -144,9 +146,9 @@ describe('Test Modal-manager with spy engine', function () {
     $(document).on('ec-crud-remote-modal-auto-before', '#linkToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
+    $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
-    $('#linkToTest').click()
+    $('#linkToTest').get(0).click()
     await wait(() => {
       return this.spyEngine.opened
     }, 500)
@@ -159,9 +161,9 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test auto openRemoteModal - button', async function () {
-    $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
+    $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
 
-    $('#buttonToTest').click()
+    $('#buttonToTest').get(0).click()
     await wait(() => {
       return this.spyEngine.opened
     })
@@ -176,9 +178,9 @@ describe('Test Modal-manager with spy engine', function () {
     $(document).on('ec-crud-remote-modal-auto-before', '#buttonToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#myId" data-ec-crud-modal-element-content="#myId .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
+    $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
 
-    $('#buttonToTest').click()
+    $('#buttonToTest').get(0).click()
     await wait(() => {
       return this.spyEngine.opened
     }, 500)
diff --git a/tests/assets/js/options-resolver.spec.js b/tests/assets/js/options-resolver.spec.js
index dd2dbb6..bb9ccae 100644
--- a/tests/assets/js/options-resolver.spec.js
+++ b/tests/assets/js/options-resolver.spec.js
@@ -75,7 +75,7 @@ describe('Test options-resolver.getDataAttributes', function () {
   })
 
   it('Element with different data types', function () {
-    $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1" data-badprefix="1" data-my-prefix-var2="16" data-my-prefix-var3="false" data-my-prefix-var4="[8]" data-my-prefix-var5="{&quot;result&quot;:true, &quot;count&quot;:100}"></div>')
+    $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1" data-badprefix="1" data-my-prefix-var2="16" data-my-prefix-var3="falSe" data-my-prefix-var4="[8]" data-my-prefix-var5="{&quot;result&quot;:true, &quot;count&quot;:100}" data-my-prefix-var6="trUe" data-my-prefix-var7="[a" data-my-prefix-var8=""></div>')
 
     const expected = {
       var1: 'value1',
@@ -85,11 +85,28 @@ describe('Test options-resolver.getDataAttributes', function () {
       var5: {
         result: true,
         count: 100
-      }
+      },
+      var6: true,
+      var7: '[a',
+      var8: null
     }
 
     expect(optionsRevolser.getDataAttributes('#myDiv', 'myPrefix')).toEqual(expected)
   })
+
+  it('Element with Element', function () {
+    $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1"></div>')
+    const element = document.querySelector('#myDiv')
+
+    expect(optionsRevolser.getDataAttributes(element, 'myPrefix')).toEqual({ var1: 'value1' })
+  })
+
+  it('Element with jQuery', function () {
+    $('body').append('<div id="myDiv" class="html-test" data-my-prefix-var1="value1"></div>')
+    const element = $('#myDiv')
+
+    expect(optionsRevolser.getDataAttributes(element, 'myPrefix')).toEqual({ var1: 'value1' })
+  })
 })
 
 describe('Test options-resolver.isNotBlank', function () {
@@ -121,3 +138,104 @@ describe('Test options-resolver.isNotBlank', function () {
     expect(optionsRevolser.isNotBlank(['val'])).toBe(true)
   })
 })
+
+describe('Test options-resolver.getElement', function () {
+  beforeEach(function () {
+    $('body').append('<div id="container" class="html-test"><div id="myDiv1" class="myDiv"></div><div id="myDiv2" class="myDiv"></div></div>')
+  })
+
+  afterEach(function () {
+    $('.html-test').remove()
+  })
+
+  it('Test with null', function () {
+    const result = optionsRevolser.getElement(null)
+
+    expect(result).toBeNull()
+  })
+
+  it('Test with string - found', function () {
+    const result = optionsRevolser.getElement('#myDiv1')
+
+    expect(result).toBeInstanceOf(Element)
+    expect(result.getAttribute('id')).toEqual('myDiv1')
+  })
+
+  it('Test with string - found (multiple)', function () {
+    const result = optionsRevolser.getElement('.myDiv')
+
+    expect(result).toBeInstanceOf(Element)
+    expect(result.getAttribute('id')).toEqual('myDiv1')
+  })
+
+  it('Test with string - not found', function () {
+    const result = optionsRevolser.getElement('#myDiv3')
+
+    expect(result).toBeNull()
+  })
+
+  it('Test with element', function () {
+    const element = document.querySelector('#myDiv1')
+    const result = optionsRevolser.getElement(element)
+
+    expect(result).toBeInstanceOf(Element)
+    expect(result.getAttribute('id')).toEqual('myDiv1')
+    expect(result).toBe(element)
+  })
+
+  // If "jquery" dependency deleted in the future, the "Test with fake jQuery" test must be kept (replacement test)
+  it('Test with jQuery', function () {
+    const result = optionsRevolser.getElement($('#myDiv1'))
+
+    expect(result).toBeInstanceOf(Element)
+    expect(result.getAttribute('id')).toEqual('myDiv1')
+  })
+
+  // If "jquery" dependency deleted in the future, the "Test with fake empty jQuery" test must be kept (replacement test)
+  it('Test with empty jQuery', function () {
+    const result = optionsRevolser.getElement($('#notFound'))
+
+    expect(result).toBeNull()
+  })
+
+  it('Test with fake jQuery', function () {
+    const object = {
+      get: function (index) {
+        if (index === 0) {
+          return document.querySelector('#myDiv1')
+        }
+
+        return undefined
+      },
+      jquery: 'fake'
+    }
+    const result = optionsRevolser.getElement(object)
+
+    expect(result).toBeInstanceOf(Element)
+    expect(result.getAttribute('id')).toEqual('myDiv1')
+  })
+
+  it('Test with fake empty jQuery', function () {
+    const object = {
+      get: function (index) {
+        return undefined
+      },
+      jquery: 'fake'
+    }
+    const result = optionsRevolser.getElement(object)
+
+    expect(result).toBeNull()
+  })
+
+  it('Test with other type', function () {
+    const result = optionsRevolser.getElement({})
+
+    expect(result).toBeNull()
+  })
+
+  it('Test with undefined', function () {
+    const result = optionsRevolser.getElement(undefined)
+
+    expect(result).toBeNull()
+  })
+})
diff --git a/webpack-encore-config.js b/webpack-encore-config.js
index e9ee59d..3ece1a5 100644
--- a/webpack-encore-config.js
+++ b/webpack-encore-config.js
@@ -19,7 +19,6 @@ module.exports = function (outputPath) {
             config.useBuiltIns = 'usage';
             config.corejs = 3;
         })
-        .autoProvidejQuery()
     ;
 
     return Encore;

From 82cf0e2da2da961cd931bdba9dd797aa6087501d Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 30 Dec 2022 20:34:37 +0100
Subject: [PATCH 200/264] Add missing functional tests

---
 .../Controller/TestCrudControllerTest.php     | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 8b7565f..34c2ab7 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -90,10 +90,12 @@ public function testChangeDisplayedColumns(Client $client): Client
     {
         $button = $client->getCrawler()->filterXPath('//button[contains(.,"Display Settings")]');
         $button->first()->click();
+        $client->waitForVisibility('#ec-crud-display-settings-'.static::SESSION_NAME);
 
         $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::input[@value="username"]')->click();
         $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[@type="submit"]')->click();
         $this->waitForAjax($client);
+        $client->waitForInvisibility('#ec-crud-display-settings-'.static::SESSION_NAME);
 
         $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler()));
         $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
@@ -308,6 +310,44 @@ public function testSessionValuesAfterResetSettings(Client $client): Client
     /**
      * @depends testSessionValuesAfterResetSettings
      */
+    public function testCheckAndUncheckAllColumns(Client $client): Client
+    {
+        $client->request('GET', static::URL);
+
+        $button = $client->getCrawler()->filterXPath('//button[contains(.,"Display Settings")]');
+        $button->first()->click();
+        $form = $client->getCrawler()->selectButton('Save')->form();
+        $this->assertCount(2, $form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue());
+
+        // Check all
+        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[contains(.,"Check all")]')->click();
+        $client->wait(5, 30)->until(fn () => 3 === \count($form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue()));
+        $this->assertCount(3, $form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue());
+
+        // Uncheck all
+        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[contains(.,"Uncheck all")]')->click();
+        $client->wait(5, 30)->until(fn () => null === $form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue());
+        $this->assertNull($form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue());
+
+        // Save and error (save not done)
+        $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[@type="submit"]')->click();
+        $this->waitForAjax($client);
+        $client->waitForVisibility('#ec-crud-display-settings-'.static::SESSION_NAME);
+        $this->assertCount(1, $client->getCrawler()->filterXPath('//div[@id="ec-crud-display-settings-'.static::SESSION_NAME.'"]/descendant::li[contains(text(), "This collection should contain 1 element or more")]'));
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
+
+        // Save not done after reload
+        $client->request('GET', static::URL);
+        $this->assertSame([5, 2], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 3], $this->getPagination($client->getCrawler()));
+
+        return $client;
+    }
+
+    /**
+     * @depends testCheckAndUncheckAllColumns
+     */
     public function testManualReset(Client $client): Client
     {
         $client->request('GET', static::URL);

From b4241d34e0b9f1f77313e4dd65d350e2357c5ca0 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 30 Dec 2022 21:20:19 +0100
Subject: [PATCH 201/264] Replace CSS classes by data-ec-crud- attributes

.ec-crud-modal-auto -> data-ec-crud-toggle="modal-auto"
.ec-crud-remote-modal-auto -> data-ec-crud-toggle="remote-modal-auto"
.ec-crud-ajax-click-auto -> data-ec-crud-toggle="ajax-click"
.ec-crud-ajax-link-auto -> data-ec-crud-toggle="ajax-link"
.ec-crud-ajax-form-auto -> data-ec-crud-toggle="ajax-form"
.ec-crud-search-form -> data-ec-crud-toggle="search-form"
.ec-crud-search-reset -> data-ec-crud-toggle="search-reset"
.ec-crud-display-settings -> data-ec-crud-toggle="display-settings"
.ec-crud-display-settings-button -> data-ec-crud-toggle="display-settings-button"
.ec-crud-display-settings-check-all-columns -> data-ec-crud-toggle="display-settings-check-all-columns"
.ec-crud-display-settings-uncheck-all-columns -> data-ec-crud-toggle="display-settings-uncheck-all-columns"
.ec-crud-display-settings-reset -> data-ec-crud-toggle="display-settings-reset"
---
 assets/js/ajax.js                           |  6 +-
 assets/js/crud.js                           | 22 +++----
 assets/js/modal/modal-manager.js            |  6 +-
 doc/references/ajax.md                      | 12 ++--
 doc/references/modal.md                     | 10 +--
 src/Form/Type/DisplaySettingsType.php       |  2 +-
 src/Twig/CrudExtension.php                  | 22 ++-----
 templates/Theme/base.html.twig              |  8 +--
 templates/Theme/bootstrap3.html.twig        |  8 +--
 templates/Theme/bootstrap4.html.twig        |  8 +--
 templates/Theme/bootstrap5.html.twig        |  8 +--
 tests/Twig/CrudExtensionTest.php            | 68 +++++----------------
 tests/assets/js/ajax.spec.js                | 20 +++---
 tests/assets/js/modal/modal-manager.spec.js | 16 ++---
 14 files changed, 83 insertions(+), 133 deletions(-)

diff --git a/assets/js/ajax.js b/assets/js/ajax.js
index c3aea7d..0a7e2b1 100644
--- a/assets/js/ajax.js
+++ b/assets/js/ajax.js
@@ -17,17 +17,17 @@ const ready = (callback) => {
 
 ready(function () {
   document.addEventListener('click', function (event) {
-    if (event.target.matches('.ec-crud-ajax-click-auto')) {
+    if (event.target.matches('[data-ec-crud-toggle="ajax-click"]')) {
       onClickAuto(event)
     }
 
-    if (event.target.matches('a.ec-crud-ajax-link-auto')) {
+    if (event.target.matches('a[data-ec-crud-toggle="ajax-link"]')) {
       onClickLinkAuto(event)
     }
   })
 
   document.addEventListener('submit', function (event) {
-    if (event.target.matches('form.ec-crud-ajax-form-auto')) {
+    if (event.target.matches('form[data-ec-crud-toggle="ajax-form"]')) {
       onSubmitFormAuto(event)
     }
   })
diff --git a/assets/js/crud.js b/assets/js/crud.js
index 7f94e66..af336a6 100644
--- a/assets/js/crud.js
+++ b/assets/js/crud.js
@@ -18,33 +18,33 @@ const ready = (callback) => {
 
 ready(function () {
   document.addEventListener('submit', function (event) {
-    if (event.target.matches('form.ec-crud-search-form')) {
+    if (event.target.matches('form[data-ec-crud-toggle="search-form"]')) {
       onSubmitCrudSearchForm(event)
     }
 
-    if (event.target.matches('.ec-crud-display-settings form')) {
+    if (event.target.matches('[data-ec-crud-toggle="display-settings"] form')) {
       onCrudDisplaySettingsSubmit(event)
     }
   })
 
   document.addEventListener('click', function (event) {
-    if (event.target.matches('button.ec-crud-search-reset')) {
+    if (event.target.matches('button[data-ec-crud-toggle="search-reset"]')) {
       onResetCrudSearchForm(event)
     }
 
-    if (event.target.matches('button.ec-crud-display-settings-button')) {
+    if (event.target.matches('button[data-ec-crud-toggle="display-settings-button"]')) {
       onCrudDisplaySettingsOpen(event)
     }
 
-    if (event.target.matches('button.ec-crud-display-settings-check-all-columns')) {
+    if (event.target.matches('button[data-ec-crud-toggle="display-settings-check-all-columns"]')) {
       onCrudDisplaySettingsCheckAllColumns(event)
     }
 
-    if (event.target.matches('button.ec-crud-display-settings-uncheck-all-columns')) {
+    if (event.target.matches('button[data-ec-crud-toggle="display-settings-uncheck-all-columns"]')) {
       onCrudDisplaySettingsUncheckAllColumns(event)
     }
 
-    if (event.target.matches('button.ec-crud-display-settings-reset')) {
+    if (event.target.matches('button[data-ec-crud-toggle="display-settings-reset"]')) {
       onCrudDisplaySettingsReset(event)
     }
   })
@@ -100,21 +100,21 @@ function onCrudDisplaySettingsOpen (event) {
 
 function onCrudDisplaySettingsCheckAllColumns (event) {
   const button = event.target
-  button.parentNode.closest('div.ec-crud-display-settings').querySelectorAll('input[type=checkbox]').forEach(checkbox => {
+  button.parentNode.closest('div[data-ec-crud-toggle="display-settings"]').querySelectorAll('input[type=checkbox]').forEach(checkbox => {
     checkbox.checked = true
   })
 }
 
 function onCrudDisplaySettingsUncheckAllColumns (event) {
   const button = event.target
-  button.parentNode.closest('div.ec-crud-display-settings').querySelectorAll('input[type=checkbox]').forEach(checkbox => {
+  button.parentNode.closest('div[data-ec-crud-toggle="display-settings"]').querySelectorAll('input[type=checkbox]').forEach(checkbox => {
     checkbox.checked = false
   })
 }
 
 function onCrudDisplaySettingsReset (event) {
   const button = event.target
-  const displaySettingsContainer = button.parentNode.closest('div.ec-crud-display-settings')
+  const displaySettingsContainer = button.parentNode.closest('div[data-ec-crud-toggle="display-settings"]')
   const listContainer = getElement('#' + displaySettingsContainer.getAttribute('data-crud-list-id'))
 
   closeDisplaySettings(displaySettingsContainer)
@@ -129,7 +129,7 @@ function onCrudDisplaySettingsSubmit (event) {
   event.preventDefault()
   const form = event.target
 
-  const displaySettingsContainer = form.parentNode.closest('div.ec-crud-display-settings')
+  const displaySettingsContainer = form.parentNode.closest('div[data-ec-crud-toggle="display-settings"]')
   const listContainer = getElement('#' + displaySettingsContainer.getAttribute('data-crud-list-id'))
 
   closeDisplaySettings(displaySettingsContainer)
diff --git a/assets/js/modal/modal-manager.js b/assets/js/modal/modal-manager.js
index ac3de0b..6fd4b05 100644
--- a/assets/js/modal/modal-manager.js
+++ b/assets/js/modal/modal-manager.js
@@ -23,15 +23,15 @@ const ready = (callback) => {
 
 ready(function () {
   document.addEventListener('click', function (event) {
-    if (event.target.matches('.ec-crud-modal-auto')) {
+    if (event.target.matches('[data-ec-crud-toggle="modal"]')) {
       onClickModalAuto(event)
     }
 
-    if (event.target.matches('button.ec-crud-remote-modal-auto')) {
+    if (event.target.matches('button[data-ec-crud-toggle="remote-modal"]')) {
       onClickButtonRemoteModalAuto(event)
     }
 
-    if (event.target.matches('a.ec-crud-remote-modal-auto')) {
+    if (event.target.matches('a[data-ec-crud-toggle="remote-modal"]')) {
       onClickLinkRemoteModalAuto(event)
     }
   })
diff --git a/doc/references/ajax.md b/doc/references/ajax.md
index 1769965..984b04f 100644
--- a/doc/references/ajax.md
+++ b/doc/references/ajax.md
@@ -63,7 +63,7 @@ La fonction `sendRequest` retourne une promesse.
 
 Fonction permettant de faire une requête AJAX lors d'un clic sur élément du DOM.
 
-L'élément du DOM doit avoir comme classe CSS `ec-crud-ajax-click-auto`.
+L'élément du DOM doit avoir l'attribut HTML `data-ec-crud-toggle="ajax-click"`.
 
 Toutes les options de la fonction `sendRequest` peuvent être utilisées en les passant par les attributs `data-`. Pour cela:
 * Préfixer chaque option par `data-ec-crud-ajax-`
@@ -73,7 +73,7 @@ Exemple: L'équivalent de l'option `updateMode` est `data-ec-crud-ajax-update-mo
 Exemple :
 
 ```html
-<button class="ec-crud-ajax-click-auto" data-ec-crud-ajax-url="/goodRequest">Go !</button>
+<button data-ec-crud-toggle="ajax-click" data-ec-crud-ajax-url="/goodRequest">Go !</button>
 ```
 
 ### link
@@ -87,12 +87,12 @@ Toutes les options de la fonction `sendRequest` peuvent être utilisées en les
 
 #### Mode automatique
 
-Le lien doit avoir comme classe CSS `ec-crud-ajax-link-auto`.
+Le lien doit avoir l'attribut HTML `data-ec-crud-toggle="ajax-link"`.
 
 Exemple :
 
 ```html
-<a href="/goodRequest" class="ec-crud-ajax-link-auto">Go !</a>
+<a href="/goodRequest" data-ec-crud-toggle="ajax-link">Go !</a>
 ```
 
 L'URL utilisée pour la requête Ajax est:
@@ -134,12 +134,12 @@ Toutes les options de la fonction `sendRequest` peuvent être utilisées en les
 
 #### Mode automatique
 
-Le formulaire doit avoir comme classe CSS `ec-crud-ajax-form-auto`.
+Le formulaire doit avoir l'attribut HTML `data-ec-crud-toggle="ajax-form"`.
 
 Exemple :
 
 ```html
-<form action="/goodRequest" method="POST" class="ec-crud-ajax-form-auto">
+<form action="/goodRequest" method="POST" data-ec-crud-toggle="ajax-form">
 ```
 
 * L'URL utilisée pour la requête Ajax est:
diff --git a/doc/references/modal.md b/doc/references/modal.md
index 8d49146..b8f9981 100644
--- a/doc/references/modal.md
+++ b/doc/references/modal.md
@@ -40,7 +40,7 @@ Options disponibles :
 ### Ouverture automatique
 
 Ouverture de la fenêtre modale lors d'un clic sur un élément du DOM. 
-L'élément du DOM doit avoir comme classe CSS `ec-crud-modal-auto`.
+L'élément du DOM doit avoir comme l'attribut HTML `data-ec-crud-toggle="modal"`.
 
 Toutes les options de la fonction `openModal` peuvent être utilisées en les passant par les attributs `data-`. Pour cela:
 * Préfixer chaque option par `data-ec-crud-modal-`
@@ -50,7 +50,7 @@ Toutes les options de la fonction `openModal` peuvent être utilisées en les pa
 Exemple :
 
 ```html
-<a href="#" class="ec-crud-modal-auto" data-ec-crud-modal-element="#main_modal">Go !</a>
+<a href="#" data-ec-crud-toggle="modal" data-ec-crud-modal-element="#main_modal">Go !</a>
 ```
 
 ## Ouverture fenêtre modale avec Ajax
@@ -84,7 +84,7 @@ Options disponibles :
 ### Ouverture automatique
 
 Ouverture de la fenêtre modale lors d'un clic sur un bouton ou un lien.
-Le bouton ou le lien doit avoir comme classe CSS `ec-crud-remote-modal-auto`.
+Le bouton ou le lien doit avoir l'attribut HTML `data-ec-crud-toggle="remote-modal"`.
 
 Toutes les options de la fonction `openRemoteModal` peuvent être utilisées en les passant par les attributs `data-`. Pour cela:
 * Préfixer chaque option par `data-ec-crud-modal-`
@@ -94,13 +94,13 @@ Toutes les options de la fonction `openRemoteModal` peuvent être utilisées en
 Exemple avec un bouton :
 
 ```html
-<button class="ec-crud-remote-modal-auto" data-ec-crud-modal-element="#main_modal" data-ec-crud-modal-element-content="#main_modal .modal-content" data-ec-crud-modal-url="/goodRequest">Go !</button>
+<button data-ec-crud-toggle="remote-modal" data-ec-crud-modal-element="#main_modal" data-ec-crud-modal-element-content="#main_modal .modal-content" data-ec-crud-modal-url="/goodRequest">Go !</button>
 ```
 
 Exemple avec un lien :
 
 ```html
-<a href="/goodRequest" class="ec-crud-remote-modal-auto" data-ec-crud-modal-element="#main_modal" data-ec-crud-modal-element-content="#main_modal .modal-content">Go !</a>
+<a href="/goodRequest" data-ec-crud-toggle="remote-modal" data-ec-crud-modal-element="#main_modal" data-ec-crud-modal-element-content="#main_modal .modal-content">Go !</a>
 ```
 
 Avec un lien, l'URL utilisée pour la requête Ajax est:
diff --git a/src/Form/Type/DisplaySettingsType.php b/src/Form/Type/DisplaySettingsType.php
index 60204ff..895dfd3 100644
--- a/src/Form/Type/DisplaySettingsType.php
+++ b/src/Form/Type/DisplaySettingsType.php
@@ -51,7 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'label' => 'display_settings.reset_display_settings',
             'translation_domain' => 'EcommitCrudBundle',
             'attr' => [
-                'class' => 'ec-crud-display-settings-reset',
+                'data-ec-crud-toggle' => 'display-settings-reset',
                 'data-reset-url' => $options['reset_settings_url'],
             ],
         ]);
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index c373282..e191ff5 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -185,7 +185,7 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
                         if (null !== $parent['ajax_options']) {
                             return array_merge(
                                 $value,
-                                ['class' => (isset($value['class'])) ? $value['class'].' ec-crud-ajax-link-auto' : 'ec-crud-ajax-link-auto'],
+                                ['data-ec-crud-toggle' => 'ajax-link'],
                                 $this->getAjaxAttributes($this->validateAjaxOptions($parent['ajax_options'])),
                             );
                         }
@@ -309,7 +309,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
                         if (null !== $parent['ajax_options']) {
                             return array_merge(
                                 $value,
-                                ['class' => (isset($value['class'])) ? $value['class'].' ec-crud-ajax-link-auto' : 'ec-crud-ajax-link-auto'],
+                                ['data-ec-crud-toggle' => 'ajax-link'],
                                 $this->getAjaxAttributes($this->validateAjaxOptions($parent['ajax_options'])),
                             );
                         }
@@ -496,6 +496,7 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
 
             $attr = array_merge(
                 [
+                    'data-ec-crud-toggle' => 'search-form',
                     'data-crud-search-id' => $crud->getDivIdSearch(),
                     'data-crud-list-id' => $crud->getDivIdList(),
                 ],
@@ -503,7 +504,6 @@ public function searchFormStart(Environment $environment, Crud $crud, array $opt
                 $value,
                 $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
             );
-            $attr['class'] = (isset($attr['class'])) ? $attr['class'].' ec-crud-search-form' : 'ec-crud-search-form';
 
             return $attr;
         });
@@ -581,13 +581,13 @@ public function searchFormReset(Environment $environment, Crud $crud, array $opt
         $resolver->addNormalizer('button_attr', function (Options $options, mixed $value) use ($crud): array {
             return array_merge(
                 [
+                    'data-ec-crud-toggle' => 'search-reset',
                     'data-crud-search-id' => $crud->getDivIdSearch(),
                     'data-crud-list-id' => $crud->getDivIdList(),
                     'data-ec-crud-ajax-url' => $crud->getSearchUrl(['reset' => 1]),
                 ],
                 $value,
                 $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
-                ['class' => (isset($value['class'])) ? $value['class'].' ec-crud-search-reset' : 'ec-crud-search-reset'],
             );
         });
         $options = $resolver->resolve($this->buildOptions('crud_search_form_reset', $options, $crud));
@@ -609,24 +609,12 @@ public function searchFormReset(Environment $environment, Crud $crud, array $opt
      * Ajax form start tag.
      *
      * @param array $options Options:
-     *                       * auto_class: Auto CSS class used. Default: ec-crud-ajax-form-auto
      *                       * ajax_options: See "ajaxAttributes" method options
      *                       * + form_start function options
      */
     public function formStartAjax(FormView $formView, array $options = []): string
     {
-        $autoClass = 'ec-crud-ajax-form-auto';
-        if (isset($options['auto_class']) && null !== $options['auto_class']) {
-            $autoClass = $options['auto_class'];
-            unset($options['auto_class']);
-        }
-        if (isset($options['attr']['class']) && null !== $options['attr']['class']) {
-            $options['attr']['class'] = sprintf('%s %s', $autoClass, $options['attr']['class']);
-        } elseif (isset($formView->vars['attr']['class']) && null !== $formView->vars['attr']['class']) {
-            $options['attr']['class'] = sprintf('%s %s', $autoClass, $formView->vars['attr']['class']);
-        } else {
-            $options['attr']['class'] = $autoClass;
-        }
+        $options['attr']['data-ec-crud-toggle'] = 'ajax-form';
 
         if (isset($options['ajax_options'])) {
             $this->validateAjaxOptions($options['ajax_options']);
diff --git a/templates/Theme/base.html.twig b/templates/Theme/base.html.twig
index 29e03b6..4d43dad 100644
--- a/templates/Theme/base.html.twig
+++ b/templates/Theme/base.html.twig
@@ -154,7 +154,7 @@
 {% block display_settings %}
 {% apply spaceless %}
     {% if crud.displayResults %}
-        {% set display_settings_container_attributes = {'class': 'ec-crud-display-settings', 'id': 'ec-crud-display-settings-'~crud.sessionName, 'data-crud-list-id': crud.divIdList} %}
+        {% set display_settings_container_attributes = {'data-ec-crud-toggle': 'display-settings', 'id': 'ec-crud-display-settings-'~crud.sessionName, 'data-crud-list-id': crud.divIdList} %}
         {% if modal %}
             {{ block('display_settings_button_modal', template_name) }}
             {{ block('display_settings_container_modal', template_name) }}
@@ -178,7 +178,7 @@
 
 {% block display_settings_button %}
     {% set display_settings_text = display_settings_text|default('display_settings.title'|trans({}, 'EcommitCrudBundle')) %}
-    {% set button_attr = button_attr|default([])|merge({class: (button_attr.class|default('') ~ ' ec-crud-display-settings-button')|trim, 'data-display-settings': 'ec-crud-display-settings-'~crud.sessionName}) %}
+    {% set button_attr = button_attr|default([])|merge({'data-ec-crud-toggle': 'display-settings-button', 'data-display-settings': 'ec-crud-display-settings-'~crud.sessionName}) %}
     <button{% with { attr: button_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
         {{ crud_icon('display_settings') }} {{ display_settings_text }}
     </button>
@@ -212,9 +212,9 @@
             {{ form_row(form.resultsPerPage) }}
             {{ form_row(form.displayedColumns) }}
             <div>
-                <button type="button" class="ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+                <button type="button" data-ec-crud-toggle="display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
                 &nbsp;
-                <button type="button" class="ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+                <button type="button" data-ec-crud-toggle="display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
             </div>
             <div style="text-align: center;">
                 {{ form_row(form.reset) }}
diff --git a/templates/Theme/bootstrap3.html.twig b/templates/Theme/bootstrap3.html.twig
index 7b68411..9cfcd18 100644
--- a/templates/Theme/bootstrap3.html.twig
+++ b/templates/Theme/bootstrap3.html.twig
@@ -63,9 +63,9 @@
                     {{ form_row(form.resultsPerPage) }}
                     {{ form_row(form.displayedColumns) }}
                     <div>
-                        <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+                        <button type="button" class="btn btn-default btn-xs" data-ec-crud-toggle="display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
                         &nbsp;
-                        <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+                        <button type="button" class="btn btn-default btn-xs" data-ec-crud-toggle="display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -89,9 +89,9 @@
             {{ form_row(form.resultsPerPage) }}
             {{ form_row(form.displayedColumns) }}
             <div>
-                <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+                <button type="button" class="btn btn-default btn-xs" data-ec-crud-toggle="display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
                 &nbsp;
-                <button type="button" class="btn btn-default btn-xs ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+                <button type="button" class="btn btn-default btn-xs" data-ec-crud-toggle="display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
             </div>
 
             <div style="text-align: center;">
diff --git a/templates/Theme/bootstrap4.html.twig b/templates/Theme/bootstrap4.html.twig
index ebd642f..9e4caab 100644
--- a/templates/Theme/bootstrap4.html.twig
+++ b/templates/Theme/bootstrap4.html.twig
@@ -71,9 +71,9 @@
                 {{ form_row(form.resultsPerPage) }}
                 {{ form_row(form.displayedColumns) }}
                 <div>
-                    <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+                    <button type="button" class="btn btn-outline-secondary btn-sm" data-ec-crud-toggle="display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
                     &nbsp;
-                    <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+                    <button type="button" class="btn btn-outline-secondary btn-sm" data-ec-crud-toggle="display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
                 </div>
             </div>
             <div class="modal-footer">
@@ -97,9 +97,9 @@
         {{ form_row(form.resultsPerPage) }}
         {{ form_row(form.displayedColumns) }}
         <div>
-            <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+            <button type="button" class="btn btn-outline-secondary btn-sm" data-ec-crud-toggle="display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
             &nbsp;
-            <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+            <button type="button" class="btn btn-outline-secondary btn-sm" data-ec-crud-toggle="display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
         </div>
 
         <div style="text-align: center;">
diff --git a/templates/Theme/bootstrap5.html.twig b/templates/Theme/bootstrap5.html.twig
index 50a03e8..070b761 100644
--- a/templates/Theme/bootstrap5.html.twig
+++ b/templates/Theme/bootstrap5.html.twig
@@ -69,9 +69,9 @@
                 {{ form_row(form.resultsPerPage) }}
                 {{ form_row(form.displayedColumns) }}
                 <div>
-                    <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+                    <button type="button" class="btn btn-outline-secondary btn-sm" data-ec-crud-toggle="display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
                     &nbsp;
-                    <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+                    <button type="button" class="btn btn-outline-secondary btn-sm" data-ec-crud-toggle="display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
                 </div>
             </div>
             <div class="modal-footer">
@@ -95,9 +95,9 @@
         {{ form_row(form.resultsPerPage) }}
         {{ form_row(form.displayedColumns) }}
         <div>
-            <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
+            <button type="button" class="btn btn-outline-secondary btn-sm" data-ec-crud-toggle="display-settings-check-all-columns">{{ display_settings_check_all_text }}</button>
             &nbsp;
-            <button type="button" class="btn btn-outline-secondary btn-sm ec-crud-display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
+            <button type="button" class="btn btn-outline-secondary btn-sm" data-ec-crud-toggle="display-settings-uncheck-all-columns">{{ display_settings_uncheck_all_text }}</button>
         </div>
 
         <div style="text-align: center;">
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index e621cc1..765b3fe 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -57,45 +57,7 @@ public function testFormStartAjax(): void
     {
         $html = $this->crudExtension->formStartAjax($this->createFormView());
 
-        $xpath = '//form[@method="post" and @action="/url" and contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")]';
-        $this->assertMatchesXpath($html, $xpath);
-    }
-
-    public function testFormStartAjaxWithCustomAutoClass(): void
-    {
-        $html = $this->crudExtension->formStartAjax($this->createFormView(), [
-            'auto_class' => 'custom-class',
-        ]);
-
-        $xpath = '//form[not(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and contains(concat(" ", normalize-space(@class), " "), " custom-class ")]';
-        $this->assertMatchesXpath($html, $xpath);
-    }
-
-    public function testFormStartAjaxWithClassAttr(): void
-    {
-        $html = $this->crudExtension->formStartAjax($this->createFormView(), [
-            'attr' => [
-                'class' => 'my-class',
-            ],
-        ]);
-
-        $xpath = '//form[(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and contains(concat(" ", normalize-space(@class), " "), " my-class ")]';
-        $this->assertMatchesXpath($html, $xpath);
-    }
-
-    public function testFormStartAjaxWithClassAttrInFormView(): void
-    {
-        $builder = $this->formFactory->createBuilder(FormType::class, null, [
-            'action' => '/url',
-            'method' => 'POST',
-            'csrf_protection' => false,
-            'attr' => [
-                'class' => 'my-class',
-            ],
-        ]);
-        $html = $this->crudExtension->formStartAjax($builder->getForm()->createView());
-
-        $xpath = '//form[(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and contains(concat(" ", normalize-space(@class), " "), " my-class ")]';
+        $xpath = '//form[@method="post" and @action="/url" and @data-ec-crud-toggle="ajax-form"]';
         $this->assertMatchesXpath($html, $xpath);
     }
 
@@ -107,7 +69,7 @@ public function testFormStartAjaxWithAjaxOptions(): void
             ],
         ]);
 
-        $xpath = '//form[(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and @data-ec-crud-ajax-on-success="a=b"]';
+        $xpath = '//form[@data-ec-crud-toggle="ajax-form" and @data-ec-crud-ajax-on-success="a=b"]';
         $this->assertMatchesXpath($html, $xpath);
     }
 
@@ -122,7 +84,7 @@ public function testFormStartAjaxWithAttrAndAjaxOptions(): void
             ],
         ]);
 
-        $xpath = '//form[(contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")) and @data-ec-crud-ajax-on-success="a=b" and @data-custom="custom"]';
+        $xpath = '//form[@data-ec-crud-toggle="ajax-form" and @data-ec-crud-ajax-on-success="a=b" and @data-custom="custom"]';
         $this->assertMatchesXpath($html, $xpath);
     }
 
@@ -142,7 +104,7 @@ public function testFormStartAjaxWithFormStartOptions(): void
             'method' => 'get',
         ]);
 
-        $xpath = '//form[@method="get" and @action="/url" and contains(concat(" ", normalize-space(@class), " "), " ec-crud-ajax-form-auto ")]';
+        $xpath = '//form[@method="get" and @action="/url" and @data-ec-crud-toggle="ajax-form"]';
         $this->assertMatchesXpath($html, $xpath);
     }
 
@@ -315,7 +277,7 @@ public function testPaginatorWithEmptyArrayAjaxOption(): void
             'page' => 1,
         ]);
 
-        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto">»</a></li></ul></nav>';
+        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" data-ec-crud-toggle="ajax-link">1</a></li><li><a href="/user?page=2" data-ec-crud-toggle="ajax-link">2</a></li><li class="next"><a href="/user?page=2" data-ec-crud-toggle="ajax-link">›</a></li><li class="last"><a href="/user?page=20" data-ec-crud-toggle="ajax-link">»</a></li></ul></nav>';
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'ajax_options' => [],
             'max_pages_before' => 1,
@@ -333,7 +295,7 @@ public function testPaginatorWithAjaxOption(): void
             'page' => 1,
         ]);
 
-        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
+        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
         $result = $this->crudExtension->paginatorLinks($this->environment, $paginator, 'user_crud', [], [
             'ajax_options' => [
                 'update' => '#myId',
@@ -460,7 +422,7 @@ public function testCrudPaginatorLinks(): void
         $crud->expects($this->once())->method('getRouteName')->willReturn('user_crud');
         $crud->expects($this->once())->method('getRouteParameters')->willReturn([]);
 
-        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
+        $expected = '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">1</a></li><li><a href="/user?page=2" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">2</a></li><li class="next"><a href="/user?page=2" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">›</a></li><li class="last"><a href="/user?page=20" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">»</a></li></ul></nav>';
         $result = $this->crudExtension->crudPaginatorLinks($this->environment, $crud, [
             'max_pages_before' => 1,
             'max_pages_after' => 1,
@@ -495,19 +457,19 @@ public function testThColumnNotSortable(): void
     public function testThColumnSortableNotActive(): void
     {
         $html = $this->crudExtension->th($this->environment, 'column2', $this->createCrud());
-        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-not-active"><a href="/user?sort=column2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label2</a></th>', $html);
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-not-active"><a href="/user?sort=column2" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">label2</a></th>', $html);
     }
 
     public function testThColumnSortableActiveAsc(): void
     {
         $html = $this->crudExtension->th($this->environment, 'column1', $this->createCrud());
-        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-asc"><a href="/user?sort=column1&amp;sort-direction=DESC" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>', $html);
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-asc"><a href="/user?sort=column1&amp;sort-direction=DESC" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>', $html);
     }
 
     public function testThColumnSortableActiveDesc(): void
     {
         $html = $this->crudExtension->th($this->environment, 'column1', $this->createCrud('column1', CRUD::DESC));
-        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-desc"><a href="/user?sort=column1&amp;sort-direction=ASC" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>', $html);
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-active-desc"><a href="/user?sort=column1&amp;sort-direction=ASC" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>', $html);
     }
 
     public function testThWithAjaxOptions(): void
@@ -517,7 +479,7 @@ public function testThWithAjaxOptions(): void
                 'update' => '#div2',
             ],
         ]);
-        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-not-active"><a href="/user?sort=column2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#div2">label2</a></th>', $html);
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-not-active"><a href="/user?sort=column2" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#div2">label2</a></th>', $html);
     }
 
     public function testThWithLabel(): void
@@ -525,7 +487,7 @@ public function testThWithLabel(): void
         $html = $this->crudExtension->th($this->environment, 'column2', $this->createCrud(), [
             'label' => 'My label',
         ]);
-        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-not-active"><a href="/user?sort=column2" class="ec-crud-ajax-link-auto" data-ec-crud-ajax-update="#myId">My label</a></th>', $html);
+        $this->assertSame('<th class="ec-crud-th ec-crud-th-sortable-not-active"><a href="/user?sort=column2" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">My label</a></th>', $html);
     }
 
     /**
@@ -554,9 +516,9 @@ public function getTestThWithAttrOptionsProvider(): array
     {
         return [
             ['column3', 'column1', Crud::ASC, '<th class="a ec-crud-th ec-crud-th-not-sortable" data-a="val">label3</th>'],
-            ['column1', 'column1', Crud::ASC, '<th class="b ec-crud-th ec-crud-th-sortable-active-asc" data-b="val"><a href="/user?sort=column1&amp;sort-direction=DESC" class="e ec-crud-ajax-link-auto" data-e="val" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>'],
-            ['column1', 'column1', Crud::DESC, '<th class="c ec-crud-th ec-crud-th-sortable-active-desc" data-c="val"><a href="/user?sort=column1&amp;sort-direction=ASC" class="f ec-crud-ajax-link-auto" data-f="val" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>'],
-            ['column2', 'column1', Crud::ASC, '<th class="d ec-crud-th ec-crud-th-sortable-not-active" data-d="val"><a href="/user?sort=column2" class="g ec-crud-ajax-link-auto" data-g="val" data-ec-crud-ajax-update="#myId">label2</a></th>'],
+            ['column1', 'column1', Crud::ASC, '<th class="b ec-crud-th ec-crud-th-sortable-active-asc" data-b="val"><a href="/user?sort=column1&amp;sort-direction=DESC" class="e" data-e="val" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">label1 <i>^</i></a></th>'],
+            ['column1', 'column1', Crud::DESC, '<th class="c ec-crud-th ec-crud-th-sortable-active-desc" data-c="val"><a href="/user?sort=column1&amp;sort-direction=ASC" class="f" data-f="val" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">label1 <i>v</i></a></th>'],
+            ['column2', 'column1', Crud::ASC, '<th class="d ec-crud-th ec-crud-th-sortable-not-active" data-d="val"><a href="/user?sort=column2" class="g" data-g="val" data-ec-crud-toggle="ajax-link" data-ec-crud-ajax-update="#myId">label2</a></th>'],
         ];
     }
 
diff --git a/tests/assets/js/ajax.spec.js b/tests/assets/js/ajax.spec.js
index 8061da0..133a8c9 100644
--- a/tests/assets/js/ajax.spec.js
+++ b/tests/assets/js/ajax.spec.js
@@ -1059,7 +1059,7 @@ describe('Test Ajax.click', function () {
   })
 
   it('Send auto-request with button', async function () {
-    $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="buttonToTest" data-ec-crud-ajax-url="/goodRequest">Go !</a>')
+    $('body').append('<button class="html-test" data-ec-crud-toggle="ajax-click" id="buttonToTest" data-ec-crud-ajax-url="/goodRequest">Go !</a>')
 
     $('#buttonToTest').get(0).click()
 
@@ -1074,7 +1074,7 @@ describe('Test Ajax.click', function () {
     $(document).on('ec-crud-ajax-click-auto-before', '#clickToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest">Go !</button>')
+    $('body').append('<button class="html-test" data-ec-crud-toggle="ajax-click" id="clickToTest" data-ec-crud-ajax-url="/goodRequest">Go !</button>')
 
     $('#clickToTest').get(0).click()
 
@@ -1088,7 +1088,7 @@ describe('Test Ajax.click', function () {
   })
 
   it('Send auto-request canceled by onBeforeSend option', async function () {
-    $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="my_callback_on_before_send">Go !</button>')
+    $('body').append('<button class="html-test" data-ec-crud-toggle="ajax-click" id="clickToTest" data-ec-crud-ajax-url="/goodRequest" data-ec-crud-ajax-on-before-send="my_callback_on_before_send">Go !</button>')
 
     callbackManager.registerCallback('my_callback_on_before_send', function (options) {
       options.stop = true
@@ -1106,7 +1106,7 @@ describe('Test Ajax.click', function () {
   })
 
   it('Send auto-request with button and error', async function () {
-    $('body').append('<button class="html-test ec-crud-ajax-click-auto" id="buttonToTest">Go !</a>')
+    $('body').append('<button class="html-test" data-ec-crud-toggle="ajax-click" id="buttonToTest">Go !</a>')
     spyOn(window.console, 'error')
 
     $('#buttonToTest').get(0).click()
@@ -1240,7 +1240,7 @@ describe('Test Ajax.link', function () {
   })
 
   it('Send auto-request with link', async function () {
-    $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
+    $('body').append('<a href="/goodRequest" class="html-test" data-ec-crud-toggle="ajax-link" id="linkToTest">Go !</a>')
 
     $('#linkToTest').get(0).click()
 
@@ -1255,7 +1255,7 @@ describe('Test Ajax.link', function () {
     $(document).on('ec-crud-ajax-link-auto-before', '#linkToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<a href="/goodRequest" class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
+    $('body').append('<a href="/goodRequest" class="html-test" data-ec-crud-toggle="ajax-link" id="linkToTest">Go !</a>')
 
     $('#linkToTest').get(0).click()
 
@@ -1269,7 +1269,7 @@ describe('Test Ajax.link', function () {
   })
 
   it('Send auto-request with link and error', async function () {
-    $('body').append('<a class="html-test ec-crud-ajax-link-auto" id="linkToTest">Go !</a>')
+    $('body').append('<a class="html-test" data-ec-crud-toggle="ajax-link" id="linkToTest">Go !</a>')
     spyOn(window.console, 'error')
 
     $('#linkToTest').get(0).click()
@@ -1460,7 +1460,7 @@ describe('Test Ajax.form', function () {
   })
 
   it('Send auto-request with form', async function () {
-    $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /><button type="submit"></button></form>')
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test" data-ec-crud-toggle="ajax-form" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /><button type="submit"></button></form>')
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
@@ -1479,7 +1479,7 @@ describe('Test Ajax.form', function () {
     $(document).on('ec-crud-ajax-form-auto-before', '#formToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<form action="/goodRequest" method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /><button type="submit"></button></form>')
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test" data-ec-crud-toggle="ajax-form" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /><button type="submit"></button></form>')
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
@@ -1495,7 +1495,7 @@ describe('Test Ajax.form', function () {
   })
 
   it('Send auto-request with form and error', async function () {
-    $('body').append('<form  method="POST" class="html-test ec-crud-ajax-form-auto" id="formToTest"><input type="text" name="var1" /><button type="submit"></button></form>')
+    $('body').append('<form  method="POST" class="html-test" data-ec-crud-toggle="ajax-form" id="formToTest"><input type="text" name="var1" /><button type="submit"></button></form>')
     spyOn(window.console, 'error')
 
     $('#formToTest button[type="submit"]').get(0).click()
diff --git a/tests/assets/js/modal/modal-manager.spec.js b/tests/assets/js/modal/modal-manager.spec.js
index bdc8418..4dd67f3 100644
--- a/tests/assets/js/modal/modal-manager.spec.js
+++ b/tests/assets/js/modal/modal-manager.spec.js
@@ -78,7 +78,7 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test auto openModal', function () {
-    $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal">Go !</a>')
+    $('body').append('<a href="#" class="html-test" id="linkToTest" data-ec-crud-toggle="modal" data-ec-crud-modal-element="#test-modal">Go !</a>')
 
     $('#linkToTest').get(0).click()
 
@@ -90,7 +90,7 @@ describe('Test Modal-manager with spy engine', function () {
     $(document).on('ec-crud-modal-auto-before', '#linkToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<a href="#" class="html-test ec-crud-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal">Go !</a>')
+    $('body').append('<a href="#" class="html-test" data-ec-crud-toggle="modal" id="linkToTest" data-ec-crud-modal-element="#test-modal">Go !</a>')
 
     $('#linkToTest').get(0).click()
 
@@ -101,7 +101,7 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test auto openRemoteModal - link', async function () {
-    $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
+    $('body').append('<a href="#" class="html-test" data-ec-crud-toggle="remote-modal" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
     $('#linkToTest').get(0).click()
     await wait(() => {
@@ -115,7 +115,7 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test auto openRemoteModal - link with href', async function () {
-    $('body').append('<a href="/goodRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content">Go !</a>')
+    $('body').append('<a href="/goodRequest" class="html-test" data-ec-crud-toggle="remote-modal" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content">Go !</a>')
 
     $('#linkToTest').get(0).click()
     await wait(() => {
@@ -129,7 +129,7 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test auto openRemoteModal - link - prioriry url attr', async function () {
-    $('body').append('<a href="/badRequest" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
+    $('body').append('<a href="/badRequest" class="html-test" data-ec-crud-toggle="remote-modal" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
     $('#linkToTest').get(0).click()
     await wait(() => {
@@ -146,7 +146,7 @@ describe('Test Modal-manager with spy engine', function () {
     $(document).on('ec-crud-remote-modal-auto-before', '#linkToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<a href="#" class="html-test ec-crud-remote-modal-auto" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
+    $('body').append('<a href="#" class="html-test" data-ec-crud-toggle="remote-modal" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</a>')
 
     $('#linkToTest').get(0).click()
     await wait(() => {
@@ -161,7 +161,7 @@ describe('Test Modal-manager with spy engine', function () {
   })
 
   it('Test auto openRemoteModal - button', async function () {
-    $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
+    $('body').append('<button class="html-test" data-ec-crud-toggle="remote-modal" id="buttonToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
 
     $('#buttonToTest').get(0).click()
     await wait(() => {
@@ -178,7 +178,7 @@ describe('Test Modal-manager with spy engine', function () {
     $(document).on('ec-crud-remote-modal-auto-before', '#buttonToTest', function (event) {
       event.preventDefault()
     })
-    $('body').append('<button class="html-test ec-crud-remote-modal-auto" id="buttonToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
+    $('body').append('<button class="html-test" data-ec-crud-toggle="remote-modal" id="buttonToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest">Go !</button>')
 
     $('#buttonToTest').get(0).click()
     await wait(() => {

From 031b656704d674995b325197ee3cdb56c014ab90 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 2 Jan 2023 19:43:00 +0100
Subject: [PATCH 202/264] Fix LICENSE year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 0eb55ec..3dfc933 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2022 E-COMMIT
+Copyright (c) 2011-2023 E-COMMIT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 40131ef5989678d69f241a42e0ad48e6b47ee68e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 2 Jan 2023 19:40:10 +0100
Subject: [PATCH 203/264] Fix Bootstrap themes

---
 templates/Theme/bootstrap4.html.twig | 4 ++--
 templates/Theme/bootstrap5.html.twig | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/Theme/bootstrap4.html.twig b/templates/Theme/bootstrap4.html.twig
index 9e4caab..19566e9 100644
--- a/templates/Theme/bootstrap4.html.twig
+++ b/templates/Theme/bootstrap4.html.twig
@@ -77,7 +77,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class ~ ' btn-outline-secondary'}}) }}
+                {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class|default('') ~ ' btn-outline-secondary'}}) }}
                 {{ form_widget(form.save, {'attr': {'class': 'btn-success'}}) }}
             </div>
             {{ form_end(form) }}
@@ -103,7 +103,7 @@
         </div>
 
         <div style="text-align: center;">
-            {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class ~ ' btn-outline-secondary'}}) }}
+            {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class|default('') ~ ' btn-outline-secondary'}}) }}
             {{ form_row(form.save, {'attr': {'class': 'btn-success'}}) }}
         </div>
         {{ form_end(form) }}
diff --git a/templates/Theme/bootstrap5.html.twig b/templates/Theme/bootstrap5.html.twig
index 070b761..317fa24 100644
--- a/templates/Theme/bootstrap5.html.twig
+++ b/templates/Theme/bootstrap5.html.twig
@@ -75,7 +75,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class ~ ' btn-outline-secondary'}}) }}
+                {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class|default('') ~ ' btn-outline-secondary'}}) }}
                 {{ form_widget(form.save, {'attr': {'class': 'btn-success'}}) }}
             </div>
             {{ form_end(form) }}
@@ -101,7 +101,7 @@
         </div>
 
         <div style="text-align: center;">
-            {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class ~ ' btn-outline-secondary'}}) }}
+            {{ form_widget(form.reset, {'attr': {'class': form.reset.vars.attr.class|default('') ~ ' btn-outline-secondary'}}) }}
             {{ form_row(form.save, {'attr': {'class': 'btn-success'}}) }}
         </div>
         {{ form_end(form) }}

From 62d55bb872fc5297aa75cf94abfa762d0267f562 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 2 Jan 2023 20:29:46 +0100
Subject: [PATCH 204/264] Fix data-ec-crud-toggle with child

---
 assets/js/ajax.js                           | 14 ++++----
 assets/js/crud.js                           | 20 +++++------
 assets/js/modal/modal-manager.js            | 23 +++++++------
 tests/assets/js/ajax.spec.js                | 24 +++++++++++++
 tests/assets/js/modal/modal-manager.spec.js | 37 +++++++++++++++++++++
 5 files changed, 92 insertions(+), 26 deletions(-)

diff --git a/assets/js/ajax.js b/assets/js/ajax.js
index 0a7e2b1..79c79e4 100644
--- a/assets/js/ajax.js
+++ b/assets/js/ajax.js
@@ -17,11 +17,11 @@ const ready = (callback) => {
 
 ready(function () {
   document.addEventListener('click', function (event) {
-    if (event.target.matches('[data-ec-crud-toggle="ajax-click"]')) {
+    if (event.target.closest('[data-ec-crud-toggle="ajax-click"]')) {
       onClickAuto(event)
     }
 
-    if (event.target.matches('a[data-ec-crud-toggle="ajax-link"]')) {
+    if (event.target.closest('a[data-ec-crud-toggle="ajax-link"]')) {
       onClickLinkAuto(event)
     }
   })
@@ -35,30 +35,32 @@ ready(function () {
 
 function onClickAuto (event) {
   event.preventDefault()
+  const element = event.target.closest('[data-ec-crud-toggle="ajax-click"]')
   const eventBefore = new CustomEvent('ec-crud-ajax-click-auto-before', {
     bubbles: true,
     cancelable: true
   })
-  event.target.dispatchEvent(eventBefore)
+  element.dispatchEvent(eventBefore)
   if (eventBefore.defaultPrevented) {
     return
   }
 
-  click(event.target).catch((error) => console.error(error))
+  click(element).catch((error) => console.error(error))
 }
 
 function onClickLinkAuto (event) {
   event.preventDefault()
+  const aLink = event.target.closest('a[data-ec-crud-toggle="ajax-link"]')
   const eventBefore = new CustomEvent('ec-crud-ajax-link-auto-before', {
     bubbles: true,
     cancelable: true
   })
-  event.target.dispatchEvent(eventBefore)
+  aLink.dispatchEvent(eventBefore)
   if (eventBefore.defaultPrevented) {
     return
   }
 
-  link(event.target).catch((error) => console.error(error))
+  link(aLink).catch((error) => console.error(error))
 }
 
 function onSubmitFormAuto (event) {
diff --git a/assets/js/crud.js b/assets/js/crud.js
index af336a6..9f17954 100644
--- a/assets/js/crud.js
+++ b/assets/js/crud.js
@@ -28,23 +28,23 @@ ready(function () {
   })
 
   document.addEventListener('click', function (event) {
-    if (event.target.matches('button[data-ec-crud-toggle="search-reset"]')) {
+    if (event.target.closest('button[data-ec-crud-toggle="search-reset"]')) {
       onResetCrudSearchForm(event)
     }
 
-    if (event.target.matches('button[data-ec-crud-toggle="display-settings-button"]')) {
+    if (event.target.closest('button[data-ec-crud-toggle="display-settings-button"]')) {
       onCrudDisplaySettingsOpen(event)
     }
 
-    if (event.target.matches('button[data-ec-crud-toggle="display-settings-check-all-columns"]')) {
+    if (event.target.closest('button[data-ec-crud-toggle="display-settings-check-all-columns"]')) {
       onCrudDisplaySettingsCheckAllColumns(event)
     }
 
-    if (event.target.matches('button[data-ec-crud-toggle="display-settings-uncheck-all-columns"]')) {
+    if (event.target.closest('button[data-ec-crud-toggle="display-settings-uncheck-all-columns"]')) {
       onCrudDisplaySettingsUncheckAllColumns(event)
     }
 
-    if (event.target.matches('button[data-ec-crud-toggle="display-settings-reset"]')) {
+    if (event.target.closest('button[data-ec-crud-toggle="display-settings-reset"]')) {
       onCrudDisplaySettingsReset(event)
     }
   })
@@ -67,7 +67,7 @@ function onSubmitCrudSearchForm (event) {
 }
 
 function onResetCrudSearchForm (event) {
-  const button = event.target
+  const button = event.target.closest('button[data-ec-crud-toggle="search-reset"]')
   const searchContainer = getElement('#' + button.getAttribute('data-crud-search-id'))
   const listContainer = getElement('#' + button.getAttribute('data-crud-list-id'))
 
@@ -81,7 +81,7 @@ function onResetCrudSearchForm (event) {
 }
 
 function onCrudDisplaySettingsOpen (event) {
-  const button = event.target
+  const button = event.target.closest('button[data-ec-crud-toggle="display-settings-button"]')
   const displaySettingsContainer = getElement('#' + button.getAttribute('data-display-settings'))
   const isModal = displaySettingsContainer.getAttribute('data-modal') === '1'
 
@@ -99,21 +99,21 @@ function onCrudDisplaySettingsOpen (event) {
 }
 
 function onCrudDisplaySettingsCheckAllColumns (event) {
-  const button = event.target
+  const button = event.target.closest('button[data-ec-crud-toggle="display-settings-check-all-columns"]')
   button.parentNode.closest('div[data-ec-crud-toggle="display-settings"]').querySelectorAll('input[type=checkbox]').forEach(checkbox => {
     checkbox.checked = true
   })
 }
 
 function onCrudDisplaySettingsUncheckAllColumns (event) {
-  const button = event.target
+  const button = event.target.closest('button[data-ec-crud-toggle="display-settings-uncheck-all-columns"]')
   button.parentNode.closest('div[data-ec-crud-toggle="display-settings"]').querySelectorAll('input[type=checkbox]').forEach(checkbox => {
     checkbox.checked = false
   })
 }
 
 function onCrudDisplaySettingsReset (event) {
-  const button = event.target
+  const button = event.target.closest('button[data-ec-crud-toggle="display-settings-reset"]')
   const displaySettingsContainer = button.parentNode.closest('div[data-ec-crud-toggle="display-settings"]')
   const listContainer = getElement('#' + displaySettingsContainer.getAttribute('data-crud-list-id'))
 
diff --git a/assets/js/modal/modal-manager.js b/assets/js/modal/modal-manager.js
index 6fd4b05..83dec11 100644
--- a/assets/js/modal/modal-manager.js
+++ b/assets/js/modal/modal-manager.js
@@ -23,15 +23,15 @@ const ready = (callback) => {
 
 ready(function () {
   document.addEventListener('click', function (event) {
-    if (event.target.matches('[data-ec-crud-toggle="modal"]')) {
+    if (event.target.closest('[data-ec-crud-toggle="modal"]')) {
       onClickModalAuto(event)
     }
 
-    if (event.target.matches('button[data-ec-crud-toggle="remote-modal"]')) {
+    if (event.target.closest('button[data-ec-crud-toggle="remote-modal"]')) {
       onClickButtonRemoteModalAuto(event)
     }
 
-    if (event.target.matches('a[data-ec-crud-toggle="remote-modal"]')) {
+    if (event.target.closest('a[data-ec-crud-toggle="remote-modal"]')) {
       onClickLinkRemoteModalAuto(event)
     }
   })
@@ -39,39 +39,42 @@ ready(function () {
 
 function onClickModalAuto (event) {
   event.preventDefault()
+  const element = event.target.closest('[data-ec-crud-toggle="modal"]')
   const eventBefore = new CustomEvent('ec-crud-modal-auto-before', {
     bubbles: true,
     cancelable: true
   })
-  event.target.dispatchEvent(eventBefore)
+  element.dispatchEvent(eventBefore)
   if (eventBefore.defaultPrevented) {
     return
   }
 
-  openModal(optionsResolver.getDataAttributes(event.target, 'ecCrudModal'))
+  openModal(optionsResolver.getDataAttributes(element, 'ecCrudModal'))
 }
 
 function onClickButtonRemoteModalAuto (event) {
   event.preventDefault()
+  const button = event.target.closest('button[data-ec-crud-toggle="remote-modal"]')
   const eventBefore = new CustomEvent('ec-crud-remote-modal-auto-before', {
     bubbles: true,
     cancelable: true
   })
-  event.target.dispatchEvent(eventBefore)
+  button.dispatchEvent(eventBefore)
   if (eventBefore.defaultPrevented) {
     return
   }
 
-  openRemoteModal(optionsResolver.getDataAttributes(event.target, 'ecCrudModal'))
+  openRemoteModal(optionsResolver.getDataAttributes(button, 'ecCrudModal'))
 }
 
 function onClickLinkRemoteModalAuto (event) {
   event.preventDefault()
+  const aLink = event.target.closest('a[data-ec-crud-toggle="remote-modal"]')
   const eventBefore = new CustomEvent('ec-crud-remote-modal-auto-before', {
     bubbles: true,
     cancelable: true
   })
-  event.target.dispatchEvent(eventBefore)
+  aLink.dispatchEvent(eventBefore)
   if (eventBefore.defaultPrevented) {
     return
   }
@@ -79,9 +82,9 @@ function onClickLinkRemoteModalAuto (event) {
   // Options in data-* override href
   const options = optionsResolver.resolve(
     {
-      url: event.target.getAttribute('href')
+      url: aLink.getAttribute('href')
     },
-    optionsResolver.getDataAttributes(event.target, 'ecCrudModal')
+    optionsResolver.getDataAttributes(aLink, 'ecCrudModal')
   )
 
   openRemoteModal(options)
diff --git a/tests/assets/js/ajax.spec.js b/tests/assets/js/ajax.spec.js
index 133a8c9..733ce3b 100644
--- a/tests/assets/js/ajax.spec.js
+++ b/tests/assets/js/ajax.spec.js
@@ -1070,6 +1070,18 @@ describe('Test Ajax.click', function () {
     expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
   })
 
+  it('Send auto-request with button and child', async function () {
+    $('body').append('<button class="html-test" data-ec-crud-toggle="ajax-click" id="buttonToTest" data-ec-crud-ajax-url="/goodRequest"><span id="childToTest">Go !</span></button>')
+
+    $('#childToTest').get(0).click()
+
+    await wait(() => {
+      return false
+    }, 500)
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+  })
+
   it('Send auto-request with button canceled', async function () {
     $(document).on('ec-crud-ajax-click-auto-before', '#clickToTest', function (event) {
       event.preventDefault()
@@ -1251,6 +1263,18 @@ describe('Test Ajax.link', function () {
     expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
   })
 
+  it('Send auto-request with link and child', async function () {
+    $('body').append('<a href="/goodRequest" class="html-test" data-ec-crud-toggle="ajax-link" id="linkToTest"><span id="childToTest">Go !</span></a>')
+
+    $('#childToTest').get(0).click()
+
+    await wait(() => {
+      return false
+    }, 500)
+
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+  })
+
   it('Send auto-request with link canceled', async function () {
     $(document).on('ec-crud-ajax-link-auto-before', '#linkToTest', function (event) {
       event.preventDefault()
diff --git a/tests/assets/js/modal/modal-manager.spec.js b/tests/assets/js/modal/modal-manager.spec.js
index 4dd67f3..a75240c 100644
--- a/tests/assets/js/modal/modal-manager.spec.js
+++ b/tests/assets/js/modal/modal-manager.spec.js
@@ -86,6 +86,15 @@ describe('Test Modal-manager with spy engine', function () {
     expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
   })
 
+  it('Test auto openModal with child', function () {
+    $('body').append('<a href="#" class="html-test" id="linkToTest" data-ec-crud-toggle="modal" data-ec-crud-modal-element="#test-modal"><span id="childToTest">Go !</span></a>')
+
+    $('#childToTest').get(0).click()
+
+    expect(this.spyEngine.openModal).toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+  })
+
   it('Test auto openModal canceled', function () {
     $(document).on('ec-crud-modal-auto-before', '#linkToTest', function (event) {
       event.preventDefault()
@@ -114,6 +123,20 @@ describe('Test Modal-manager with spy engine', function () {
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
   })
 
+  it('Test auto openRemoteModal - link with child', async function () {
+    $('body').append('<a href="#" class="html-test" data-ec-crud-toggle="remote-modal" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest"><span id="childToTest">Go !</span></a>')
+
+    $('#childToTest').get(0).click()
+    await wait(() => {
+      return this.spyEngine.opened
+    })
+
+    expect(this.spyEngine.openModal).toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+  })
+
   it('Test auto openRemoteModal - link with href', async function () {
     $('body').append('<a href="/goodRequest" class="html-test" data-ec-crud-toggle="remote-modal" id="linkToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content">Go !</a>')
 
@@ -174,6 +197,20 @@ describe('Test Modal-manager with spy engine', function () {
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
   })
 
+  it('Test auto openRemoteModal - button with child', async function () {
+    $('body').append('<button class="html-test" data-ec-crud-toggle="remote-modal" id="buttonToTest" data-ec-crud-modal-element="#test-modal" data-ec-crud-modal-element-content="#test-modal .content" data-ec-crud-modal-url="/goodRequest"><span id="childToTest">Go !</span></button>')
+
+    $('#childToTest').get(0).click()
+    await wait(() => {
+      return this.spyEngine.opened
+    })
+
+    expect(this.spyEngine.openModal).toHaveBeenCalled()
+    expect(this.spyEngine.closeModal).not.toHaveBeenCalled()
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+  })
+
   it('Test auto openRemoteModal - button - canceled', async function () {
     $(document).on('ec-crud-remote-modal-auto-before', '#buttonToTest', function (event) {
       event.preventDefault()

From 7ea52639964744a76bbfeec728c1a9ea0f38a3f9 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 3 Jan 2023 13:09:12 +0100
Subject: [PATCH 205/264] [Ajax] Fix body and query parameters with objects

---
 assets/js/ajax.js            | 49 +++++++++++++++++-----------
 tests/assets/js/ajax.spec.js | 62 ++++++++++++++++++++++++++++++++----
 2 files changed, 85 insertions(+), 26 deletions(-)

diff --git a/assets/js/ajax.js b/assets/js/ajax.js
index 79c79e4..419ea81 100644
--- a/assets/js/ajax.js
+++ b/assets/js/ajax.js
@@ -138,14 +138,8 @@ export function sendRequest (options) {
       fetchOptions.body = options.body
     } else if (options.body instanceof Object) {
       const formData = new FormData()
-      Object.entries(options.body).forEach(entry => {
-        if (Array.isArray(entry[1])) {
-          entry[1].forEach(subEntry => {
-            formData.append(entry[0], subEntry)
-          })
-        } else {
-          formData.append(entry[0], entry[1])
-        }
+      generateParameters([], '', '', options.body).forEach(entry => {
+        formData.append(entry[0], entry[1])
       })
       fetchOptions.body = formData
     } else if (options.body !== null) {
@@ -330,17 +324,8 @@ function resolveUrl (options) {
   const url = new URL(options.url, window.location.origin)
   const searchParams = url.searchParams
 
-  Object.entries(options.query).forEach(entry => {
-    if (Array.isArray(entry[1])) {
-      if (searchParams.has(entry[0])) {
-        searchParams.delete(entry[0])
-      }
-      entry[1].forEach(subEntry => {
-        searchParams.append(entry[0], subEntry)
-      })
-    } else {
-      searchParams.set(entry[0], entry[1])
-    }
+  generateParameters([], '', '', options.query).forEach(entry => {
+    searchParams.set(entry[0], entry[1])
   })
 
   if (!options.cache && !searchParams.has('_')) {
@@ -350,6 +335,32 @@ function resolveUrl (options) {
   return url.toString()
 }
 
+function generateParameters (result, propertyPath, property, value) {
+  if (/[[\]]/.test(property)) {
+    return result
+  }
+
+  if (propertyPath === '') {
+    propertyPath = property
+  } else {
+    propertyPath = propertyPath + '[' + property + ']'
+  }
+
+  if (typeof (value) === 'undefined' || typeof (value) !== 'object') {
+    result.push([propertyPath, value])
+
+    return result
+  }
+
+  for (const param in value) {
+    if (Object.prototype.hasOwnProperty.call(value, param)) {
+      result = generateParameters(result, propertyPath, param, value[param])
+    }
+  }
+
+  return result
+}
+
 function executeEventsAndCallbacksSuccess (callbacksSuccess, options, data, response) {
   const eventOnSuccess = new CustomEvent('ec-crud-ajax-on-success', {
     detail: {
diff --git a/tests/assets/js/ajax.spec.js b/tests/assets/js/ajax.spec.js
index 733ce3b..92f15d3 100644
--- a/tests/assets/js/ajax.spec.js
+++ b/tests/assets/js/ajax.spec.js
@@ -432,7 +432,15 @@ describe('Test Ajax.sendRequest', function () {
       url: '/goodRequest',
       body: {
         var1: 'My value 1',
-        'var2[]': ['val2A', 'val2C']
+        var2: ['val2A', 'val2C'],
+        'var[': 'value', // Ignored
+        object: {
+          property1: 'A',
+          property2: ['B', 'C'],
+          subObject: {
+            property3: 'D'
+          }
+        }
       },
       onComplete: function (statusText, response) {
         callbackComplete()
@@ -452,7 +460,15 @@ describe('Test Ajax.sendRequest', function () {
 
     expect(response).toBeInstanceOf(Response)
     expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
-    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2[]', 'val2A'], ['var2[]', 'val2C']]) // Parsed by addJasmineAjaxFormDataSupport
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([
+      ['var1', 'My value 1'],
+      ['var2[0]', 'val2A'],
+      ['var2[1]', 'val2C'],
+      ['object[property1]', 'A'],
+      ['object[property2][0]', 'B'],
+      ['object[property2][1]', 'C'],
+      ['object[subObject][property3]', 'D']
+    ]) // Parsed by addJasmineAjaxFormDataSupport
     expect(callbackSuccess).toHaveBeenCalled()
     expect(callbackError).not.toHaveBeenCalled()
     expect(callbackComplete).toHaveBeenCalled()
@@ -496,11 +512,43 @@ describe('Test Ajax.sendRequest', function () {
 
   it('Send request with query option', async function () {
     const promise = ajax.sendRequest({
-      url: '/goodRequest?var1=val1&var2[]=val2a&var3=val3',
+      url: '/goodRequest',
+      query: {
+        // Same example as https://www.php.net/manual/fr/function.http-build-query.php
+        user: {
+          name: 'Bob Smith',
+          age: 47,
+          sex: 'M',
+          dob: '5/12/1956'
+        },
+        'var[': 'value', // Ignored
+        pastimes: ['golf', 'opera', 'poker', 'rap'],
+        children: {
+          bobby: {
+            age: 12,
+            sex: 'M'
+          },
+          sally: {
+            age: 8,
+            sex: 'F'
+          }
+        }
+      },
+      cache: true
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toEqual('http://localhost:9876/goodRequest?user%5Bname%5D=Bob+Smith&user%5Bage%5D=47&user%5Bsex%5D=M&user%5Bdob%5D=5%2F12%2F1956&pastimes%5B0%5D=golf&pastimes%5B1%5D=opera&pastimes%5B2%5D=poker&pastimes%5B3%5D=rap&children%5Bbobby%5D%5Bage%5D=12&children%5Bbobby%5D%5Bsex%5D=M&children%5Bsally%5D%5Bage%5D=8&children%5Bsally%5D%5Bsex%5D=F')
+  })
+
+  it('Send request with query option and override', async function () {
+    const promise = ajax.sendRequest({
+      url: '/goodRequest?var1=value1&var2=value2',
       query: {
-        var1: 'new1', // override
-        'var2[]': ['new2a', 'new2b'], // override
-        var4: 'new4'
+        var1: 'newValue1'
       },
       cache: true
     })
@@ -509,7 +557,7 @@ describe('Test Ajax.sendRequest', function () {
     const response = await promise
 
     expect(response).toBeInstanceOf(Response)
-    expect(jasmine.Ajax.requests.mostRecent().url).toEqual('http://localhost:9876/goodRequest?var1=new1&var3=val3&var2%5B%5D=new2a&var2%5B%5D=new2b&var4=new4')
+    expect(jasmine.Ajax.requests.mostRecent().url).toEqual('http://localhost:9876/goodRequest?var1=newValue1&var2=value2')
   })
 
   it('Send request with cache', async function () {

From 206d412d6a85647d6f1d864838f882e8c5313476 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 27 Jan 2023 19:17:46 +0100
Subject: [PATCH 206/264] Add doctrine/collections v2 support

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index eac0682..dccfaeb 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "php": "^8.0",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "doctrine/collections": "^1.5",
+        "doctrine/collections": "^1.5|^2.0",
         "doctrine/dbal": "^2.13.1|^3.2",
         "doctrine/doctrine-bundle": "^2.4.5",
         "doctrine/orm": "^2.9",

From 5877b257342cd94d641a897a6de1a31aac97a217 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 3 Jun 2023 19:36:48 +0200
Subject: [PATCH 207/264] Fix CS

---
 composer.json                                            | 5 ++++-
 src/Controller/CrudControllerTrait.php                   | 2 +-
 src/Crud/Crud.php                                        | 8 ++++----
 src/Crud/CrudConfig.php                                  | 4 ++--
 src/Crud/CrudSession.php                                 | 2 +-
 src/Crud/Http/QueryBuilder.php                           | 4 ++--
 src/Form/Type/DisplaySettingsType.php                    | 9 ---------
 src/Form/Type/FormSearchType.php                         | 9 ---------
 src/Twig/CrudExtension.php                               | 4 ++--
 tests/Crud/AbstractCrudTest.php                          | 2 +-
 tests/Crud/CrudSessionTest.php                           | 2 +-
 tests/Crud/SearchFormBuilderTest.php                     | 2 +-
 .../TestCrudControllerWithPersistentSettingsTest.php     | 2 +-
 13 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/composer.json b/composer.json
index dccfaeb..53f5d28 100644
--- a/composer.json
+++ b/composer.json
@@ -65,6 +65,9 @@
         "psr-4": { "Ecommit\\CrudBundle\\Tests\\": "tests/" }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     }
 }
diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index 21d08e7..bc79937 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -26,7 +26,7 @@ abstract protected function getCrudOptions(): array;
 
     abstract protected function getTemplateName(string $action): string;
 
-    protected function createCrudConfig(?string $sessionName = null): CrudConfig
+    protected function createCrudConfig(string $sessionName = null): CrudConfig
     {
         return new CrudConfig($sessionName);
     }
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 462cdf7..dcceb66 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -882,10 +882,10 @@ protected function save(): void
                 $em->flush();
             } else {
                 // Create object in database only if not default values
-                if ($this->sessionValues->getDisplayedColumns() != $this->getDefaultDisplayedColumns() ||
-                    $this->sessionValues->getMaxPerPage() != $this->getDefaultMaxPerPage() ||
-                    $this->sessionValues->getSortDirection() != $this->getDefaultSortDirection() ||
-                    $this->sessionValues->getSort() != $this->getDefaultSort()
+                if ($this->sessionValues->getDisplayedColumns() != $this->getDefaultDisplayedColumns()
+                    || $this->sessionValues->getMaxPerPage() != $this->getDefaultMaxPerPage()
+                    || $this->sessionValues->getSortDirection() != $this->getDefaultSortDirection()
+                    || $this->sessionValues->getSort() != $this->getDefaultSort()
                 ) {
                     $objectDatabase = new UserCrudSettings(
                         $this->container->get('security.token_storage')->getToken()->getUser(),
diff --git a/src/Crud/CrudConfig.php b/src/Crud/CrudConfig.php
index f480b87..4443abb 100644
--- a/src/Crud/CrudConfig.php
+++ b/src/Crud/CrudConfig.php
@@ -19,7 +19,7 @@ final class CrudConfig implements \ArrayAccess
 {
     protected array $options = [];
 
-    public function __construct(?string $sessionName = null)
+    public function __construct(string $sessionName = null)
     {
         if (null !== $sessionName) {
             $this->setSessionName($sessionName);
@@ -155,7 +155,7 @@ public function setRoute(string $name, array $parameters = []): self
         return $this;
     }
 
-    public function createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = []): self
+    public function createSearchForm(SearcherInterface $defaultData, string $type = null, array $options = []): self
     {
         $this->options['search_form_data'] = $defaultData;
         $this->options['search_form_type'] = $type;
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index 5e96581..1615e89 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -29,7 +29,7 @@ final class CrudSession
     /**
      * @internal
      */
-    public function __construct(protected int $maxPerPage, protected array $displayedColumns, protected string $sort, protected string $sortDirection, ?SearcherInterface $searchFormData = null)
+    public function __construct(protected int $maxPerPage, protected array $displayedColumns, protected string $sort, protected string $sortDirection, SearcherInterface $searchFormData = null)
     {
         $this->searchFormData = ($searchFormData) ? clone $searchFormData : null; // Avoid modification by reference (by the user or an invalid form)
     }
diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index dfefe6d..d953a53 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -31,7 +31,7 @@ final class QueryBuilder implements QueryBuilderInterface
     protected array $orders = [];
     protected HttpClientInterface $client;
 
-    public function __construct(protected string $url, protected string $httpMethod, ?HttpClientInterface $client = null)
+    public function __construct(protected string $url, protected string $httpMethod, HttpClientInterface $client = null)
     {
         if (null === $client) {
             $client = HttpClient::create();
@@ -50,7 +50,7 @@ public function setOrderBuilder(\Closure $orderBuilder): self
     }
 
     /**
-     * @param \Closure $orderBuilder Closure aguments: $queryBuilder, $page, $resultsPerPage
+     * Closure aguments: $queryBuilder, $page, $resultsPerPage.
      */
     public function setPaginationBuilder(\Closure $paginationBuilder): self
     {
diff --git a/src/Form/Type/DisplaySettingsType.php b/src/Form/Type/DisplaySettingsType.php
index 895dfd3..6dff738 100644
--- a/src/Form/Type/DisplaySettingsType.php
+++ b/src/Form/Type/DisplaySettingsType.php
@@ -24,9 +24,6 @@
 
 class DisplaySettingsType extends AbstractType
 {
-    /**
-     * {@inheritdoc}
-     */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->add('resultsPerPage', ChoiceType::class, [
@@ -62,9 +59,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         ]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
@@ -78,9 +72,6 @@ public function configureOptions(OptionsResolver $resolver): void
         ]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBlockPrefix()
     {
         return 'crud_display_settings';
diff --git a/src/Form/Type/FormSearchType.php b/src/Form/Type/FormSearchType.php
index c9615e0..e031237 100644
--- a/src/Form/Type/FormSearchType.php
+++ b/src/Form/Type/FormSearchType.php
@@ -19,16 +19,10 @@
 
 class FormSearchType extends AbstractType
 {
-    /**
-     * {@inheritdoc}
-     */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
@@ -37,9 +31,6 @@ public function configureOptions(OptionsResolver $resolver): void
         ]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBlockPrefix()
     {
         return 'crud_search';
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index e191ff5..4b563cd 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -701,7 +701,7 @@ protected function getAjaxAttributes(array $options): array
         return $attributes;
     }
 
-    public function crudIcon(Environment $environment, string $iconName, ?string $iconTheme = null): string
+    public function crudIcon(Environment $environment, string $iconName, string $iconTheme = null): string
     {
         if (null === $iconTheme) {
             $iconTheme = $this->iconTheme;
@@ -720,7 +720,7 @@ protected function renderBlock(Environment $environment, string $templateName, s
         return ob_get_clean();
     }
 
-    protected function buildOptions(string $function, array $inlineOptions, ?Crud $crud = null): array
+    protected function buildOptions(string $function, array $inlineOptions, Crud $crud = null): array
     {
         $options = [];
 
diff --git a/tests/Crud/AbstractCrudTest.php b/tests/Crud/AbstractCrudTest.php
index 146dcea..1c838b0 100644
--- a/tests/Crud/AbstractCrudTest.php
+++ b/tests/Crud/AbstractCrudTest.php
@@ -81,7 +81,7 @@ protected function createCrud(array|CrudConfig $crudConfig, array $filters = [],
         return $crud;
     }
 
-    protected function createValidCrudConfig(?CrudConfig $crudConfig = null, bool $withSearcher = false): CrudConfig
+    protected function createValidCrudConfig(CrudConfig $crudConfig = null, bool $withSearcher = false): CrudConfig
     {
         $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
             ->createQueryBuilder('u')
diff --git a/tests/Crud/CrudSessionTest.php b/tests/Crud/CrudSessionTest.php
index 6cdb020..c095df2 100644
--- a/tests/Crud/CrudSessionTest.php
+++ b/tests/Crud/CrudSessionTest.php
@@ -239,7 +239,7 @@ protected function setPropertyWithoutGetter(CrudSession $crudSession, string $pr
         $reflectionMethod->setValue($crudSession, $value);
     }
 
-    protected function createCrudSession(?UserSearcher $searchFormData = null): CrudSession
+    protected function createCrudSession(UserSearcher $searchFormData = null): CrudSession
     {
         return new CrudSession(100, ['col1'], 'sort1', Crud::ASC, $searchFormData);
     }
diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
index 47fa5e5..b47cb35 100644
--- a/tests/Crud/SearchFormBuilderTest.php
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -470,7 +470,7 @@ protected function createCrudContainer(array $filters = []): ContainerInterface
         return $container;
     }
 
-    protected function createSearchFormBuilder(?array $filters = null, ?Crud $crud = null, ?SearcherInterface $defaultData = null, ?string $type = null, array $options = []): SearchFormBuilder
+    protected function createSearchFormBuilder(array $filters = null, Crud $crud = null, SearcherInterface $defaultData = null, string $type = null, array $options = []): SearchFormBuilder
     {
         $filters = (null !== $filters) ? $filters : ['my_filter' => $this->createMock(FilterInterface::class)];
         $crud = ($crud) ?: $this->createCrud($this->createValidCrudConfig());
diff --git a/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
index ecf7fd9..fe14c75 100644
--- a/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
+++ b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
@@ -270,7 +270,7 @@ protected function logout(Client $client): void
         $client->request('GET', '/logout');
     }
 
-    protected function changeSettings(Client $client, array $headerColumnClicks = [], array $displayColumnClicks = [], ?int $resultsPerPage = null): void
+    protected function changeSettings(Client $client, array $headerColumnClicks = [], array $displayColumnClicks = [], int $resultsPerPage = null): void
     {
         foreach ($headerColumnClicks as $column) {
             $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[contains(text(), "'.$column.'")]');

From 3678cc4d054914e767556c3295ceb1ea59b52bc6 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 3 Jun 2023 19:44:10 +0200
Subject: [PATCH 208/264] Fix doc

---
 doc/references/ajax.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/references/ajax.md b/doc/references/ajax.md
index 984b04f..d120b23 100644
--- a/doc/references/ajax.md
+++ b/doc/references/ajax.md
@@ -51,11 +51,11 @@ La fonction `sendRequest` retourne une promesse.
 
 | Événement                | Objet                                                                                    | Description                                                                                                                    | Propriétés disponibles                                                    |
 |--------------------------|------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------|
-| ec-crud-ajax             | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent) (cancelable) | Appelé avant l'exécution de la requête, avant la résolution des options. Peut annuler la requête avec `event.preventDefault()` | <ul><li>event.details.options</li></ul>                                   |
-| ec-crud-ajax-before-send | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent) (cancelable) | Appelé avant l'exécution de la requête, après la résolution des options. Peut annuler la requête avec `event.preventDefault()` | <ul><li>event.details.options</li></ul>                                   |
-| ec-crud-ajax-on-success  | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent)              | Même fonctionnement que callback `onSuccess`                                                                                   | <ul><li>event.details.data</li><li>event.details.response</li></ul>       |
-| ec-crud-ajax-on-error    | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent)              | Même fonctionnement que callback `onError`                                                                                     | <ul><li>event.details.statusText</li><li>event.details.response</li></ul> |
-| ec-crud-ajax-on-complete | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent)              | Même fonctionnement que callback `onComplete`                                                                                  | <ul><li>event.details.statusText</li><li>event.details.response</li></ul> |
+| ec-crud-ajax             | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent) (cancelable) | Appelé avant l'exécution de la requête, avant la résolution des options. Peut annuler la requête avec `event.preventDefault()` | <ul><li>event.detail.options</li></ul>                                   |
+| ec-crud-ajax-before-send | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent) (cancelable) | Appelé avant l'exécution de la requête, après la résolution des options. Peut annuler la requête avec `event.preventDefault()` | <ul><li>event.detail.options</li></ul>                                   |
+| ec-crud-ajax-on-success  | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent)              | Même fonctionnement que callback `onSuccess`                                                                                   | <ul><li>event.detail.data</li><li>event.detail.response</li></ul>       |
+| ec-crud-ajax-on-error    | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent)              | Même fonctionnement que callback `onError`                                                                                     | <ul><li>event.detail.statusText</li><li>event.detail.response</li></ul> |
+| ec-crud-ajax-on-complete | [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent)              | Même fonctionnement que callback `onComplete`                                                                                  | <ul><li>event.detail.statusText</li><li>event.detail.response</li></ul> |
 
 
 

From 19c9f7a3cbeb2d455215b9414de25350ffd88141 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 3 Jun 2023 19:44:35 +0200
Subject: [PATCH 209/264] Add Symfony 6.3 tests

---
 .github/workflows/tests.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 13a9296..f2f5013 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -30,6 +30,10 @@ jobs:
                         symfony-version: '6.2.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 6.2.* lowest'
+                    -   php-version: '8.1'
+                        symfony-version: '6.3.*'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with SF 6.3.* lowest'
 
 
                     #Symfony versions
@@ -45,6 +49,9 @@ jobs:
                     -   php-version: '8.2'
                         symfony-version: '6.2.*'
                         description: 'with SF 6.2.*'
+                    -   php-version: '8.2'
+                        symfony-version: '6.3.*'
+                        description: 'with SF 6.3.*'
 
                     #PHP versions
                     -   php-version: '8.0'

From a83e4bd9b1ada9868c05d563f4a24fb7cfdbe319 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 3 Jun 2023 20:37:49 +0200
Subject: [PATCH 210/264] Require PHP 8.1

---
 .github/workflows/tests.yml           | 7 +++----
 .php-cs-fixer.dist.php                | 2 +-
 composer.json                         | 2 +-
 tests/Functional/App/public/index.php | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f2f5013..0a73078 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,11 +14,11 @@ jobs:
             matrix:
                 include:
                     #Mini (for each Symfony version)
-                    -   php-version: '8.0'
+                    -   php-version: '8.1'
                         symfony-version: '5.4.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 5.4.* lowest'
-                    -   php-version: '8.0'
+                    -   php-version: '8.1'
                         symfony-version: '6.0.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 6.0.* lowest'
@@ -54,7 +54,6 @@ jobs:
                         description: 'with SF 6.3.*'
 
                     #PHP versions
-                    -   php-version: '8.0'
                     -   php-version: '8.1'
                     -   php-version: '8.2'
 
@@ -64,7 +63,7 @@ jobs:
                         coding-standards: true
 
                     #Static Analysis (min PHP version)
-                    -   php-version: '8.0'
+                    -   php-version: '8.1'
                         description: 'with Static Analysis'
                         static-analysis: true
 
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 55777ed..0738a31 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -21,7 +21,7 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         '@DoctrineAnnotation' => true,
-        '@PHP80Migration' => true,
+        '@PHP81Migration' => true,
         '@PHP80Migration:risky' => true,
         '@PHPUnit84Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
diff --git a/composer.json b/composer.json
index 53f5d28..a9a2e2e 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-json": "*",
         "ext-mbstring": "*",
         "doctrine/collections": "^1.5|^2.0",
diff --git a/tests/Functional/App/public/index.php b/tests/Functional/App/public/index.php
index 77552c2..0367e06 100644
--- a/tests/Functional/App/public/index.php
+++ b/tests/Functional/App/public/index.php
@@ -18,7 +18,7 @@
 require dirname(__DIR__).'/config/bootstrap.php';
 
 if ($_SERVER['APP_DEBUG']) {
-    umask(0000);
+    umask(0);
 
     Debug::enable();
 }

From 1f909f25c3e9bf1de8d7f3f5db1484f019e9818c Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 15 Jul 2023 16:29:03 +0200
Subject: [PATCH 211/264] Fix CS

---
 src/Crud/CrudConfig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Crud/CrudConfig.php b/src/Crud/CrudConfig.php
index 4443abb..3ea5e23 100644
--- a/src/Crud/CrudConfig.php
+++ b/src/Crud/CrudConfig.php
@@ -209,7 +209,7 @@ public function setTwigFunctionsConfiguration(array $value): self
         return $this;
     }
 
-    public function resetOptions(null|string|array $options = null): self
+    public function resetOptions(string|array $options = null): self
     {
         if (null === $options) {
             $this->options = [];

From c3f464f700cf2853b113706dc2b47e92c8d59d1e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 15 Jul 2023 17:04:22 +0200
Subject: [PATCH 212/264] Add auto_reset option

---
 src/Crud/CrudResponseGenerator.php            | 12 ++++++----
 .../Controller/TestCrudControllerTest.php     | 22 +++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index 3ec2384..751a781 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -30,7 +30,7 @@ public function __construct(protected ContainerInterface $container)
 
     public function getResponse(Crud $crud, array $options = []): Response
     {
-        $options = $this->getOptions($options);
+        $options = $this->getOptions($options, true);
         $data = $this->processCrud($crud, $options);
 
         return $this->renderCrud($this->getTemplateName($options['template_generator'], 'index'), $data);
@@ -40,7 +40,7 @@ public function getAjaxResponse(Crud $crud, array $options = []): Response
     {
         $masterRequest = $this->container->get('request_stack')->getMainRequest();
 
-        $options = $this->getOptions($options);
+        $options = $this->getOptions($options, false);
         $data = $this->processCrud($crud, $options);
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
@@ -64,7 +64,7 @@ public function getAjaxResponse(Crud $crud, array $options = []): Response
 
     public function getCrudData(Crud $crud, array $options = []): array
     {
-        $options = $this->getOptions($options);
+        $options = $this->getOptions($options, false);
 
         return $this->processCrud($crud, $options);
     }
@@ -87,6 +87,9 @@ protected function processCrud(Crud $crud, array $options): array
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
 
+        if ($options['auto_reset']) {
+            $crud->reset();
+        }
         if ($request->query->has('search')) {
             $crud->processSearchForm();
         }
@@ -106,12 +109,13 @@ protected function processCrud(Crud $crud, array $options): array
         return $data;
     }
 
-    protected function getOptions(array $options): array
+    protected function getOptions(array $options, bool $autoResetDefaultValue): array
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
             'before_build' => null,
             'after_build' => null,
+            'auto_reset' => $autoResetDefaultValue,
         ]);
         $resolver->setRequired([
             'template_generator',
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 34c2ab7..ff40ac7 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -165,21 +165,21 @@ public function testChangePage(Client $client): Client
     /**
      * @depends testChangePage
      */
-    public function testSessionValuesAfterChangePage(Client $client): Client
+    public function testSessionValuesAfterChangePageAndReload(Client $client): Client
     {
         $client->request('GET', static::URL);
 
-        $this->assertSame([1, 3], $this->countRowsAndColumns($client->getCrawler()));
-        $this->assertSame([2, 2], $this->getPagination($client->getCrawler()));
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
-        $this->assertSame('JudieCieux', $this->getFirstUsername($client->getCrawler()));
+        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
         $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
 
     /**
-     * @depends testSessionValuesAfterChangePage
+     * @depends testSessionValuesAfterChangePageAndReload
      */
     public function testSearch(Client $client): Client
     {
@@ -200,21 +200,21 @@ public function testSearch(Client $client): Client
     /**
      * @depends testSearch
      */
-    public function testSessionValuesAfterSearch(Client $client): Client
+    public function testSessionValuesAfterSearchAndReload(Client $client): Client
     {
         $client->request('GET', static::URL);
 
-        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
-        $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
+        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
-        $this->assertSame('HenriPoste', $this->getFirstUsername($client->getCrawler()));
+        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
         $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
 
     /**
-     * @depends testSessionValuesAfterSearch
+     * @depends testSessionValuesAfterSearchAndReload
      */
     public function testSearchWithoutFilter(Client $client): Client
     {
@@ -409,7 +409,7 @@ public function testManualResetSort(Client $client): Client
         }
         $client->request('GET', $resetUrl);
 
-        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler())); // Not reset display settings and search
+        $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler())); // Not reset display settings and search
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
 
         return $client;

From 3d0d5aa1d204fbf364c649bb6a3e26f89c4806a2 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 22 Jul 2023 14:28:51 +0200
Subject: [PATCH 213/264] Revert "Add auto_reset option"

This reverts commit c3f464f700cf2853b113706dc2b47e92c8d59d1e.
---
 src/Crud/CrudResponseGenerator.php            | 12 ++++------
 .../Controller/TestCrudControllerTest.php     | 22 +++++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index 751a781..3ec2384 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -30,7 +30,7 @@ public function __construct(protected ContainerInterface $container)
 
     public function getResponse(Crud $crud, array $options = []): Response
     {
-        $options = $this->getOptions($options, true);
+        $options = $this->getOptions($options);
         $data = $this->processCrud($crud, $options);
 
         return $this->renderCrud($this->getTemplateName($options['template_generator'], 'index'), $data);
@@ -40,7 +40,7 @@ public function getAjaxResponse(Crud $crud, array $options = []): Response
     {
         $masterRequest = $this->container->get('request_stack')->getMainRequest();
 
-        $options = $this->getOptions($options, false);
+        $options = $this->getOptions($options);
         $data = $this->processCrud($crud, $options);
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
@@ -64,7 +64,7 @@ public function getAjaxResponse(Crud $crud, array $options = []): Response
 
     public function getCrudData(Crud $crud, array $options = []): array
     {
-        $options = $this->getOptions($options, false);
+        $options = $this->getOptions($options);
 
         return $this->processCrud($crud, $options);
     }
@@ -87,9 +87,6 @@ protected function processCrud(Crud $crud, array $options): array
 
         $request = $this->container->get('request_stack')->getCurrentRequest();
 
-        if ($options['auto_reset']) {
-            $crud->reset();
-        }
         if ($request->query->has('search')) {
             $crud->processSearchForm();
         }
@@ -109,13 +106,12 @@ protected function processCrud(Crud $crud, array $options): array
         return $data;
     }
 
-    protected function getOptions(array $options, bool $autoResetDefaultValue): array
+    protected function getOptions(array $options): array
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
             'before_build' => null,
             'after_build' => null,
-            'auto_reset' => $autoResetDefaultValue,
         ]);
         $resolver->setRequired([
             'template_generator',
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index ff40ac7..34c2ab7 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -165,21 +165,21 @@ public function testChangePage(Client $client): Client
     /**
      * @depends testChangePage
      */
-    public function testSessionValuesAfterChangePageAndReload(Client $client): Client
+    public function testSessionValuesAfterChangePage(Client $client): Client
     {
         $client->request('GET', static::URL);
 
-        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
-        $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
+        $this->assertSame([1, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([2, 2], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
-        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+        $this->assertSame('JudieCieux', $this->getFirstUsername($client->getCrawler()));
         $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
 
     /**
-     * @depends testSessionValuesAfterChangePageAndReload
+     * @depends testSessionValuesAfterChangePage
      */
     public function testSearch(Client $client): Client
     {
@@ -200,21 +200,21 @@ public function testSearch(Client $client): Client
     /**
      * @depends testSearch
      */
-    public function testSessionValuesAfterSearchAndReload(Client $client): Client
+    public function testSessionValuesAfterSearch(Client $client): Client
     {
         $client->request('GET', static::URL);
 
-        $this->assertSame([10, 3], $this->countRowsAndColumns($client->getCrawler()));
-        $this->assertSame([1, 2], $this->getPagination($client->getCrawler()));
+        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler()));
+        $this->assertSame([1, 1], $this->getPagination($client->getCrawler()));
         $this->assertSame(['last_name', Crud::DESC], $this->getSort($client->getCrawler()));
-        $this->assertSame('ClémentTine', $this->getFirstUsername($client->getCrawler()));
+        $this->assertSame('HenriPoste', $this->getFirstUsername($client->getCrawler()));
         $this->checkBeforeAndAfterBuild($client->getCrawler());
 
         return $client;
     }
 
     /**
-     * @depends testSessionValuesAfterSearchAndReload
+     * @depends testSessionValuesAfterSearch
      */
     public function testSearchWithoutFilter(Client $client): Client
     {
@@ -409,7 +409,7 @@ public function testManualResetSort(Client $client): Client
         }
         $client->request('GET', $resetUrl);
 
-        $this->assertSame([5, 3], $this->countRowsAndColumns($client->getCrawler())); // Not reset display settings and search
+        $this->assertSame([2, 3], $this->countRowsAndColumns($client->getCrawler())); // Not reset display settings and search
         $this->assertSame(['first_name', Crud::ASC], $this->getSort($client->getCrawler()));
 
         return $client;

From 68039205ffbaeb1048981535dc3a0d6cecdf1af2 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 11 Aug 2023 15:40:42 +0200
Subject: [PATCH 214/264] Label: Add TranslatableInterface support

---
 composer.json                                      |  1 +
 src/Crud/CrudColumn.php                            |  7 ++++---
 src/Form/Type/DisplaySettingsType.php              | 11 ++++++++++-
 src/Twig/CrudExtension.php                         |  3 ++-
 tests/Functional/App/Controller/UserController.php |  3 ++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index a9a2e2e..208c158 100644
--- a/composer.json
+++ b/composer.json
@@ -41,6 +41,7 @@
         "symfony/security-csrf": "^5.4|^6.0",
         "symfony/service-contracts": "^1.1.6|^2|^3",
         "symfony/translation": "^5.4|^6.0",
+        "symfony/translation-contracts": "^2.3|^3.0",
         "symfony/twig-bridge": "^5.4|^6.0",
         "symfony/twig-bundle": "^5.4|^6.0",
         "symfony/validator": "^5.4|^6.0",
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index d836345..7b7729a 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -17,6 +17,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Validation;
+use Symfony\Contracts\Translation\TranslatableInterface;
 
 final class CrudColumn
 {
@@ -53,7 +54,7 @@ public function __construct(array $options)
             'alias',
         ]);
         $resolver->setDefaults([
-            'label' => fn (Options $options): string => $options['id'],
+            'label' => fn (Options $options): string|TranslatableInterface => $options['id'],
             'sortable' => true,
             'displayed_by_default' => true,
             'alias_sort' => fn (Options $options): string => $options['alias'],
@@ -64,7 +65,7 @@ public function __construct(array $options)
             new Length(max: 100, maxMessage: 'The column id "{{ value }}" is too long. It should have {{ limit }} character or less')
         ));
         $resolver->setAllowedTypes('alias', 'string');
-        $resolver->setAllowedTypes('label', 'string');
+        $resolver->setAllowedTypes('label', ['string', TranslatableInterface::class]);
         $resolver->setAllowedTypes('sortable', 'bool');
         $resolver->setAllowedTypes('displayed_by_default', 'bool');
         $resolver->setAllowedTypes('alias_sort', ['string', 'array']);
@@ -83,7 +84,7 @@ public function getAlias(): string
         return $this->options['alias'];
     }
 
-    public function getLabel(): string
+    public function getLabel(): string|TranslatableInterface
     {
         return $this->options['label'];
     }
diff --git a/src/Form/Type/DisplaySettingsType.php b/src/Form/Type/DisplaySettingsType.php
index 6dff738..6af7b75 100644
--- a/src/Form/Type/DisplaySettingsType.php
+++ b/src/Form/Type/DisplaySettingsType.php
@@ -21,6 +21,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Count;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Contracts\Translation\TranslatableInterface;
 
 class DisplaySettingsType extends AbstractType
 {
@@ -34,8 +35,16 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'constraints' => new NotBlank(),
         ]);
 
+        $columnsChoices = $options['columns_choices'];
         $builder->add('displayedColumns', ChoiceType::class, [
-            'choices' => array_flip($options['columns_choices']),
+            'choices' => array_keys($columnsChoices),
+            'choice_label' => function (string $choice, string $key, mixed $value) use ($columnsChoices): string|TranslatableInterface {
+                if (\array_key_exists($choice, $columnsChoices)) {
+                    return $columnsChoices[$choice];
+                }
+
+                return $choice;
+            },
             'multiple' => true,
             'expanded' => true,
             'label' => 'display_settings.displayed_columns',
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 4b563cd..abaabad 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatableInterface;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
@@ -330,7 +331,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
 
             return $value;
         });
-        $resolver->setAllowedTypes('label', ['null', 'string']);
+        $resolver->setAllowedTypes('label', ['null', 'string', TranslatableInterface::class]);
         $options = $resolver->resolve($this->buildOptions('crud_th', $options, $crud));
 
         // If the column is not to be shown, returns empty
diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index d56cd8c..f3e29d7 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -17,6 +17,7 @@
 use Ecommit\CrudBundle\Crud\Crud;
 use Ecommit\CrudBundle\Tests\Functional\App\Entity\TestUser;
 use Ecommit\CrudBundle\Tests\Functional\App\Form\Searcher\UserSearcher;
+use Symfony\Component\Translation\TranslatableMessage;
 
 class UserController extends AbstractCrudController
 {
@@ -31,7 +32,7 @@ protected function getCrudOptions(): array
         $crudConfig = $this->createCrudConfig(static::getCrudName())
             ->addColumn('username', 'u.username', 'username', ['displayed_by_default' => false])
             ->addColumn('firstName', 'u.firstName', 'first_name')
-            ->addColumn('lastName', 'u.lastName', 'last_name')
+            ->addColumn('lastName', 'u.lastName', new TranslatableMessage('last_name'))
             ->setQueryBuilder($queryBuilder)
             ->setMaxPerPage([5, 10, 50], 5)
             ->setDefaultSort('firstName', Crud::ASC)

From bb13c581b94f611a1e3154f7acf8717f6fb2fabe Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 19 Sep 2023 15:56:34 +0200
Subject: [PATCH 215/264] Fix CS

---
 .../Functional/App/Controller/UserWithoutTraitController.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index 2a77209..706638f 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -67,7 +67,7 @@ public function crudAction(Request $request, CrudResponseGenerator $crudResponse
                     return $data;
                 },
                 'after_build' => function (Crud $crud, array $data) {
-                    $data['test_before_after_build'] = $data['test_before_after_build'].' AFTER';
+                    $data['test_before_after_build'] .= ' AFTER';
 
                     return $data;
                 },
@@ -90,7 +90,7 @@ public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResp
                     return $data;
                 },
                 'after_build' => function (Crud $crud, array $data) {
-                    $data['test_before_after_build'] = $data['test_before_after_build'].' AFTER';
+                    $data['test_before_after_build'] .= ' AFTER';
 
                     return $data;
                 },

From 19d03e6aff1f4ac87169025aff921365c6e2eb0f Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 24 Dec 2023 14:56:28 +0100
Subject: [PATCH 216/264] [CI - Coding Standards] Use PHP 8.2

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0a73078..66db2af 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -58,7 +58,7 @@ jobs:
                     -   php-version: '8.2'
 
                     #CS
-                    -   php-version: '8.1'
+                    -   php-version: '8.2'
                         description: 'with Coding Standards'
                         coding-standards: true
 

From d159a042c62cc837459ac10cb0b0783e4a2af84b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 24 Oct 2023 13:11:50 +0200
Subject: [PATCH 217/264] Add Symfony 7.0 support and PHP 8.3 tests

---
 .github/workflows/tests.yml                   | 63 +++++++++++--------
 composer.json                                 | 46 +++++++-------
 src/DependencyInjection/Configuration.php     |  2 +-
 .../Entity/EntitiesToChoicesTransformer.php   |  4 +-
 .../Entity/EntitiesToIdsTransformer.php       |  2 +-
 .../Entity/EntityToChoiceTransformer.php      |  4 +-
 .../Entity/EntityToIdTransformer.php          |  2 +-
 src/Form/Filter/DateFilter.php                |  1 +
 tests/Functional/App/Kernel.php               |  6 ++
 tests/Functional/App/config/security.yaml     |  1 -
 10 files changed, 74 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 66db2af..403bbb1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,43 +19,42 @@ jobs:
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 5.4.* lowest'
                     -   php-version: '8.1'
-                        symfony-version: '6.0.*'
+                        symfony-version: '6.4.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with SF 6.0.* lowest'
-                    -   php-version: '8.1'
-                        symfony-version: '6.1.*'
-                        composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with SF 6.1.* lowest'
-                    -   php-version: '8.1'
-                        symfony-version: '6.2.*'
-                        composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with SF 6.2.* lowest'
-                    -   php-version: '8.1'
-                        symfony-version: '6.3.*'
+                        description: 'with SF 6.4.* lowest'
+                    -   php-version: '8.2'
+                        symfony-version: '7.0.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with SF 6.3.* lowest'
+                        description: 'with SF 7.0.* lowest'
 
 
                     #Symfony versions
-                    -   php-version: '8.2'
+                    -   php-version: '8.3'
                         symfony-version: '5.4.*'
                         description: 'with SF 5.4.*'
-                    -   php-version: '8.2'
-                        symfony-version: '6.0.*'
-                        description: 'with SF 6.0.*'
-                    -   php-version: '8.2'
-                        symfony-version: '6.1.*'
-                        description: 'with SF 6.1.*'
-                    -   php-version: '8.2'
-                        symfony-version: '6.2.*'
-                        description: 'with SF 6.2.*'
-                    -   php-version: '8.2'
-                        symfony-version: '6.3.*'
-                        description: 'with SF 6.3.*'
+                    -   php-version: '8.3'
+                        symfony-version: '5.4.*@dev'
+                        description: 'with SF 5.4.* dev'
+                    -   php-version: '8.3'
+                        symfony-version: '6.4.*'
+                        description: 'with SF 6.4.*'
+                    -   php-version: '8.3'
+                        symfony-version: '6.4.*@dev'
+                        description: 'with SF 6.4.* dev'
+                    -   php-version: '8.3'
+                        symfony-version: '7.0.*'
+                        description: 'with SF 7.0.*'
+                    -   php-version: '8.3'
+                        symfony-version: '7.0.*@dev'
+                        description: 'with SF 7.0.* dev'
+                    -   php-version: '8.3'
+                        symfony-version: '7.1.*@dev'
+                        description: 'with SF 7.1.* dev'
 
                     #PHP versions
                     -   php-version: '8.1'
                     -   php-version: '8.2'
+                    -   php-version: '8.3'
 
                     #CS
                     -   php-version: '8.2'
@@ -114,6 +113,18 @@ jobs:
                     key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}-${{ matrix.composer-flags }}-${{ hashFiles('**/yarn.lock') }}
                     restore-keys: composer-${{ runner.os }}-${{ matrix.php-version }}-
 
+            -   name: Configure minimum stability
+                if: matrix.symfony-version && contains(matrix.symfony-version, '@dev')
+                run: composer config minimum-stability dev
+
+            -   name: Remove friendsofphp/php-cs-fixer
+                if: matrix.coding-standards != true
+                run: composer remove friendsofphp/php-cs-fixer --dev --no-update
+
+            -   name: Remove vimeo/psalm
+                if: matrix.static-analysis != true
+                run: composer remove vimeo/psalm --dev --no-update
+
             -   name: Configure Symfony Flex
                 if: matrix.symfony-version
                 run: composer config extra.symfony.require ${{ matrix.symfony-version }}
diff --git a/composer.json b/composer.json
index 208c158..28094bb 100644
--- a/composer.json
+++ b/composer.json
@@ -22,29 +22,29 @@
         "ecommit/paginator": "^1.0",
         "ecommit/scalar-values": "^1.0",
         "psr/container": "^1.1|^2.0",
-        "symfony/asset": "^5.4|^6.0",
-        "symfony/config": "^5.4|^6.0",
-        "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/doctrine-bridge": "^5.4.3|^6.0.3",
-        "symfony/form": "^5.4|^6.0",
-        "symfony/framework-bundle": "^5.4|^6.0",
-        "symfony/http-client": "^5.4|^6.0",
+        "symfony/asset": "^5.4|^6.0|^7.0",
+        "symfony/config": "^5.4|^6.0|^7.0",
+        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+        "symfony/doctrine-bridge": "^5.4.3|^6.0.3|^7.0",
+        "symfony/form": "^5.4|^6.0|^7.0",
+        "symfony/framework-bundle": "^5.4|^6.0|^7.0",
+        "symfony/http-client": "^5.4|^6.0|^7.0",
         "symfony/http-client-contracts": "^2.4|^3.0",
-        "symfony/http-foundation": "^5.4|^6.0",
-        "symfony/http-kernel": "^5.4|^6.0",
-        "symfony/intl": "^5.4|^6.0",
-        "symfony/options-resolver": "^5.4|^6.0",
-        "symfony/property-access": "^5.4|^6.0",
-        "symfony/routing": "^5.4|^6.0",
-        "symfony/security-bundle": "^5.4|^6.0",
-        "symfony/security-core": "^5.4|^6.0",
-        "symfony/security-csrf": "^5.4|^6.0",
+        "symfony/http-foundation": "^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^5.4|^6.0|^7.0",
+        "symfony/intl": "^5.4|^6.0|^7.0",
+        "symfony/options-resolver": "^5.4|^6.0|^7.0",
+        "symfony/property-access": "^5.4|^6.0|^7.0",
+        "symfony/routing": "^5.4|^6.0|^7.0",
+        "symfony/security-bundle": "^5.4|^6.0|^7.0",
+        "symfony/security-core": "^5.4|^6.0|^7.0",
+        "symfony/security-csrf": "^5.4|^6.0|^7.0",
         "symfony/service-contracts": "^1.1.6|^2|^3",
-        "symfony/translation": "^5.4|^6.0",
+        "symfony/translation": "^5.4|^6.0|^7.0",
         "symfony/translation-contracts": "^2.3|^3.0",
-        "symfony/twig-bridge": "^5.4|^6.0",
-        "symfony/twig-bundle": "^5.4|^6.0",
-        "symfony/validator": "^5.4|^6.0",
+        "symfony/twig-bridge": "^5.4|^6.0|^7.0",
+        "symfony/twig-bundle": "^5.4|^6.0|^7.0",
+        "symfony/validator": "^5.4|^6.0|^7.0",
         "twig/twig": "^2.12.0|^3.0"
     },
     "require-dev": {
@@ -53,10 +53,10 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^9.0",
-        "symfony/dom-crawler": "^5.4|^6.0",
+        "symfony/dom-crawler": "^5.4|^6.0|^7.0",
         "symfony/panther": "^2.0.1",
-        "symfony/webpack-encore-bundle": "^1.7.3",
-        "symfony/yaml": "^5.4|^6.0",
+        "symfony/webpack-encore-bundle": "^1.7.3|^2.1.1",
+        "symfony/yaml": "^5.4|^6.0|^7.0",
         "vimeo/psalm": "^4.22"
     },
     "autoload": {
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 50798a6..42a6f01 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -28,7 +28,7 @@ class Configuration implements ConfigurationInterface
      * @psalm-suppress PossiblyUndefinedMethod
      * @psalm-suppress PossiblyNullReference
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('ecommit_crud');
         /** @var ArrayNodeDefinition $rootNode */
diff --git a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
index 4ec0baf..c133ad0 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
@@ -28,7 +28,7 @@ public function __construct(QueryBuilder $queryBuilder, string $identifier, mixe
         parent::__construct($queryBuilder, $identifier, $choiceLabel, $throwExceptionIfValueNotFoundInReverse);
     }
 
-    public function transform(mixed $value)
+    public function transform(mixed $value): mixed
     {
         if (null === $value) {
             return [];
@@ -49,7 +49,7 @@ public function transform(mixed $value)
         return $results;
     }
 
-    public function reverseTransform(mixed $value)
+    public function reverseTransform(mixed $value): mixed
     {
         $collection = new ArrayCollection();
 
diff --git a/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
index c649c66..d6a8eea 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
@@ -18,7 +18,7 @@
 
 class EntitiesToIdsTransformer extends EntitiesToChoicesTransformer
 {
-    public function transform(mixed $value)
+    public function transform(mixed $value): mixed
     {
         if (null === $value) {
             return [];
diff --git a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
index 099a271..3677596 100644
--- a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
@@ -19,7 +19,7 @@
 
 class EntityToChoiceTransformer extends AbstractEntityTransformer
 {
-    public function transform(mixed $value)
+    public function transform(mixed $value): mixed
     {
         if (null === $value || '' === $value) {
             return null;
@@ -38,7 +38,7 @@ public function transform(mixed $value)
         return $results;
     }
 
-    public function reverseTransform(mixed $value)
+    public function reverseTransform(mixed $value): mixed
     {
         if ('' === $value || null === $value) {
             return null;
diff --git a/src/Form/DataTransformer/Entity/EntityToIdTransformer.php b/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
index 864d06b..864996a 100644
--- a/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToIdTransformer.php
@@ -17,7 +17,7 @@
 
 class EntityToIdTransformer extends EntityToChoiceTransformer
 {
-    public function transform(mixed $value)
+    public function transform(mixed $value): mixed
     {
         if (null === $value || '' === $value) {
             return null;
diff --git a/src/Form/Filter/DateFilter.php b/src/Form/Filter/DateFilter.php
index 4090c71..3156357 100644
--- a/src/Form/Filter/DateFilter.php
+++ b/src/Form/Filter/DateFilter.php
@@ -30,6 +30,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
     {
         $typeOptions = $this->getTypeOptions($options, [
             'input' => 'datetime',
+            'widget' => 'choice',
         ]);
         $type = ($options['with_time']) ? DateTimeType::class : DateType::class;
         $builder->addField($property, $type, $typeOptions);
diff --git a/tests/Functional/App/Kernel.php b/tests/Functional/App/Kernel.php
index 3484386..045fa54 100644
--- a/tests/Functional/App/Kernel.php
+++ b/tests/Functional/App/Kernel.php
@@ -39,6 +39,12 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $loader->load($this->getProjectDir().'/config/webpack_encore.yaml');
         $loader->load($this->getProjectDir().'/config/ecommit_crud.yaml');
         $loader->load($this->getProjectDir().'/config/services.yaml');
+
+        if (5 === static::MAJOR_VERSION) {
+            $container->loadFromExtension('security', [
+                'enable_authenticator_manager' => true,
+            ]);
+        }
     }
 
     public function process(ContainerBuilder $container): void
diff --git a/tests/Functional/App/config/security.yaml b/tests/Functional/App/config/security.yaml
index 29a9ffa..7893b29 100644
--- a/tests/Functional/App/config/security.yaml
+++ b/tests/Functional/App/config/security.yaml
@@ -1,5 +1,4 @@
 security:
-    enable_authenticator_manager: true
     password_hashers:
         Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'plaintext'
 

From 6206b242cedc858347a90d64cc1598fc5eac7c99 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 29 Dec 2023 14:14:37 +0100
Subject: [PATCH 218/264] [TH] Add Markup support

---
 src/Twig/CrudExtension.php     | 4 +++-
 templates/Theme/base.html.twig | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index abaabad..db92e44 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -22,6 +22,7 @@
 use Symfony\Contracts\Translation\TranslatableInterface;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
+use Twig\Markup;
 use Twig\TwigFunction;
 
 final class CrudExtension extends AbstractExtension
@@ -331,7 +332,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
 
             return $value;
         });
-        $resolver->setAllowedTypes('label', ['null', 'string', TranslatableInterface::class]);
+        $resolver->setAllowedTypes('label', ['null', 'string', TranslatableInterface::class, Markup::class]);
         $options = $resolver->resolve($this->buildOptions('crud_th', $options, $crud));
 
         // If the column is not to be shown, returns empty
@@ -360,6 +361,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
             'crud' => $crud,
             'options' => $options,
             'label' => $label,
+            'translate_label' => !$label instanceof Markup,
         ]));
     }
 
diff --git a/templates/Theme/base.html.twig b/templates/Theme/base.html.twig
index 4d43dad..161f3a8 100644
--- a/templates/Theme/base.html.twig
+++ b/templates/Theme/base.html.twig
@@ -97,14 +97,14 @@
 
 {% block th_not_sortable %}
     {% set th_attr = th_attr.not_sortable|merge({class: (th_attr.not_sortable.class|default('') ~ ' ec-crud-th ec-crud-th-not-sortable')|trim}) %}
-    <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>{{ label|trans }}</th>
+    <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>{{ (translate_label) ? label|trans : label }}</th>
 {% endblock %}
 
 {% block th_sortable_not_active %}
     {% set th_attr = th_attr.sortable_not_active|merge({class: (th_attr.sortable_not_active.class|default('') ~ ' ec-crud-th ec-crud-th-sortable-not-active')|trim}) %}
     {% set a_attr = a_attr.sortable_not_active %}
     <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-        <a href="{{ path(crud.routeName, crud.routeParameters|merge({('sort'): column.id})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}>{{ label|trans }}</a>
+        <a href="{{ path(crud.routeName, crud.routeParameters|merge({('sort'): column.id})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}>{{ (translate_label) ? label|trans : label }}</a>
     </th>
 {% endblock %}
 
@@ -127,7 +127,7 @@
 {% block th_sortable_active %}
     <th{% with { attr: th_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
         <a href="{{ path(crud.routeName, crud.routeParameters|merge({('sort'): column.id, 'sort-direction': new_sort_direction})) }}"{% with { attr: a_attr } %}{{ block('attributes', template_name) }}{% endwith %}>
-            {{- label|trans }} {{ crud_icon(icon_name) -}}
+            {{- (translate_label) ? label|trans : label }} {{ crud_icon(icon_name) -}}
         </a>
     </th>
 {% endblock %}

From 4a7d56eea7829d353d5fe50321ba6ed9ff0324ea Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 1 Jan 2024 13:52:55 +0100
Subject: [PATCH 219/264] Update license years

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 3dfc933..890295d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2023 E-COMMIT
+Copyright (c) 2011-2024 E-COMMIT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From d39a720c56f979cc0f005d2898413d9a42759ebc Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Nov 2024 17:49:04 +0100
Subject: [PATCH 220/264] Fix locale tests

---
 phpunit.xml.dist                           | 2 +-
 tests/Form/Filter/NumberFilterTest.php     | 8 ++++----
 tests/Functional/App/config/framework.yaml | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e931afd..36b3776 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
         <env name="KERNEL_CLASS" value="Ecommit\CrudBundle\Tests\Functional\App\Kernel" />
         <env name="APP_ENV" value="test"/>
         <server name="PANTHER_WEB_SERVER_DIR" value="./tests/Functional/App/public" />
-        <ini name="intl.default_locale" value="fr" />
+        <ini name="intl.default_locale" value="en" />
     </php>
 
     <extensions>
diff --git a/tests/Form/Filter/NumberFilterTest.php b/tests/Form/Filter/NumberFilterTest.php
index 68f24e9..49e7afc 100644
--- a/tests/Form/Filter/NumberFilterTest.php
+++ b/tests/Form/Filter/NumberFilterTest.php
@@ -34,14 +34,14 @@ public function getTestViewAndQueryBuilderProvider(): array
             ['5', NumberFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5', NumberFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             ['5', NumberFilter::SMALLER_EQUAL, '5', 'e.name <= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
-            ['5.25', NumberFilter::EQUAL, '5,25', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5.25']],
+            ['5.25', NumberFilter::EQUAL, '5.25', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5.25']],
 
             // Int value
             [5, NumberFilter::GREATER_THAN, '5', 'e.name > :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             [5, NumberFilter::GREATER_EQUAL, '5', 'e.name >= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             [5, NumberFilter::SMALLER_THAN, '5', 'e.name < :value_integer_propertyName', ['value_integer_propertyName' => '5']],
             [5, NumberFilter::SMALLER_EQUAL, '5', 'e.name <= :value_integer_propertyName', ['value_integer_propertyName' => '5']],
-            [5.25, NumberFilter::EQUAL, '5,25', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5.25']],
+            [5.25, NumberFilter::EQUAL, '5.25', 'e.name = :value_integer_propertyName', ['value_integer_propertyName' => '5.25']],
         ];
     }
 
@@ -51,8 +51,8 @@ public function getTestSubmitProvider(): array
             [null, null, ''],
             ['', null, ''],
             ['5', 5.0, '5'],
-            ['5.25', 5.25, '5,25'],
-            ['5,25', 5.25, '5,25'],
+            ['5.25', 5.25, '5.25'],
+            ['5,25', 5.25, '5.25'],
         ];
     }
 }
diff --git a/tests/Functional/App/config/framework.yaml b/tests/Functional/App/config/framework.yaml
index b6b17c2..26a851e 100644
--- a/tests/Functional/App/config/framework.yaml
+++ b/tests/Functional/App/config/framework.yaml
@@ -4,3 +4,4 @@ framework:
     session:
         handler_id: null
         storage_factory_id: session.storage.factory.mock_file
+    default_locale: en

From fd34aa96f54b84c354796bc8a2bae60b6e8e6e46 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Nov 2024 18:15:27 +0100
Subject: [PATCH 221/264] Fix CS

---
 src/Controller/CrudControllerTrait.php               |  2 +-
 src/Crud/Crud.php                                    | 12 ++++++------
 src/Crud/CrudConfig.php                              |  6 +++---
 src/Crud/CrudResponseGenerator.php                   |  2 +-
 src/Crud/CrudSession.php                             |  2 +-
 src/Crud/Http/QueryBuilder.php                       |  2 +-
 src/Crud/SearchFormBuilder.php                       |  8 ++++----
 .../Entity/EntitiesToChoicesTransformer.php          |  2 +-
 .../Entity/EntityToChoiceTransformer.php             |  2 +-
 src/Form/Filter/BooleanFilter.php                    | 10 +++++-----
 src/Form/Filter/CollectionFilterTrait.php            |  2 +-
 src/Form/Filter/DateFilter.php                       |  6 +++---
 src/Form/Filter/IntegerFilter.php                    |  2 +-
 src/Form/Filter/NotNullFilter.php                    |  2 +-
 src/Form/Filter/NullFilter.php                       |  2 +-
 src/Form/Filter/TextFilter.php                       |  2 +-
 src/Form/Type/EntityAjaxType.php                     |  4 ++--
 src/Twig/CrudExtension.php                           |  4 ++--
 tests/Crud/AbstractCrudTest.php                      |  2 +-
 tests/Crud/CrudSessionTest.php                       |  2 +-
 tests/Crud/SearchFormBuilderTest.php                 |  2 +-
 .../EntitiesToChoicesTransformerTest.php             |  2 +-
 .../DataTransformer/EntitiesToIdsTransformerTest.php |  2 +-
 .../EntityToChoiceTransformerTest.php                |  2 +-
 .../DataTransformer/EntityToIdTransformerTest.php    |  2 +-
 tests/Form/Type/EntityAjaxTypeTest.php               |  2 +-
 tests/Functional/App/Controller/UserController.php   |  2 +-
 .../App/Controller/UserWithoutTraitController.php    |  8 ++++----
 .../TestCrudControllerWithPersistentSettingsTest.php |  2 +-
 tests/Twig/CrudExtensionTest.php                     |  2 +-
 30 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/Controller/CrudControllerTrait.php b/src/Controller/CrudControllerTrait.php
index bc79937..21d08e7 100644
--- a/src/Controller/CrudControllerTrait.php
+++ b/src/Controller/CrudControllerTrait.php
@@ -26,7 +26,7 @@ abstract protected function getCrudOptions(): array;
 
     abstract protected function getTemplateName(string $action): string;
 
-    protected function createCrudConfig(string $sessionName = null): CrudConfig
+    protected function createCrudConfig(?string $sessionName = null): CrudConfig
     {
         return new CrudConfig($sessionName);
     }
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index dcceb66..ea1b556 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -115,7 +115,7 @@ public function __construct(array $options, protected ContainerInterface $contai
                     throw new \Exception('A column must be an array or a CrudColum instance.');
                 }
                 if (\array_key_exists($column->getId(), $columns)) {
-                    throw new \Exception(sprintf('The column "column1" already exists.', $column->getId()));
+                    throw new \Exception(\sprintf('The column "column1" already exists.', $column->getId()));
                 }
                 $columns[$column->getId()] = $column;
             }
@@ -133,7 +133,7 @@ public function __construct(array $options, protected ContainerInterface $contai
                     throw new \Exception('A column must be an array or a CrudColum instance.');
                 }
                 if (\array_key_exists($column->getId(), $columns)) {
-                    throw new \Exception(sprintf('The column "column1" already exists.', $column->getId()));
+                    throw new \Exception(\sprintf('The column "column1" already exists.', $column->getId()));
                 }
                 $columns[$column->getId()] = $column;
             }
@@ -186,7 +186,7 @@ public function __construct(array $options, protected ContainerInterface $contai
         // Check duplicates in columns / vitual columns
         $duplicates = array_intersect_key($this->options['columns'], $this->options['virtual_columns']);
         if (\count($duplicates) > 0) {
-            throw new \Exception(sprintf('The column "column1" already exists.', array_keys($duplicates)[0]));
+            throw new \Exception(\sprintf('The column "column1" already exists.', array_keys($duplicates)[0]));
         }
 
         $this->init();
@@ -262,7 +262,7 @@ public function getColumn(string $columnId): CrudColumn
         if (isset($this->options['columns'][$columnId])) {
             return $this->options['columns'][$columnId];
         }
-        throw new \Exception(sprintf('The column "%s" does not exist.', $columnId));
+        throw new \Exception(\sprintf('The column "%s" does not exist.', $columnId));
     }
 
     /**
@@ -296,7 +296,7 @@ public function getVirtualColumn(string $columnId): CrudColumn
         if (isset($this->options['virtual_columns'][$columnId])) {
             return $this->options['virtual_columns'][$columnId];
         }
-        throw new \Exception(sprintf('The column "%s" does not exist.', $columnId));
+        throw new \Exception(\sprintf('The column "%s" does not exist.', $columnId));
     }
 
     public function getQueryBuilder(): \Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Query\QueryBuilder|QueryBuilderInterface
@@ -805,7 +805,7 @@ protected function createDisplaySettingsForm(): void
             'resultsPerPage' => $this->getSessionValues()->getMaxPerPage(),
             'displayedColumns' => $this->getSessionValues()->getDisplayedColumns(),
         ];
-        $formName = sprintf('crud_display_settings_%s', $this->getSessionName());
+        $formName = \sprintf('crud_display_settings_%s', $this->getSessionName());
 
         $this->displaySettingsForm = $this->container->get('form.factory')->createNamed($formName, DisplaySettingsType::class, $data, [
             'results_per_page_choices' => $resultsPerPageChoices,
diff --git a/src/Crud/CrudConfig.php b/src/Crud/CrudConfig.php
index 3ea5e23..0bd9bd7 100644
--- a/src/Crud/CrudConfig.php
+++ b/src/Crud/CrudConfig.php
@@ -19,7 +19,7 @@ final class CrudConfig implements \ArrayAccess
 {
     protected array $options = [];
 
-    public function __construct(string $sessionName = null)
+    public function __construct(?string $sessionName = null)
     {
         if (null !== $sessionName) {
             $this->setSessionName($sessionName);
@@ -155,7 +155,7 @@ public function setRoute(string $name, array $parameters = []): self
         return $this;
     }
 
-    public function createSearchForm(SearcherInterface $defaultData, string $type = null, array $options = []): self
+    public function createSearchForm(SearcherInterface $defaultData, ?string $type = null, array $options = []): self
     {
         $this->options['search_form_data'] = $defaultData;
         $this->options['search_form_type'] = $type;
@@ -209,7 +209,7 @@ public function setTwigFunctionsConfiguration(array $value): self
         return $this;
     }
 
-    public function resetOptions(string|array $options = null): self
+    public function resetOptions(string|array|null $options = null): self
     {
         if (null === $options) {
             $this->options = [];
diff --git a/src/Crud/CrudResponseGenerator.php b/src/Crud/CrudResponseGenerator.php
index 3ec2384..1b335a6 100644
--- a/src/Crud/CrudResponseGenerator.php
+++ b/src/Crud/CrudResponseGenerator.php
@@ -133,7 +133,7 @@ protected function renderCrudView(string $view, array $parameters = []): string
         return $this->container->get('twig')->render($view, $parameters);
     }
 
-    protected function renderCrud(string $view, array $parameters = [], Response $response = null): Response
+    protected function renderCrud(string $view, array $parameters = [], ?Response $response = null): Response
     {
         $content = $this->container->get('twig')->render($view, $parameters);
 
diff --git a/src/Crud/CrudSession.php b/src/Crud/CrudSession.php
index 1615e89..5e96581 100644
--- a/src/Crud/CrudSession.php
+++ b/src/Crud/CrudSession.php
@@ -29,7 +29,7 @@ final class CrudSession
     /**
      * @internal
      */
-    public function __construct(protected int $maxPerPage, protected array $displayedColumns, protected string $sort, protected string $sortDirection, SearcherInterface $searchFormData = null)
+    public function __construct(protected int $maxPerPage, protected array $displayedColumns, protected string $sort, protected string $sortDirection, ?SearcherInterface $searchFormData = null)
     {
         $this->searchFormData = ($searchFormData) ? clone $searchFormData : null; // Avoid modification by reference (by the user or an invalid form)
     }
diff --git a/src/Crud/Http/QueryBuilder.php b/src/Crud/Http/QueryBuilder.php
index d953a53..59ee9b4 100644
--- a/src/Crud/Http/QueryBuilder.php
+++ b/src/Crud/Http/QueryBuilder.php
@@ -31,7 +31,7 @@ final class QueryBuilder implements QueryBuilderInterface
     protected array $orders = [];
     protected HttpClientInterface $client;
 
-    public function __construct(protected string $url, protected string $httpMethod, HttpClientInterface $client = null)
+    public function __construct(protected string $url, protected string $httpMethod, ?HttpClientInterface $client = null)
     {
         if (null === $client) {
             $client = HttpClient::create();
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index fd84008..f8c6e62 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -56,7 +56,7 @@ protected function createFormBuilder(?string $type): void
         if ($type) {
             $this->form = $formFactory->createBuilder($type, null, $formOptions);
         } else {
-            $formName = sprintf('crud_search_%s', $this->crud->getSessionName());
+            $formName = \sprintf('crud_search_%s', $this->crud->getSessionName());
             $this->form = $formFactory->createNamedBuilder($formName, FormSearchType::class, null, $formOptions);
         }
     }
@@ -67,7 +67,7 @@ public function addFilter(string $property, string $filter, array $options = [])
             throw new \Exception('The "addFilter" method cannot be called after the form creation');
         }
         if (!$this->container->get('ecommit_crud.filters')->has($filter)) {
-            throw new \Exception(sprintf('The filter "%s" does not exist', $filter));
+            throw new \Exception(\sprintf('The filter "%s" does not exist', $filter));
         }
         /** @var FilterInterface $filterService */
         $filterService = $this->container->get('ecommit_crud.filters')->get($filter);
@@ -139,7 +139,7 @@ public function createForm(): self
             // Check if column exists
             $columnId = $filter['options']['column_id'];
             if (!\array_key_exists($columnId, $this->crud->getColumns()) && !\array_key_exists($columnId, $this->crud->getVirtualColumns())) {
-                throw new \Exception(sprintf('The column "%s" does not exist', $columnId));
+                throw new \Exception(\sprintf('The column "%s" does not exist', $columnId));
             }
 
             /** @var FilterInterface $filterService */
@@ -219,7 +219,7 @@ public function updateQueryBuilder(\Doctrine\ORM\QueryBuilder|\Doctrine\DBAL\Que
                 /** @var FilterInterface $filterService */
                 $filterService = $this->container->get('ecommit_crud.filters')->get($filter['name']);
                 if (!$filterService->supportsQueryBuilder($queryBuilder)) {
-                    throw new \Exception(sprintf('The filter "%s" does not support "%s" query builder', $filter['name'], $queryBuilder::class));
+                    throw new \Exception(\sprintf('The filter "%s" does not support "%s" query builder', $filter['name'], $queryBuilder::class));
                 }
                 $filterService->updateQueryBuilder($queryBuilder, $property, $value, $filter['options']);
             }
diff --git a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
index c133ad0..9fe4896 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
@@ -67,7 +67,7 @@ public function reverseTransform(mixed $value): mixed
         }
         $value = array_unique($value);
         if (\count($value) > $this->maxResults) {
-            throw new TransformationFailedException(sprintf('This collection should contain %s elements or less.', $this->maxResults));
+            throw new TransformationFailedException(\sprintf('This collection should contain %s elements or less.', $this->maxResults));
         }
 
         $hash = $this->getCacheHash($value);
diff --git a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
index 3677596..b397d5f 100644
--- a/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntityToChoiceTransformer.php
@@ -62,7 +62,7 @@ public function reverseTransform(mixed $value): mixed
             }
             if (1 !== \count($entities)) {
                 if ($this->throwExceptionIfValueNotFoundInReverse) {
-                    throw new TransformationFailedException(sprintf('The entity with key "%s" could not be found or is not unique', (string) $value));
+                    throw new TransformationFailedException(\sprintf('The entity with key "%s" could not be found or is not unique', (string) $value));
                 }
 
                 return null;
diff --git a/src/Form/Filter/BooleanFilter.php b/src/Form/Filter/BooleanFilter.php
index 7f5744d..a54b88c 100644
--- a/src/Form/Filter/BooleanFilter.php
+++ b/src/Form/Filter/BooleanFilter.php
@@ -45,25 +45,25 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
 
         if (static::VALUE_TRUE === $value) {
             $or = $queryBuilder->expr()->orX();
-            $or->add(sprintf('%s = :%s', $options['alias_search'], $parameterTrueName));
+            $or->add(\sprintf('%s = :%s', $options['alias_search'], $parameterTrueName));
             $queryBuilder->setParameter($parameterTrueName, $options['value_true']);
             if ($options['not_null_is_true']) {
-                $or->add(sprintf('%s IS NOT NULL AND %s != :%s', $options['alias_search'], $options['alias_search'], $parameterFalseName));
+                $or->add(\sprintf('%s IS NOT NULL AND %s != :%s', $options['alias_search'], $options['alias_search'], $parameterFalseName));
                 $queryBuilder->setParameter($parameterFalseName, $options['value_false']);
             }
             $queryBuilder->andWhere($or);
         } elseif (static::VALUE_FALSE === $value) {
             if (null === $options['value_false']) {
-                $queryBuilder->andWhere(sprintf('%s IS NULL', $options['alias_search']));
+                $queryBuilder->andWhere(\sprintf('%s IS NULL', $options['alias_search']));
 
                 return;
             }
 
             $or = $queryBuilder->expr()->orX();
-            $or->add(sprintf('%s = :%s', $options['alias_search'], $parameterFalseName));
+            $or->add(\sprintf('%s = :%s', $options['alias_search'], $parameterFalseName));
             $queryBuilder->setParameter($parameterFalseName, $options['value_false']);
             if ($options['null_is_false']) {
-                $or->add(sprintf('%s IS NULL', $options['alias_search']));
+                $or->add(\sprintf('%s IS NULL', $options['alias_search']));
             }
             $queryBuilder->andWhere($or);
         }
diff --git a/src/Form/Filter/CollectionFilterTrait.php b/src/Form/Filter/CollectionFilterTrait.php
index 95896cf..1623844 100644
--- a/src/Form/Filter/CollectionFilterTrait.php
+++ b/src/Form/Filter/CollectionFilterTrait.php
@@ -62,7 +62,7 @@ protected function updateCollectionQueryBuilder(mixed $queryBuilder, string $pro
             if (!\is_scalar($value)) {
                 return;
             }
-            $queryBuilder->andWhere(sprintf('%s = :%s', $options['alias_search'], $parameterName))
+            $queryBuilder->andWhere(\sprintf('%s = :%s', $options['alias_search'], $parameterName))
                 ->setParameter($parameterName, $value);
         }
     }
diff --git a/src/Form/Filter/DateFilter.php b/src/Form/Filter/DateFilter.php
index 3156357..2f831d5 100644
--- a/src/Form/Filter/DateFilter.php
+++ b/src/Form/Filter/DateFilter.php
@@ -55,7 +55,7 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
                 }
                 $value = $value->format('Y-m-d H:i:s');
                 $queryBuilder->andWhere(
-                    sprintf('%s %s :%s', $options['alias_search'], $options['comparator'], $parameterName)
+                    \sprintf('%s %s :%s', $options['alias_search'], $options['comparator'], $parameterName)
                 )
                     ->setParameter($parameterName, $value);
                 break;
@@ -66,7 +66,7 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
                 }
                 $value = $value->format('Y-m-d H:i:s');
                 $queryBuilder->andWhere(
-                    sprintf('%s %s :%s', $options['alias_search'], $options['comparator'], $parameterName)
+                    \sprintf('%s %s :%s', $options['alias_search'], $options['comparator'], $parameterName)
                 )
                     ->setParameter($parameterName, $value);
                 break;
@@ -82,7 +82,7 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
                 $parameterNameInf = 'value_date_inf_'.str_replace(' ', '', $property);
                 $parameterNameSup = 'value_date_sup_'.str_replace(' ', '', $property);
                 $queryBuilder->andWhere(
-                    sprintf(
+                    \sprintf(
                         '%s >= :%s AND %s <= :%s',
                         $options['alias_search'],
                         $parameterNameInf,
diff --git a/src/Form/Filter/IntegerFilter.php b/src/Form/Filter/IntegerFilter.php
index 3ef4840..0834ae2 100644
--- a/src/Form/Filter/IntegerFilter.php
+++ b/src/Form/Filter/IntegerFilter.php
@@ -39,7 +39,7 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
 
         $parameterName = 'value_integer_'.str_replace(' ', '', $property);
 
-        $queryBuilder->andWhere(sprintf('%s %s :%s', $options['alias_search'], $options['comparator'], $parameterName))
+        $queryBuilder->andWhere(\sprintf('%s %s :%s', $options['alias_search'], $options['comparator'], $parameterName))
             ->setParameter($parameterName, $value);
     }
 
diff --git a/src/Form/Filter/NotNullFilter.php b/src/Form/Filter/NotNullFilter.php
index 52a9291..74f3607 100644
--- a/src/Form/Filter/NotNullFilter.php
+++ b/src/Form/Filter/NotNullFilter.php
@@ -21,6 +21,6 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
             return;
         }
 
-        $queryBuilder->andWhere(sprintf('%s IS NOT NULL', $options['alias_search']));
+        $queryBuilder->andWhere(\sprintf('%s IS NOT NULL', $options['alias_search']));
     }
 }
diff --git a/src/Form/Filter/NullFilter.php b/src/Form/Filter/NullFilter.php
index 63ed03e..3f7fe1f 100644
--- a/src/Form/Filter/NullFilter.php
+++ b/src/Form/Filter/NullFilter.php
@@ -30,6 +30,6 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
             return;
         }
 
-        $queryBuilder->andWhere(sprintf('%s IS NULL', $options['alias_search']));
+        $queryBuilder->andWhere(\sprintf('%s IS NULL', $options['alias_search']));
     }
 }
diff --git a/src/Form/Filter/TextFilter.php b/src/Form/Filter/TextFilter.php
index 9d6569e..8fce5af 100644
--- a/src/Form/Filter/TextFilter.php
+++ b/src/Form/Filter/TextFilter.php
@@ -42,7 +42,7 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
         $parameterName = 'value_text_'.str_replace(' ', '', $property);
 
         if ($options['must_begin'] && $options['must_end']) {
-            $queryBuilder->andWhere(sprintf('%s = :%s', $options['alias_search'], $parameterName))
+            $queryBuilder->andWhere(\sprintf('%s = :%s', $options['alias_search'], $parameterName))
                 ->setParameter($parameterName, $value);
         } else {
             $after = ($options['must_begin']) ? '' : '%';
diff --git a/src/Form/Type/EntityAjaxType.php b/src/Form/Type/EntityAjaxType.php
index f33546d..3fe7ec8 100644
--- a/src/Form/Type/EntityAjaxType.php
+++ b/src/Form/Type/EntityAjaxType.php
@@ -93,14 +93,14 @@ public function configureOptions(OptionsResolver $resolver): void
 
             $em = $this->registry->getManagerForClass($options['class']);
             if (null === $em) {
-                throw new RuntimeException(sprintf('Class "%s" : Entity manager not found', $options['class']));
+                throw new RuntimeException(\sprintf('Class "%s" : Entity manager not found', $options['class']));
             }
 
             return $em;
         };
         $resolver->setNormalizer('em', $emNormalizer);
 
-        $queryBuilderNormalizer = function (Options $options, null|QueryBuilder|\Closure $queryBuilder): QueryBuilder {
+        $queryBuilderNormalizer = function (Options $options, QueryBuilder|\Closure|null $queryBuilder): QueryBuilder {
             $em = $options['em'];
             $class = $options['class'];
 
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index db92e44..f76b57c 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -704,7 +704,7 @@ protected function getAjaxAttributes(array $options): array
         return $attributes;
     }
 
-    public function crudIcon(Environment $environment, string $iconName, string $iconTheme = null): string
+    public function crudIcon(Environment $environment, string $iconName, ?string $iconTheme = null): string
     {
         if (null === $iconTheme) {
             $iconTheme = $this->iconTheme;
@@ -723,7 +723,7 @@ protected function renderBlock(Environment $environment, string $templateName, s
         return ob_get_clean();
     }
 
-    protected function buildOptions(string $function, array $inlineOptions, Crud $crud = null): array
+    protected function buildOptions(string $function, array $inlineOptions, ?Crud $crud = null): array
     {
         $options = [];
 
diff --git a/tests/Crud/AbstractCrudTest.php b/tests/Crud/AbstractCrudTest.php
index 1c838b0..146dcea 100644
--- a/tests/Crud/AbstractCrudTest.php
+++ b/tests/Crud/AbstractCrudTest.php
@@ -81,7 +81,7 @@ protected function createCrud(array|CrudConfig $crudConfig, array $filters = [],
         return $crud;
     }
 
-    protected function createValidCrudConfig(CrudConfig $crudConfig = null, bool $withSearcher = false): CrudConfig
+    protected function createValidCrudConfig(?CrudConfig $crudConfig = null, bool $withSearcher = false): CrudConfig
     {
         $queryBuilder = self::getContainer()->get(ManagerRegistry::class)->getRepository(TestUser::class)
             ->createQueryBuilder('u')
diff --git a/tests/Crud/CrudSessionTest.php b/tests/Crud/CrudSessionTest.php
index c095df2..6cdb020 100644
--- a/tests/Crud/CrudSessionTest.php
+++ b/tests/Crud/CrudSessionTest.php
@@ -239,7 +239,7 @@ protected function setPropertyWithoutGetter(CrudSession $crudSession, string $pr
         $reflectionMethod->setValue($crudSession, $value);
     }
 
-    protected function createCrudSession(UserSearcher $searchFormData = null): CrudSession
+    protected function createCrudSession(?UserSearcher $searchFormData = null): CrudSession
     {
         return new CrudSession(100, ['col1'], 'sort1', Crud::ASC, $searchFormData);
     }
diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
index b47cb35..47fa5e5 100644
--- a/tests/Crud/SearchFormBuilderTest.php
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -470,7 +470,7 @@ protected function createCrudContainer(array $filters = []): ContainerInterface
         return $container;
     }
 
-    protected function createSearchFormBuilder(array $filters = null, Crud $crud = null, SearcherInterface $defaultData = null, string $type = null, array $options = []): SearchFormBuilder
+    protected function createSearchFormBuilder(?array $filters = null, ?Crud $crud = null, ?SearcherInterface $defaultData = null, ?string $type = null, array $options = []): SearchFormBuilder
     {
         $filters = (null !== $filters) ? $filters : ['my_filter' => $this->createMock(FilterInterface::class)];
         $crud = ($crud) ?: $this->createCrud($this->createValidCrudConfig());
diff --git a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
index ce3f3a5..ee53710 100644
--- a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
@@ -45,7 +45,7 @@ public function testTransform($choiceLabel, array $expected): void
 
     public function getTestTransformProvider(): array
     {
-        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
+        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             [null, ['1' => 'tag1', '3' => '3']], // Choice label: null
diff --git a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
index 1f2b7c3..2ea57c6 100644
--- a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
@@ -28,7 +28,7 @@ protected function createTransformer(...$args): DataTransformerInterface
 
     public function getTestTransformProvider(): array
     {
-        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
+        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             [null, ['1', '3']], // Choice label: null
diff --git a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
index be28a50..8487414 100644
--- a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
@@ -43,7 +43,7 @@ public function testTransform($choiceLabel, $expected): void
 
     public function getTestTransformProvider(): array
     {
-        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
+        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             [null, ['3' => '3']], // Choice label: null
diff --git a/tests/Form/DataTransformer/EntityToIdTransformerTest.php b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
index 49fb7a4..9b666f6 100644
--- a/tests/Form/DataTransformer/EntityToIdTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
@@ -27,7 +27,7 @@ protected function createTransformer(...$args): DataTransformerInterface
 
     public function getTestTransformProvider(): array
     {
-        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
+        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             [null, '3'], // Choice label: null
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index 257767b..5bf4aab 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -242,7 +242,7 @@ public function testViewWithChoiceLabel($choiceLabel, $expectedViewValue): void
 
     public function getTestViewWithChoiceLabelProvider(): array
     {
-        $closure = fn (Tag $tag) => sprintf('name: %s', $tag->getName());
+        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             ['name', ['2' => 'tag2']],
diff --git a/tests/Functional/App/Controller/UserController.php b/tests/Functional/App/Controller/UserController.php
index f3e29d7..dd44fa4 100644
--- a/tests/Functional/App/Controller/UserController.php
+++ b/tests/Functional/App/Controller/UserController.php
@@ -78,7 +78,7 @@ public function getPersistentSettings(): bool
 
     protected function getTemplateName(string $action): string
     {
-        return sprintf('user/%s.html.twig', $action);
+        return \sprintf('user/%s.html.twig', $action);
     }
 
     public function crudAction()
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index 706638f..4e0e314 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -60,7 +60,7 @@ public function crudAction(Request $request, CrudResponseGenerator $crudResponse
     {
         if ($request->query->has('test-before-and-after-build-query')) {
             return $crudResponseGenerator->getResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
-                'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
+                'template_generator' => fn (string $action) => \sprintf('user/%s.html.twig', $action),
                 'before_build' => function (Crud $crud, array $data) {
                     $data['test_before_after_build'] = 'BEFORE';
 
@@ -75,7 +75,7 @@ public function crudAction(Request $request, CrudResponseGenerator $crudResponse
         }
 
         return $crudResponseGenerator->getResponse($this->getCrud('user_without_trait'), [
-            'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
+            'template_generator' => fn (string $action) => \sprintf('user/%s.html.twig', $action),
         ]);
     }
 
@@ -83,7 +83,7 @@ public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResp
     {
         if ($request->query->has('test-before-and-after-build-query')) {
             return $crudResponseGenerator->getAjaxResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
-                'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
+                'template_generator' => fn (string $action) => \sprintf('user/%s.html.twig', $action),
                 'before_build' => function (Crud $crud, array $data) {
                     $data['test_before_after_build'] = 'BEFORE';
 
@@ -98,7 +98,7 @@ public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResp
         }
 
         return $crudResponseGenerator->getAjaxResponse($this->getCrud('user_without_trait'), [
-            'template_generator' => fn (string $action) => sprintf('user/%s.html.twig', $action),
+            'template_generator' => fn (string $action) => \sprintf('user/%s.html.twig', $action),
         ]);
     }
 
diff --git a/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
index fe14c75..ecf7fd9 100644
--- a/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
+++ b/tests/Functional/Controller/TestCrudControllerWithPersistentSettingsTest.php
@@ -270,7 +270,7 @@ protected function logout(Client $client): void
         $client->request('GET', '/logout');
     }
 
-    protected function changeSettings(Client $client, array $headerColumnClicks = [], array $displayColumnClicks = [], int $resultsPerPage = null): void
+    protected function changeSettings(Client $client, array $headerColumnClicks = [], array $displayColumnClicks = [], ?int $resultsPerPage = null): void
     {
         foreach ($headerColumnClicks as $column) {
             $link = $client->getCrawler()->filterXPath('//table[@class="result"]/thead/tr/th/a[contains(text(), "'.$column.'")]');
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 765b3fe..b056ec0 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -248,7 +248,7 @@ public function getTestPaginatorWithTypeOptionProvider(): array
             $result = '';
             for ($i = 1; $i <= 20; ++$i) {
                 $class = ($i === $currentPage) ? ' class="current"' : '';
-                $result .= sprintf('<li%s><a href="/user?page=%s">%s</a></li>', $class, $i, $i);
+                $result .= \sprintf('<li%s><a href="/user?page=%s">%s</a></li>', $class, $i, $i);
             }
 
             return $result;

From 70206c24ace9c2fb5033884e3211a28e9d8a38b9 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Nov 2024 18:30:07 +0100
Subject: [PATCH 222/264] Require Symfony ^6.4|^7.1

---
 .github/workflows/tests.yml | 24 ++++++--------------
 composer.json               | 44 ++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 403bbb1..80c8b1c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,27 +14,17 @@ jobs:
             matrix:
                 include:
                     #Mini (for each Symfony version)
-                    -   php-version: '8.1'
-                        symfony-version: '5.4.*'
-                        composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with SF 5.4.* lowest'
                     -   php-version: '8.1'
                         symfony-version: '6.4.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 6.4.* lowest'
                     -   php-version: '8.2'
-                        symfony-version: '7.0.*'
+                        symfony-version: '7.1.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with SF 7.0.* lowest'
+                        description: 'with SF 7.1.* lowest'
 
 
                     #Symfony versions
-                    -   php-version: '8.3'
-                        symfony-version: '5.4.*'
-                        description: 'with SF 5.4.*'
-                    -   php-version: '8.3'
-                        symfony-version: '5.4.*@dev'
-                        description: 'with SF 5.4.* dev'
                     -   php-version: '8.3'
                         symfony-version: '6.4.*'
                         description: 'with SF 6.4.*'
@@ -42,14 +32,14 @@ jobs:
                         symfony-version: '6.4.*@dev'
                         description: 'with SF 6.4.* dev'
                     -   php-version: '8.3'
-                        symfony-version: '7.0.*'
-                        description: 'with SF 7.0.*'
-                    -   php-version: '8.3'
-                        symfony-version: '7.0.*@dev'
-                        description: 'with SF 7.0.* dev'
+                        symfony-version: '7.1.*'
+                        description: 'with SF 7.1.*'
                     -   php-version: '8.3'
                         symfony-version: '7.1.*@dev'
                         description: 'with SF 7.1.* dev'
+                    -   php-version: '8.3'
+                        symfony-version: '7.2.*@dev'
+                        description: 'with SF 7.2.* dev'
 
                     #PHP versions
                     -   php-version: '8.1'
diff --git a/composer.json b/composer.json
index 28094bb..7664b71 100644
--- a/composer.json
+++ b/composer.json
@@ -22,29 +22,29 @@
         "ecommit/paginator": "^1.0",
         "ecommit/scalar-values": "^1.0",
         "psr/container": "^1.1|^2.0",
-        "symfony/asset": "^5.4|^6.0|^7.0",
-        "symfony/config": "^5.4|^6.0|^7.0",
-        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-        "symfony/doctrine-bridge": "^5.4.3|^6.0.3|^7.0",
-        "symfony/form": "^5.4|^6.0|^7.0",
-        "symfony/framework-bundle": "^5.4|^6.0|^7.0",
-        "symfony/http-client": "^5.4|^6.0|^7.0",
+        "symfony/asset": "^6.4|^7.1",
+        "symfony/config": "^6.4|^7.1",
+        "symfony/dependency-injection": "^6.4|^7.1",
+        "symfony/doctrine-bridge": "^6.4|^7.1",
+        "symfony/form": "^6.4|^7.1",
+        "symfony/framework-bundle": "^6.4|^7.1",
+        "symfony/http-client": "^6.4|^7.1",
         "symfony/http-client-contracts": "^2.4|^3.0",
-        "symfony/http-foundation": "^5.4|^6.0|^7.0",
-        "symfony/http-kernel": "^5.4|^6.0|^7.0",
-        "symfony/intl": "^5.4|^6.0|^7.0",
-        "symfony/options-resolver": "^5.4|^6.0|^7.0",
-        "symfony/property-access": "^5.4|^6.0|^7.0",
-        "symfony/routing": "^5.4|^6.0|^7.0",
-        "symfony/security-bundle": "^5.4|^6.0|^7.0",
-        "symfony/security-core": "^5.4|^6.0|^7.0",
-        "symfony/security-csrf": "^5.4|^6.0|^7.0",
+        "symfony/http-foundation": "^6.4|^7.1",
+        "symfony/http-kernel": "^6.4|^7.1",
+        "symfony/intl": "^6.4|^7.1",
+        "symfony/options-resolver": "^6.4|^7.1",
+        "symfony/property-access": "^6.4|^7.1",
+        "symfony/routing": "^6.4|^7.1",
+        "symfony/security-bundle": "^6.4|^7.1",
+        "symfony/security-core": "^6.4|^7.1",
+        "symfony/security-csrf": "^6.4|^7.1",
         "symfony/service-contracts": "^1.1.6|^2|^3",
-        "symfony/translation": "^5.4|^6.0|^7.0",
+        "symfony/translation": "^6.4|^7.1",
         "symfony/translation-contracts": "^2.3|^3.0",
-        "symfony/twig-bridge": "^5.4|^6.0|^7.0",
-        "symfony/twig-bundle": "^5.4|^6.0|^7.0",
-        "symfony/validator": "^5.4|^6.0|^7.0",
+        "symfony/twig-bridge": "^6.4|^7.1",
+        "symfony/twig-bundle": "^6.4|^7.1",
+        "symfony/validator": "^6.4|^7.1",
         "twig/twig": "^2.12.0|^3.0"
     },
     "require-dev": {
@@ -53,10 +53,10 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^9.0",
-        "symfony/dom-crawler": "^5.4|^6.0|^7.0",
+        "symfony/dom-crawler": "^6.4|^7.1",
         "symfony/panther": "^2.0.1",
         "symfony/webpack-encore-bundle": "^1.7.3|^2.1.1",
-        "symfony/yaml": "^5.4|^6.0|^7.0",
+        "symfony/yaml": "^6.4|^7.1",
         "vimeo/psalm": "^4.22"
     },
     "autoload": {

From c3551f1e02787a12748fae339df5bd43aeef5213 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 16 Nov 2024 21:03:58 +0100
Subject: [PATCH 223/264] Add Doctrine DBAL v4 / ORM v3 support, remove DBAL v2
 support

---
 composer.json                         | 6 +++---
 src/Crud/Crud.php                     | 5 +++--
 src/EventListener/MappingEntities.php | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 7664b71..526ed4c 100644
--- a/composer.json
+++ b/composer.json
@@ -14,11 +14,11 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "doctrine/collections": "^1.5|^2.0",
-        "doctrine/dbal": "^2.13.1|^3.2",
+        "doctrine/dbal": "^3.2|^4.0",
         "doctrine/doctrine-bundle": "^2.4.5",
-        "doctrine/orm": "^2.9",
+        "doctrine/orm": "^2.9|^3.0",
         "doctrine/persistence": "^1.3|^2.0|^3.0",
-        "ecommit/doctrine-utils": "^1.0",
+        "ecommit/doctrine-utils": "^1.0|^2.0",
         "ecommit/paginator": "^1.0",
         "ecommit/scalar-values": "^1.0",
         "psr/container": "^1.1|^2.0",
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index ea1b556..4e54997 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -584,9 +584,10 @@ protected function resetDisplaySettings(): void
         if ($this->options['persistent_settings']) {
             // Remove settings in database
             $qb = $this->container->get('doctrine')->getManager()->createQueryBuilder();
-            $qb->delete('EcommitCrudBundle:UserCrudSettings', 's')
+            $qb->delete(UserCrudSettings::class, 's')
                 ->andWhere('s.user = :user AND s.crudName = :crud_name')
-                ->setParameters(['user' => $this->container->get('security.token_storage')->getToken()->getUser(), 'crud_name' => $this->getSessionName()])
+                ->setParameter('user', $this->container->get('security.token_storage')->getToken()->getUser())
+                ->setParameter('crud_name', $this->getSessionName())
                 ->getQuery()
                 ->execute();
         }
diff --git a/src/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
index a3a211c..8fa0d7a 100644
--- a/src/EventListener/MappingEntities.php
+++ b/src/EventListener/MappingEntities.php
@@ -14,6 +14,7 @@
 namespace Ecommit\CrudBundle\EventListener;
 
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 final class MappingEntities
@@ -43,7 +44,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
         }
     }
 
-    protected function mappUserCrudSettings(ClassMetadataInfo $userCrudSettingsMetadata, ClassMetadataInfo $userMetadata): void
+    protected function mappUserCrudSettings(ClassMetadataInfo|ClassMetadata $userCrudSettingsMetadata, ClassMetadataInfo|ClassMetadata $userMetadata): void
     {
         $this->isLoad = true;
 

From 077014d6a0db5953b0d1b52dd2332b6e0649ff7c Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 18 Nov 2024 18:23:20 +0100
Subject: [PATCH 224/264] Upgrade psalm

---
 composer.json                             |  2 +-
 psalm.xml                                 | 14 ++++++++++++++
 src/Crud/Crud.php                         |  8 +++-----
 src/Crud/SearchFormBuilder.php            |  2 +-
 src/DependencyInjection/Configuration.php |  1 +
 src/Form/Filter/TextFilter.php            |  4 ++--
 src/Twig/CrudExtension.php                |  5 +++++
 7 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 526ed4c..e19a981 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
         "symfony/panther": "^2.0.1",
         "symfony/webpack-encore-bundle": "^1.7.3|^2.1.1",
         "symfony/yaml": "^6.4|^7.1",
-        "vimeo/psalm": "^4.22"
+        "vimeo/psalm": "^5.0"
     },
     "autoload": {
         "psr-4": { "Ecommit\\CrudBundle\\": "src/" }
diff --git a/psalm.xml b/psalm.xml
index 8280a17..95e414a 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -20,5 +20,19 @@
                 <referencedClass name="UnitEnum"/>
             </errorLevel>
         </UndefinedDocblockClass>
+        <MissingTemplateParam>
+            <errorLevel type="suppress">
+                <!-- DataTransformer to be rewritten -->
+                <file name="src/Form/DataTransformer/Entity/AbstractEntityTransformer.php" />
+                <file name="src/Crud/CrudConfig.php" />
+            </errorLevel>
+        </MissingTemplateParam>
+        <UndefinedClass>
+            <errorLevel type="suppress">
+                <!-- Doctrine ORM v2 support -->
+                <referencedClass name="Doctrine\ORM\Mapping\ClassMetadataInfo"/>
+                <file name="src/EventListener/MappingEntities.php" />
+            </errorLevel>
+        </UndefinedClass>
     </issueHandlers>
 </psalm>
diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 4e54997..272760f 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -115,7 +115,7 @@ public function __construct(array $options, protected ContainerInterface $contai
                     throw new \Exception('A column must be an array or a CrudColum instance.');
                 }
                 if (\array_key_exists($column->getId(), $columns)) {
-                    throw new \Exception(\sprintf('The column "column1" already exists.', $column->getId()));
+                    throw new \Exception(\sprintf('The column "%s" already exists.', $column->getId()));
                 }
                 $columns[$column->getId()] = $column;
             }
@@ -133,7 +133,7 @@ public function __construct(array $options, protected ContainerInterface $contai
                     throw new \Exception('A column must be an array or a CrudColum instance.');
                 }
                 if (\array_key_exists($column->getId(), $columns)) {
-                    throw new \Exception(\sprintf('The column "column1" already exists.', $column->getId()));
+                    throw new \Exception(\sprintf('The column "%s" already exists.', $column->getId()));
                 }
                 $columns[$column->getId()] = $column;
             }
@@ -186,12 +186,10 @@ public function __construct(array $options, protected ContainerInterface $contai
         // Check duplicates in columns / vitual columns
         $duplicates = array_intersect_key($this->options['columns'], $this->options['virtual_columns']);
         if (\count($duplicates) > 0) {
-            throw new \Exception(\sprintf('The column "column1" already exists.', array_keys($duplicates)[0]));
+            throw new \Exception(\sprintf('The column "%s" already exists.', array_keys($duplicates)[0]));
         }
 
         $this->init();
-
-        return $this;
     }
 
     protected function init(): void
diff --git a/src/Crud/SearchFormBuilder.php b/src/Crud/SearchFormBuilder.php
index f8c6e62..f00413a 100644
--- a/src/Crud/SearchFormBuilder.php
+++ b/src/Crud/SearchFormBuilder.php
@@ -53,7 +53,7 @@ protected function createFormBuilder(?string $type): void
             $formOptions['validation_groups'] = $this->options['validation_groups'];
         }
 
-        if ($type) {
+        if (null !== $type) {
             $this->form = $formFactory->createBuilder($type, null, $formOptions);
         } else {
             $formName = \sprintf('crud_search_%s', $this->crud->getSessionName());
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 42a6f01..1a40e91 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -27,6 +27,7 @@ class Configuration implements ConfigurationInterface
     /**
      * @psalm-suppress PossiblyUndefinedMethod
      * @psalm-suppress PossiblyNullReference
+     * @psalm-suppress UndefinedInterfaceMethod
      */
     public function getConfigTreeBuilder(): TreeBuilder
     {
diff --git a/src/Form/Filter/TextFilter.php b/src/Form/Filter/TextFilter.php
index 8fce5af..5b7a2ff 100644
--- a/src/Form/Filter/TextFilter.php
+++ b/src/Form/Filter/TextFilter.php
@@ -45,8 +45,8 @@ public function updateQueryBuilder(mixed $queryBuilder, string $property, mixed
             $queryBuilder->andWhere(\sprintf('%s = :%s', $options['alias_search'], $parameterName))
                 ->setParameter($parameterName, $value);
         } else {
-            $after = ($options['must_begin']) ? '' : '%';
-            $before = ($options['must_end']) ? '' : '%';
+            $after = (true === $options['must_begin']) ? '' : '%';
+            $before = (true === $options['must_end']) ? '' : '%';
             $value = addcslashes($value, '%_');
             $like = $after.$value.$before;
             $queryBuilder->andWhere($queryBuilder->expr()->like($options['alias_search'], ':'.$parameterName))
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index f76b57c..4f1483c 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -683,6 +683,11 @@ protected function validateAjaxOptions(array $options, array $requiredOptions =
         return $resolver->resolve($options);
     }
 
+    /**
+     * @param array<string, string|bool|array<array-key, mixed>|null> $options
+     *
+     * @return array<string, string>
+     */
     protected function getAjaxAttributes(array $options): array
     {
         $attributes = [];

From 85e7909e2548ea70ae9f820798c78397c280bc66 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 24 Nov 2024 12:33:14 +0100
Subject: [PATCH 225/264] Upgrade eslint v9 and replace "standard" by
 "neostandard"

---
 .eslintrc.js                 | 22 ----------------------
 README.md                    |  3 +--
 assets/js/ajax.js            | 26 +++++++++++++-------------
 eslint.config.mjs            | 24 ++++++++++++++++++++++++
 package.json                 |  8 +++-----
 tests/assets/js/ajax.spec.js |  2 +-
 6 files changed, 42 insertions(+), 43 deletions(-)
 delete mode 100644 .eslintrc.js
 create mode 100644 eslint.config.mjs

diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index ee37113..0000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,22 +0,0 @@
-module.exports = {
-    env: {
-        'browser': true,
-        'es6': true,
-        'jasmine': true,
-        'node': true
-    },
-    extends: [
-        'standard'
-    ],
-    globals: {
-        Atomics: 'readonly',
-        SharedArrayBuffer: 'readonly'
-    },
-    parserOptions: {
-        ecmaVersion: 2018,
-        sourceType: 'module'
-    },
-    rules: {
-        'linebreak-style': ['error', 'unix'],
-    }
-}
diff --git a/README.md b/README.md
index b058385..eb79480 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,7 @@
 
 
 ![Tests](https://github.com/e-commit/EcommitCrudBundle/workflows/Tests/badge.svg)
-[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
-
+[![neostandard javascript style](https://img.shields.io/badge/code_style-neostandard-brightgreen?style=flat)](https://github.com/neostandard/neostandard)
 
 **WARNING: This branch is under development. Not use in production. You can use stable versions or 2.6 branch.**
 
diff --git a/assets/js/ajax.js b/assets/js/ajax.js
index 419ea81..89c8342 100644
--- a/assets/js/ajax.js
+++ b/assets/js/ajax.js
@@ -81,7 +81,7 @@ export function sendRequest (options) {
   const eventBeginning = new CustomEvent('ec-crud-ajax', {
     cancelable: true,
     detail: {
-      options: options
+      options
     }
   })
   document.dispatchEvent(eventBeginning)
@@ -152,7 +152,7 @@ export function sendRequest (options) {
   const eventBeforeSend = new CustomEvent('ec-crud-ajax-before-send', {
     cancelable: true,
     detail: {
-      options: options
+      options
     }
   })
   document.dispatchEvent(eventBeforeSend)
@@ -282,8 +282,8 @@ export function updateDom (element, updateMode, content) {
     cancelable: true,
     detail: {
       element: originElement,
-      updateMode: updateMode,
-      content: content
+      updateMode,
+      content
     }
   })
   element.dispatchEvent(eventBefore)
@@ -313,8 +313,8 @@ export function updateDom (element, updateMode, content) {
     bubbles: true,
     detail: {
       element: originElement,
-      updateMode: updateMode,
-      content: content
+      updateMode,
+      content
     }
   })
   element.dispatchEvent(eventAfter)
@@ -364,8 +364,8 @@ function generateParameters (result, propertyPath, property, value) {
 function executeEventsAndCallbacksSuccess (callbacksSuccess, options, data, response) {
   const eventOnSuccess = new CustomEvent('ec-crud-ajax-on-success', {
     detail: {
-      data: data,
-      response: response
+      data,
+      response
     }
   })
   document.dispatchEvent(eventOnSuccess)
@@ -374,7 +374,7 @@ function executeEventsAndCallbacksSuccess (callbacksSuccess, options, data, resp
   const eventOnComplete = new CustomEvent('ec-crud-ajax-on-complete', {
     detail: {
       statusText: response.statusText,
-      response: response
+      response
     }
   })
   document.dispatchEvent(eventOnComplete)
@@ -384,8 +384,8 @@ function executeEventsAndCallbacksSuccess (callbacksSuccess, options, data, resp
 function executeEventsAndCallbacksError (options, statusText, response) {
   const eventOnError = new CustomEvent('ec-crud-ajax-on-error', {
     detail: {
-      statusText: statusText,
-      response: response
+      statusText,
+      response
     }
   })
   document.dispatchEvent(eventOnError)
@@ -393,8 +393,8 @@ function executeEventsAndCallbacksError (options, statusText, response) {
 
   const eventOnComplete = new CustomEvent('ec-crud-ajax-on-complete', {
     detail: {
-      statusText: statusText,
-      response: response
+      statusText,
+      response
     }
   })
   document.dispatchEvent(eventOnComplete)
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 0000000..15225a4
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,24 @@
+import globals from 'globals';
+import neostandard from 'neostandard';
+
+export default [
+    ...neostandard(),
+    {
+        languageOptions: {
+            ecmaVersion: 2018,
+            sourceType: 'module',
+            globals: {
+                ...globals.browser,
+                ...globals.node,
+                ...globals.jasmine,
+                Atomics: 'readonly',
+                SharedArrayBuffer: 'readonly',
+                jasmine: true
+            }
+        },
+
+        rules: {
+            '@stylistic/linebreak-style': ['error', 'unix'],
+        }
+    }
+];
diff --git a/package.json b/package.json
index 9b9cf13..db4b42e 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,8 @@
     "@ecommit/crud-bundle": "link:assets",
     "@symfony/webpack-encore": "^3.0",
     "core-js": "^3.0.0",
-    "eslint": "^8.0",
-    "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0",
+    "eslint": "^9.0",
+    "globals": "^15.12",
     "install": "^0.13.0",
     "jasmine": "^4.0",
     "jquery": "^3",
@@ -17,6 +14,7 @@
     "karma-jasmine-ajax": "^0.1.13",
     "karma-spec-reporter": "^0.0.32",
     "karma-webpack": "^5.0",
+    "neostandard": "^0.11.8",
     "webpack-notifier": "^1.6.0",
     "whatwg-fetch": "^3.6.2"
   },
diff --git a/tests/assets/js/ajax.spec.js b/tests/assets/js/ajax.spec.js
index 92f15d3..3424357 100644
--- a/tests/assets/js/ajax.spec.js
+++ b/tests/assets/js/ajax.spec.js
@@ -978,7 +978,7 @@ describe('Test Ajax.sendRequest', function () {
         priority: -99
       },
       update: '#ajax-result .content',
-      updateMode: updateMode
+      updateMode
     })
 
     expect(callbackSuccess).toHaveBeenCalledWith(expectedContent)

From c6b390bc82d369534a31f7702f5e3d43c54fde9d Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 24 Nov 2024 12:46:58 +0100
Subject: [PATCH 226/264] Upgrade Encore dependencies

---
 package.json             | 10 +++++++---
 webpack-encore-config.js |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index db4b42e..10c4129 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,10 @@
 {
   "devDependencies": {
+    "@babel/core": "^7.17.0",
+    "@babel/preset-env": "^7.16.0",
     "@ecommit/crud-bundle": "link:assets",
-    "@symfony/webpack-encore": "^3.0",
-    "core-js": "^3.0.0",
+    "@symfony/webpack-encore": "^5.0",
+    "core-js": "^3.38.0",
     "eslint": "^9.0",
     "globals": "^15.12",
     "install": "^0.13.0",
@@ -15,7 +17,9 @@
     "karma-spec-reporter": "^0.0.32",
     "karma-webpack": "^5.0",
     "neostandard": "^0.11.8",
-    "webpack-notifier": "^1.6.0",
+    "webpack": "^5.74.0",
+    "webpack-cli": "^5.1.0",
+    "webpack-notifier": "^1.15.0",
     "whatwg-fetch": "^3.6.2"
   },
   "private": true
diff --git a/webpack-encore-config.js b/webpack-encore-config.js
index 3ece1a5..b8467e5 100644
--- a/webpack-encore-config.js
+++ b/webpack-encore-config.js
@@ -17,7 +17,7 @@ module.exports = function (outputPath) {
         .enableVersioning(false)
         .configureBabelPresetEnv((config) => {
             config.useBuiltIns = 'usage';
-            config.corejs = 3;
+            config.corejs = '3.38';
         })
     ;
 

From cf4c5e0774028cc514f616cde96406eb39db2173 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 24 Nov 2024 20:43:56 +0100
Subject: [PATCH 227/264] [Ajax] Fix catch

---
 assets/js/ajax.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/assets/js/ajax.js b/assets/js/ajax.js
index 89c8342..88e5e19 100644
--- a/assets/js/ajax.js
+++ b/assets/js/ajax.js
@@ -200,9 +200,7 @@ export function sendRequest (options) {
         dataPromise.then(data => {
           executeEventsAndCallbacksSuccess(callbacksSuccess, options, data, response)
           resolve(response)
-        })
-
-        dataPromise.catch(error => {
+        }).catch(error => {
           error = 'Error during fetching response body: ' + error
           executeEventsAndCallbacksError(options, error, response)
           reject(error)
@@ -216,9 +214,7 @@ export function sendRequest (options) {
           resolve(response)
         }
       }
-    })
-
-    fetchPromise.catch(error => {
+    }).catch(error => {
       error = 'Error during query execution: ' + error
       executeEventsAndCallbacksError(options, error, null)
       reject(error)

From 754e4673386b7fd3bba741210428ef4627bf3517 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sun, 24 Nov 2024 20:50:08 +0100
Subject: [PATCH 228/264] Upgrade Jasmine 5

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 10c4129..70040de 100644
--- a/package.json
+++ b/package.json
@@ -8,13 +8,13 @@
     "eslint": "^9.0",
     "globals": "^15.12",
     "install": "^0.13.0",
-    "jasmine": "^4.0",
+    "jasmine": "^5.0",
     "jquery": "^3",
     "karma": "^6.0",
     "karma-firefox-launcher": "^2.0",
-    "karma-jasmine": "^4.0",
+    "karma-jasmine": "^5.1",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-spec-reporter": "^0.0.32",
+    "karma-spec-reporter": "^0.0.36",
     "karma-webpack": "^5.0",
     "neostandard": "^0.11.8",
     "webpack": "^5.74.0",

From 47fb31490849a70c32eecc8aff5ec16422a50cb0 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 14 Dec 2024 17:10:20 +0100
Subject: [PATCH 229/264] [Tests] Add doctrine/data-fixtures v2 support

---
 tests/Functional/App/DataFixtures/EntityManyToOneFixtures.php | 2 +-
 tests/Functional/App/DataFixtures/TestUserFixtures.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Functional/App/DataFixtures/EntityManyToOneFixtures.php b/tests/Functional/App/DataFixtures/EntityManyToOneFixtures.php
index acbbea9..19b968c 100644
--- a/tests/Functional/App/DataFixtures/EntityManyToOneFixtures.php
+++ b/tests/Functional/App/DataFixtures/EntityManyToOneFixtures.php
@@ -40,7 +40,7 @@ public function load(ObjectManager $manager): void
         $manager->flush();
     }
 
-    public function getDependencies()
+    public function getDependencies(): array
     {
         return [
             TagFixtures::class,
diff --git a/tests/Functional/App/DataFixtures/TestUserFixtures.php b/tests/Functional/App/DataFixtures/TestUserFixtures.php
index b8a9cac..31920cd 100644
--- a/tests/Functional/App/DataFixtures/TestUserFixtures.php
+++ b/tests/Functional/App/DataFixtures/TestUserFixtures.php
@@ -47,7 +47,7 @@ public function load(ObjectManager $manager): void
         }
 
         $userCrudSettings = new UserCrudSettings(
-            $this->getReference('user_EveReste'),
+            $this->getReference('user_EveReste', TestUser::class),
             'crud_persistent_settings',
             50,
             ['username', 'firstName'],

From 316734560d6402f8fa5d48d1328a659073754a6a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 14 Dec 2024 16:56:00 +0100
Subject: [PATCH 230/264] Add PHP 8.4 tests

---
 .github/workflows/tests.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 80c8b1c..febc874 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -25,19 +25,19 @@ jobs:
 
 
                     #Symfony versions
-                    -   php-version: '8.3'
+                    -   php-version: '8.4'
                         symfony-version: '6.4.*'
                         description: 'with SF 6.4.*'
-                    -   php-version: '8.3'
+                    -   php-version: '8.4'
                         symfony-version: '6.4.*@dev'
                         description: 'with SF 6.4.* dev'
-                    -   php-version: '8.3'
+                    -   php-version: '8.4'
                         symfony-version: '7.1.*'
                         description: 'with SF 7.1.*'
-                    -   php-version: '8.3'
+                    -   php-version: '8.4'
                         symfony-version: '7.1.*@dev'
                         description: 'with SF 7.1.* dev'
-                    -   php-version: '8.3'
+                    -   php-version: '8.4'
                         symfony-version: '7.2.*@dev'
                         description: 'with SF 7.2.* dev'
 
@@ -45,6 +45,7 @@ jobs:
                     -   php-version: '8.1'
                     -   php-version: '8.2'
                     -   php-version: '8.3'
+                    -   php-version: '8.4'
 
                     #CS
                     -   php-version: '8.2'

From 00ed4f60178478e99f899172594e60a2abb634b7 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 27 Dec 2024 19:47:23 +0100
Subject: [PATCH 231/264] Fix Psalm

---
 src/EventListener/MappingEntities.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
index 8fa0d7a..2a4684c 100644
--- a/src/EventListener/MappingEntities.php
+++ b/src/EventListener/MappingEntities.php
@@ -51,9 +51,6 @@ protected function mappUserCrudSettings(ClassMetadataInfo|ClassMetadata $userCru
         $userCrudSettingsMetadata->setAssociationOverride(
             'user',
             [
-                'targetEntity' => $userMetadata->getName(),
-                'fieldName' => 'user',
-                'id' => true,
                 'joinColumns' => [[
                     'name' => 'user_id',
                     'referencedColumnName' => $userMetadata->getSingleIdentifierColumnName(),

From fa748b907f707fe707fc9064a5fa5a6ee999e5de Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 27 Dec 2024 19:56:12 +0100
Subject: [PATCH 232/264] Add Symfony 7.2 tests

---
 .github/workflows/tests.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index febc874..a73ca59 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,6 +22,10 @@ jobs:
                         symfony-version: '7.1.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 7.1.* lowest'
+                    -   php-version: '8.2'
+                        symfony-version: '7.2.*'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with SF 7.2.* lowest'
 
 
                     #Symfony versions
@@ -37,6 +41,9 @@ jobs:
                     -   php-version: '8.4'
                         symfony-version: '7.1.*@dev'
                         description: 'with SF 7.1.* dev'
+                    -   php-version: '8.4'
+                        symfony-version: '7.2.*'
+                        description: 'with SF 7.2.*'
                     -   php-version: '8.4'
                         symfony-version: '7.2.*@dev'
                         description: 'with SF 7.2.* dev'

From fff778647e035d00d10b23127687589b4eda3cc3 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 27 Dec 2024 21:50:31 +0100
Subject: [PATCH 233/264] [Ajax] Add ec-crud-ajax-form-before and
 ec-crud-ajax-form-complete events

---
 assets/js/ajax.js            |  34 +++++++++++
 tests/assets/js/ajax.spec.js | 113 +++++++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+)

diff --git a/assets/js/ajax.js b/assets/js/ajax.js
index 88e5e19..a231b06 100644
--- a/assets/js/ajax.js
+++ b/assets/js/ajax.js
@@ -252,6 +252,21 @@ export function link (link, options) {
 }
 
 export function sendForm (form, options) {
+  const eventBefore = new CustomEvent('ec-crud-ajax-form-before', {
+    bubbles: true,
+    cancelable: true,
+    detail: {
+      form,
+      options
+    }
+  })
+  document.dispatchEvent(eventBefore)
+  if (eventBefore.defaultPrevented) {
+    return new Promise((resolve, reject) => {
+      resolve(null)
+    })
+  }
+
   form = optionsResolver.getElement(form)
   // Options in data-* override options argument
   // Option argument override action, method and data form
@@ -267,6 +282,25 @@ export function sendForm (form, options) {
     )
   )
 
+  const callbacksComplete = []
+  callbacksComplete.push({
+    priority: 10,
+    callback: (statusText, response) => {
+      const eventOnComplete = new CustomEvent('ec-crud-ajax-form-complete', {
+        detail: {
+          form,
+          statusText,
+          response
+        }
+      })
+      document.dispatchEvent(eventOnComplete)
+    }
+  })
+  if (optionsResolver.isNotBlank(options.onComplete)) {
+    callbacksComplete.push(options.onComplete)
+  }
+  options.onComplete = callbacksComplete
+
   return sendRequest(options)
 }
 
diff --git a/tests/assets/js/ajax.spec.js b/tests/assets/js/ajax.spec.js
index 3424357..9676bfd 100644
--- a/tests/assets/js/ajax.spec.js
+++ b/tests/assets/js/ajax.spec.js
@@ -1364,12 +1364,21 @@ describe('Test Ajax.form', function () {
       status: 200,
       responseText: 'CONTENT'
     })
+
+    jasmine.Ajax.stubRequest(/error404/).andReturn({
+      status: 404,
+      statusText: 'Not Found',
+      response: 'Page not found !',
+      responseText: 'Page not found !'
+    })
   })
 
   afterEach(function () {
     jasmine.Ajax.uninstall()
     $('.html-test').remove()
     callbackManager.clear()
+    $(document).off('ec-crud-ajax-form-before')
+    $(document).off('ec-crud-ajax-form-complete')
   })
 
   it('Send request with form', async function () {
@@ -1377,8 +1386,17 @@ describe('Test Ajax.form', function () {
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
+    const callbackFormBefore = jasmine.createSpy('form_before')
+    const callbackFormComplete = jasmine.createSpy('form_complete')
     const callbackSuccess = jasmine.createSpy('success')
 
+    $(document).on('ec-crud-ajax-form-before', function (event) {
+      callbackFormBefore()
+    })
+    $(document).on('ec-crud-ajax-form-complete', function (event) {
+      callbackFormComplete()
+    })
+
     const promise = ajax.sendForm('#formToTest', {
       onSuccess: function (data, response) {
         callbackSuccess()
@@ -1392,9 +1410,92 @@ describe('Test Ajax.form', function () {
     expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
     expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
+    expect(callbackFormBefore).toHaveBeenCalled()
+    expect(callbackFormComplete).toHaveBeenCalled()
     expect(callbackSuccess).toHaveBeenCalled()
   })
 
+  it('Send request with form canceled', async function () {
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    const callbackFormComplete = jasmine.createSpy('form_complete')
+
+    $(document).on('ec-crud-ajax-form-before', function (event) {
+      event.preventDefault()
+    })
+    $(document).on('ec-crud-ajax-form-complete', function (event) {
+      callbackFormComplete()
+    })
+
+    const promise = ajax.sendForm('#formToTest')
+    expect(promise).toBeInstanceOf(Promise)
+
+    await promise
+
+    expect(callbackFormComplete).not.toHaveBeenCalled()
+  })
+
+  it('Send request with form and complete callback', async function () {
+    $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    const callbackFormBefore = jasmine.createSpy('form_before')
+    const callbackFormComplete = jasmine.createSpy('form_complete')
+    const callbackComplete = jasmine.createSpy('complete')
+
+    $(document).on('ec-crud-ajax-form-before', function (event) {
+      callbackFormBefore()
+    })
+    $(document).on('ec-crud-ajax-form-complete', function (event) {
+      callbackFormComplete()
+    })
+
+    const promise = ajax.sendForm('#formToTest', {
+      onComplete: function (statusText, response) {
+        callbackComplete()
+      }
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    const response = await promise
+
+    expect(response).toBeInstanceOf(Response)
+    expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
+    expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
+    expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
+    expect(callbackFormBefore).toHaveBeenCalled()
+    expect(callbackFormComplete).toHaveBeenCalled()
+    expect(callbackComplete).toHaveBeenCalled()
+  })
+
+  it('Send request with form and error', async function () {
+    $('body').append('<form action="/error404" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
+    $('#formToTest input[name=var1]').val('My value 1')
+    $('#formToTest input[name=var2]').val('My value 2')
+
+    const callbackFormComplete = jasmine.createSpy('form_complete')
+    const callbackSuccess = jasmine.createSpy('success')
+
+    $(document).on('ec-crud-ajax-form-complete', function (event) {
+      callbackFormComplete()
+    })
+
+    const promise = ajax.sendForm('#formToTest', {
+      onSuccess: function (data, response) {
+        callbackSuccess()
+      }
+    })
+    expect(promise).toBeInstanceOf(Promise)
+
+    await promise
+
+    expect(callbackFormComplete).toHaveBeenCalled()
+    expect(callbackSuccess).not.toHaveBeenCalled()
+  })
+
   it('Send request with form with Element', async function () {
     $('body').append('<form action="/goodRequest" method="POST" class="html-test" id="formToTest"><input type="text" name="var1" /><input type="text" name="var2" /></form>')
     $('#formToTest input[name=var1]').val('My value 1')
@@ -1536,6 +1637,16 @@ describe('Test Ajax.form', function () {
     $('#formToTest input[name=var1]').val('My value 1')
     $('#formToTest input[name=var2]').val('My value 2')
 
+    const callbackFormBefore = jasmine.createSpy('form_before')
+    const callbackFormComplete = jasmine.createSpy('form_complete')
+
+    $(document).on('ec-crud-ajax-form-before', function (event) {
+      callbackFormBefore()
+    })
+    $(document).on('ec-crud-ajax-form-complete', function (event) {
+      callbackFormComplete()
+    })
+
     $('#formToTest button[type="submit"]').get(0).click()
 
     await wait(() => {
@@ -1545,6 +1656,8 @@ describe('Test Ajax.form', function () {
     expect(jasmine.Ajax.requests.mostRecent().url).toMatch('/goodRequest')
     expect(jasmine.Ajax.requests.mostRecent().method).toBe('POST')
     expect(jasmine.Ajax.requests.mostRecent().data()).toEqual([['var1', 'My value 1'], ['var2', 'My value 2']]) // Parsed by addJasmineAjaxFormDataSupport
+    expect(callbackFormBefore).toHaveBeenCalled()
+    expect(callbackFormComplete).toHaveBeenCalled()
   })
 
   it('Send auto-request with form canceled', async function () {

From bf701d799b9b1d1768165018bf8375e8a3e04c35 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 30 Dec 2024 17:23:07 +0100
Subject: [PATCH 234/264] Fix CS and "Check license year"

---
 .github/workflows/tests.yml                |  2 +-
 src/Twig/CrudExtension.php                 | 22 ++++++++++------------
 tests/Crud/CrudColumnTest.php              |  2 +-
 tests/Crud/CrudTest.php                    |  2 +-
 tests/Form/Filter/AbstractFilterTest.php   |  6 ++----
 tests/Form/Filter/EntityAjaxFilterTest.php |  8 ++------
 tests/Form/Filter/EntityFilterTest.php     |  8 ++------
 tests/Form/Type/EntityAjaxTypeTest.php     |  4 +---
 8 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a73ca59..494fd1a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -154,7 +154,7 @@ jobs:
 
             -   name: Check license year
                 if: matrix.coding-standards
-                run: cat LICENSE |grep -E "\(c\) ([0-9]+\-)*`date +%G`"
+                run: cat LICENSE |grep -E "\(c\) ([0-9]+\-)*`date +%Y`"
 
             -   name: Run ESLint
                 if: matrix.coding-standards
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 4f1483c..ea5c72b 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -581,18 +581,16 @@ public function searchFormReset(Environment $environment, Crud $crud, array $opt
         ]);
         $resolver->setAllowedTypes('ajax_options', ['array']);
         $resolver->setAllowedTypes('button_attr', ['array']);
-        $resolver->addNormalizer('button_attr', function (Options $options, mixed $value) use ($crud): array {
-            return array_merge(
-                [
-                    'data-ec-crud-toggle' => 'search-reset',
-                    'data-crud-search-id' => $crud->getDivIdSearch(),
-                    'data-crud-list-id' => $crud->getDivIdList(),
-                    'data-ec-crud-ajax-url' => $crud->getSearchUrl(['reset' => 1]),
-                ],
-                $value,
-                $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
-            );
-        });
+        $resolver->addNormalizer('button_attr', fn (Options $options, mixed $value): array => array_merge(
+            [
+                'data-ec-crud-toggle' => 'search-reset',
+                'data-crud-search-id' => $crud->getDivIdSearch(),
+                'data-crud-list-id' => $crud->getDivIdList(),
+                'data-ec-crud-ajax-url' => $crud->getSearchUrl(['reset' => 1]),
+            ],
+            $value,
+            $this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
+        ));
         $options = $resolver->resolve($this->buildOptions('crud_search_form_reset', $options, $crud));
 
         if ($options['render']) {
diff --git a/tests/Crud/CrudColumnTest.php b/tests/Crud/CrudColumnTest.php
index e3ce139..e0ac639 100644
--- a/tests/Crud/CrudColumnTest.php
+++ b/tests/Crud/CrudColumnTest.php
@@ -32,7 +32,7 @@ public function testMissingIdOption(): void
     public function testIdTooLongOption(): void
     {
         $options = $this->createValidConfig();
-        $options['id'] = str_pad('', 101, 'a');
+        $options['id'] = mb_str_pad('', 101, 'a');
 
         $this->expectException(ValidationFailedException::class);
         $this->expectExceptionMessageMatches('/The column id ".+" is too long. It should have 100 character or less/');
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 69fed9d..0eb7352 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -51,7 +51,7 @@ public function getTestCrudWithInvalidSessionNameProvider(): array
             ['', InvalidOptionsException::class, '/The option "session_name" with value ".*" is invalid/'],
             ['aa#bb', ValidationFailedException::class, '/Invalid session_name format/'],
             ['aa bb', ValidationFailedException::class, '/Invalid session_name format/'],
-            [str_pad('', 101, 'a'), ValidationFailedException::class, '/Invalid session_name format/'],
+            [mb_str_pad('', 101, 'a'), ValidationFailedException::class, '/Invalid session_name format/'],
             [1, InvalidOptionsException::class, '/The option "session_name" with value 1 is expected to be of type "string", but is of type "int"/'],
         ];
     }
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTest.php
index f35b1e3..26c4908 100644
--- a/tests/Form/Filter/AbstractFilterTest.php
+++ b/tests/Form/Filter/AbstractFilterTest.php
@@ -82,12 +82,10 @@ protected function setUp(): void
         $this->crudFactory = $this->getMockBuilder(CrudFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->crudFactory->method('create')->willReturnCallback(function (array $options) use ($container) {
-            return $this->getMockBuilder(Crud::class)
+        $this->crudFactory->method('create')->willReturnCallback(fn (array $options) => $this->getMockBuilder(Crud::class)
                 ->setConstructorArgs([$options, $container])
                 ->onlyMethods(['save', 'buildSearchForm']) // buildSearchForm: Disable search form creation
-                ->getMock();
-        });
+                ->getMock());
     }
 
     protected function tearDown(): void
diff --git a/tests/Form/Filter/EntityAjaxFilterTest.php b/tests/Form/Filter/EntityAjaxFilterTest.php
index 2a4eb54..c1a5c37 100644
--- a/tests/Form/Filter/EntityAjaxFilterTest.php
+++ b/tests/Form/Filter/EntityAjaxFilterTest.php
@@ -154,11 +154,9 @@ public function getTestSubmitInvalidProvider(): array
     public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = function (EntityRepository $entityRepository) {
-                return $entityRepository->createQueryBuilder('t')
+            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
-            };
         } else {
             $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
                 ->select('t')
@@ -213,11 +211,9 @@ public function getTestViewWithQueryBuilderProvider(): array
     public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedViewData): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = function (EntityRepository $entityRepository) {
-                return $entityRepository->createQueryBuilder('t')
+            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
-            };
         } else {
             $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
                 ->select('t')
diff --git a/tests/Form/Filter/EntityFilterTest.php b/tests/Form/Filter/EntityFilterTest.php
index 2df7ab3..6f1bf01 100644
--- a/tests/Form/Filter/EntityFilterTest.php
+++ b/tests/Form/Filter/EntityFilterTest.php
@@ -165,11 +165,9 @@ public function testSubmitInvalidMaxCount(): void
     public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = function (EntityRepository $entityRepository) {
-                return $entityRepository->createQueryBuilder('t')
+            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
-            };
         } else {
             $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
                 ->select('t')
@@ -223,11 +221,9 @@ public function getTestViewWithQueryBuilderProvider(): array
     public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedViewData): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = function (EntityRepository $entityRepository) {
-                return $entityRepository->createQueryBuilder('t')
+            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
-            };
         } else {
             $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
                 ->select('t')
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index 5bf4aab..39e686e 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -174,11 +174,9 @@ public function getTestSubmitInvalidProvider(): array
     public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedDataBuilderName, $expectedViewData): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = function (EntityRepository $entityRepository) {
-                return $entityRepository->createQueryBuilder('t')
+            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
-            };
         } else {
             $queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
                 ->select('t')

From 9e79e55cec72cc54fde421a18f529ed4c81b8314 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 1 Jan 2025 15:26:30 +0100
Subject: [PATCH 235/264] Update license year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 890295d..eefc686 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2024 E-COMMIT
+Copyright (c) 2011-2025 E-COMMIT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 82b16996ac72e6f5f3d1683b9438e30c097f1a4d Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 5 Mar 2025 21:34:17 +0100
Subject: [PATCH 236/264] Upgrade actions/cache@v3

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 494fd1a..d190b14 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -103,7 +103,7 @@ jobs:
                 run: echo "::set-output name=dir::$(yarn cache dir)"
 
             -   name: Cache dependencies
-                uses: actions/cache@v2
+                uses: actions/cache@v3
                 with:
                     path: |
                         ${{ steps.composer-cache.outputs.dir }}

From 56338616e27158c9f63fc7285bbf970e022c8196 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Sat, 15 Mar 2025 14:10:56 +0100
Subject: [PATCH 237/264] Add Symfony 7.3.*@dev tests

---
 .github/workflows/tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d190b14..7fbe54a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,15 +38,15 @@ jobs:
                     -   php-version: '8.4'
                         symfony-version: '7.1.*'
                         description: 'with SF 7.1.*'
-                    -   php-version: '8.4'
-                        symfony-version: '7.1.*@dev'
-                        description: 'with SF 7.1.* dev'
                     -   php-version: '8.4'
                         symfony-version: '7.2.*'
                         description: 'with SF 7.2.*'
                     -   php-version: '8.4'
                         symfony-version: '7.2.*@dev'
                         description: 'with SF 7.2.* dev'
+                    -   php-version: '8.4'
+                        symfony-version: '7.3.*@dev'
+                        description: 'with SF 7.3.* dev'
 
                     #PHP versions
                     -   php-version: '8.1'

From 104ba71abb10f1b848ac8100e2121c61bc08a519 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 9 Jun 2025 20:30:07 +0200
Subject: [PATCH 238/264] Add Symfony 7.3 and 7.4.*@dev tests

---
 .github/workflows/tests.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7fbe54a..7ee19e4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,6 +26,10 @@ jobs:
                         symfony-version: '7.2.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 7.2.* lowest'
+                    -   php-version: '8.2'
+                        symfony-version: '7.3.*'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with SF 7.3.* lowest'
 
 
                     #Symfony versions
@@ -44,9 +48,15 @@ jobs:
                     -   php-version: '8.4'
                         symfony-version: '7.2.*@dev'
                         description: 'with SF 7.2.* dev'
+                    -   php-version: '8.4'
+                        symfony-version: '7.3.*'
+                        description: 'with SF 7.3.*'
                     -   php-version: '8.4'
                         symfony-version: '7.3.*@dev'
                         description: 'with SF 7.3.* dev'
+                    -   php-version: '8.4'
+                        symfony-version: '7.4.*@dev'
+                        description: 'with SF 7.4.* dev'
 
                     #PHP versions
                     -   php-version: '8.1'

From 7ddc95d6deb98a2e832e6dc783628fcd6ed759ca Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 15 Oct 2025 12:26:23 +0200
Subject: [PATCH 239/264] Fix modal test engine close event

---
 tests/assets/js/modal/engine/test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/assets/js/modal/engine/test.js b/tests/assets/js/modal/engine/test.js
index 08024da..53f3120 100644
--- a/tests/assets/js/modal/engine/test.js
+++ b/tests/assets/js/modal/engine/test.js
@@ -13,12 +13,12 @@ import $ from 'jquery'
 export function openModal (options) {
   runCallback(options.onOpen, $(options.element))
 
-  $(document).on('DOMNodeRemoved', options.element + ' .content', function (event) {
+  $(document).one('testEngineClose', options.element, function () {
     runCallback(options.onClose, $(options.element))
   })
 }
 
 export function closeModal (element) {
   $(element + ' .content').remove()
-  $(document).off('remove', element + ' .content')
+  $(document).find(element).trigger('testEngineClose')
 }

From 7a68325c08f4ed88fac3a0dc8aa637db82074515 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Wed, 15 Oct 2025 13:44:10 +0200
Subject: [PATCH 240/264] [EntityAjaxType] Not clear list if not valid but
 synchronized

---
 src/Form/Type/EntityAjaxType.php       |  1 +
 templates/Form/entity_ajax.html.twig   |  4 ++--
 tests/Form/Type/EntityAjaxTypeTest.php | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Form/Type/EntityAjaxType.php b/src/Form/Type/EntityAjaxType.php
index 3fe7ec8..b1d9af5 100644
--- a/src/Form/Type/EntityAjaxType.php
+++ b/src/Form/Type/EntityAjaxType.php
@@ -63,6 +63,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
     {
         $view->vars['url'] = $this->router->generate($options['route_name'], $options['route_parameters']);
         $view->vars['multiple'] = $options['multiple'];
+        $view->vars['list_is_synchronized'] = $form->isSynchronized();
 
         if ($options['multiple']) {
             $view->vars['full_name'] .= '[]';
diff --git a/templates/Form/entity_ajax.html.twig b/templates/Form/entity_ajax.html.twig
index 090f471..3d88da4 100644
--- a/templates/Form/entity_ajax.html.twig
+++ b/templates/Form/entity_ajax.html.twig
@@ -10,8 +10,8 @@
     {% endif %}
 
     <select {{ block('widget_attributes') }}>
-        {# If null (invalid) or if invalid : Not display list because several labels are missing #}
-        {% if value is not null and valid %}
+        {# If null (not valid) or if not synchronized : Not display list because several labels are missing #}
+        {% if value is not null and list_is_synchronized %}
             {% for id, label in value %}
                 <option value="{{ id }}" selected="selected">{{ label }}</option>
             {% endfor %}
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index 39e686e..aae3fca 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -22,6 +22,7 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+use Symfony\Component\Validator\Constraints\Blank;
 
 class EntityAjaxTypeTest extends KernelTestCase
 {
@@ -82,6 +83,7 @@ public function testView(bool $multiple, $modelData, $dataBuilderName, $expected
         $this->assertSame($expectedViewValue, $view->vars['value']);
         $this->assertSame('/fake', $view->vars['url']);
         $this->assertSame($multiple, $view->vars['multiple']);
+        $this->assertTrue($view->vars['list_is_synchronized']);
     }
 
     public function getTestViewProvider(): array
@@ -168,6 +170,22 @@ public function getTestSubmitInvalidProvider(): array
         ];
     }
 
+    public function testSubmitInvalidByValidator(): void
+    {
+        $field = $this->factory->create(EntityAjaxType::class, null, [
+            'class' => Tag::class,
+            'route_name' => 'fake_route',
+            'multiple' => false,
+            'constraints' => [new Blank()],
+        ]);
+
+        $field->submit('2');
+
+        $this->assertTrue($field->isSynchronized());
+        $this->assertFalse($field->isValid());
+        $this->assertSame(['2' => 'tag2'], $field->getViewData());
+    }
+
     /**
      * @dataProvider getTestSubmitWithQueryBuilderProvider
      */

From 5a83cefcbf0b3aa0d80bb58969e80ba58c148478 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Tue, 21 Oct 2025 21:32:29 +0200
Subject: [PATCH 241/264] Ajout fontawesome7_solid.html.twig

---
 .../IconTheme/fontawesome7_solid.html.twig    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 templates/IconTheme/fontawesome7_solid.html.twig

diff --git a/templates/IconTheme/fontawesome7_solid.html.twig b/templates/IconTheme/fontawesome7_solid.html.twig
new file mode 100644
index 0000000..c0720fd
--- /dev/null
+++ b/templates/IconTheme/fontawesome7_solid.html.twig
@@ -0,0 +1,31 @@
+{% use '@EcommitCrud/IconTheme/base.html.twig' %}
+
+{% block asc %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-arrow-down-a-z"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block desc %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-arrow-down-z-a"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block display_settings %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-gear" aria-hidden="true"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block search %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
+    {% endapply %}
+{% endblock %}
+
+{% block reset %}
+    {% apply spaceless %}
+        <i class="fa-solid fa-fire" aria-hidden="true"></i>
+    {% endapply %}
+{% endblock %}

From aeeb3847554ac3ea92fe405b57bf88387862abc7 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Dec 2025 20:40:47 +0100
Subject: [PATCH 242/264] Fix MappingEntities

---
 src/EventListener/MappingEntities.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
index 2a4684c..7233b1f 100644
--- a/src/EventListener/MappingEntities.php
+++ b/src/EventListener/MappingEntities.php
@@ -35,10 +35,12 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
         /** @var string $className */
         $className = $metadata->getName();
         if (!$this->isLoad && is_subclass_of($className, 'Ecommit\CrudBundle\Entity\UserCrudInterface')) {
+            $this->isLoad = true;
             $userCrudSettingsMetadata = $eventArgs->getEntityManager()->getMetadataFactory()->getMetadataFor('Ecommit\CrudBundle\Entity\UserCrudSettings');
             $this->mappUserCrudSettings($userCrudSettingsMetadata, $metadata);
         }
         if (!$this->isLoad && 'Ecommit\CrudBundle\Entity\UserCrudSettings' === $className) {
+            $this->isLoad = true;
             $userMetadata = $eventArgs->getEntityManager()->getMetadataFactory()->getMetadataFor('Ecommit\CrudBundle\Entity\UserCrudInterface');
             $this->mappUserCrudSettings($metadata, $userMetadata);
         }
@@ -46,8 +48,6 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
 
     protected function mappUserCrudSettings(ClassMetadataInfo|ClassMetadata $userCrudSettingsMetadata, ClassMetadataInfo|ClassMetadata $userMetadata): void
     {
-        $this->isLoad = true;
-
         $userCrudSettingsMetadata->setAssociationOverride(
             'user',
             [

From b0ab1437353a3bac15580090d63d5238c5599292 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Dec 2025 21:01:05 +0100
Subject: [PATCH 243/264] Remove Symfony 7.1 / 7.2 support, add Symfony 7.4
 tests

---
 .github/workflows/tests.yml | 25 ++++++---------------
 composer.json               | 44 ++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7ee19e4..afb5e2b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,19 +18,14 @@ jobs:
                         symfony-version: '6.4.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 6.4.* lowest'
-                    -   php-version: '8.2'
-                        symfony-version: '7.1.*'
-                        composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with SF 7.1.* lowest'
-                    -   php-version: '8.2'
-                        symfony-version: '7.2.*'
-                        composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with SF 7.2.* lowest'
                     -   php-version: '8.2'
                         symfony-version: '7.3.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 7.3.* lowest'
-
+                    -   php-version: '8.2'
+                        symfony-version: '7.4.*'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with SF 7.4.* lowest'
 
                     #Symfony versions
                     -   php-version: '8.4'
@@ -39,21 +34,15 @@ jobs:
                     -   php-version: '8.4'
                         symfony-version: '6.4.*@dev'
                         description: 'with SF 6.4.* dev'
-                    -   php-version: '8.4'
-                        symfony-version: '7.1.*'
-                        description: 'with SF 7.1.*'
-                    -   php-version: '8.4'
-                        symfony-version: '7.2.*'
-                        description: 'with SF 7.2.*'
-                    -   php-version: '8.4'
-                        symfony-version: '7.2.*@dev'
-                        description: 'with SF 7.2.* dev'
                     -   php-version: '8.4'
                         symfony-version: '7.3.*'
                         description: 'with SF 7.3.*'
                     -   php-version: '8.4'
                         symfony-version: '7.3.*@dev'
                         description: 'with SF 7.3.* dev'
+                    -   php-version: '8.4'
+                        symfony-version: '7.4.*'
+                        description: 'with SF 7.4.*'
                     -   php-version: '8.4'
                         symfony-version: '7.4.*@dev'
                         description: 'with SF 7.4.* dev'
diff --git a/composer.json b/composer.json
index e19a981..007a3db 100644
--- a/composer.json
+++ b/composer.json
@@ -22,29 +22,29 @@
         "ecommit/paginator": "^1.0",
         "ecommit/scalar-values": "^1.0",
         "psr/container": "^1.1|^2.0",
-        "symfony/asset": "^6.4|^7.1",
-        "symfony/config": "^6.4|^7.1",
-        "symfony/dependency-injection": "^6.4|^7.1",
-        "symfony/doctrine-bridge": "^6.4|^7.1",
-        "symfony/form": "^6.4|^7.1",
-        "symfony/framework-bundle": "^6.4|^7.1",
-        "symfony/http-client": "^6.4|^7.1",
+        "symfony/asset": "^6.4|^7.3",
+        "symfony/config": "^6.4|^7.3",
+        "symfony/dependency-injection": "^6.4|^7.3",
+        "symfony/doctrine-bridge": "^6.4|^7.3",
+        "symfony/form": "^6.4|^7.3",
+        "symfony/framework-bundle": "^6.4|^7.3",
+        "symfony/http-client": "^6.4|^7.3",
         "symfony/http-client-contracts": "^2.4|^3.0",
-        "symfony/http-foundation": "^6.4|^7.1",
-        "symfony/http-kernel": "^6.4|^7.1",
-        "symfony/intl": "^6.4|^7.1",
-        "symfony/options-resolver": "^6.4|^7.1",
-        "symfony/property-access": "^6.4|^7.1",
-        "symfony/routing": "^6.4|^7.1",
-        "symfony/security-bundle": "^6.4|^7.1",
-        "symfony/security-core": "^6.4|^7.1",
-        "symfony/security-csrf": "^6.4|^7.1",
+        "symfony/http-foundation": "^6.4|^7.3",
+        "symfony/http-kernel": "^6.4|^7.3",
+        "symfony/intl": "^6.4|^7.3",
+        "symfony/options-resolver": "^6.4|^7.3",
+        "symfony/property-access": "^6.4|^7.3",
+        "symfony/routing": "^6.4|^7.3",
+        "symfony/security-bundle": "^6.4|^7.3",
+        "symfony/security-core": "^6.4|^7.3",
+        "symfony/security-csrf": "^6.4|^7.3",
         "symfony/service-contracts": "^1.1.6|^2|^3",
-        "symfony/translation": "^6.4|^7.1",
+        "symfony/translation": "^6.4|^7.3",
         "symfony/translation-contracts": "^2.3|^3.0",
-        "symfony/twig-bridge": "^6.4|^7.1",
-        "symfony/twig-bundle": "^6.4|^7.1",
-        "symfony/validator": "^6.4|^7.1",
+        "symfony/twig-bridge": "^6.4|^7.3",
+        "symfony/twig-bundle": "^6.4|^7.3",
+        "symfony/validator": "^6.4|^7.3",
         "twig/twig": "^2.12.0|^3.0"
     },
     "require-dev": {
@@ -53,10 +53,10 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^9.0",
-        "symfony/dom-crawler": "^6.4|^7.1",
+        "symfony/dom-crawler": "^6.4|^7.3",
         "symfony/panther": "^2.0.1",
         "symfony/webpack-encore-bundle": "^1.7.3|^2.1.1",
-        "symfony/yaml": "^6.4|^7.1",
+        "symfony/yaml": "^6.4|^7.3",
         "vimeo/psalm": "^5.0"
     },
     "autoload": {

From 89f1baba0859db8379d325774c294533a649b2de Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Dec 2025 21:19:16 +0100
Subject: [PATCH 244/264] Fix min doctrine/doctrine-fixtures-bundle version

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 007a3db..0bd7b42 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,8 @@
     "require-dev": {
         "dbrekelmans/bdi": "^1.0",
         "dg/bypass-finals": "^1.3",
-        "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "doctrine/data-fixtures": "^1.5.3",
+        "doctrine/doctrine-fixtures-bundle": "^3.4.2",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^9.0",
         "symfony/dom-crawler": "^6.4|^7.3",

From a6ca2def044a4d0036d2c2c75016f9aa4d1328cb Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Dec 2025 21:32:04 +0100
Subject: [PATCH 245/264] Use enable_native_lazy_objects

---
 tests/Functional/App/Kernel.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/Functional/App/Kernel.php b/tests/Functional/App/Kernel.php
index 045fa54..9540afe 100644
--- a/tests/Functional/App/Kernel.php
+++ b/tests/Functional/App/Kernel.php
@@ -40,7 +40,15 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $loader->load($this->getProjectDir().'/config/ecommit_crud.yaml');
         $loader->load($this->getProjectDir().'/config/services.yaml');
 
-        if (5 === static::MAJOR_VERSION) {
+        if (\PHP_VERSION_ID >= 80400) { // @legacy
+            $container->loadFromExtension('doctrine', [
+                'orm' => [
+                    'enable_native_lazy_objects' => true,
+                ],
+            ]);
+        }
+
+        if (5 === static::MAJOR_VERSION) { // @legacy
             $container->loadFromExtension('security', [
                 'enable_authenticator_manager' => true,
             ]);

From 01afcdcd134e3aec150df2eab3bf46421ee26262 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Dec 2025 21:54:19 +0100
Subject: [PATCH 246/264] Fix Panther code

---
 .github/workflows/tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index afb5e2b..453663f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -133,6 +133,11 @@ jobs:
                     yarn install
                     yarn encore dev
 
+            -   name: Fix Panther code
+                if: matrix.coding-standards != true && matrix.static-analysis != true
+                run: |
+                    sed -i 's/protected function doRequest(\$request)/protected function doRequest(object $request): object/' vendor/symfony/panther/src/Client.php
+
             -   name: Run PHPUnit
                 if: matrix.coding-standards != true && matrix.static-analysis != true
                 run: php vendor/phpunit/phpunit/phpunit

From 45dfe265f72e65ba6cf5d3fc404b53cbfb6c0fad Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Dec 2025 22:00:26 +0100
Subject: [PATCH 247/264] Fix CS

---
 tests/Functional/App/Entity/Tag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Functional/App/Entity/Tag.php b/tests/Functional/App/Entity/Tag.php
index 8451c58..3c53f3d 100644
--- a/tests/Functional/App/Entity/Tag.php
+++ b/tests/Functional/App/Entity/Tag.php
@@ -16,7 +16,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class Tag
+class Tag implements \Stringable
 {
     #[ORM\Id]
     #[ORM\Column(type: 'integer')]

From 30bc35323118c2f45133a848bf92deb5767e2eca Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Dec 2025 22:06:31 +0100
Subject: [PATCH 248/264] Add analyze-dependencies CI job

---
 .github/workflows/tests.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 453663f..174759b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -58,6 +58,11 @@ jobs:
                         description: 'with Coding Standards'
                         coding-standards: true
 
+                    # Dependencies
+                    -   php-version: '8.4'
+                        description: 'with Analyze dependencies'
+                        analyze-dependencies: true
+
                     #Static Analysis (min PHP version)
                     -   php-version: '8.1'
                         description: 'with Static Analysis'
@@ -134,28 +139,22 @@ jobs:
                     yarn encore dev
 
             -   name: Fix Panther code
-                if: matrix.coding-standards != true && matrix.static-analysis != true
+                if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true
                 run: |
                     sed -i 's/protected function doRequest(\$request)/protected function doRequest(object $request): object/' vendor/symfony/panther/src/Client.php
 
             -   name: Run PHPUnit
-                if: matrix.coding-standards != true && matrix.static-analysis != true
+                if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true
                 run: php vendor/phpunit/phpunit/phpunit
 
             -   name: Run Karma
-                if: matrix.coding-standards != true && matrix.static-analysis != true
+                if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true
                 run: xvfb-run ./node_modules/.bin/karma start --single-run
 
             -   name: Run PHP CS Fixer
                 if: matrix.coding-standards
                 run: php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
 
-            -   name: Analyze composer dependencies
-                if: matrix.coding-standards
-                run: |
-                    curl -LSs https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar > composer-require-checker.phar
-                    php composer-require-checker.phar check composer.json
-
             -   name: Check license year
                 if: matrix.coding-standards
                 run: cat LICENSE |grep -E "\(c\) ([0-9]+\-)*`date +%Y`"
@@ -164,6 +163,12 @@ jobs:
                 if: matrix.coding-standards
                 run: ./node_modules/.bin/eslint assets/js/* tests/assets/js/*
 
+            -   name: Analyze composer dependencies
+                if: matrix.analyze-dependencies
+                run: |
+                    curl -LSs https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar > composer-require-checker.phar
+                    php composer-require-checker.phar check composer.json
+
             -   name: Run Psalm
                 if: matrix.static-analysis
                 run: php vendor/bin/psalm --stats --output-format=github

From 61a51eff87e7bd81dbd123ce8e5e151c1331ac69 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 5 Dec 2025 16:50:44 +0100
Subject: [PATCH 249/264] Convert config from XML to PHP

---
 config/crud.php                               | 69 +++++++++++++++++++
 config/filters.php                            | 51 ++++++++++++++
 config/filters.xml                            | 46 -------------
 config/services.xml                           | 46 -------------
 .../EcommitCrudExtension.php                  |  8 +--
 5 files changed, 124 insertions(+), 96 deletions(-)
 create mode 100644 config/crud.php
 create mode 100644 config/filters.php
 delete mode 100644 config/filters.xml
 delete mode 100644 config/services.xml

diff --git a/config/crud.php b/config/crud.php
new file mode 100644
index 0000000..09c6d21
--- /dev/null
+++ b/config/crud.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Doctrine\Persistence\ManagerRegistry;
+use Ecommit\CrudBundle\Crud\CrudFactory;
+use Ecommit\CrudBundle\Crud\CrudResponseGenerator;
+use Ecommit\CrudBundle\EventListener\MappingEntities;
+use Ecommit\CrudBundle\Form\Type\EntityAjaxType;
+use Ecommit\CrudBundle\Twig\CrudExtension;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+
+return static function (ContainerConfigurator $container): void {
+    $container->services()
+
+        ->set('ecommit_crud.locator', ServiceLocator::class)
+        ->args([[
+            'router' => service(RouterInterface::class),
+            'form.factory' => service(FormFactoryInterface::class),
+            'request_stack' => service(RequestStack::class),
+            'doctrine' => service(ManagerRegistry::class),
+            'security.token_storage' => service(TokenStorageInterface::class),
+            'ecommit_crud.filters' => service('ecommit_crud.filters'),
+        ]])
+        ->tag('container.service_locator')
+
+        ->set('ecommit_crud.factory', CrudFactory::class)
+        ->args([service('ecommit_crud.locator')])
+        ->alias(CrudFactory::class, 'ecommit_crud.factory')
+
+        ->set('ecommit_crud.response_generatror', CrudResponseGenerator::class)
+        ->tag('container.service_subscriber')
+        ->alias(CrudResponseGenerator::class, 'ecommit_crud.response_generatror')
+
+        ->set('ecommit_crud.twig.crud_extension', CrudExtension::class)
+        ->args([
+            service('twig.form.renderer'),
+            param('ecommit_crud.theme'),
+            param('ecommit_crud.icon_theme'),
+            param('ecommit_crud.twig_functions_configuration'),
+        ])
+        ->tag('twig.extension')
+
+        ->set('ecommit_crud.event_listener.mapping_entities', MappingEntities::class)
+        ->tag('doctrine.event_listener', ['event' => 'loadClassMetadata'])
+
+        ->set('ecommit_crud.type.entity_ajax', EntityAjaxType::class)
+        ->args([
+            service(ManagerRegistry::class),
+            service(RouterInterface::class),
+        ])
+        ->tag('form.type')
+    ;
+};
diff --git a/config/filters.php b/config/filters.php
new file mode 100644
index 0000000..bdf5b2c
--- /dev/null
+++ b/config/filters.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the EcommitCrudBundle package.
+ *
+ * (c) E-commit <contact@e-commit.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Ecommit\CrudBundle\Form\Filter;
+
+return static function (ContainerConfigurator $container): void {
+    $container->services()
+
+        ->set('ecommit_crud.filter.boolean', Filter\BooleanFilter::class)
+        ->tag('ecommit_crud.filter')
+
+        ->set('ecommit_crud.filter.choice', Filter\ChoiceFilter::class)
+        ->tag('ecommit_crud.filter')
+
+        ->set('ecommit_crud.filter.date', Filter\DateFilter::class)
+        ->tag('ecommit_crud.filter')
+
+        ->set('ecommit_crud.filter.entity_ajax', Filter\EntityAjaxFilter::class)
+        ->tag('ecommit_crud.filter')
+
+        ->set('ecommit_crud.filter.entity', Filter\EntityFilter::class)
+        ->tag('ecommit_crud.filter')
+
+        ->set('ecommit_crud.filter.integer', Filter\IntegerFilter::class)
+        ->tag('ecommit_crud.filter')
+
+        ->set('ecommit_crud.filter.not_null', Filter\NotNullFilter::class)
+        ->tag('ecommit_crud.filter')
+
+        ->set('ecommit_crud.filter.null', Filter\NullFilter::class)
+        ->tag('ecommit_crud.filter')
+
+        ->set('ecommit_crud.filter.number', Filter\NumberFilter::class)
+        ->tag('ecommit_crud.filter')
+
+        ->set('ecommit_crud.filter.text', Filter\TextFilter::class)
+        ->tag('ecommit_crud.filter')
+    ;
+};
diff --git a/config/filters.xml b/config/filters.xml
deleted file mode 100644
index 86a28e0..0000000
--- a/config/filters.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <services>
-        <service id="ecommit_crud.filter.boolean" class="Ecommit\CrudBundle\Form\Filter\BooleanFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-
-        <service id="ecommit_crud.filter.choice" class="Ecommit\CrudBundle\Form\Filter\ChoiceFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-
-        <service id="ecommit_crud.filter.date" class="Ecommit\CrudBundle\Form\Filter\DateFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-
-        <service id="ecommit_crud.filter.entity_ajax" class="Ecommit\CrudBundle\Form\Filter\EntityAjaxFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-
-        <service id="ecommit_crud.filter.entity" class="Ecommit\CrudBundle\Form\Filter\EntityFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-
-        <service id="ecommit_crud.filter.integer" class="Ecommit\CrudBundle\Form\Filter\IntegerFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-
-        <service id="ecommit_crud.filter.not_null" class="Ecommit\CrudBundle\Form\Filter\NotNullFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-
-        <service id="ecommit_crud.filter.null" class="Ecommit\CrudBundle\Form\Filter\NullFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-
-        <service id="ecommit_crud.filter.number" class="Ecommit\CrudBundle\Form\Filter\NumberFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-
-        <service id="ecommit_crud.filter.text" class="Ecommit\CrudBundle\Form\Filter\TextFilter">
-            <tag name="ecommit_crud.filter" />
-        </service>
-    </services>
-</container>
diff --git a/config/services.xml b/config/services.xml
deleted file mode 100644
index cad6425..0000000
--- a/config/services.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <services>
-        <service id="ecommit_crud.locator" class="Symfony\Component\DependencyInjection\ServiceLocator">
-            <argument type="collection">
-                <argument key="router" type="service" id="Symfony\Component\Routing\RouterInterface"/>
-                <argument key="form.factory" type="service" id="Symfony\Component\Form\FormFactoryInterface"/>
-                <argument key="request_stack" type="service" id="Symfony\Component\HttpFoundation\RequestStack"/>
-                <argument key="doctrine" type="service" id="Doctrine\Persistence\ManagerRegistry"/>
-                <argument key="security.token_storage" type="service" id="Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface"/>
-                <argument key="ecommit_crud.filters" type="service" id="ecommit_crud.filters"/>
-            </argument>
-            <tag name="container.service_locator"/>
-        </service>
-
-        <service id="ecommit_crud.factory" class="Ecommit\CrudBundle\Crud\CrudFactory">
-            <argument type="service" id="ecommit_crud.locator"/>
-        </service>
-        <service id="Ecommit\CrudBundle\Crud\CrudFactory" alias="ecommit_crud.factory" />
-
-        <service id="ecommit_crud.response_generatror" class="Ecommit\CrudBundle\Crud\CrudResponseGenerator">
-            <tag name="container.service_subscriber" />
-        </service>
-        <service id="Ecommit\CrudBundle\Crud\CrudResponseGenerator" alias="ecommit_crud.response_generatror" />
-
-        <service id="ecommit_crud.twig.crud_extension" class="Ecommit\CrudBundle\Twig\CrudExtension">
-            <argument type="service" id="twig.form.renderer" />
-            <argument>%ecommit_crud.theme%</argument>
-            <argument>%ecommit_crud.icon_theme%</argument>
-            <argument>%ecommit_crud.twig_functions_configuration%</argument>
-            <tag name="twig.extension"/>
-        </service>
-
-        <service id="ecommit_crud.event_listener.mapping_entities" class="Ecommit\CrudBundle\EventListener\MappingEntities">
-            <tag name="doctrine.event_listener" event="loadClassMetadata" />
-        </service>
-
-        <service id="ecommit_crud.type.entity_ajax" class="Ecommit\CrudBundle\Form\Type\EntityAjaxType">
-            <argument type="service" id="Doctrine\Persistence\ManagerRegistry" />
-            <argument type="service" id="Symfony\Component\Routing\RouterInterface" />
-            <tag name="form.type" />
-        </service>
-    </services>
-</container>
diff --git a/src/DependencyInjection/EcommitCrudExtension.php b/src/DependencyInjection/EcommitCrudExtension.php
index b9824e7..6fd3879 100644
--- a/src/DependencyInjection/EcommitCrudExtension.php
+++ b/src/DependencyInjection/EcommitCrudExtension.php
@@ -16,7 +16,7 @@
 use Ecommit\CrudBundle\Form\Filter\FilterInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class EcommitCrudExtension extends Extension
@@ -34,9 +34,9 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = new Configuration();
         $configs = $this->processConfiguration($configuration, $configs);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
-        $loader->load('services.xml');
-        $loader->load('filters.xml');
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
+        $loader->load('crud.php');
+        $loader->load('filters.php');
 
         $container->setParameter('ecommit_crud.theme', $configs['theme']);
         $container->setParameter('ecommit_crud.icon_theme', $configs['icon_theme']);

From 2622fdf1901df1c2aec5eaa73758c2d1ef3258bf Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 5 Dec 2025 17:07:37 +0100
Subject: [PATCH 250/264] [CI] Use vendor/bin directory

---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 174759b..d8c3528 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -145,7 +145,7 @@ jobs:
 
             -   name: Run PHPUnit
                 if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true
-                run: php vendor/phpunit/phpunit/phpunit
+                run: php vendor/bin/phpunit
 
             -   name: Run Karma
                 if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true
@@ -153,7 +153,7 @@ jobs:
 
             -   name: Run PHP CS Fixer
                 if: matrix.coding-standards
-                run: php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff --dry-run -v
+                run: php vendor/bin/php-cs-fixer fix --diff --dry-run -v
 
             -   name: Check license year
                 if: matrix.coding-standards

From 66f322820370a89a42fbc565fc73a87d4a10abda Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 5 Dec 2025 17:26:23 +0100
Subject: [PATCH 251/264] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 3d41713..ff04480 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ composer.lock
 /composer-require-checker.phar
 /drivers/
 /node_modules/
+/tests/Functional/App/config/reference.php
 /tests/Functional/App/public/build/
 /tests/Functional/App/var/
 /vendor/

From a416dc5b9981da1b0bae79ad5a7a96741c638135 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 5 Dec 2025 17:28:02 +0100
Subject: [PATCH 252/264] Add PHP 8.5 support

---
 .github/workflows/tests.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d8c3528..7ba9ddb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -28,22 +28,22 @@ jobs:
                         description: 'with SF 7.4.* lowest'
 
                     #Symfony versions
-                    -   php-version: '8.4'
+                    -   php-version: '8.5'
                         symfony-version: '6.4.*'
                         description: 'with SF 6.4.*'
-                    -   php-version: '8.4'
+                    -   php-version: '8.5'
                         symfony-version: '6.4.*@dev'
                         description: 'with SF 6.4.* dev'
-                    -   php-version: '8.4'
+                    -   php-version: '8.5'
                         symfony-version: '7.3.*'
                         description: 'with SF 7.3.*'
-                    -   php-version: '8.4'
+                    -   php-version: '8.5'
                         symfony-version: '7.3.*@dev'
                         description: 'with SF 7.3.* dev'
-                    -   php-version: '8.4'
+                    -   php-version: '8.5'
                         symfony-version: '7.4.*'
                         description: 'with SF 7.4.*'
-                    -   php-version: '8.4'
+                    -   php-version: '8.5'
                         symfony-version: '7.4.*@dev'
                         description: 'with SF 7.4.* dev'
 
@@ -52,6 +52,7 @@ jobs:
                     -   php-version: '8.2'
                     -   php-version: '8.3'
                     -   php-version: '8.4'
+                    -   php-version: '8.5'
 
                     #CS
                     -   php-version: '8.2'
@@ -59,7 +60,7 @@ jobs:
                         coding-standards: true
 
                     # Dependencies
-                    -   php-version: '8.4'
+                    -   php-version: '8.5'
                         description: 'with Analyze dependencies'
                         analyze-dependencies: true
 

From 1bcfa4484a2db7953be514aaad6a7f157405ee97 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 5 Dec 2025 17:58:00 +0100
Subject: [PATCH 253/264] Replace yarn with npm

---
 .github/workflows/tests.yml | 15 +++++++--------
 .gitignore                  |  3 +--
 doc/install.md              |  6 +++---
 package.json                |  8 +++++++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7ba9ddb..ae3577c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -81,7 +81,6 @@ jobs:
                 run: |
                     sudo rm -rf ~/.nvm && curl -sL "https://deb.nodesource.com/setup_16.x" | sudo -E bash -
                     sudo apt-get install -y nodejs
-                    sudo npm install -g yarn
                     sudo apt-get install xvfb
 
             -   name: Setup PHP
@@ -103,17 +102,17 @@ jobs:
                 id: composer-cache
                 run: echo "::set-output name=dir::$(composer config cache-dir)"
 
-            -   name: Get yarn cache directory
-                id: yarn-cache
-                run: echo "::set-output name=dir::$(yarn cache dir)"
+            -   name: Get npm cache directory
+                id: npm-cache
+                run: echo "::set-output name=dir::$(npm config get cache)"
 
             -   name: Cache dependencies
                 uses: actions/cache@v3
                 with:
                     path: |
                         ${{ steps.composer-cache.outputs.dir }}
-                        ${{ steps.yarn-cache.outputs.dir }}
-                    key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}-${{ matrix.composer-flags }}-${{ hashFiles('**/yarn.lock') }}
+                        ${{ steps.npm-cache.outputs.dir }}
+                    key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}-${{ matrix.composer-flags }}-${{ hashFiles('**/package-lock.json') }}
                     restore-keys: composer-${{ runner.os }}-${{ matrix.php-version }}-
 
             -   name: Configure minimum stability
@@ -136,8 +135,8 @@ jobs:
                 run: |
                     composer update --no-interaction --no-progress ${{ matrix.composer-flags }}
                     vendor/bin/bdi detect drivers
-                    yarn install
-                    yarn encore dev
+                    npm install
+                    npm run dev
 
             -   name: Fix Panther code
                 if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true
diff --git a/.gitignore b/.gitignore
index ff04480..1db696c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,8 @@ composer.lock
 /composer-require-checker.phar
 /drivers/
 /node_modules/
+/package-lock.json
 /tests/Functional/App/config/reference.php
 /tests/Functional/App/public/build/
 /tests/Functional/App/var/
 /vendor/
-yarn-error.log
-yarn.lock
diff --git a/doc/install.md b/doc/install.md
index 528c6e7..b83ebf9 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -3,7 +3,7 @@
 Prérequis :
 * Projet Symfony fonctionnel
 * Entité utilisateur avec Doctrine
-* Yarn
+* NodeJS
 * Webpack Encore
 * Pour une compatibilité avec un maximum de navigateurs Internet, il est conseillé :
   * De configurer Webpack Encore pour activer Babel et core-js
@@ -23,7 +23,7 @@ Installez le bundle avec Composer : A la racine de votre projet Symfony, éxécu
 
 ```bash
 $ composer require ecommit/crud-bundle:3.*@dev
-$ yarn add --dev @ecommit/crud-bundle@link:vendor/ecommit/crud-bundle/assets
+$ npm install --save-dev @ecommit/crud-bundle@file:vendor/ecommit/crud-bundle/assets
 ```
 
 Activez le bundle dans le fichier de configuration `config/bundles.php` de votre projet :
@@ -102,7 +102,7 @@ modalManager.defineEngine(modalEngine);
 Recompiliez avec Webpack Encore:
 
 ```bash
-yarn encore dev
+npm run dev
 ```
 
 Mettez à jour vos entités Doctrine :
diff --git a/package.json b/package.json
index 70040de..e606087 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "devDependencies": {
     "@babel/core": "^7.17.0",
     "@babel/preset-env": "^7.16.0",
-    "@ecommit/crud-bundle": "link:assets",
+    "@ecommit/crud-bundle": "file:assets",
     "@symfony/webpack-encore": "^5.0",
     "core-js": "^3.38.0",
     "eslint": "^9.0",
@@ -22,5 +22,11 @@
     "webpack-notifier": "^1.15.0",
     "whatwg-fetch": "^3.6.2"
   },
+  "scripts": {
+     "dev-server": "encore dev-server",
+     "dev": "encore dev",
+     "watch": "encore dev --watch",
+     "build": "encore production --progress"
+  },
   "private": true
 }

From 7ca1c52400ce91209fcdba2cd76d62c374b1a80b Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 18 Dec 2025 19:45:57 +0100
Subject: [PATCH 254/264] Fix MappingEntities event

---
 src/EventListener/MappingEntities.php | 30 ++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
index 7233b1f..3d1b10b 100644
--- a/src/EventListener/MappingEntities.php
+++ b/src/EventListener/MappingEntities.php
@@ -16,32 +16,45 @@
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Ecommit\CrudBundle\Entity\UserCrudInterface;
+use Ecommit\CrudBundle\Entity\UserCrudSettings;
 
 final class MappingEntities
 {
-    protected bool $isLoad = false;
+    private bool $isLoad = false;
+
+    /** @var array<class-string, bool> */
+    private array $inProgress = [];
 
     /**
      * @psalm-suppress ArgumentTypeCoercion
      */
     public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
+        if ($this->isLoad) {
+            return;
+        }
+
         $metadata = $eventArgs->getClassMetadata();
 
         if ($metadata->isMappedSuperclass) {
             return;
         }
 
-        /** @var string $className */
+        /** @var class-string $className */
         $className = $metadata->getName();
-        if (!$this->isLoad && is_subclass_of($className, 'Ecommit\CrudBundle\Entity\UserCrudInterface')) {
-            $this->isLoad = true;
-            $userCrudSettingsMetadata = $eventArgs->getEntityManager()->getMetadataFactory()->getMetadataFor('Ecommit\CrudBundle\Entity\UserCrudSettings');
+
+        if (isset($this->inProgress[$className])) {
+            return;
+        }
+        $this->inProgress[$className] = true;
+
+        if (is_subclass_of($className, UserCrudInterface::class)) {
+            $userCrudSettingsMetadata = $eventArgs->getEntityManager()->getMetadataFactory()->getMetadataFor(UserCrudSettings::class);
             $this->mappUserCrudSettings($userCrudSettingsMetadata, $metadata);
         }
-        if (!$this->isLoad && 'Ecommit\CrudBundle\Entity\UserCrudSettings' === $className) {
-            $this->isLoad = true;
-            $userMetadata = $eventArgs->getEntityManager()->getMetadataFactory()->getMetadataFor('Ecommit\CrudBundle\Entity\UserCrudInterface');
+        if (UserCrudSettings::class === $className) {
+            $userMetadata = $eventArgs->getEntityManager()->getMetadataFactory()->getMetadataFor(UserCrudInterface::class);
             $this->mappUserCrudSettings($metadata, $userMetadata);
         }
     }
@@ -58,5 +71,6 @@ protected function mappUserCrudSettings(ClassMetadataInfo|ClassMetadata $userCru
                 ]],
             ]
         );
+        $this->isLoad = true;
     }
 }

From 3804e95209fd1c3fac023d2ef787fadb48edd5f2 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 16 Feb 2026 13:56:57 +0100
Subject: [PATCH 255/264] Fix CS

---
 src/Crud/Crud.php                             |  4 ++--
 src/Crud/CrudColumn.php                       |  6 ++---
 .../Entity/AbstractEntityTransformer.php      |  2 +-
 .../Entity/EntitiesToChoicesTransformer.php   |  2 +-
 .../Entity/EntitiesToIdsTransformer.php       |  2 +-
 src/Form/Filter/EntityFilter.php              |  2 +-
 src/Form/Type/DisplaySettingsType.php         |  2 +-
 src/Form/Type/EntityAjaxType.php              |  4 ++--
 src/Twig/CrudExtension.php                    |  6 ++---
 tests/Crud/AbstractCrudTest.php               |  6 ++---
 tests/Crud/CrudFiltersTest.php                |  4 ++--
 tests/Crud/CrudTest.php                       |  8 +++----
 tests/Crud/Http/QueryBuilderTest.php          | 12 +++++-----
 tests/Crud/SearchFormBuilderTest.php          | 22 +++++++++----------
 .../EntitiesToChoicesTransformerTest.php      |  2 +-
 .../EntitiesToIdsTransformerTest.php          |  2 +-
 .../EntityToChoiceTransformerTest.php         |  2 +-
 .../EntityToIdTransformerTest.php             |  2 +-
 tests/Form/Filter/AbstractFilterTest.php      |  2 +-
 tests/Form/Filter/EntityAjaxFilterTest.php    |  4 ++--
 tests/Form/Filter/EntityFilterTest.php        |  4 ++--
 tests/Form/Type/EntityAjaxTypeTest.php        |  4 ++--
 .../Controller/UserWithoutTraitController.php | 16 +++++++-------
 .../Controller/TestCrudControllerTest.php     |  4 ++--
 tests/Twig/CrudExtensionTest.php              |  4 ++--
 25 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
index 272760f..b003e35 100644
--- a/src/Crud/Crud.php
+++ b/src/Crud/Crud.php
@@ -106,7 +106,7 @@ public function __construct(array $options, protected ContainerInterface $contai
         $resolver->setAllowedValues('columns', Validation::createCallable(
             new Assert\Count(min: 1, minMessage: 'The CRUD should contain 1 column or more.'),
         ));
-        $resolver->setNormalizer('columns', function (Options $options, array $value): array {
+        $resolver->setNormalizer('columns', static function (Options $options, array $value): array {
             $columns = [];
             foreach ($value as $column) {
                 if (\is_array($column)) {
@@ -124,7 +124,7 @@ public function __construct(array $options, protected ContainerInterface $contai
         });
 
         $resolver->setAllowedTypes('virtual_columns', 'array');
-        $resolver->setNormalizer('virtual_columns', function (Options $options, array $value): array {
+        $resolver->setNormalizer('virtual_columns', static function (Options $options, array $value): array {
             $columns = [];
             foreach ($value as $column) {
                 if (\is_array($column)) {
diff --git a/src/Crud/CrudColumn.php b/src/Crud/CrudColumn.php
index 7b7729a..6dc829a 100644
--- a/src/Crud/CrudColumn.php
+++ b/src/Crud/CrudColumn.php
@@ -54,11 +54,11 @@ public function __construct(array $options)
             'alias',
         ]);
         $resolver->setDefaults([
-            'label' => fn (Options $options): string|TranslatableInterface => $options['id'],
+            'label' => static fn (Options $options): string|TranslatableInterface => $options['id'],
             'sortable' => true,
             'displayed_by_default' => true,
-            'alias_sort' => fn (Options $options): string => $options['alias'],
-            'alias_search' => fn (Options $options): string => $options['alias'],
+            'alias_sort' => static fn (Options $options): string => $options['alias'],
+            'alias_search' => static fn (Options $options): string => $options['alias'],
         ]);
         $resolver->setAllowedTypes('id', 'string');
         $resolver->setAllowedValues('id', Validation::createCallable(
diff --git a/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php b/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
index 70ce4e4..e1a4e5f 100644
--- a/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
+++ b/src/Form/DataTransformer/Entity/AbstractEntityTransformer.php
@@ -33,7 +33,7 @@ protected function getCacheHash(mixed $id): string
     {
         if (\is_array($id)) {
             $id = ScalarValues::filterScalarValues($id);
-            $id = array_map(function ($child) {
+            $id = array_map(static function ($child) {
                 return (string) $child; // Converts ids from integer to string => Parameters for transform and reverse functions must be identicals
             }, $id);
             sort($id);
diff --git a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
index 9fe4896..662e251 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToChoicesTransformer.php
@@ -34,7 +34,7 @@ public function transform(mixed $value): mixed
             return [];
         }
 
-        if (!($value instanceof Collection)) {
+        if (!$value instanceof Collection) {
             throw new UnexpectedTypeException($value, Collection::class);
         }
 
diff --git a/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
index d6a8eea..df37d6a 100644
--- a/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
+++ b/src/Form/DataTransformer/Entity/EntitiesToIdsTransformer.php
@@ -24,7 +24,7 @@ public function transform(mixed $value): mixed
             return [];
         }
 
-        if (!($value instanceof Collection)) {
+        if (!$value instanceof Collection) {
             throw new UnexpectedTypeException($value, Collection::class);
         }
 
diff --git a/src/Form/Filter/EntityFilter.php b/src/Form/Filter/EntityFilter.php
index 16425ff..39b583c 100644
--- a/src/Form/Filter/EntityFilter.php
+++ b/src/Form/Filter/EntityFilter.php
@@ -31,7 +31,7 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
     {
         $typeOptions = $this->getTypeOptions($options, array_merge($this->getCollectionTypeOptions($options), [
             'class' => $options['class'],
-            'query_builder' => fn (EntityRepository $er) => $er->createQueryBuilder('e'),
+            'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('e'),
         ]));
 
         if (isset($typeOptions['choices'])) {
diff --git a/src/Form/Type/DisplaySettingsType.php b/src/Form/Type/DisplaySettingsType.php
index 6af7b75..90847a8 100644
--- a/src/Form/Type/DisplaySettingsType.php
+++ b/src/Form/Type/DisplaySettingsType.php
@@ -38,7 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         $columnsChoices = $options['columns_choices'];
         $builder->add('displayedColumns', ChoiceType::class, [
             'choices' => array_keys($columnsChoices),
-            'choice_label' => function (string $choice, string $key, mixed $value) use ($columnsChoices): string|TranslatableInterface {
+            'choice_label' => static function (string $choice, string $key, mixed $value) use ($columnsChoices): string|TranslatableInterface {
                 if (\array_key_exists($choice, $columnsChoices)) {
                     return $columnsChoices[$choice];
                 }
diff --git a/src/Form/Type/EntityAjaxType.php b/src/Form/Type/EntityAjaxType.php
index b1d9af5..b908d40 100644
--- a/src/Form/Type/EntityAjaxType.php
+++ b/src/Form/Type/EntityAjaxType.php
@@ -101,7 +101,7 @@ public function configureOptions(OptionsResolver $resolver): void
         };
         $resolver->setNormalizer('em', $emNormalizer);
 
-        $queryBuilderNormalizer = function (Options $options, QueryBuilder|\Closure|null $queryBuilder): QueryBuilder {
+        $queryBuilderNormalizer = static function (Options $options, QueryBuilder|\Closure|null $queryBuilder): QueryBuilder {
             $em = $options['em'];
             $class = $options['class'];
 
@@ -119,7 +119,7 @@ public function configureOptions(OptionsResolver $resolver): void
         };
         $resolver->setNormalizer('query_builder', $queryBuilderNormalizer);
 
-        $identifierNormalizer = function (Options $options, ?string $identifier): string {
+        $identifierNormalizer = static function (Options $options, ?string $identifier): string {
             if (null !== $identifier) {
                 return $identifier;
             }
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index ea5c72b..224e93d 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -159,7 +159,7 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
             'max_pages_after' => 3,
             'nav_attr' => [],
             'ul_attr' => [],
-            'li_attr' => function (OptionsResolver $liResolver): void {
+            'li_attr' => static function (OptionsResolver $liResolver): void {
                 $liResolver->setDefaults([
                     'first_page' => [],
                     'previous_page' => [],
@@ -288,7 +288,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
         $resolver->setDefaults([
             'ajax_options' => null,
             'label' => null,
-            'th_attr' => function (OptionsResolver $thResolver): void {
+            'th_attr' => static function (OptionsResolver $thResolver): void {
                 $thResolver->setDefaults([
                     'not_sortable' => [],
                     'sortable_active_asc' => [],
@@ -325,7 +325,7 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
             'block' => 'th',
         ]);
         $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
-        $resolver->addNormalizer('ajax_options', function (Options $options, mixed $value) use ($crud): array {
+        $resolver->addNormalizer('ajax_options', static function (Options $options, mixed $value) use ($crud): array {
             if (!isset($value['update'])) {
                 $value['update'] = '#'.$crud->getDivIdList();
             }
diff --git a/tests/Crud/AbstractCrudTest.php b/tests/Crud/AbstractCrudTest.php
index 146dcea..c9589b6 100644
--- a/tests/Crud/AbstractCrudTest.php
+++ b/tests/Crud/AbstractCrudTest.php
@@ -49,8 +49,8 @@ protected function createCrud(array|CrudConfig $crudConfig, array $filters = [],
             ->willReturn($request);
 
         $crudFilters = $this->createMock(CrudFilters::class);
-        $crudFilters->method('has')->willReturnCallback(fn (string $name) => \array_key_exists($name, $filters) || static::getContainer()->get('ecommit_crud.filters')->has($name));
-        $crudFilters->method('get')->willReturnCallback(function (string $name) use ($filters): FilterInterface {
+        $crudFilters->method('has')->willReturnCallback(static fn (string $name) => \array_key_exists($name, $filters) || static::getContainer()->get('ecommit_crud.filters')->has($name));
+        $crudFilters->method('get')->willReturnCallback(static function (string $name) use ($filters): FilterInterface {
             if (\array_key_exists($name, $filters)) {
                 return $filters[$name];
             }
@@ -60,7 +60,7 @@ protected function createCrud(array|CrudConfig $crudConfig, array $filters = [],
 
         $container = $this->createMock(ContainerInterface::class);
         $container->method('get')
-            ->willReturnCallback(function ($name) use ($requestStack, $crudFilters) {
+            ->willReturnCallback(static function ($name) use ($requestStack, $crudFilters) {
                 if ('request_stack' === $name) {
                     return $requestStack;
                 } elseif ('ecommit_crud.filters' === $name) {
diff --git a/tests/Crud/CrudFiltersTest.php b/tests/Crud/CrudFiltersTest.php
index 0c285eb..30f7c7c 100644
--- a/tests/Crud/CrudFiltersTest.php
+++ b/tests/Crud/CrudFiltersTest.php
@@ -58,9 +58,9 @@ protected function createCrudFilters(): CrudFilters
 
         $container = $this->createMock(ContainerInterface::class);
         $container->method('has')
-            ->willReturnCallback(fn ($name): bool => \array_key_exists($name, $filters));
+            ->willReturnCallback(static fn ($name): bool => \array_key_exists($name, $filters));
         $container->method('get')
-            ->willReturnCallback(fn ($name): FilterInterface => $filters[$name]);
+            ->willReturnCallback(static fn ($name): FilterInterface => $filters[$name]);
 
         return new CrudFilters($container);
     }
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index 0eb7352..e16dfa4 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -121,19 +121,19 @@ public function testAddColumnAlreadyExists(callable $callback): void
     public function getTestAddColumnAlreadyExistsProvider(): array
     {
         return [
-            [function (CrudConfig $crudConfig): void {
+            [static function (CrudConfig $crudConfig): void {
                 $crudConfig->addColumn(['id' => 'column1', 'alias' => 'alias1'])
                     ->addColumn(['id' => 'column1', 'alias' => 'alias1']);
             }],
-            [function (CrudConfig $crudConfig): void {
+            [static function (CrudConfig $crudConfig): void {
                 $crudConfig->addVirtualColumn(['id' => 'column1', 'alias' => 'alias1'])
                     ->addVirtualColumn(['id' => 'column1', 'alias' => 'alias1']);
             }],
-            [function (CrudConfig $crudConfig): void {
+            [static function (CrudConfig $crudConfig): void {
                 $crudConfig->addColumn(['id' => 'column1', 'alias' => 'alias1'])
                     ->addVirtualColumn(['id' => 'column1', 'alias' => 'alias1']);
             }],
-            [function (CrudConfig $crudConfig): void {
+            [static function (CrudConfig $crudConfig): void {
                 $crudConfig->addVirtualColumn(['id' => 'column1', 'alias' => 'alias1'])
                     ->addColumn(['id' => 'column1', 'alias' => 'alias1']);
             }],
diff --git a/tests/Crud/Http/QueryBuilderTest.php b/tests/Crud/Http/QueryBuilderTest.php
index ffa4b7e..0752afb 100644
--- a/tests/Crud/Http/QueryBuilderTest.php
+++ b/tests/Crud/Http/QueryBuilderTest.php
@@ -135,7 +135,7 @@ public function testSetBodyIsJson(): void
     public function testOrderBy(): void
     {
         $queryBuilder = $this->createQueryBuider();
-        $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
+        $queryBuilder->setOrderBuilder(static function (QueryBuilder $queryBuilder, $orders): void {
             foreach ($orders as $sort => $sortDirection) {
                 $queryBuilder->addParameter(new QueryBuilderBodyParameter('sort', $sort));
                 $queryBuilder->addParameter(new QueryBuilderBodyParameter('sort-direction', $sortDirection));
@@ -152,7 +152,7 @@ public function testOrderBy(): void
     public function testAddOrderBy(): void
     {
         $queryBuilder = $this->createQueryBuider();
-        $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
+        $queryBuilder->setOrderBuilder(static function (QueryBuilder $queryBuilder, $orders): void {
             $paramSort = [];
             $paramSortDirection = [];
             foreach ($orders as $sort => $sortDirection) {
@@ -174,7 +174,7 @@ public function testAddOrderBy(): void
     public function testPagination(): void
     {
         $queryBuilder = $this->createQueryBuider();
-        $queryBuilder->setPaginationBuilder(function (QueryBuilder $queryBuilder, $page, $resultsPerPage): void {
+        $queryBuilder->setPaginationBuilder(static function (QueryBuilder $queryBuilder, $page, $resultsPerPage): void {
             $queryBuilder->addParameter(new QueryBuilderBodyParameter('page', $page));
             $queryBuilder->addParameter(new QueryBuilderBodyParameter('per_page', $resultsPerPage));
         });
@@ -191,13 +191,13 @@ public function testFull(): void
         $queryBuilder->addParameter(new QueryBuilderQueryParameter('queryparam1', 'queryparamval1'));
         $queryBuilder->addParameter(new QueryBuilderBodyParameter('bodyparam1', 'bodyparamval1'));
         $queryBuilder->addParameter(new QueryBuilderHeaderParameter('headerparam1', 'headerparamval1'));
-        $queryBuilder->setOrderBuilder(function (QueryBuilder $queryBuilder, $orders): void {
+        $queryBuilder->setOrderBuilder(static function (QueryBuilder $queryBuilder, $orders): void {
             foreach ($orders as $sort => $sortDirection) {
                 $queryBuilder->addParameter(new QueryBuilderQueryParameter('sort', $sort));
                 $queryBuilder->addParameter(new QueryBuilderQueryParameter('sort-direction', $sortDirection));
             }
         });
-        $queryBuilder->setPaginationBuilder(function (QueryBuilder $queryBuilder, $page, $resultsPerPage): void {
+        $queryBuilder->setPaginationBuilder(static function (QueryBuilder $queryBuilder, $page, $resultsPerPage): void {
             $queryBuilder->addParameter(new QueryBuilderQueryParameter('page', $page));
             $queryBuilder->addParameter(new QueryBuilderQueryParameter('per_page', $resultsPerPage));
         });
@@ -217,7 +217,7 @@ public function testFull(): void
 
     protected function createQueryBuider(string $method = 'GET'): QueryBuilder
     {
-        $callback = function ($method, $url, $options): MockResponse {
+        $callback = static function ($method, $url, $options): MockResponse {
             // Result : Returns request options
             $result = [
                 'method' => $method,
diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
index 47fa5e5..98eb894 100644
--- a/tests/Crud/SearchFormBuilderTest.php
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -215,8 +215,8 @@ public function testCreateFormWithDefaultColumnId(): void
     {
         $filter = $this->createMock(FilterInterface::class);
         $filter->expects($this->exactly(2))->method('buildForm')->withConsecutive(
-            [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'column1', self::callback(fn ($value): bool => \is_array($value))],
-            [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'virtual1', self::callback(fn ($value): bool => \is_array($value))],
+            [self::callback(static fn ($value): bool => $value instanceof SearchFormBuilder), 'column1', self::callback(static fn ($value): bool => \is_array($value))],
+            [self::callback(static fn ($value): bool => $value instanceof SearchFormBuilder), 'virtual1', self::callback(static fn ($value): bool => \is_array($value))],
         );
         $crudConfig = $this->createValidCrudConfig()
             ->addColumn(['id' => 'column1', 'alias' => 'alias1'])
@@ -232,8 +232,8 @@ public function testCreateFormWithColumnIdOption(): void
     {
         $filter = $this->createMock(FilterInterface::class);
         $filter->expects($this->exactly(2))->method('buildForm')->withConsecutive(
-            [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'property1', self::callback(fn ($value): bool => \is_array($value))],
-            [self::callback(fn ($value): bool => $value instanceof SearchFormBuilder), 'property2', self::callback(fn ($value): bool => \is_array($value))],
+            [self::callback(static fn ($value): bool => $value instanceof SearchFormBuilder), 'property1', self::callback(static fn ($value): bool => \is_array($value))],
+            [self::callback(static fn ($value): bool => $value instanceof SearchFormBuilder), 'property2', self::callback(static fn ($value): bool => \is_array($value))],
         );
         $crudConfig = $this->createValidCrudConfig()
             ->addColumn(['id' => 'column1', 'alias' => 'alias1'])
@@ -370,7 +370,7 @@ public function testUpdateQueryBuilder(): void
             self::equalTo($queryBuilder),
             'property',
             'value',
-            self::callback(fn ($value): bool => \is_array($value))
+            self::callback(static fn ($value): bool => \is_array($value))
         );
         $filter->expects($this->once())->method('supportsQueryBuilder')->with($queryBuilder)->willReturn(true);
 
@@ -403,7 +403,7 @@ public function testUpdateQueryBuilderWithUpdateQueryBuilderOption(): void
             self::equalTo($queryBuilder),
             'property',
             'value',
-            self::callback(fn ($value): bool => \is_array($value))
+            self::callback(static fn ($value): bool => \is_array($value))
         );
 
         $crudConfig = $this->createValidCrudConfig()
@@ -412,7 +412,7 @@ public function testUpdateQueryBuilderWithUpdateQueryBuilderOption(): void
         $searchFormBuilder = $this->createSearchFormBuilder(filters: ['my_filter' => $filter], crud: $crud)
             ->addFilter('property', 'my_filter', [
                 'column_id' => 'column1',
-                'update_query_builder' => function ($queryBuilder, $property, $value, $options) use ($callback): void {
+                'update_query_builder' => static function ($queryBuilder, $property, $value, $options) use ($callback): void {
                     $callback->getCallback($queryBuilder, $property, $value, $options);
                 },
             ]);
@@ -456,16 +456,16 @@ public function testUpdateQueryBuilderNotSuported(): void
     protected function createCrudContainer(array $filters = []): ContainerInterface
     {
         $crudFilters = $this->createMock(ContainerInterface::class);
-        $crudFilters->method('has')->willReturnCallback(fn (string $id) => \array_key_exists($id, $filters));
-        $crudFilters->method('get')->willReturnCallback(fn (string $id) => $filters[$id]);
+        $crudFilters->method('has')->willReturnCallback(static fn (string $id) => \array_key_exists($id, $filters));
+        $crudFilters->method('get')->willReturnCallback(static fn (string $id) => $filters[$id]);
 
         $services = [
             'form.factory' => self::getContainer()->get('form.factory'),
             'ecommit_crud.filters' => $crudFilters,
         ];
         $container = $this->createMock(ContainerInterface::class);
-        $container->method('has')->willReturnCallback(fn (string $id) => \array_key_exists($id, $services));
-        $container->method('get')->willReturnCallback(fn (string $id) => $services[$id]);
+        $container->method('has')->willReturnCallback(static fn (string $id) => \array_key_exists($id, $services));
+        $container->method('get')->willReturnCallback(static fn (string $id) => $services[$id]);
 
         return $container;
     }
diff --git a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
index ee53710..dca6cc0 100644
--- a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
@@ -45,7 +45,7 @@ public function testTransform($choiceLabel, array $expected): void
 
     public function getTestTransformProvider(): array
     {
-        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
+        $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             [null, ['1' => 'tag1', '3' => '3']], // Choice label: null
diff --git a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
index 2ea57c6..cd5e194 100644
--- a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
@@ -28,7 +28,7 @@ protected function createTransformer(...$args): DataTransformerInterface
 
     public function getTestTransformProvider(): array
     {
-        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
+        $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             [null, ['1', '3']], // Choice label: null
diff --git a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
index 8487414..38d8e4f 100644
--- a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
@@ -43,7 +43,7 @@ public function testTransform($choiceLabel, $expected): void
 
     public function getTestTransformProvider(): array
     {
-        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
+        $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             [null, ['3' => '3']], // Choice label: null
diff --git a/tests/Form/DataTransformer/EntityToIdTransformerTest.php b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
index 9b666f6..361099b 100644
--- a/tests/Form/DataTransformer/EntityToIdTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
@@ -27,7 +27,7 @@ protected function createTransformer(...$args): DataTransformerInterface
 
     public function getTestTransformProvider(): array
     {
-        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
+        $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             [null, '3'], // Choice label: null
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTest.php
index 26c4908..374841c 100644
--- a/tests/Form/Filter/AbstractFilterTest.php
+++ b/tests/Form/Filter/AbstractFilterTest.php
@@ -71,7 +71,7 @@ protected function setUp(): void
         $container = $this->createMock(ContainerInterface::class);
         $container->expects($this->any())
             ->method('get')
-            ->willReturnCallback(function ($name) use ($requestStack) {
+            ->willReturnCallback(static function ($name) use ($requestStack) {
                 if ('request_stack' === $name) {
                     return $requestStack;
                 }
diff --git a/tests/Form/Filter/EntityAjaxFilterTest.php b/tests/Form/Filter/EntityAjaxFilterTest.php
index c1a5c37..47e6c5d 100644
--- a/tests/Form/Filter/EntityAjaxFilterTest.php
+++ b/tests/Form/Filter/EntityAjaxFilterTest.php
@@ -154,7 +154,7 @@ public function getTestSubmitInvalidProvider(): array
     public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
+            $queryBuilder = static fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
         } else {
@@ -211,7 +211,7 @@ public function getTestViewWithQueryBuilderProvider(): array
     public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedViewData): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
+            $queryBuilder = static fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
         } else {
diff --git a/tests/Form/Filter/EntityFilterTest.php b/tests/Form/Filter/EntityFilterTest.php
index 6f1bf01..40f0c0d 100644
--- a/tests/Form/Filter/EntityFilterTest.php
+++ b/tests/Form/Filter/EntityFilterTest.php
@@ -165,7 +165,7 @@ public function testSubmitInvalidMaxCount(): void
     public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
+            $queryBuilder = static fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
         } else {
@@ -221,7 +221,7 @@ public function getTestViewWithQueryBuilderProvider(): array
     public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedViewData): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
+            $queryBuilder = static fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
         } else {
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index aae3fca..ee12c28 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -192,7 +192,7 @@ public function testSubmitInvalidByValidator(): void
     public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedDataBuilderName, $expectedViewData): void
     {
         if ($queryBuilderIsClosure) {
-            $queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
+            $queryBuilder = static fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
                     ->select('t')
                     ->andWhere('t.id > 2');
         } else {
@@ -258,7 +258,7 @@ public function testViewWithChoiceLabel($choiceLabel, $expectedViewValue): void
 
     public function getTestViewWithChoiceLabelProvider(): array
     {
-        $closure = fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
+        $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
         return [
             ['name', ['2' => 'tag2']],
diff --git a/tests/Functional/App/Controller/UserWithoutTraitController.php b/tests/Functional/App/Controller/UserWithoutTraitController.php
index 4e0e314..4098077 100644
--- a/tests/Functional/App/Controller/UserWithoutTraitController.php
+++ b/tests/Functional/App/Controller/UserWithoutTraitController.php
@@ -60,13 +60,13 @@ public function crudAction(Request $request, CrudResponseGenerator $crudResponse
     {
         if ($request->query->has('test-before-and-after-build-query')) {
             return $crudResponseGenerator->getResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
-                'template_generator' => fn (string $action) => \sprintf('user/%s.html.twig', $action),
-                'before_build' => function (Crud $crud, array $data) {
+                'template_generator' => static fn (string $action) => \sprintf('user/%s.html.twig', $action),
+                'before_build' => static function (Crud $crud, array $data) {
                     $data['test_before_after_build'] = 'BEFORE';
 
                     return $data;
                 },
-                'after_build' => function (Crud $crud, array $data) {
+                'after_build' => static function (Crud $crud, array $data) {
                     $data['test_before_after_build'] .= ' AFTER';
 
                     return $data;
@@ -75,7 +75,7 @@ public function crudAction(Request $request, CrudResponseGenerator $crudResponse
         }
 
         return $crudResponseGenerator->getResponse($this->getCrud('user_without_trait'), [
-            'template_generator' => fn (string $action) => \sprintf('user/%s.html.twig', $action),
+            'template_generator' => static fn (string $action) => \sprintf('user/%s.html.twig', $action),
         ]);
     }
 
@@ -83,13 +83,13 @@ public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResp
     {
         if ($request->query->has('test-before-and-after-build-query')) {
             return $crudResponseGenerator->getAjaxResponse($this->getCrud('user_without_trait_with_data', ['test-before-and-after-build-query' => 1]), [
-                'template_generator' => fn (string $action) => \sprintf('user/%s.html.twig', $action),
-                'before_build' => function (Crud $crud, array $data) {
+                'template_generator' => static fn (string $action) => \sprintf('user/%s.html.twig', $action),
+                'before_build' => static function (Crud $crud, array $data) {
                     $data['test_before_after_build'] = 'BEFORE';
 
                     return $data;
                 },
-                'after_build' => function (Crud $crud, array $data) {
+                'after_build' => static function (Crud $crud, array $data) {
                     $data['test_before_after_build'] .= ' AFTER';
 
                     return $data;
@@ -98,7 +98,7 @@ public function ajaxCrudAction(Request $request, CrudResponseGenerator $crudResp
         }
 
         return $crudResponseGenerator->getAjaxResponse($this->getCrud('user_without_trait'), [
-            'template_generator' => fn (string $action) => \sprintf('user/%s.html.twig', $action),
+            'template_generator' => static fn (string $action) => \sprintf('user/%s.html.twig', $action),
         ]);
     }
 
diff --git a/tests/Functional/Controller/TestCrudControllerTest.php b/tests/Functional/Controller/TestCrudControllerTest.php
index 34c2ab7..0c0cd40 100644
--- a/tests/Functional/Controller/TestCrudControllerTest.php
+++ b/tests/Functional/Controller/TestCrudControllerTest.php
@@ -321,12 +321,12 @@ public function testCheckAndUncheckAllColumns(Client $client): Client
 
         // Check all
         $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[contains(.,"Check all")]')->click();
-        $client->wait(5, 30)->until(fn () => 3 === \count($form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue()));
+        $client->wait(5, 30)->until(static fn () => 3 === \count($form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue()));
         $this->assertCount(3, $form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue());
 
         // Uncheck all
         $client->getCrawler()->filterXPath('//form[@name="crud_display_settings_'.static::SESSION_NAME.'"]/descendant::button[contains(.,"Uncheck all")]')->click();
-        $client->wait(5, 30)->until(fn () => null === $form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue());
+        $client->wait(5, 30)->until(static fn () => null === $form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue());
         $this->assertNull($form->get('crud_display_settings_'.static::SESSION_NAME.'[displayedColumns]')->getValue());
 
         // Save and error (save not done)
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index b056ec0..68c983b 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -244,7 +244,7 @@ public function testPaginatorWithTypeOption(int $page, string $type, string $exp
 
     public function getTestPaginatorWithTypeOptionProvider(): array
     {
-        $full = function (int $currentPage) {
+        $full = static function (int $currentPage) {
             $result = '';
             for ($i = 1; $i <= 20; ++$i) {
                 $class = ($i === $currentPage) ? ' class="current"' : '';
@@ -748,7 +748,7 @@ protected function createCrud(string $sort = 'column1', string $sortDirection =
         $crud->expects($this->any())->method('getRouteName')->willReturn('user_crud');
         $crud->expects($this->any())->method('getRouteParameters')->willReturn([]);
         $crud->expects($this->any())->method('getSessionValues')->willReturn($crudSession);
-        $crud->expects($this->any())->method('getColumn')->willReturnCallback(fn ($columnId) => $columns[$columnId]);
+        $crud->expects($this->any())->method('getColumn')->willReturnCallback(static fn ($columnId) => $columns[$columnId]);
 
         return $crud;
     }

From f030a8ece84dbc0e09b4b5d90a305e5e901e9881 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 16 Feb 2026 13:57:33 +0100
Subject: [PATCH 256/264] Update license year

---
 .github/workflows/tests.yml | 4 ----
 LICENSE                     | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ae3577c..d402ea3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -155,10 +155,6 @@ jobs:
                 if: matrix.coding-standards
                 run: php vendor/bin/php-cs-fixer fix --diff --dry-run -v
 
-            -   name: Check license year
-                if: matrix.coding-standards
-                run: cat LICENSE |grep -E "\(c\) ([0-9]+\-)*`date +%Y`"
-
             -   name: Run ESLint
                 if: matrix.coding-standards
                 run: ./node_modules/.bin/eslint assets/js/* tests/assets/js/*
diff --git a/LICENSE b/LICENSE
index eefc686..a6b1d0f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2025 E-COMMIT
+Copyright (c) 2011-present E-COMMIT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From ab45e12d4ef07c13de0a98b8ba2f10a45bf42751 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Fri, 5 Dec 2025 17:38:33 +0100
Subject: [PATCH 257/264] Add Symfony 8.0 support, remove Symfony 7.3 support

---
 .github/workflows/tests.yml               |  28 ++---
 composer.json                             |  54 ++++----
 src/Form/Filter/CollectionFilterTrait.php |   8 +-
 src/Form/Filter/TextFilter.php            |   8 +-
 src/Form/Type/DisplaySettingsType.php     |   4 +-
 src/Form/Type/EntityAjaxType.php          |   2 +-
 src/Form/Type/FormSearchType.php          |   2 +-
 src/Twig/CrudExtension.php                | 147 ++++++++++++----------
 tests/Functional/App/config/doctrine.yaml |   1 -
 9 files changed, 130 insertions(+), 124 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d402ea3..f123bf6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,14 +18,14 @@ jobs:
                         symfony-version: '6.4.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 6.4.* lowest'
-                    -   php-version: '8.2'
-                        symfony-version: '7.3.*'
-                        composer-flags: '--prefer-stable --prefer-lowest'
-                        description: 'with SF 7.3.* lowest'
                     -   php-version: '8.2'
                         symfony-version: '7.4.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 7.4.* lowest'
+                    -   php-version: '8.4'
+                        symfony-version: '8.0.*'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with SF 8.0.* lowest'
 
                     #Symfony versions
                     -   php-version: '8.5'
@@ -34,18 +34,21 @@ jobs:
                     -   php-version: '8.5'
                         symfony-version: '6.4.*@dev'
                         description: 'with SF 6.4.* dev'
-                    -   php-version: '8.5'
-                        symfony-version: '7.3.*'
-                        description: 'with SF 7.3.*'
-                    -   php-version: '8.5'
-                        symfony-version: '7.3.*@dev'
-                        description: 'with SF 7.3.* dev'
                     -   php-version: '8.5'
                         symfony-version: '7.4.*'
                         description: 'with SF 7.4.*'
                     -   php-version: '8.5'
                         symfony-version: '7.4.*@dev'
                         description: 'with SF 7.4.* dev'
+                    -   php-version: '8.5'
+                        symfony-version: '8.0.*'
+                        description: 'with SF 8.0.*'
+                    -   php-version: '8.5'
+                        symfony-version: '8.0.*@dev'
+                        description: 'with SF 8.0.* dev'
+                    -   php-version: '8.5'
+                        symfony-version: '8.1.*@dev'
+                        description: 'with SF 8.1.* dev'
 
                     #PHP versions
                     -   php-version: '8.1'
@@ -138,11 +141,6 @@ jobs:
                     npm install
                     npm run dev
 
-            -   name: Fix Panther code
-                if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true
-                run: |
-                    sed -i 's/protected function doRequest(\$request)/protected function doRequest(object $request): object/' vendor/symfony/panther/src/Client.php
-
             -   name: Run PHPUnit
                 if: matrix.coding-standards != true && matrix.analyze-dependencies != true && matrix.static-analysis != true
                 run: php vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 0bd7b42..5034d52 100644
--- a/composer.json
+++ b/composer.json
@@ -15,49 +15,49 @@
         "ext-mbstring": "*",
         "doctrine/collections": "^1.5|^2.0",
         "doctrine/dbal": "^3.2|^4.0",
-        "doctrine/doctrine-bundle": "^2.4.5",
+        "doctrine/doctrine-bundle": "^2.4.5|^3.0",
         "doctrine/orm": "^2.9|^3.0",
-        "doctrine/persistence": "^1.3|^2.0|^3.0",
+        "doctrine/persistence": "^2.0|^3.0|^4.0",
         "ecommit/doctrine-utils": "^1.0|^2.0",
         "ecommit/paginator": "^1.0",
         "ecommit/scalar-values": "^1.0",
         "psr/container": "^1.1|^2.0",
-        "symfony/asset": "^6.4|^7.3",
-        "symfony/config": "^6.4|^7.3",
-        "symfony/dependency-injection": "^6.4|^7.3",
-        "symfony/doctrine-bridge": "^6.4|^7.3",
-        "symfony/form": "^6.4|^7.3",
-        "symfony/framework-bundle": "^6.4|^7.3",
-        "symfony/http-client": "^6.4|^7.3",
+        "symfony/asset": "^6.4|^7.4|^8.0",
+        "symfony/config": "^6.4|^7.4|^8.0",
+        "symfony/dependency-injection": "^6.4|^7.4|^8.0",
+        "symfony/doctrine-bridge": "^6.4|^7.4|^8.0",
+        "symfony/form": "^6.4|^7.4|^8.0",
+        "symfony/framework-bundle": "^6.4|^7.4|^8.0",
+        "symfony/http-client": "^6.4|^7.4|^8.0",
         "symfony/http-client-contracts": "^2.4|^3.0",
-        "symfony/http-foundation": "^6.4|^7.3",
-        "symfony/http-kernel": "^6.4|^7.3",
-        "symfony/intl": "^6.4|^7.3",
-        "symfony/options-resolver": "^6.4|^7.3",
-        "symfony/property-access": "^6.4|^7.3",
-        "symfony/routing": "^6.4|^7.3",
-        "symfony/security-bundle": "^6.4|^7.3",
-        "symfony/security-core": "^6.4|^7.3",
-        "symfony/security-csrf": "^6.4|^7.3",
+        "symfony/http-foundation": "^6.4|^7.4|^8.0",
+        "symfony/http-kernel": "^6.4|^7.4|^8.0",
+        "symfony/intl": "^6.4|^7.4|^8.0",
+        "symfony/options-resolver": "^6.4|^7.4|^8.0",
+        "symfony/property-access": "^6.4|^7.4|^8.0",
+        "symfony/routing": "^6.4|^7.4|^8.0",
+        "symfony/security-bundle": "^6.4|^7.4|^8.0",
+        "symfony/security-core": "^6.4|^7.4|^8.0",
+        "symfony/security-csrf": "^6.4|^7.4|^8.0",
         "symfony/service-contracts": "^1.1.6|^2|^3",
-        "symfony/translation": "^6.4|^7.3",
+        "symfony/translation": "^6.4|^7.4|^8.0",
         "symfony/translation-contracts": "^2.3|^3.0",
-        "symfony/twig-bridge": "^6.4|^7.3",
-        "symfony/twig-bundle": "^6.4|^7.3",
-        "symfony/validator": "^6.4|^7.3",
+        "symfony/twig-bridge": "^6.4|^7.4|^8.0",
+        "symfony/twig-bundle": "^6.4|^7.4|^8.0",
+        "symfony/validator": "^6.4|^7.4|^8.0",
         "twig/twig": "^2.12.0|^3.0"
     },
     "require-dev": {
         "dbrekelmans/bdi": "^1.0",
         "dg/bypass-finals": "^1.3",
-        "doctrine/data-fixtures": "^1.5.3",
-        "doctrine/doctrine-fixtures-bundle": "^3.4.2",
+        "doctrine/data-fixtures": "^1.5.3|^2.0",
+        "doctrine/doctrine-fixtures-bundle": "^3.4.2|^4.0",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^9.0",
-        "symfony/dom-crawler": "^6.4|^7.3",
+        "symfony/dom-crawler": "^6.4|^7.4|^8.0",
         "symfony/panther": "^2.0.1",
-        "symfony/webpack-encore-bundle": "^1.7.3|^2.1.1",
-        "symfony/yaml": "^6.4|^7.3",
+        "symfony/webpack-encore-bundle": "^1.7.3|^2.4",
+        "symfony/yaml": "^6.4|^7.4|^8.0",
         "vimeo/psalm": "^5.0"
     },
     "autoload": {
diff --git a/src/Form/Filter/CollectionFilterTrait.php b/src/Form/Filter/CollectionFilterTrait.php
index 1623844..cc83c55 100644
--- a/src/Form/Filter/CollectionFilterTrait.php
+++ b/src/Form/Filter/CollectionFilterTrait.php
@@ -25,10 +25,10 @@ protected function getCollectionTypeOptions(array $options): array
         $constraints = [];
         if ($options['multiple']) {
             $constraints = [
-                new Assert\Count([
-                    'min' => $options['min'],
-                    'max' => $options['max'],
-                ]),
+                new Assert\Count(
+                    min: $options['min'],
+                    max: $options['max'],
+                ),
             ];
         }
 
diff --git a/src/Form/Filter/TextFilter.php b/src/Form/Filter/TextFilter.php
index 5b7a2ff..51fb564 100644
--- a/src/Form/Filter/TextFilter.php
+++ b/src/Form/Filter/TextFilter.php
@@ -24,10 +24,10 @@ public function buildForm(SearchFormBuilder $builder, string $property, array $o
     {
         $typeOptions = $this->getTypeOptions($options, [
             'constraints' => [
-                new Assert\Length([
-                    'min' => $options['min_length'],
-                    'max' => $options['max_length'],
-                ]),
+                new Assert\Length(
+                    min: $options['min_length'],
+                    max: $options['max_length'],
+                ),
             ],
         ]);
         $builder->addField($property, $options['type'], $typeOptions);
diff --git a/src/Form/Type/DisplaySettingsType.php b/src/Form/Type/DisplaySettingsType.php
index 90847a8..d93828c 100644
--- a/src/Form/Type/DisplaySettingsType.php
+++ b/src/Form/Type/DisplaySettingsType.php
@@ -50,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'label' => 'display_settings.displayed_columns',
             'translation_domain' => 'EcommitCrudBundle',
             'choice_translation_domain' => 'messages',
-            'constraints' => [new NotBlank(), new Count(['min' => 1])],
+            'constraints' => [new NotBlank(), new Count(min: 1)],
         ]);
 
         $builder->add('reset', ButtonType::class, [
@@ -81,7 +81,7 @@ public function configureOptions(OptionsResolver $resolver): void
         ]);
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'crud_display_settings';
     }
diff --git a/src/Form/Type/EntityAjaxType.php b/src/Form/Type/EntityAjaxType.php
index b908d40..d814117 100644
--- a/src/Form/Type/EntityAjaxType.php
+++ b/src/Form/Type/EntityAjaxType.php
@@ -135,7 +135,7 @@ public function configureOptions(OptionsResolver $resolver): void
         $resolver->setNormalizer('identifier', $identifierNormalizer);
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'ecommit_crud_entity_ajax';
     }
diff --git a/src/Form/Type/FormSearchType.php b/src/Form/Type/FormSearchType.php
index e031237..78be9a8 100644
--- a/src/Form/Type/FormSearchType.php
+++ b/src/Form/Type/FormSearchType.php
@@ -31,7 +31,7 @@ public function configureOptions(OptionsResolver $resolver): void
         ]);
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'crud_search';
     }
diff --git a/src/Twig/CrudExtension.php b/src/Twig/CrudExtension.php
index 224e93d..bcd3594 100644
--- a/src/Twig/CrudExtension.php
+++ b/src/Twig/CrudExtension.php
@@ -159,47 +159,47 @@ public function paginatorLinks(Environment $environment, PaginatorInterface $pag
             'max_pages_after' => 3,
             'nav_attr' => [],
             'ul_attr' => [],
-            'li_attr' => static function (OptionsResolver $liResolver): void {
-                $liResolver->setDefaults([
-                    'first_page' => [],
-                    'previous_page' => [],
-                    'current_page' => [],
-                    'next_page' => [],
-                    'last_page' => [],
-                    'other_page' => [],
-                ]);
-                foreach (['first_page', 'previous_page', 'current_page', 'next_page', 'last_page', 'other_page'] as $option) {
-                    $liResolver->setAllowedTypes($option, 'array');
-                }
-            },
-            'a_attr' => function (OptionsResolver $aResolver, Options $parent): void {
-                $aResolver->setDefaults([
-                    'first_page' => [],
-                    'previous_page' => [],
-                    'current_page' => [],
-                    'next_page' => [],
-                    'last_page' => [],
-                    'other_page' => [],
-                ]);
-                foreach (['first_page', 'previous_page', 'current_page', 'next_page', 'last_page', 'other_page'] as $option) {
-                    $aResolver->setAllowedTypes($option, 'array');
-                    $aResolver->addNormalizer($option, function (Options $options, mixed $value) use ($parent): array {
-                        if (null !== $parent['ajax_options']) {
-                            return array_merge(
-                                $value,
-                                ['data-ec-crud-toggle' => 'ajax-link'],
-                                $this->getAjaxAttributes($this->validateAjaxOptions($parent['ajax_options'])),
-                            );
-                        }
-
-                        return $value;
-                    });
-                }
-            },
             'render' => null,
             'theme' => $this->theme,
             'block' => 'paginator_links',
         ]);
+        $this->nestedOptions($resolver, 'li_attr', static function (OptionsResolver $liResolver): void {
+            $liResolver->setDefaults([
+                'first_page' => [],
+                'previous_page' => [],
+                'current_page' => [],
+                'next_page' => [],
+                'last_page' => [],
+                'other_page' => [],
+            ]);
+            foreach (['first_page', 'previous_page', 'current_page', 'next_page', 'last_page', 'other_page'] as $option) {
+                $liResolver->setAllowedTypes($option, 'array');
+            }
+        });
+        $this->nestedOptions($resolver, 'a_attr', function (OptionsResolver $aResolver, Options $parent): void {
+            $aResolver->setDefaults([
+                'first_page' => [],
+                'previous_page' => [],
+                'current_page' => [],
+                'next_page' => [],
+                'last_page' => [],
+                'other_page' => [],
+            ]);
+            foreach (['first_page', 'previous_page', 'current_page', 'next_page', 'last_page', 'other_page'] as $option) {
+                $aResolver->setAllowedTypes($option, 'array');
+                $aResolver->addNormalizer($option, function (Options $options, mixed $value) use ($parent): array {
+                    if (null !== $parent['ajax_options']) {
+                        return array_merge(
+                            $value,
+                            ['data-ec-crud-toggle' => 'ajax-link'],
+                            $this->getAjaxAttributes($this->validateAjaxOptions($parent['ajax_options'])),
+                        );
+                    }
+
+                    return $value;
+                });
+            }
+        });
         $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
         $resolver->setAllowedTypes('max_pages_before', 'int');
         $resolver->setAllowedTypes('max_pages_after', 'int');
@@ -288,42 +288,42 @@ public function th(Environment $environment, string $columnId, Crud $crud, array
         $resolver->setDefaults([
             'ajax_options' => null,
             'label' => null,
-            'th_attr' => static function (OptionsResolver $thResolver): void {
-                $thResolver->setDefaults([
-                    'not_sortable' => [],
-                    'sortable_active_asc' => [],
-                    'sortable_active_desc' => [],
-                    'sortable_not_active' => [],
-                ]);
-                foreach (['not_sortable', 'sortable_active_asc', 'sortable_active_desc', 'sortable_not_active'] as $option) {
-                    $thResolver->setAllowedTypes($option, 'array');
-                }
-            },
-            'a_attr' => function (OptionsResolver $aResolver, Options $parent): void {
-                $aResolver->setDefaults([
-                    'sortable_active_asc' => [],
-                    'sortable_active_desc' => [],
-                    'sortable_not_active' => [],
-                ]);
-                foreach (['sortable_active_asc', 'sortable_active_desc', 'sortable_not_active'] as $option) {
-                    $aResolver->setAllowedTypes($option, 'array');
-                    $aResolver->addNormalizer($option, function (Options $options, mixed $value) use ($parent): array {
-                        if (null !== $parent['ajax_options']) {
-                            return array_merge(
-                                $value,
-                                ['data-ec-crud-toggle' => 'ajax-link'],
-                                $this->getAjaxAttributes($this->validateAjaxOptions($parent['ajax_options'])),
-                            );
-                        }
-
-                        return $value;
-                    });
-                }
-            },
             'render' => null,
             'theme' => $this->theme,
             'block' => 'th',
         ]);
+        $this->nestedOptions($resolver, 'th_attr', static function (OptionsResolver $thResolver): void {
+            $thResolver->setDefaults([
+                'not_sortable' => [],
+                'sortable_active_asc' => [],
+                'sortable_active_desc' => [],
+                'sortable_not_active' => [],
+            ]);
+            foreach (['not_sortable', 'sortable_active_asc', 'sortable_active_desc', 'sortable_not_active'] as $option) {
+                $thResolver->setAllowedTypes($option, 'array');
+            }
+        });
+        $this->nestedOptions($resolver, 'a_attr', function (OptionsResolver $aResolver, Options $parent): void {
+            $aResolver->setDefaults([
+                'sortable_active_asc' => [],
+                'sortable_active_desc' => [],
+                'sortable_not_active' => [],
+            ]);
+            foreach (['sortable_active_asc', 'sortable_active_desc', 'sortable_not_active'] as $option) {
+                $aResolver->setAllowedTypes($option, 'array');
+                $aResolver->addNormalizer($option, function (Options $options, mixed $value) use ($parent): array {
+                    if (null !== $parent['ajax_options']) {
+                        return array_merge(
+                            $value,
+                            ['data-ec-crud-toggle' => 'ajax-link'],
+                            $this->getAjaxAttributes($this->validateAjaxOptions($parent['ajax_options'])),
+                        );
+                    }
+
+                    return $value;
+                });
+            }
+        });
         $resolver->setAllowedTypes('ajax_options', ['null', 'array']);
         $resolver->addNormalizer('ajax_options', static function (Options $options, mixed $value) use ($crud): array {
             if (!isset($value['update'])) {
@@ -740,4 +740,13 @@ protected function buildOptions(string $function, array $inlineOptions, ?Crud $c
 
         return array_merge($options, $inlineOptions);
     }
+
+    private function nestedOptions(OptionsResolver $optionsResolver, string $option, \Closure $nested): void
+    {
+        if (method_exists($optionsResolver, 'setOptions')) {
+            $optionsResolver->setOptions($option, $nested);
+        } else { // @legacy Symfony < 7.3
+            $optionsResolver->setDefault($option, $nested);
+        }
+    }
 }
diff --git a/tests/Functional/App/config/doctrine.yaml b/tests/Functional/App/config/doctrine.yaml
index 0f4e29d..42e17ef 100644
--- a/tests/Functional/App/config/doctrine.yaml
+++ b/tests/Functional/App/config/doctrine.yaml
@@ -6,7 +6,6 @@ doctrine:
                 logging: false
 
     orm:
-        auto_generate_proxy_classes: false
         entity_managers:
             default:
                 connection: default

From 39422a1f3e5968cfabdc30fb21535ae3059cbc1e Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 16 Feb 2026 18:07:51 +0100
Subject: [PATCH 258/264] Upgrade PHPUnit 10

---
 .gitignore                                    |  2 +-
 .php-cs-fixer.dist.php                        |  2 +-
 composer.json                                 |  4 +-
 phpunit.xml.dist                              | 39 +++++++------------
 ...tCrudTest.php => AbstractCrudTestCase.php} |  2 +-
 tests/Crud/CrudColumnTest.php                 |  2 +-
 tests/Crud/CrudConfigTest.php                 |  4 +-
 tests/Crud/CrudFiltersTest.php                |  2 +-
 tests/Crud/CrudTest.php                       | 39 ++++++++++---------
 tests/Crud/SearchFormBuilderTest.php          | 34 +++++++++++-----
 ... => AbstractEntityTransformerTestCase.php} |  2 +-
 .../EntitiesToChoicesTransformerTest.php      |  6 +--
 .../EntitiesToIdsTransformerTest.php          |  2 +-
 .../EntityToChoiceTransformerTest.php         |  6 +--
 .../EntityToIdTransformerTest.php             |  2 +-
 ...terTest.php => AbstractFilterTestCase.php} |  2 +-
 tests/Form/Filter/BooleanFilterTest.php       | 16 ++++----
 tests/Form/Filter/ChoiceFilterTest.php        |  8 ++--
 tests/Form/Filter/DateFilterTest.php          | 14 +++----
 tests/Form/Filter/EntityAjaxFilterTest.php    | 12 +++---
 tests/Form/Filter/EntityFilterTest.php        | 12 +++---
 tests/Form/Filter/IntegerFilterTest.php       |  8 ++--
 tests/Form/Filter/NotNullFilterTest.php       |  2 +-
 tests/Form/Filter/NullFilterTest.php          |  6 +--
 tests/Form/Filter/NumberFilterTest.php        |  4 +-
 tests/Form/Filter/TextFilterTest.php          |  6 +--
 tests/Form/Type/EntityAjaxTypeTest.php        | 10 ++---
 tests/Twig/CrudExtensionTest.php              | 10 ++---
 28 files changed, 133 insertions(+), 125 deletions(-)
 rename tests/Crud/{AbstractCrudTest.php => AbstractCrudTestCase.php} (98%)
 rename tests/Form/DataTransformer/{AbstractEntityTransformerTest.php => AbstractEntityTransformerTestCase.php} (92%)
 rename tests/Form/Filter/{AbstractFilterTest.php => AbstractFilterTestCase.php} (98%)

diff --git a/.gitignore b/.gitignore
index 1db696c..eaf34b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .php-cs-fixer.cache
-.phpunit.result.cache
+.phpunit.cache/
 composer.lock
 /composer-require-checker.phar
 /drivers/
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 0738a31..60779b5 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -23,7 +23,7 @@
         '@DoctrineAnnotation' => true,
         '@PHP81Migration' => true,
         '@PHP80Migration:risky' => true,
-        '@PHPUnit84Migration:risky' => true,
+        '@PHPUnit100Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'fopen_flags' => true,
         'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
diff --git a/composer.json b/composer.json
index 5034d52..d585ff7 100644
--- a/composer.json
+++ b/composer.json
@@ -53,9 +53,9 @@
         "doctrine/data-fixtures": "^1.5.3|^2.0",
         "doctrine/doctrine-fixtures-bundle": "^3.4.2|^4.0",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^10.0",
         "symfony/dom-crawler": "^6.4|^7.4|^8.0",
-        "symfony/panther": "^2.0.1",
+        "symfony/panther": "^2.3",
         "symfony/webpack-encore-bundle": "^1.7.3|^2.4",
         "symfony/yaml": "^6.4|^7.4|^8.0",
         "vimeo/psalm": "^5.0"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 36b3776..2796260 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,27 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.0/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         bootstrap="tests/bootstrap.php"
->
-    <php>
-        <env name="KERNEL_CLASS" value="Ecommit\CrudBundle\Tests\Functional\App\Kernel" />
-        <env name="APP_ENV" value="test"/>
-        <server name="PANTHER_WEB_SERVER_DIR" value="./tests/Functional/App/public" />
-        <ini name="intl.default_locale" value="en" />
-    </php>
-
-    <extensions>
-        <extension class="Symfony\Component\Panther\ServerExtension" />
-    </extensions>
-
-    <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="tests/bootstrap.php" cacheDirectory=".phpunit.cache">
+  <php>
+    <env name="KERNEL_CLASS" value="Ecommit\CrudBundle\Tests\Functional\App\Kernel"/>
+    <env name="APP_ENV" value="test"/>
+    <server name="PANTHER_WEB_SERVER_DIR" value="./tests/Functional/App/public"/>
+    <ini name="intl.default_locale" value="en"/>
+  </php>
+  <extensions>
+      <bootstrap class="Symfony\Component\Panther\ServerExtension"/>
+  </extensions>
+  <testsuites>
+    <testsuite name="Project Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/tests/Crud/AbstractCrudTest.php b/tests/Crud/AbstractCrudTestCase.php
similarity index 98%
rename from tests/Crud/AbstractCrudTest.php
rename to tests/Crud/AbstractCrudTestCase.php
index c9589b6..4d0efa0 100644
--- a/tests/Crud/AbstractCrudTest.php
+++ b/tests/Crud/AbstractCrudTestCase.php
@@ -26,7 +26,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
-abstract class AbstractCrudTest extends KernelTestCase
+abstract class AbstractCrudTestCase extends KernelTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/Crud/CrudColumnTest.php b/tests/Crud/CrudColumnTest.php
index e0ac639..22ea908 100644
--- a/tests/Crud/CrudColumnTest.php
+++ b/tests/Crud/CrudColumnTest.php
@@ -140,7 +140,7 @@ public function testGetAliasSearch(): void
         $this->assertSame('val', $crudColumn->getAliasSearch());
     }
 
-    public function getBooleanProvier(): array
+    public static function getBooleanProvier(): array
     {
         return [[true], [false]];
     }
diff --git a/tests/Crud/CrudConfigTest.php b/tests/Crud/CrudConfigTest.php
index 01915fd..ca1078b 100644
--- a/tests/Crud/CrudConfigTest.php
+++ b/tests/Crud/CrudConfigTest.php
@@ -182,7 +182,7 @@ public function testResetOptions(mixed $value, array $expected): void
         $this->assertSame($expected, $config->getOptions());
     }
 
-    public function getTestResetOptionsProvider(): array
+    public static function getTestResetOptionsProvider(): array
     {
         return [
             [null, []],
@@ -203,7 +203,7 @@ public function testOffsetExists(string $offset, bool $expected): void
         $this->assertSame($expected, $config->offsetExists($offset));
     }
 
-    public function getTestOffsetExistsProvider(): array
+    public static function getTestOffsetExistsProvider(): array
     {
         return [
             ['session_name', true],
diff --git a/tests/Crud/CrudFiltersTest.php b/tests/Crud/CrudFiltersTest.php
index 30f7c7c..62dc2d4 100644
--- a/tests/Crud/CrudFiltersTest.php
+++ b/tests/Crud/CrudFiltersTest.php
@@ -35,7 +35,7 @@ public function testHas(string $filter, $expected): void
         $this->assertSame($expected, $this->crudFilters->has($filter));
     }
 
-    public function getTestHasProvider(): array
+    public static function getTestHasProvider(): array
     {
         return [
             ['filter_1', true],
diff --git a/tests/Crud/CrudTest.php b/tests/Crud/CrudTest.php
index e16dfa4..4976584 100644
--- a/tests/Crud/CrudTest.php
+++ b/tests/Crud/CrudTest.php
@@ -30,7 +30,7 @@
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 use Symfony\Component\Validator\Exception\ValidationFailedException;
 
-class CrudTest extends AbstractCrudTest
+class CrudTest extends AbstractCrudTestCase
 {
     /**
      * @dataProvider getTestCrudWithInvalidSessionNameProvider
@@ -45,7 +45,7 @@ public function testCrudWithInvalidSessionName(mixed $sessionName, string $expec
         $this->createCrud($crudOptions);
     }
 
-    public function getTestCrudWithInvalidSessionNameProvider(): array
+    public static function getTestCrudWithInvalidSessionNameProvider(): array
     {
         return [
             ['', InvalidOptionsException::class, '/The option "session_name" with value ".*" is invalid/'],
@@ -118,7 +118,7 @@ public function testAddColumnAlreadyExists(callable $callback): void
         $this->createCrud($crudConfig);
     }
 
-    public function getTestAddColumnAlreadyExistsProvider(): array
+    public static function getTestAddColumnAlreadyExistsProvider(): array
     {
         return [
             [static function (CrudConfig $crudConfig): void {
@@ -249,20 +249,22 @@ public function testGetVirtualColumnNotExists(): void
     /**
      * @dataProvider getTestQueryBuilderProvider
      */
-    public function testQueryBuilder(mixed $queryBuilder): void
+    public function testQueryBuilder(\Closure $queryBuilderFactory): void
     {
+        $queryBuilder = $queryBuilderFactory($this);
+
         $crudConfig = $this->createValidCrudConfig()
             ->setQueryBuilder($queryBuilder);
         $crud = $this->createCrud($crudConfig);
         $this->assertSame($queryBuilder, $crud->getQueryBuilder());
     }
 
-    public function getTestQueryBuilderProvider(): array
+    public static function getTestQueryBuilderProvider(): array
     {
         return [
-            [$this->createMock(\Doctrine\ORM\QueryBuilder::class)],
-            [$this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class)],
-            [$this->createMock(\Ecommit\CrudBundle\Crud\QueryBuilderInterface::class)],
+            [static fn (self $testCase) => $testCase->createMock(\Doctrine\ORM\QueryBuilder::class)],
+            [static fn (self $testCase) => $testCase->createMock(\Doctrine\DBAL\Query\QueryBuilder::class)],
+            [static fn (self $testCase) => $testCase->createMock(\Ecommit\CrudBundle\Crud\QueryBuilderInterface::class)],
         ];
     }
 
@@ -771,7 +773,7 @@ public function testRequiredOptions(string $option): void
         $this->createCrud($crudConfig);
     }
 
-    public function getTestRequiredOptionsProvider(): array
+    public static function getTestRequiredOptionsProvider(): array
     {
         return [
             ['session_name'],
@@ -873,7 +875,7 @@ public function testChangeColumnsDisplayedWithBadValue(array $value): void
         $this->assertSame(['firstName'], $crud->getSessionValues()->getDisplayedColumns());
     }
 
-    public function getTestChangeColumnsDisplayedWithBadValueProvider(): array
+    public static function getTestChangeColumnsDisplayedWithBadValueProvider(): array
     {
         return [
             [['bad_column']],
@@ -906,7 +908,7 @@ public function testChangeSortWithBadValue(mixed $value): void
         $this->assertSame('username', $crud->getSessionValues()->getSort());
     }
 
-    public function getTestChangeSortWithBadValueProvider(): array
+    public static function getTestChangeSortWithBadValueProvider(): array
     {
         return [
             [null],
@@ -944,7 +946,7 @@ public function testChangeSortPersonalizedSortWithBadValue(mixed $value): void
         $this->assertSame('defaultPersonalizedSort', $crud->getSessionValues()->getSort());
     }
 
-    public function getTestChangeSortPersonalizedSortWithBadValueProvider(): array
+    public static function getTestChangeSortPersonalizedSortWithBadValueProvider(): array
     {
         return [
             [null],
@@ -977,7 +979,7 @@ public function testChangeSortDirectionWithBadValue(mixed $value): void
         $this->assertSame(Crud::DESC, $crud->getSessionValues()->getSortDirection());
     }
 
-    public function getTestChangeSortDirectionWithBadValueProvider(): array
+    public static function getTestChangeSortDirectionWithBadValueProvider(): array
     {
         return [
             [null],
@@ -1002,8 +1004,9 @@ public function testChangeSearchFormData(): void
     /**
      * @dataProvider getTestChangeSearchFormDataWithBadValueProvider
      */
-    public function testChangeSearchFormDataWithBadValue(?SearcherInterface $value): void
+    public function testChangeSearchFormDataWithBadValue(\Closure $valueFactory): void
     {
+        $value = $valueFactory($this);
         $crud = $this->createCrud($this->createValidCrudConfig(withSearcher: true));
 
         $reflectionMethod = (new \ReflectionClass($crud))->getMethod('changeSearchFormData');
@@ -1013,11 +1016,11 @@ public function testChangeSearchFormDataWithBadValue(?SearcherInterface $value):
         $this->assertEquals(new UserSearcher(), $crud->getSessionValues()->getSearchFormData());
     }
 
-    public function getTestChangeSearchFormDataWithBadValueProvider(): array
+    public static function getTestChangeSearchFormDataWithBadValueProvider(): array
     {
         return [
-            [null],
-            [$this->createMock(SearcherInterface::class)],
+            [static fn (self $self) => null],
+            [static fn (self $self) => $self->createMock(SearcherInterface::class)],
         ];
     }
 
@@ -1031,7 +1034,7 @@ public function testChangeSearchFormDataWithoutSearchForm(): void
         $this->assertNull($crud->getSessionValues()->getSearchFormData());
     }
 
-    public function getBoolProvider(): array
+    public static function getBoolProvider(): array
     {
         return [
             [true],
diff --git a/tests/Crud/SearchFormBuilderTest.php b/tests/Crud/SearchFormBuilderTest.php
index 98eb894..0ba6412 100644
--- a/tests/Crud/SearchFormBuilderTest.php
+++ b/tests/Crud/SearchFormBuilderTest.php
@@ -27,7 +27,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 
-class SearchFormBuilderTest extends AbstractCrudTest
+class SearchFormBuilderTest extends AbstractCrudTestCase
 {
     /**
      * @dataProvider getTestCreateFormBuilderProvider
@@ -39,7 +39,7 @@ public function testCreateFormBuilder(?string $type, string $expectedName, strin
         $this->assertInstanceOf($expectedType, $searchFormBuilder->getFormBuilder()->getFormConfig()->getType()->getInnerType());
     }
 
-    public function getTestCreateFormBuilderProvider(): array
+    public static function getTestCreateFormBuilderProvider(): array
     {
         return [
             [null, 'crud_search_session_name', FormSearchType::class],
@@ -214,10 +214,17 @@ public function testCreateForm(): void
     public function testCreateFormWithDefaultColumnId(): void
     {
         $filter = $this->createMock(FilterInterface::class);
-        $filter->expects($this->exactly(2))->method('buildForm')->withConsecutive(
-            [self::callback(static fn ($value): bool => $value instanceof SearchFormBuilder), 'column1', self::callback(static fn ($value): bool => \is_array($value))],
-            [self::callback(static fn ($value): bool => $value instanceof SearchFormBuilder), 'virtual1', self::callback(static fn ($value): bool => \is_array($value))],
-        );
+        $invokedCount = 0;
+        $filter->expects($this->exactly(2))->method('buildForm')->willReturnCallback(static function ($searchFormBuilder, $property, $options) use (&$invokedCount): void {
+            self::assertInstanceOf(SearchFormBuilder::class, $searchFormBuilder);
+            if (0 === $invokedCount) {
+                self::assertSame('column1', $property);
+            } elseif (1 === $invokedCount) {
+                self::assertSame('virtual1', $property);
+            }
+            ++$invokedCount;
+            self::assertIsArray($options);
+        });
         $crudConfig = $this->createValidCrudConfig()
             ->addColumn(['id' => 'column1', 'alias' => 'alias1'])
             ->addVirtualColumn(['id' => 'virtual1', 'alias' => 'alias1']);
@@ -231,10 +238,17 @@ public function testCreateFormWithDefaultColumnId(): void
     public function testCreateFormWithColumnIdOption(): void
     {
         $filter = $this->createMock(FilterInterface::class);
-        $filter->expects($this->exactly(2))->method('buildForm')->withConsecutive(
-            [self::callback(static fn ($value): bool => $value instanceof SearchFormBuilder), 'property1', self::callback(static fn ($value): bool => \is_array($value))],
-            [self::callback(static fn ($value): bool => $value instanceof SearchFormBuilder), 'property2', self::callback(static fn ($value): bool => \is_array($value))],
-        );
+        $invokedCount = 0;
+        $filter->expects($this->exactly(2))->method('buildForm')->willReturnCallback(static function ($searchFormBuilder, $property, $options) use (&$invokedCount): void {
+            self::assertInstanceOf(SearchFormBuilder::class, $searchFormBuilder);
+            if (0 === $invokedCount) {
+                self::assertSame('property1', $property);
+            } elseif (1 === $invokedCount) {
+                self::assertSame('property2', $property);
+            }
+            ++$invokedCount;
+            self::assertIsArray($options);
+        });
         $crudConfig = $this->createValidCrudConfig()
             ->addColumn(['id' => 'column1', 'alias' => 'alias1'])
             ->addVirtualColumn(['id' => 'virtual1', 'alias' => 'alias1']);
diff --git a/tests/Form/DataTransformer/AbstractEntityTransformerTest.php b/tests/Form/DataTransformer/AbstractEntityTransformerTestCase.php
similarity index 92%
rename from tests/Form/DataTransformer/AbstractEntityTransformerTest.php
rename to tests/Form/DataTransformer/AbstractEntityTransformerTestCase.php
index 1215c40..0038da4 100644
--- a/tests/Form/DataTransformer/AbstractEntityTransformerTest.php
+++ b/tests/Form/DataTransformer/AbstractEntityTransformerTestCase.php
@@ -18,7 +18,7 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\DataTransformerInterface;
 
-abstract class AbstractEntityTransformerTest extends KernelTestCase
+abstract class AbstractEntityTransformerTestCase extends KernelTestCase
 {
     /**
      * @var EntityManager
diff --git a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
index dca6cc0..36f03bf 100644
--- a/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToChoicesTransformerTest.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
-class EntitiesToChoicesTransformerTest extends AbstractEntityTransformerTest
+class EntitiesToChoicesTransformerTest extends AbstractEntityTransformerTestCase
 {
     protected function createTransformer(...$args): DataTransformerInterface
     {
@@ -43,7 +43,7 @@ public function testTransform($choiceLabel, array $expected): void
         $this->assertSame($expected, $transformer->transform($collection));
     }
 
-    public function getTestTransformProvider(): array
+    public static function getTestTransformProvider(): array
     {
         $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
@@ -109,7 +109,7 @@ public function testReverseTransformNullValue($value): void
         $this->assertEquals(new ArrayCollection(), $transformer->reverseTransform($value));
     }
 
-    public function getTestReverseTransformNullValueProvider(): array
+    public static function getTestReverseTransformNullValueProvider(): array
     {
         return [
             [''],
diff --git a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
index cd5e194..0bc403b 100644
--- a/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
+++ b/tests/Form/DataTransformer/EntitiesToIdsTransformerTest.php
@@ -26,7 +26,7 @@ protected function createTransformer(...$args): DataTransformerInterface
         return new EntitiesToIdsTransformer(...$args);
     }
 
-    public function getTestTransformProvider(): array
+    public static function getTestTransformProvider(): array
     {
         $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
diff --git a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
index 38d8e4f..c8793bc 100644
--- a/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToChoiceTransformerTest.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
-class EntityToChoiceTransformerTest extends AbstractEntityTransformerTest
+class EntityToChoiceTransformerTest extends AbstractEntityTransformerTestCase
 {
     protected function createTransformer(...$args): DataTransformerInterface
     {
@@ -41,7 +41,7 @@ public function testTransform($choiceLabel, $expected): void
         $this->assertSame($expected, $transformer->transform($entity));
     }
 
-    public function getTestTransformProvider(): array
+    public static function getTestTransformProvider(): array
     {
         $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
@@ -101,7 +101,7 @@ public function testReverseTransformNullValue($value): void
         $this->assertNull($transformer->reverseTransform($value));
     }
 
-    public function getTestReverseTransformNullValueProvider(): array
+    public static function getTestReverseTransformNullValueProvider(): array
     {
         return [
             [''],
diff --git a/tests/Form/DataTransformer/EntityToIdTransformerTest.php b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
index 361099b..1ec58ae 100644
--- a/tests/Form/DataTransformer/EntityToIdTransformerTest.php
+++ b/tests/Form/DataTransformer/EntityToIdTransformerTest.php
@@ -25,7 +25,7 @@ protected function createTransformer(...$args): DataTransformerInterface
         return new EntityToIdTransformer(...$args);
     }
 
-    public function getTestTransformProvider(): array
+    public static function getTestTransformProvider(): array
     {
         $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
diff --git a/tests/Form/Filter/AbstractFilterTest.php b/tests/Form/Filter/AbstractFilterTestCase.php
similarity index 98%
rename from tests/Form/Filter/AbstractFilterTest.php
rename to tests/Form/Filter/AbstractFilterTestCase.php
index 374841c..2f454db 100644
--- a/tests/Form/Filter/AbstractFilterTest.php
+++ b/tests/Form/Filter/AbstractFilterTestCase.php
@@ -30,7 +30,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
-abstract class AbstractFilterTest extends KernelTestCase
+abstract class AbstractFilterTestCase extends KernelTestCase
 {
     /**
      * @var EntityManager
diff --git a/tests/Form/Filter/BooleanFilterTest.php b/tests/Form/Filter/BooleanFilterTest.php
index 4bca3b8..e1d21be 100644
--- a/tests/Form/Filter/BooleanFilterTest.php
+++ b/tests/Form/Filter/BooleanFilterTest.php
@@ -15,7 +15,7 @@
 
 use Ecommit\CrudBundle\Form\Filter\BooleanFilter;
 
-class BooleanFilterTest extends AbstractFilterTest
+class BooleanFilterTest extends AbstractFilterTestCase
 {
     /**
      * @dataProvider getTestViewAndQueryBuilderProvider
@@ -31,7 +31,7 @@ public function testViewAndQueryBuilder($modelData, $expectedViewData, ?string $
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         return [
             [null, '', null, []],
@@ -62,7 +62,7 @@ public function testValueTrueOption($modelData, ?string $whereExpected, array $p
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestValueTrueOptionProvider(): array
+    public static function getTestValueTrueOptionProvider(): array
     {
         return [
             [null, null, []],
@@ -85,7 +85,7 @@ public function testValueFalseOption($modelData, ?string $whereExpected, array $
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestValueFalseOptionProvider(): array
+    public static function getTestValueFalseOptionProvider(): array
     {
         return [
             [null, null, []],
@@ -108,7 +108,7 @@ public function testValueFalseNullOption($modelData, ?string $whereExpected, arr
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestValueFalseNullOptionProvider(): array
+    public static function getTestValueFalseNullOptionProvider(): array
     {
         return [
             [null, null, []],
@@ -131,7 +131,7 @@ public function testNotNullIsTrueOption($notNullIsTrue, $modelData, ?string $whe
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestNotNullIsTrueOptionProvider(): array
+    public static function getTestNotNullIsTrueOptionProvider(): array
     {
         return [
             [false, null, null, []],
@@ -159,7 +159,7 @@ public function testNullIsFalseOption($nullIsFalse, $modelData, ?string $whereEx
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestNullIsFalseOptionProvider(): array
+    public static function getTestNullIsFalseOptionProvider(): array
     {
         return [
             [true, null, null, []],
@@ -194,7 +194,7 @@ public function testSubmit($submittedData, $expectedModelData, $expectedViewData
         $this->assertSame($expectedViewData, $field->getViewData());
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             [null, null, ''],
diff --git a/tests/Form/Filter/ChoiceFilterTest.php b/tests/Form/Filter/ChoiceFilterTest.php
index 844acd2..7a57f5a 100644
--- a/tests/Form/Filter/ChoiceFilterTest.php
+++ b/tests/Form/Filter/ChoiceFilterTest.php
@@ -16,7 +16,7 @@
 use Ecommit\CrudBundle\Form\Filter\ChoiceFilter;
 use Symfony\Component\Form\Extension\Core\Type\LanguageType;
 
-class ChoiceFilterTest extends AbstractFilterTest
+class ChoiceFilterTest extends AbstractFilterTestCase
 {
     /**
      * @dataProvider getTestViewAndQueryBuilderProvider
@@ -35,7 +35,7 @@ public function testViewAndQueryBuilder($modelData, bool $multiple, $expectedVie
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         return [
             // No multiple
@@ -99,7 +99,7 @@ public function testSubmit($submittedData, bool $multiple, $expectedModelData, $
         $this->assertSame($expectedViewData, $field->getViewData());
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             // No multiple
@@ -136,7 +136,7 @@ public function testSubmitInvalidFormat($submittedData, bool $multiple): void
         $this->assertNull($field->getData());
     }
 
-    public function getTestSubmitInvalidFormatProvider(): array
+    public static function getTestSubmitInvalidFormatProvider(): array
     {
         return [
             // No multiple
diff --git a/tests/Form/Filter/DateFilterTest.php b/tests/Form/Filter/DateFilterTest.php
index 361afc1..0ebc9bb 100644
--- a/tests/Form/Filter/DateFilterTest.php
+++ b/tests/Form/Filter/DateFilterTest.php
@@ -16,7 +16,7 @@
 use Ecommit\CrudBundle\Form\Filter\DateFilter;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
-class DateFilterTest extends AbstractFilterTest
+class DateFilterTest extends AbstractFilterTestCase
 {
     public function testOptionsAreRequired(): void
     {
@@ -43,7 +43,7 @@ public function testViewAndQueryBuilder($modelData, bool $withTime, string $comp
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         $data = [
             // Null value
@@ -93,7 +93,7 @@ public function testInvalidInput($modelData): void
         $this->checkQueryBuilder($crud, null, []);
     }
 
-    public function getTestInvalidInputProvider(): array
+    public static function getTestInvalidInputProvider(): array
     {
         return [
             [['not-scalar']],
@@ -124,7 +124,7 @@ public function testSubmit($withTime, $submittedData, $expectedModelData, $expec
         $this->assertSame($expectedViewData, $field->getViewData());
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             // Without time
@@ -160,7 +160,7 @@ public function testSubmitInvalidFormat($submittedData): void
         $this->assertNull($field->getData());
     }
 
-    public function getTestSubmitInvalidFormatProvider(): array
+    public static function getTestSubmitInvalidFormatProvider(): array
     {
         return [
             ['bad-value'],
@@ -190,7 +190,7 @@ public function testViewAndQueryBuilderWithSingleTextWidget($modelData, bool $wi
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestViewAndQueryBuilderWithSingleTextWidgetProvider(): array
+    public static function getTestViewAndQueryBuilderWithSingleTextWidgetProvider(): array
     {
         $inputValue = new \DateTime('2021-04-01 13:10:20');
 
@@ -233,7 +233,7 @@ public function testSubmitWithSingleTextWidget($withTime, $submittedData, $expec
         $this->assertSame($expectedViewData, $field->getViewData());
     }
 
-    public function getTestSubmitWithSingleTextWidgetProvider(): array
+    public static function getTestSubmitWithSingleTextWidgetProvider(): array
     {
         return [
             // Without time
diff --git a/tests/Form/Filter/EntityAjaxFilterTest.php b/tests/Form/Filter/EntityAjaxFilterTest.php
index 47e6c5d..7ac48e2 100644
--- a/tests/Form/Filter/EntityAjaxFilterTest.php
+++ b/tests/Form/Filter/EntityAjaxFilterTest.php
@@ -18,7 +18,7 @@
 use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
-class EntityAjaxFilterTest extends AbstractFilterTest
+class EntityAjaxFilterTest extends AbstractFilterTestCase
 {
     public function testOptionsAreRequired(): void
     {
@@ -51,7 +51,7 @@ public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedVie
         $this->assertSame($expectedIdsFound, $idsFound);
     }
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         return [
             // No multiple
@@ -93,7 +93,7 @@ public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $
         $this->assertSame($expectedViewData, $field->getViewData());
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             // No multiple
@@ -133,7 +133,7 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
         $this->assertNull($field->getData());
     }
 
-    public function getTestSubmitInvalidProvider(): array
+    public static function getTestSubmitInvalidProvider(): array
     {
         return [
             // No multiple
@@ -184,7 +184,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
         $this->assertSame($expectedIdsFound, $idsFound);
     }
 
-    public function getTestViewWithQueryBuilderProvider(): array
+    public static function getTestViewWithQueryBuilderProvider(): array
     {
         return [
             // No multiple - Valid
@@ -242,7 +242,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
         $this->assertSame($expectedViewData, $field->getViewData()); // Twig doesn't display invalid list
     }
 
-    public function getTestSubmitWithQueryBuilderProvider(): array
+    public static function getTestSubmitWithQueryBuilderProvider(): array
     {
         return [
             // No multiple - Valid
diff --git a/tests/Form/Filter/EntityFilterTest.php b/tests/Form/Filter/EntityFilterTest.php
index 40f0c0d..a6cc554 100644
--- a/tests/Form/Filter/EntityFilterTest.php
+++ b/tests/Form/Filter/EntityFilterTest.php
@@ -18,7 +18,7 @@
 use Ecommit\CrudBundle\Tests\Functional\App\Entity\Tag;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
-class EntityFilterTest extends AbstractFilterTest
+class EntityFilterTest extends AbstractFilterTestCase
 {
     public function testOptionsAreRequired(): void
     {
@@ -50,7 +50,7 @@ public function testViewAndQueryBuilder(bool $multiple, $modelData, $expectedVie
         $this->assertSame($expectedIdsFound, $idsFound);
     }
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         return [
             // No multiple
@@ -91,7 +91,7 @@ public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $
         $this->assertSame($expectedViewData, $field->getViewData());
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             // No multiple
@@ -126,7 +126,7 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
         $this->assertFalse($field->isValid());
     }
 
-    public function getTestSubmitInvalidProvider(): array
+    public static function getTestSubmitInvalidProvider(): array
     {
         return [
             // No multiple
@@ -194,7 +194,7 @@ public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $mult
         $this->assertSame($expectedIdsFound, $idsFound);
     }
 
-    public function getTestViewWithQueryBuilderProvider(): array
+    public static function getTestViewWithQueryBuilderProvider(): array
     {
         return [
             // No multiple - Valid
@@ -252,7 +252,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
         }
     }
 
-    public function getTestSubmitWithQueryBuilderProvider(): array
+    public static function getTestSubmitWithQueryBuilderProvider(): array
     {
         return [
             // No multiple - Valid
diff --git a/tests/Form/Filter/IntegerFilterTest.php b/tests/Form/Filter/IntegerFilterTest.php
index 82287b0..8d7518c 100644
--- a/tests/Form/Filter/IntegerFilterTest.php
+++ b/tests/Form/Filter/IntegerFilterTest.php
@@ -16,7 +16,7 @@
 use Ecommit\CrudBundle\Form\Filter\IntegerFilter;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
-class IntegerFilterTest extends AbstractFilterTest
+class IntegerFilterTest extends AbstractFilterTestCase
 {
     public const TEST_FILTER = IntegerFilter::class;
 
@@ -44,7 +44,7 @@ public function testViewAndQueryBuilder($modelData, string $comparator, $expecte
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         return [
             // Null value
@@ -102,7 +102,7 @@ public function testSubmit($submittedData, $expectedModelData, $expectedViewData
         $this->assertSame($expectedViewData, $field->getViewData());
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             [null, null, ''],
@@ -132,7 +132,7 @@ public function testSubmitInvalidFormat($submittedData): void
         $this->assertNull($field->getData());
     }
 
-    public function getTestSubmitInvalidFormatProvider(): array
+    public static function getTestSubmitInvalidFormatProvider(): array
     {
         return [
             [['not-scalar']],
diff --git a/tests/Form/Filter/NotNullFilterTest.php b/tests/Form/Filter/NotNullFilterTest.php
index 25002b3..07f2ec9 100644
--- a/tests/Form/Filter/NotNullFilterTest.php
+++ b/tests/Form/Filter/NotNullFilterTest.php
@@ -19,7 +19,7 @@ class NotNullFilterTest extends NullFilterTest
 {
     public const TEST_FILTER = NotNullFilter::class;
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         return [
             // Null value
diff --git a/tests/Form/Filter/NullFilterTest.php b/tests/Form/Filter/NullFilterTest.php
index e151325..462c807 100644
--- a/tests/Form/Filter/NullFilterTest.php
+++ b/tests/Form/Filter/NullFilterTest.php
@@ -15,7 +15,7 @@
 
 use Ecommit\CrudBundle\Form\Filter\NullFilter;
 
-class NullFilterTest extends AbstractFilterTest
+class NullFilterTest extends AbstractFilterTestCase
 {
     public const TEST_FILTER = NullFilter::class;
 
@@ -34,7 +34,7 @@ public function testViewAndQueryBuilder($modelData, $expectedChecked, ?string $w
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         return [
             // Null value
@@ -67,7 +67,7 @@ public function testSubmit($submittedData, $expectedModelData): void
         $this->assertSame($expectedModelData, $field->getData());
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             [null, false],
diff --git a/tests/Form/Filter/NumberFilterTest.php b/tests/Form/Filter/NumberFilterTest.php
index 49e7afc..d8e2262 100644
--- a/tests/Form/Filter/NumberFilterTest.php
+++ b/tests/Form/Filter/NumberFilterTest.php
@@ -19,7 +19,7 @@ class NumberFilterTest extends IntegerFilterTest
 {
     public const TEST_FILTER = NumberFilter::class;
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         return [
             // Null value
@@ -45,7 +45,7 @@ public function getTestViewAndQueryBuilderProvider(): array
         ];
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             [null, null, ''],
diff --git a/tests/Form/Filter/TextFilterTest.php b/tests/Form/Filter/TextFilterTest.php
index 739644d..151b958 100644
--- a/tests/Form/Filter/TextFilterTest.php
+++ b/tests/Form/Filter/TextFilterTest.php
@@ -16,7 +16,7 @@
 use Ecommit\CrudBundle\Form\Filter\TextFilter;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 
-class TextFilterTest extends AbstractFilterTest
+class TextFilterTest extends AbstractFilterTestCase
 {
     /**
      * @dataProvider getTestViewAndQueryBuilderProvider
@@ -35,7 +35,7 @@ public function testViewAndQueryBuilder($modelData, bool $mustBegin, bool $mustE
         $this->checkQueryBuilder($crud, $whereExpected, $parametersExpected);
     }
 
-    public function getTestViewAndQueryBuilderProvider(): array
+    public static function getTestViewAndQueryBuilderProvider(): array
     {
         return [
             // Null value
@@ -89,7 +89,7 @@ public function testSubmit($submittedData, $expectedModelData, $expectedViewData
         $this->assertSame($expectedViewData, $field->getViewData());
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             [null, null, ''],
diff --git a/tests/Form/Type/EntityAjaxTypeTest.php b/tests/Form/Type/EntityAjaxTypeTest.php
index ee12c28..ebab802 100644
--- a/tests/Form/Type/EntityAjaxTypeTest.php
+++ b/tests/Form/Type/EntityAjaxTypeTest.php
@@ -86,7 +86,7 @@ public function testView(bool $multiple, $modelData, $dataBuilderName, $expected
         $this->assertTrue($view->vars['list_is_synchronized']);
     }
 
-    public function getTestViewProvider(): array
+    public static function getTestViewProvider(): array
     {
         return [
             // No multiple
@@ -120,7 +120,7 @@ public function testSubmit(bool $multiple, $submittedData, $expectedModelData, $
         $this->assertEquals($expectedViewData, $field->getViewData());
     }
 
-    public function getTestSubmitProvider(): array
+    public static function getTestSubmitProvider(): array
     {
         return [
             // No multiple
@@ -155,7 +155,7 @@ public function testSubmitInvalid(bool $multiple, $submittedData): void
         $this->assertNull($field->getData());
     }
 
-    public function getTestSubmitInvalidProvider(): array
+    public static function getTestSubmitInvalidProvider(): array
     {
         return [
             // No multiple
@@ -217,7 +217,7 @@ public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $mu
         $this->assertEquals($expectedViewData, $field->getViewData()); // Twig doesn't display invalid list
     }
 
-    public function getTestSubmitWithQueryBuilderProvider(): array
+    public static function getTestSubmitWithQueryBuilderProvider(): array
     {
         return [
             // No multiple - Valid
@@ -256,7 +256,7 @@ public function testViewWithChoiceLabel($choiceLabel, $expectedViewValue): void
         $this->assertSame($expectedViewValue, $view->vars['value']);
     }
 
-    public function getTestViewWithChoiceLabelProvider(): array
+    public static function getTestViewWithChoiceLabelProvider(): array
     {
         $closure = static fn (Tag $tag) => \sprintf('name: %s', $tag->getName());
 
diff --git a/tests/Twig/CrudExtensionTest.php b/tests/Twig/CrudExtensionTest.php
index 68c983b..bc9b09f 100644
--- a/tests/Twig/CrudExtensionTest.php
+++ b/tests/Twig/CrudExtensionTest.php
@@ -121,7 +121,7 @@ public function testAjaxAttributes(array $ajaxOptions, string $expected): void
         $this->assertSame($expected, $result);
     }
 
-    public function getTestAjaxAttributesProvider(): array
+    public static function getTestAjaxAttributesProvider(): array
     {
         return [
             [[], ''],
@@ -183,7 +183,7 @@ public function testPaginatorWithDefaultOptions(int $page, string $expected): vo
         $this->assertSame($expected, $result);
     }
 
-    public function getTestPaginatorWithDefaultOptionsProvider(): array
+    public static function getTestPaginatorWithDefaultOptionsProvider(): array
     {
         return [
             [1, '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1">1</a></li><li><a href="/user?page=2">2</a></li><li><a href="/user?page=3">3</a></li><li><a href="/user?page=4">4</a></li><li class="next"><a href="/user?page=2">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
@@ -213,7 +213,7 @@ public function testPaginatorWithMaxPagesOptions(int $page, string $expected): v
         $this->assertSame($expected, $result);
     }
 
-    public function getTestPaginatorWithMaxPagesOptionsProvider(): array
+    public static function getTestPaginatorWithMaxPagesOptionsProvider(): array
     {
         return [
             [1, '<nav><ul class="ec-crud-pagination"><li class="current"><a href="/user?page=1">1</a></li><li><a href="/user?page=2">2</a></li><li><a href="/user?page=3">3</a></li><li class="next"><a href="/user?page=2">›</a></li><li class="last"><a href="/user?page=20">»</a></li></ul></nav>'],
@@ -242,7 +242,7 @@ public function testPaginatorWithTypeOption(int $page, string $type, string $exp
         $this->assertSame($expected, $result);
     }
 
-    public function getTestPaginatorWithTypeOptionProvider(): array
+    public static function getTestPaginatorWithTypeOptionProvider(): array
     {
         $full = static function (int $currentPage) {
             $result = '';
@@ -512,7 +512,7 @@ public function testThWithAttrOptions(string $columnId, string $sort, string $so
         $this->assertSame($expected, $html);
     }
 
-    public function getTestThWithAttrOptionsProvider(): array
+    public static function getTestThWithAttrOptionsProvider(): array
     {
         return [
             ['column3', 'column1', Crud::ASC, '<th class="a ec-crud-th ec-crud-th-not-sortable" data-a="val">label3</th>'],

From 20b4b9ababedd7eb9eba63631c6118741f04ef6f Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 16 Feb 2026 20:27:08 +0100
Subject: [PATCH 259/264] Remove legacy code

---
 tests/Functional/App/Kernel.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/Functional/App/Kernel.php b/tests/Functional/App/Kernel.php
index 9540afe..bf81c14 100644
--- a/tests/Functional/App/Kernel.php
+++ b/tests/Functional/App/Kernel.php
@@ -47,12 +47,6 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
                 ],
             ]);
         }
-
-        if (5 === static::MAJOR_VERSION) { // @legacy
-            $container->loadFromExtension('security', [
-                'enable_authenticator_manager' => true,
-            ]);
-        }
     }
 
     public function process(ContainerBuilder $container): void

From bc5185adad41b92b3ff22d1a2fe3d05811434fdf Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Mon, 16 Feb 2026 20:28:22 +0100
Subject: [PATCH 260/264] Update PHP-CS-Fixer rules

---
 .php-cs-fixer.dist.php | 6 +++---
 composer.json          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 60779b5..0909099 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -21,9 +21,9 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         '@DoctrineAnnotation' => true,
-        '@PHP81Migration' => true,
-        '@PHP80Migration:risky' => true,
-        '@PHPUnit100Migration:risky' => true,
+        '@PHP8x1Migration' => true,
+        '@PHP8x0Migration:risky' => true,
+        '@PHPUnit10x0Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'fopen_flags' => true,
         'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
diff --git a/composer.json b/composer.json
index d585ff7..06ec917 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
         "dg/bypass-finals": "^1.3",
         "doctrine/data-fixtures": "^1.5.3|^2.0",
         "doctrine/doctrine-fixtures-bundle": "^3.4.2|^4.0",
-        "friendsofphp/php-cs-fixer": "^3.0",
+        "friendsofphp/php-cs-fixer": "^3.88",
         "phpunit/phpunit": "^10.0",
         "symfony/dom-crawler": "^6.4|^7.4|^8.0",
         "symfony/panther": "^2.3",

From 6e44164e81e6e554dada15bcaff3246165363fed Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Jun 2026 17:53:52 +0200
Subject: [PATCH 261/264] Add gitattributes

---
 .gitattributes | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..ab4548a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+/.editorconfig export-ignore
+/.github export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/eslint.config.mjs export-ignore
+/karma.conf.js export-ignore
+/phpstan-baseline.neon export-ignore
+/phpstan.neon.dist export-ignore
+/phpunit.xml.dist export-ignore
+/tests export-ignore
+/webpack.config.js export-ignore
+/webpack-encore-config.js export-ignore

From 25b9e5fe45c401ce87656e50a58caf241019f220 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Jun 2026 17:58:31 +0200
Subject: [PATCH 262/264] Add Symfony 8.1.* and 8.2.*@dev tests

---
 .github/workflows/tests.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f123bf6..a036595 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,6 +26,10 @@ jobs:
                         symfony-version: '8.0.*'
                         composer-flags: '--prefer-stable --prefer-lowest'
                         description: 'with SF 8.0.* lowest'
+                    -   php-version: '8.4'
+                        symfony-version: '8.1.*'
+                        composer-flags: '--prefer-stable --prefer-lowest'
+                        description: 'with SF 8.1.* lowest'
 
                     #Symfony versions
                     -   php-version: '8.5'
@@ -46,9 +50,15 @@ jobs:
                     -   php-version: '8.5'
                         symfony-version: '8.0.*@dev'
                         description: 'with SF 8.0.* dev'
+                    -   php-version: '8.5'
+                        symfony-version: '8.1.*'
+                        description: 'with SF 8.1.*'
                     -   php-version: '8.5'
                         symfony-version: '8.1.*@dev'
                         description: 'with SF 8.1.* dev'
+                    -   php-version: '8.5'
+                        symfony-version: '8.2.*@dev'
+                        description: 'with SF 8.2.* dev'
 
                     #PHP versions
                     -   php-version: '8.1'

From a42515e3ad32ec44497ae2a3bfd334fb607b8999 Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Jun 2026 18:05:13 +0200
Subject: [PATCH 263/264] [php-cs-fixer] Use PHP 8.5

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a036595..6ac4368 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -68,7 +68,7 @@ jobs:
                     -   php-version: '8.5'
 
                     #CS
-                    -   php-version: '8.2'
+                    -   php-version: '8.5'
                         description: 'with Coding Standards'
                         coding-standards: true
 

From 1aee217646c0d8767a75cc2f23cc91cf60bac19a Mon Sep 17 00:00:00 2001
From: hlecorche <hlecorche@e-commit.fr>
Date: Thu, 4 Jun 2026 18:10:11 +0200
Subject: [PATCH 264/264] [Configuration] Add string validation

---
 src/DependencyInjection/Configuration.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 1a40e91..7cb1191 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -37,8 +37,18 @@ public function getConfigTreeBuilder(): TreeBuilder
 
         $rootNode
             ->children()
-                ->scalarNode('theme')->isRequired()->end()
-                ->scalarNode('icon_theme')->isRequired()->end()
+                ->scalarNode('theme')->isRequired() // @legacy SF < 7.2 (string node introduced in Symfony 7.2)
+                    ->validate()
+                        ->ifTrue(static fn (mixed $value) => !\is_string($value))
+                        ->thenInvalid('Invalid theme')
+                    ->end()
+                ->end()
+                ->scalarNode('icon_theme')->isRequired() // @legacy SF < 7.2 (string node introduced in Symfony 7.2)
+                    ->validate()
+                        ->ifTrue(static fn (mixed $value) => !\is_string($value))
+                        ->thenInvalid('icon_theme')
+                    ->end()
+                ->end()
                 ->arrayNode('twig_functions_configuration')
                     ->treatNullLike([])
                     ->prototype('variable')->end()