Update of LiipTest (dependency).

MTES-MCT · Apr 4, 2022 · 2eb9175 · 2eb9175
1 parent 9f81ade
commit 2eb9175
Show file tree

Hide file tree

Showing 34 changed files with 190 additions and 123 deletions.
diff --git a/README.md b/README.md
@@ -47,9 +47,11 @@ Install instructions are for server using Apache on Debian (Apache user being `w
 
 A PostGre database and role should be created for the application. 
 
+For the next instructions, we will assume that you install the applicatino on a server on `/opt` with `www-data` beeing the Apache (or any other web server) user.
+
 ```(bash)
-$ cd /var/www/
-$ git clone https://github.com/SebastienTouze/rapportNav.git app/rapportNav
+$ cd /opt/rapportnav/
+$ git clone https://github.com/SebastienTouze/rapportNav.git app-ppr
 ```
 Before taking the next steps, create your environment `.env.local` file copying `.template.env`. 
 You will need to configure : 
@@ -71,6 +73,8 @@ $ sudo -u www-data yarn build
 $ sudo -u www-data bin/console doctrine:migration:migrate
 ```
 
+You may need to install assets for the SonataAdminBundle using `$ sudo -u www-data bin/console assets:install`
+
 If you aim to contribute to the code you may prefer to use the `yarn dev` or `yarn watch` commands for js compilation. 
 Some basic fixtures to get a development environment are available using `bin/console doctrine:fixtures:load --group=default`
 This command should be executed in dev environment, you may add the `--env=dev` depending on the environment defined in your `.env.local`

diff --git a/composer.json b/composer.json
@@ -58,8 +58,8 @@
 		"ext-xdebug" : "*",
 		"doctrine/doctrine-fixtures-bundle" : "^3.1",
 		"easycorp/easy-log-handler" : "^1.0.7",
-		"liip/functional-test-bundle" : "^4.0.0",
-		"liip/test-fixtures-bundle" : "^1.0.0",
+		"liip/functional-test-bundle" : "^4.5.0",
+		"liip/test-fixtures-bundle" : "^2.2",
 		"symfony/browser-kit" : "^4.4",
 		"symfony/css-selector" : "^4.4",
 		"symfony/debug-bundle" : "^4.4",

diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/doctrine_migrations.yaml b/config/packages/doctrine_migrations.yaml
@@ -1,5 +1,3 @@
 doctrine_migrations:
-    dir_name: '%kernel.project_dir%/src/Migrations'
-    # namespace is arbitrary but should be different from App\Migrations
-    # as migrations classes should NOT be autoloaded
-    namespace: DoctrineMigrations
+    migrations_paths:
+        'DoctrineMigrations': '%kernel.project_dir%/src/Migrations'
diff --git a/config/packages/test/framework.yaml b/config/packages/test/framework.yaml
@@ -8,6 +8,4 @@ liip_functional_test:
     authentication:
         username: "alfred.de-musset"
         password: "1234"
-liip_test_fixtures:
-    cache_db:
-        sqlite: liip_test_fixtures.services_database_backup.sqlite
+
diff --git a/src/Admin/AgentAdmin.php b/src/Admin/AgentAdmin.php
@@ -15,7 +15,7 @@
 
 final class AgentAdmin extends AbstractAdmin {
 
-    public function toString($object): ?string {
+    public function toString($object): string {
         return $object instanceof \App\Entity\Agent ? $object->__toString() : 'Agent';
     }
 
@@ -36,7 +36,7 @@ protected function configureListFields(ListMapper $listMapper): void {
             ->add('service.nom')
             ->add('dateArrivee')
             ->add('dateDepart')
-            ->add('_action', null, [
+            ->add(ListMapper::NAME_ACTIONS, null, [
                 'actions' => [
                     'show' => [],
                     'edit' => [],

diff --git a/src/Admin/CategorieControleAutreAdmin.php b/src/Admin/CategorieControleAutreAdmin.php
@@ -11,21 +11,21 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 final class CategorieControleAutreAdmin extends AbstractAdmin {
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper): void {
         $formMapper
             ->add('nom', TextType::class, ['required' => true])
             ->add('complementDonnee')
         ;
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void {
         $datagridMapper
             ->add('nom')
             ->add('complementDonnee')
         ;
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper): void {
         $listMapper
             ->addIdentifier('nom')
             ->add('complementDonnee')

diff --git a/src/Admin/CategorieControleNavireAdmin.php b/src/Admin/CategorieControleNavireAdmin.php
@@ -11,17 +11,17 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 final class CategorieControleNavireAdmin extends AbstractAdmin {
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper): void {
         $formMapper
             ->add('nom', TextType::class, ['required' => true]);
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void {
         $datagridMapper
             ->add('nom');
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper): void {
         $listMapper
             ->addIdentifier('nom');
     }

diff --git a/src/Admin/CategorieEtablissementAdmin.php b/src/Admin/CategorieEtablissementAdmin.php
@@ -11,21 +11,21 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 final class CategorieEtablissementAdmin extends AbstractAdmin {
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper): void {
         $formMapper
             ->add('nom', TextType::class, ['required' => true])
             ->add('complementDonnee')
         ;
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void {
         $datagridMapper
             ->add('nom')
             ->add('complementDonnee')
         ;
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper): void {
         $listMapper
             ->addIdentifier('nom')
             ->add('complementDonnee')

diff --git a/src/Admin/CategorieLoisirAdmin.php b/src/Admin/CategorieLoisirAdmin.php
@@ -11,17 +11,17 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 final class CategorieLoisirAdmin extends AbstractAdmin {
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper): void {
         $formMapper
             ->add('nom', TextType::class, ['required' => true]);
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void {
         $datagridMapper
             ->add('nom');
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper): void {
         $listMapper
             ->addIdentifier('nom');
     }

diff --git a/src/Admin/CategorieMethodeCiblage.php b/src/Admin/CategorieMethodeCiblage.php
@@ -11,19 +11,19 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 final class CategorieMethodeCiblage extends AbstractAdmin {
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper): void {
         $formMapper
             ->add('nom', TextType::class, ['required' => true])
         ;
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void {
         $datagridMapper
             ->add('nom')
         ;
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper): void {
         $listMapper
             ->addIdentifier('nom')
         ;

diff --git a/src/Admin/CategorieMoyenAdmin.php b/src/Admin/CategorieMoyenAdmin.php
@@ -11,19 +11,19 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 class CategorieMoyenAdmin extends AbstractAdmin {
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper): void {
         $formMapper
             ->add('nom', TextType::class, ['required' => true])
         ;
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void {
         $datagridMapper
             ->add('nom')
         ;
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper): void {
         $listMapper
             ->addIdentifier('nom')
         ;

diff --git a/src/Admin/CategorieTacheAdmin.php b/src/Admin/CategorieTacheAdmin.php
@@ -11,17 +11,17 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 final class CategorieTacheAdmin extends AbstractAdmin {
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper): void {
         $formMapper
             ->add('nom', TextType::class, ['required' => true]);
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void {
         $datagridMapper
             ->add('nom');
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper): void {
         $listMapper
             ->addIdentifier('nom');
     }

diff --git a/src/Admin/CategorieUsageNavireAdmin.php b/src/Admin/CategorieUsageNavireAdmin.php
@@ -11,17 +11,17 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 final class CategorieUsageNavireAdmin extends AbstractAdmin {
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper): void {
         $formMapper
             ->add('nom', TextType::class, ['required' => true]);
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void {
         $datagridMapper
             ->add('nom');
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper): void {
         $listMapper
             ->addIdentifier('nom');
     }

diff --git a/src/Admin/EtablissementAdmin.php b/src/Admin/EtablissementAdmin.php
@@ -13,7 +13,7 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 class EtablissementAdmin extends AbstractAdmin {
-    protected function configureFormFields(FormMapper $formMapper) {
+    protected function configureFormFields(FormMapper $formMapper): void {
         $formMapper
             ->add('nom', TextType::class, ['required' => true, 'label' => "Nom (ou N/A pour non applicable)"])
             ->add('type')
@@ -22,7 +22,7 @@ protected function configureFormFields(FormMapper $formMapper) {
         ;
     }
 
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void {
         $datagridMapper
             ->add('nom')
             ->add('type')
@@ -31,13 +31,13 @@ protected function configureDatagridFilters(DatagridMapper $datagridMapper) {
         ;
     }
 
-    protected function configureListFields(ListMapper $listMapper) {
+    protected function configureListFields(ListMapper $listMapper): void {
         $listMapper
             ->addIdentifier('nom')
             ->add('type')
             ->add('adresse')
             ->add('commune')
-            ->add('_action', null, [
+            ->add(ListMapper::NAME_ACTIONS, null, [
                 'actions' => [
                     'show' => [],
                     'edit' => [],