Minor improvments

Add test file Add test file
Spomky-Labs · Sep 22, 2023 · 7a1d3b0 · 7a1d3b0
1 parent f281efe
commit 7a1d3b0
Show file tree

Hide file tree

Showing 19 changed files with 216 additions and 193 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/ecs.php b/ecs.php
@@ -96,9 +96,6 @@
         ]
     );
 
-    $config->services()
-        ->remove(PhpUnitTestClassRequiresCoversFixer::class);
-
     $config->parallel();
     $config->paths([__DIR__]);
     $config->skip([
@@ -109,6 +106,7 @@
         __DIR__ . '/heroku',
         __DIR__ . '/public',
         __DIR__ . '/var',
+        PhpUnitTestClassRequiresCoversFixer::class,
     ])
     ;
 };
diff --git a/importmap.php b/importmap.php
@@ -1,18 +1,6 @@
 <?php
 
-/**
- * Returns the import map for this application.
- *
- * - "path" is a path inside the asset mapper system. Use the
- *     "debug:asset-map" command to see the full list of paths.
- *
- * - "preload" set to true for any modules that are loaded on the initial
- *     page load to help the browser download them earlier.
- *
- * The "importmap:require" command can be used to add new entries to this file.
- *
- * This file has been auto-generated by the importmap commands.
- */
+declare(strict_types=1);
 return [
     'app' => [
         'path' => 'app.js',

diff --git a/rector.php b/rector.php
@@ -18,23 +18,20 @@
     $rectorConfig->sets([
         SetList::DEAD_CODE,
         LevelSetList::UP_TO_PHP_82,
-        SymfonyLevelSetList::UP_TO_SYMFONY_62,
+        SymfonyLevelSetList::UP_TO_SYMFONY_63,
         SymfonySetList::SYMFONY_CODE_QUALITY,
         SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
+        SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES,
+        DoctrineSetList::DOCTRINE_ORM_214,
         DoctrineSetList::DOCTRINE_CODE_QUALITY,
         DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
-        PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
         PHPUnitLevelSetList::UP_TO_PHPUNIT_100,
         PHPUnitSetList::PHPUNIT_CODE_QUALITY,
-        PHPUnitSetList::PHPUNIT_EXCEPTION,
-        PHPUnitSetList::REMOVE_MOCKS,
-        PHPUnitSetList::PHPUNIT_YIELD_DATA_PROVIDER,
+        PHPUnitSetList::ANNOTATIONS_TO_ATTRIBUTES,
     ]);
-    $rectorConfig->services()
-        ->remove(RemoveExtraParametersRector::class);
     $rectorConfig->phpVersion(PhpVersion::PHP_82);
     $rectorConfig->paths([__DIR__ . '/config', __DIR__ . '/src', __DIR__ . '/tests']);
-    $rectorConfig->skip([__DIR__ . '/config/bundles.php']);
+    $rectorConfig->skip([__DIR__ . '/config/bundles.php', RemoveExtraParametersRector::class]);
     $rectorConfig->parallel();
     $rectorConfig->importNames();
     $rectorConfig->importShortClasses();

diff --git a/src/Command/Init/InitCitiesCommand.php b/src/Command/Init/InitCitiesCommand.php
@@ -7,15 +7,15 @@
 use App\Entity\City;
 use App\Repository\CityRepository;
 use App\Repository\DepartmentRepository;
-use function count;
-use function is_string;
-use const JSON_THROW_ON_ERROR;
 use RuntimeException;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use function count;
+use function is_string;
+use const JSON_THROW_ON_ERROR;
 
 #[AsCommand(name: 'app:init:cities', description: 'Initialisation des villes',)]
 final class InitCitiesCommand extends Command

diff --git a/src/Command/Init/InitDeparmentsCommand.php b/src/Command/Init/InitDeparmentsCommand.php
@@ -7,15 +7,15 @@
 use App\Entity\Department;
 use App\Repository\DepartmentRepository;
 use App\Repository\RegionRepository;
-use function count;
-use function is_string;
-use const JSON_THROW_ON_ERROR;
 use RuntimeException;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use function count;
+use function is_string;
+use const JSON_THROW_ON_ERROR;
 
 #[AsCommand(name: 'app:init:departments', description: 'Initialisation des départements',)]
 final class InitDeparmentsCommand extends Command

diff --git a/src/Command/Init/InitRegionsCommand.php b/src/Command/Init/InitRegionsCommand.php
@@ -6,15 +6,15 @@
 
 use App\Entity\Region;
 use App\Repository\RegionRepository;
-use function count;
-use function is_string;
-use const JSON_THROW_ON_ERROR;
 use RuntimeException;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use function count;
+use function is_string;
+use const JSON_THROW_ON_ERROR;
 
 #[AsCommand(name: 'app:init:regions', description: 'Initialisation des régions',)]
 final class InitRegionsCommand extends Command

diff --git a/src/Command/Init/InitUsersCommand.php b/src/Command/Init/InitUsersCommand.php
@@ -6,9 +6,6 @@
 
 use App\Entity\User;
 use App\Repository\UserRepository;
-use function count;
-use function is_string;
-use const JSON_THROW_ON_ERROR;
 use RuntimeException;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -17,6 +14,9 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
 use Symfony\Component\Uid\Ulid;
+use function count;
+use function is_string;
+use const JSON_THROW_ON_ERROR;
 
 #[AsCommand(name: 'app:init:users', description: 'User initialization')]
 final class InitUsersCommand extends Command
@@ -35,9 +35,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $hasher = $this->hasherFactory->getPasswordHasher(User::class);
 
         $data = file_get_contents($this->projectDirectory . '/data/users.json');
-        is_string($data) || throw new RuntimeException(
-            'Unable to find user data.'
-        );
+        is_string($data) || throw new RuntimeException('Unable to find user data.');
         /** @var array<array{username: string, email: string, password: string, name: string, roles: array<string>}> $users */
         $users = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
 

diff --git a/src/Command/User/DemoteUserCommand.php b/src/Command/User/DemoteUserCommand.php
@@ -5,13 +5,13 @@
 namespace App\Command\User;
 
 use App\Repository\UserRepository;
-use function is_array;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use function is_array;
 
 #[AsCommand('app:user:demote')]
 final class DemoteUserCommand extends Command

diff --git a/src/Command/User/PromoteUserCommand.php b/src/Command/User/PromoteUserCommand.php
@@ -5,13 +5,13 @@
 namespace App\Command\User;
 
 use App\Repository\UserRepository;
-use function is_array;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use function is_array;
 
 #[AsCommand('app:user:promote')]
 final class PromoteUserCommand extends Command

diff --git a/src/Kernel.php b/src/Kernel.php
@@ -5,7 +5,7 @@
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 
-final class Kernel extends BaseKernel
+class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
 }
diff --git a/src/Repository/DepartmentRepository.php b/src/Repository/DepartmentRepository.php
@@ -52,28 +52,28 @@ public function remove(Department $entity, bool $flush = false): void
         }
     }
 
-//    /**
-//     * @return Department[] Returns an array of Department objects
-//     */
-//    public function findByExampleField($value): array
-//    {
-//        return $this->createQueryBuilder('d')
-//            ->andWhere('d.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->orderBy('d.id', 'ASC')
-//            ->setMaxResults(10)
-//            ->getQuery()
-//            ->getResult()
-//        ;
-//    }
+    //    /**
+    //     * @return Department[] Returns an array of Department objects
+    //     */
+    //    public function findByExampleField($value): array
+    //    {
+    //        return $this->createQueryBuilder('d')
+    //            ->andWhere('d.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->orderBy('d.id', 'ASC')
+    //            ->setMaxResults(10)
+    //            ->getQuery()
+    //            ->getResult()
+    //        ;
+    //    }
 
-//    public function findOneBySomeField($value): ?Department
-//    {
-//        return $this->createQueryBuilder('d')
-//            ->andWhere('d.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->getQuery()
-//            ->getOneOrNullResult()
-//        ;
-//    }
+    //    public function findOneBySomeField($value): ?Department
+    //    {
+    //        return $this->createQueryBuilder('d')
+    //            ->andWhere('d.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->getQuery()
+    //            ->getOneOrNullResult()
+    //        ;
+    //    }
 }
diff --git a/src/Repository/MeasureRepository.php b/src/Repository/MeasureRepository.php
@@ -45,28 +45,28 @@ public function remove(Measure $entity, bool $flush = false): void
         }
     }
 
-//    /**
-//     * @return Measure[] Returns an array of Measure objects
-//     */
-//    public function findByExampleField($value): array
-//    {
-//        return $this->createQueryBuilder('m')
-//            ->andWhere('m.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->orderBy('m.id', 'ASC')
-//            ->setMaxResults(10)
-//            ->getQuery()
-//            ->getResult()
-//        ;
-//    }
+    //    /**
+    //     * @return Measure[] Returns an array of Measure objects
+    //     */
+    //    public function findByExampleField($value): array
+    //    {
+    //        return $this->createQueryBuilder('m')
+    //            ->andWhere('m.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->orderBy('m.id', 'ASC')
+    //            ->setMaxResults(10)
+    //            ->getQuery()
+    //            ->getResult()
+    //        ;
+    //    }
 
-//    public function findOneBySomeField($value): ?Measure
-//    {
-//        return $this->createQueryBuilder('m')
-//            ->andWhere('m.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->getQuery()
-//            ->getOneOrNullResult()
-//        ;
-//    }
+    //    public function findOneBySomeField($value): ?Measure
+    //    {
+    //        return $this->createQueryBuilder('m')
+    //            ->andWhere('m.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->getQuery()
+    //            ->getOneOrNullResult()
+    //        ;
+    //    }
 }
diff --git a/src/Repository/RegionRepository.php b/src/Repository/RegionRepository.php
@@ -52,28 +52,28 @@ public function flush(): void
             ->clear();
     }
 
-//    /**
-//     * @return Region[] Returns an array of Region objects
-//     */
-//    public function findByExampleField($value): array
-//    {
-//        return $this->createQueryBuilder('r')
-//            ->andWhere('r.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->orderBy('r.id', 'ASC')
-//            ->setMaxResults(10)
-//            ->getQuery()
-//            ->getResult()
-//        ;
-//    }
+    //    /**
+    //     * @return Region[] Returns an array of Region objects
+    //     */
+    //    public function findByExampleField($value): array
+    //    {
+    //        return $this->createQueryBuilder('r')
+    //            ->andWhere('r.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->orderBy('r.id', 'ASC')
+    //            ->setMaxResults(10)
+    //            ->getQuery()
+    //            ->getResult()
+    //        ;
+    //    }
 
-//    public function findOneBySomeField($value): ?Region
-//    {
-//        return $this->createQueryBuilder('r')
-//            ->andWhere('r.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->getQuery()
-//            ->getOneOrNullResult()
-//        ;
-//    }
+    //    public function findOneBySomeField($value): ?Region
+    //    {
+    //        return $this->createQueryBuilder('r')
+    //            ->andWhere('r.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->getQuery()
+    //            ->getOneOrNullResult()
+    //        ;
+    //    }
 }
diff --git a/src/Security/UserProvider.php b/src/Security/UserProvider.php
@@ -26,9 +26,7 @@ public function loadUserByIdentifier(string $identifier): UserInterface
         return $user;
     }
 
-    /**
-     * {@inheritdoc}
-     */
+
     public function refreshUser(UserInterface $user): UserInterface
     {
         if (! $this->supportsClass($user::class)) {

diff --git a/templates/components/search_cities.html.twig b/templates/components/search_cities.html.twig
@@ -21,6 +21,8 @@
             </ul>
         </div>
     {% else %}
-        <div>No city matches "{{ query }}"</div>
+        {% if not query == '' %}
+            <div>No city matches "{{ query }}"</div>
+        {% endif %}
     {% endif %}
 </div>
diff --git a/templates/dashboard/index.html.twig b/templates/dashboard/index.html.twig
@@ -3,18 +3,19 @@
 {% block title %}Community records{% endblock %}
 
 {% block content %}
-    <section class="bg-white border-b py-8">
-        <div class="container mx-auto flex flex-wrap p-4 pt-4 pb-12">
+    <section class="bg-white border-b py-8 my-6">
+        <div class="container mx-auto flex flex-wrap p-4">
             <h2 class="w-full my-2 text-5xl font-bold leading-tight text-center text-gray-800">
                 Choose a city
             </h2>
             <div class="w-full mb-4">
                 <div class="h-1 mx-auto gradient w-64 opacity-25 my-0 py-0 rounded-t"></div>
             </div>
             <div class="text-gray-800 w-fullp-6 flex flex-col flex-grow flex-shrink">
-            <p class="text-gray-800 text-base px-6 mb-5">
-                {{ component('search_cities') }}
-            </p>
+                <p class="text-gray-800 text-base px-6 mb-5">
+                    {{ component('search_cities') }}
+                </p>
+            </div>
         </div>
     </section>
 {% endblock %}