From 6d230d69ee31155214d9d024b0d5c836ae203e71 Mon Sep 17 00:00:00 2001
From: Jonathan Foucher <jfoucher@gmail.com>
Date: Tue, 13 Feb 2024 10:27:29 +0100
Subject: [PATCH] cs fix
---
migrations/Version20230710121656.php | 2 +-
migrations/Version20240209102637.php | 7 ++--
src/Application/Controller/CRUDController.php | 6 +--
.../Controller/ControllerHelper.php | 2 +-
.../Type/CriterePrincipeFondamentalType.php | 4 +-
.../Form/Type/MesureProtectionAIPDType.php | 14 +++----
.../AIPD/Form/Type/ModeleAnalyseType.php | 10 ++---
.../AIPD/Model/CriterePrincipeFondamental.php | 2 +-
.../AIPD/Model/ModeleQuestionConformite.php | 2 +-
.../Controller/DuplicationController.php | 4 +-
.../Admin/Hydrator/DuplicationHydrator.php | 6 +--
.../Controller/DocumentController.php | 2 +-
.../Maturity/Calculator/MaturityHandler.php | 4 +-
src/Domain/Maturity/Repository/Survey.php | 4 +-
.../Command/NotificationsSendCommand.php | 2 +-
.../Controller/NotificationController.php | 8 ++--
.../Serializer/NotificationNormalizer.php | 4 +-
.../Controller/ContractorController.php | 9 ++---
.../Controller/TreatmentController.php | 11 +++--
src/Domain/Registry/Form/Type/ProofType.php | 7 ++--
.../Registry/Form/Type/TreatmentType.php | 2 +-
src/Domain/Registry/Model/Contractor.php | 2 +-
src/Domain/Registry/Model/Request.php | 9 +----
src/Domain/Registry/Model/Treatment.php | 4 +-
src/Domain/Registry/Model/Violation.php | 2 +-
src/Domain/Registry/Repository/Mesurement.php | 2 +-
src/Domain/Registry/Repository/Tool.php | 2 +-
src/Domain/Registry/Repository/Treatment.php | 4 +-
.../Generator/Csv/AbstractGenerator.php | 2 +-
.../Generator/Csv/TreatmentGenerator.php | 2 +-
.../Generator/Word/AbstractGenerator.php | 2 +-
.../Word/ConformiteOrganisationGenerator.php | 2 +-
.../Generator/Word/OverviewGenerator.php | 2 +-
src/Domain/Reporting/Handler/WordHandler.php | 2 +-
src/Domain/Reporting/Metrics/AdminMetric.php | 2 +-
.../Reporting/Metrics/MetricInterface.php | 2 +-
src/Domain/Reporting/Metrics/UserMetric.php | 2 +-
.../EventSubscriber/Event/LogJournalEvent.php | 2 +-
.../User/Controller/SecurityController.php | 2 +-
src/Domain/User/Controller/UserController.php | 9 ++---
.../UserBelongsToCollectivityExtension.php | 4 +-
src/Domain/User/Form/Type/UserType.php | 6 +--
src/Domain/User/Repository/Collectivity.php | 2 +-
.../ORM/Maturity/Repository/Survey.php | 4 +-
.../Notification/Repository/Notification.php | 4 +-
.../Repository/NotificationUser.php | 1 +
.../ORM/Registry/Repository/Contractor.php | 2 +-
.../ORM/Registry/Repository/Mesurement.php | 4 +-
.../ORM/Registry/Repository/Tool.php | 2 +-
.../ORM/Registry/Repository/Treatment.php | 4 +-
.../ORM/User/Repository/Collectivity.php | 2 +-
.../NotificationEventSubscriberTest.php | 5 ++-
.../NotificationGenerationSubscriberTest.php | 2 +-
.../Controller/MesurementControllerTest.php | 3 +-
.../User/Form/Type/CollectivityTypeTest.php | 22 +++++-----
tests/Functional/Api/CollectivityTest.php | 40 ++++++-------------
tests/Functional/Api/RequestTest.php | 20 +---------
tests/Functional/Api/TreatmentTest.php | 16 +-------
tests/Utils/FormTypeHelper.php | 2 +-
59 files changed, 128 insertions(+), 185 deletions(-)
diff --git a/migrations/Version20230710121656.php b/migrations/Version20230710121656.php
index 4dc95a170..1c529eecd 100644
--- a/migrations/Version20230710121656.php
+++ b/migrations/Version20230710121656.php
@@ -23,7 +23,7 @@ final class Version20230710121656 extends AbstractMigration
$this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.');
$this->addSql('ALTER TABLE maturity_referentiel CHANGE description description LONGTEXT DEFAULT NULL');
- //$this->addSql('UPDATE registry_treatment_shelf_life SET ultimate_fate = "destruction" where ultimate_fate IS NULL');
+ // $this->addSql('UPDATE registry_treatment_shelf_life SET ultimate_fate = "destruction" where ultimate_fate IS NULL');
$this->addSql('ALTER TABLE maturity_domain ADD description LONGTEXT DEFAULT NULL');
}
diff --git a/migrations/Version20240209102637.php b/migrations/Version20240209102637.php
index b45aa98a5..62605b0a6 100644
--- a/migrations/Version20240209102637.php
+++ b/migrations/Version20240209102637.php
@@ -12,12 +12,12 @@ use Doctrine\Migrations\AbstractMigration;
*/
final class Version20240209102637 extends AbstractMigration
{
- public function getDescription() : string
+ public function getDescription(): string
{
return 'Increase length of several fields to 1000 characters';
}
- public function up(Schema $schema) : void
+ public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.');
@@ -39,10 +39,9 @@ final class Version20240209102637 extends AbstractMigration
$this->addSql('ALTER TABLE aipd_analyse_question_conformite MODIFY texte_non_conformite_mineure VARCHAR(1000) DEFAULT NULL');
$this->addSql('ALTER TABLE aipd_analyse_question_conformite MODIFY justificatif VARCHAR(1000) DEFAULT NULL');
$this->addSql('ALTER TABLE registry_treatment_shelf_life MODIFY duration VARCHAR(500) DEFAULT NULL');
-
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.');
diff --git a/src/Application/Controller/CRUDController.php b/src/Application/Controller/CRUDController.php
index 334ad318f..cf0bc3b0d 100644
--- a/src/Application/Controller/CRUDController.php
+++ b/src/Application/Controller/CRUDController.php
@@ -124,7 +124,7 @@ abstract class CRUDController extends AbstractController
*
* @return string The generated templating base path
*/
- protected function getTemplatingBasePath(string $template = null): string
+ protected function getTemplatingBasePath(?string $template = null): string
{
// TODO: Check template existence
$domain = \ucfirst($this->getDomain());
@@ -143,7 +143,7 @@ abstract class CRUDController extends AbstractController
*
* @return string The generated flashbag
*/
- protected function getFlashbagMessage(string $type, string $template = null, $object = null): string
+ protected function getFlashbagMessage(string $type, ?string $template = null, $object = null): string
{
$params = [];
if (!\is_null($object)) {
@@ -163,7 +163,7 @@ abstract class CRUDController extends AbstractController
*
* @return string The generated route name
*/
- protected function getRouteName(string $template = null): string
+ protected function getRouteName(?string $template = null): string
{
return "{$this->getDomain()}_{$this->getModel()}_{$template}";
}
diff --git a/src/Application/Controller/ControllerHelper.php b/src/Application/Controller/ControllerHelper.php
index 5798a083c..abe70e7f4 100644
--- a/src/Application/Controller/ControllerHelper.php
+++ b/src/Application/Controller/ControllerHelper.php
@@ -134,7 +134,7 @@ class ControllerHelper
*
* @return string The translated key
*/
- public function trans(string $key, array $parameters = [], string $domain = null): string
+ public function trans(string $key, array $parameters = [], ?string $domain = null): string
{
return $this->translator->trans($key, $parameters, $domain);
}
diff --git a/src/Domain/AIPD/Form/Type/CriterePrincipeFondamentalType.php b/src/Domain/AIPD/Form/Type/CriterePrincipeFondamentalType.php
index fc446d477..1fb17972a 100644
--- a/src/Domain/AIPD/Form/Type/CriterePrincipeFondamentalType.php
+++ b/src/Domain/AIPD/Form/Type/CriterePrincipeFondamentalType.php
@@ -10,8 +10,8 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\FileType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Validator\Constraints\File;
@@ -90,7 +90,7 @@ class CriterePrincipeFondamentalType extends AbstractType
'image/png',
],
'mimeTypesMessage' => 'aipd_validator.fichier.file',
- 'groups' => ['default'],
+ 'groups' => ['default'],
]),
],
'attr' => [
diff --git a/src/Domain/AIPD/Form/Type/MesureProtectionAIPDType.php b/src/Domain/AIPD/Form/Type/MesureProtectionAIPDType.php
index ed635bd0a..7b36969be 100644
--- a/src/Domain/AIPD/Form/Type/MesureProtectionAIPDType.php
+++ b/src/Domain/AIPD/Form/Type/MesureProtectionAIPDType.php
@@ -18,48 +18,48 @@ class MesureProtectionAIPDType extends AbstractType
$builder
->add('nom', TextType::class, [
'label' => 'aipd.mesure_protection.label.name',
- 'attr' => [
+ 'attr' => [
'maxlength' => 255,
],
'purify_html' => true,
])
->add('nomCourt', TextType::class, [
'label' => 'aipd.mesure_protection.label.short_name',
- 'attr' => [
+ 'attr' => [
'maxlength' => 255,
],
'purify_html' => true,
])
->add('labelLivrable', TextType::class, [
'label' => 'aipd.mesure_protection.label.label_livrable',
- 'attr' => [
+ 'attr' => [
'maxlength' => 255,
],
'purify_html' => true,
])
->add('phrasePreconisation', TextType::class, [
'label' => 'aipd.mesure_protection.label.preconisation',
- 'attr' => [
+ 'attr' => [
'maxlength' => 255,
],
'purify_html' => true,
])
->add('detail', TextType::class, [
'label' => 'aipd.mesure_protection.label.detail',
- 'attr' => [
+ 'attr' => [
'maxlength' => 255,
],
'purify_html' => true,
])
->add('poidsVraisemblance', IntegerType::class, [
'label' => 'aipd.mesure_protection.label.vraisemblance',
- 'attr' => [
+ 'attr' => [
'min' => 1,
],
])
->add('poidsGravite', IntegerType::class, [
'label' => 'aipd.mesure_protection.label.gravite',
- 'attr' => [
+ 'attr' => [
'min' => 1,
],
])
diff --git a/src/Domain/AIPD/Form/Type/ModeleAnalyseType.php b/src/Domain/AIPD/Form/Type/ModeleAnalyseType.php
index 864f8eff7..e98fad65f 100644
--- a/src/Domain/AIPD/Form/Type/ModeleAnalyseType.php
+++ b/src/Domain/AIPD/Form/Type/ModeleAnalyseType.php
@@ -20,7 +20,7 @@ class ModeleAnalyseType extends AbstractType
case 1:
$builder
->add('nom', TextType::class, [
- 'label' => 'aipd.modele_analyse.label.name',
+ 'label' => 'aipd.modele_analyse.label.name',
'required' => true,
'attr' => [
'maxlength' => 255,
@@ -28,7 +28,7 @@ class ModeleAnalyseType extends AbstractType
'purify_html' => true,
])
->add('description', TextType::class, [
- 'label' => 'aipd.modele_analyse.label.description',
+ 'label' => 'aipd.modele_analyse.label.description',
'required' => true,
'attr' => [
'maxlength' => 255,
@@ -36,7 +36,7 @@ class ModeleAnalyseType extends AbstractType
'purify_html' => true,
])
->add('labelAmeliorationPrevue', TextType::class, [
- 'label' => 'aipd.modele_analyse.label.amelioration_prevue',
+ 'label' => 'aipd.modele_analyse.label.amelioration_prevue',
'required' => true,
'attr' => [
'maxlength' => 255,
@@ -44,7 +44,7 @@ class ModeleAnalyseType extends AbstractType
'purify_html' => true,
])
->add('labelInsatisfaisant', TextType::class, [
- 'label' => 'aipd.modele_analyse.label.amelioration_insatisfaisant',
+ 'label' => 'aipd.modele_analyse.label.amelioration_insatisfaisant',
'required' => true,
'attr' => [
'maxlength' => 255,
@@ -52,7 +52,7 @@ class ModeleAnalyseType extends AbstractType
'purify_html' => true,
])
->add('labelSatisfaisant', TextType::class, [
- 'label' => 'aipd.modele_analyse.label.amelioration_satisfaisant',
+ 'label' => 'aipd.modele_analyse.label.amelioration_satisfaisant',
'required' => true,
'attr' => [
'maxlength' => 255,
diff --git a/src/Domain/AIPD/Model/CriterePrincipeFondamental.php b/src/Domain/AIPD/Model/CriterePrincipeFondamental.php
index 3cbea5ed6..12a2dd603 100644
--- a/src/Domain/AIPD/Model/CriterePrincipeFondamental.php
+++ b/src/Domain/AIPD/Model/CriterePrincipeFondamental.php
@@ -47,7 +47,7 @@ class CriterePrincipeFondamental
protected bool $deleteFile = false;
- public function __construct(string $label = null, string $code = null)
+ public function __construct(?string $label = null, ?string $code = null)
{
$this->id = Uuid::uuid4();
if (!\is_null($label)) {
diff --git a/src/Domain/AIPD/Model/ModeleQuestionConformite.php b/src/Domain/AIPD/Model/ModeleQuestionConformite.php
index b715c03e5..d7ea59e99 100644
--- a/src/Domain/AIPD/Model/ModeleQuestionConformite.php
+++ b/src/Domain/AIPD/Model/ModeleQuestionConformite.php
@@ -16,7 +16,7 @@ class ModeleQuestionConformite extends AbstractQuestionConformite
*/
private ModeleAnalyse $modeleAnalyse;
- public function __construct(string $question, int $position, ModeleAnalyse $modeleAnalyse = null)
+ public function __construct(string $question, int $position, ?ModeleAnalyse $modeleAnalyse = null)
{
parent::__construct($question, $position);
diff --git a/src/Domain/Admin/Controller/DuplicationController.php b/src/Domain/Admin/Controller/DuplicationController.php
index cabea81d9..46fded322 100644
--- a/src/Domain/Admin/Controller/DuplicationController.php
+++ b/src/Domain/Admin/Controller/DuplicationController.php
@@ -34,14 +34,14 @@ use App\Domain\Admin\Model\Duplication;
use App\Domain\Admin\Repository as AdminRepository;
use App\Domain\Admin\Transformer\DuplicationFormDTOTransformer;
use App\Domain\User\Repository as UserRepository;
-use Symfony\Contracts\Translation\TranslatorInterface;
-// utilisés dynamiquements pour revert duplication, ne pas supprimer
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+// utilisés dynamiquements pour revert duplication, ne pas supprimer
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Contracts\Translation\TranslatorInterface;
class DuplicationController extends AbstractController
{
diff --git a/src/Domain/Admin/Hydrator/DuplicationHydrator.php b/src/Domain/Admin/Hydrator/DuplicationHydrator.php
index d8896e483..45d988d3d 100644
--- a/src/Domain/Admin/Hydrator/DuplicationHydrator.php
+++ b/src/Domain/Admin/Hydrator/DuplicationHydrator.php
@@ -41,12 +41,8 @@ class DuplicationHydrator
/**
* Hydrate a Duplication Model thanks to it related fields.
- *
- * @param Duplication $duplication
- *
- * @return Duplication
*/
- public function hydrate(Model\Duplication $duplication): Model\Duplication
+ public function hydrate(Duplication $duplication): Duplication
{
$this->hydrateDataField($duplication);
diff --git a/src/Domain/Documentation/Controller/DocumentController.php b/src/Domain/Documentation/Controller/DocumentController.php
index 4413295f6..53a923f28 100644
--- a/src/Domain/Documentation/Controller/DocumentController.php
+++ b/src/Domain/Documentation/Controller/DocumentController.php
@@ -120,7 +120,7 @@ class DocumentController extends CRUDController
return DocumentType::class;
}
- protected function getRouteName(string $template = null): string
+ protected function getRouteName(?string $template = null): string
{
if ('list' === $template) {
return "{$this->getDomain()}_{$this->getModel()}_index";
diff --git a/src/Domain/Maturity/Calculator/MaturityHandler.php b/src/Domain/Maturity/Calculator/MaturityHandler.php
index bcb95f3b1..907a06669 100644
--- a/src/Domain/Maturity/Calculator/MaturityHandler.php
+++ b/src/Domain/Maturity/Calculator/MaturityHandler.php
@@ -30,11 +30,11 @@ use App\Domain\Maturity\Model;
class MaturityHandler
{
/**
- * @var Calculator\Maturity
+ * @var Maturity
*/
private $calculator;
- public function __construct(Calculator\Maturity $calculator)
+ public function __construct(Maturity $calculator)
{
$this->calculator = $calculator;
}
diff --git a/src/Domain/Maturity/Repository/Survey.php b/src/Domain/Maturity/Repository/Survey.php
index 2e92bfea3..23d663456 100644
--- a/src/Domain/Maturity/Repository/Survey.php
+++ b/src/Domain/Maturity/Repository/Survey.php
@@ -38,7 +38,7 @@ interface Survey extends CRUDRepositoryInterface, DataTablesRepository
*
* @return array The array of survey given by the collectivity
*/
- public function findAllByCollectivity(Collectivity $collectivity, array $order = [], int $limit = null, array $where = []): iterable;
+ public function findAllByCollectivity(Collectivity $collectivity, array $order = [], ?int $limit = null, array $where = []): iterable;
/**
* Find previous survey by created_at date.
@@ -60,7 +60,7 @@ interface Survey extends CRUDRepositoryInterface, DataTablesRepository
*
* @return array The array of survey given by the collectivity
*/
- public function findAllByCollectivities(array $collectivities, array $order = [], int $limit = null): iterable;
+ public function findAllByCollectivities(array $collectivities, array $order = [], ?int $limit = null): iterable;
/**
* Find all surveys that have not been updated for more than 18 months.
diff --git a/src/Domain/Notification/Command/NotificationsSendCommand.php b/src/Domain/Notification/Command/NotificationsSendCommand.php
index 26f5ec50d..4a9de572f 100644
--- a/src/Domain/Notification/Command/NotificationsSendCommand.php
+++ b/src/Domain/Notification/Command/NotificationsSendCommand.php
@@ -37,7 +37,7 @@ class NotificationsSendCommand extends Command
MailerInterface $mailer,
TranslatorInterface $translator,
bool $activeNotifications,
- string $name = null,
+ ?string $name = null,
) {
parent::__construct($name);
$this->userRepository = $userRepository;
diff --git a/src/Domain/Notification/Controller/NotificationController.php b/src/Domain/Notification/Controller/NotificationController.php
index f4c29a5af..782bff7cf 100644
--- a/src/Domain/Notification/Controller/NotificationController.php
+++ b/src/Domain/Notification/Controller/NotificationController.php
@@ -99,7 +99,7 @@ class NotificationController extends CRUDController
protected function getModelClass(): string
{
- return Model\Notification::class;
+ return Notification::class;
}
protected function getFormType(): string
@@ -153,7 +153,7 @@ class NotificationController extends CRUDController
$reponse = $this->getBaseDataTablesResponse($request, $notifications, $criteria);
- /** @var Model\Notification $notification */
+ /** @var Notification $notification */
foreach ($notifications as $notification) {
$read = '<span class="badge bg-green">' . $this->translator->trans('notifications.label.read') . '</span>';
$unread = '<span class="badge bg-yellow">' . $this->translator->trans('notifications.label.unread') . '</span>';
@@ -202,7 +202,7 @@ class NotificationController extends CRUDController
return new JsonResponse($reponse);
}
- private function generateActionCellContent(Model\Notification $notification)
+ private function generateActionCellContent(Notification $notification)
{
$id = $notification->getId();
@@ -253,7 +253,7 @@ class NotificationController extends CRUDController
* {@inheritdoc}
* Here, we wanna compute maturity score.
*
- * @param Model\Notification $object
+ * @param Notification $object
*/
public function formPrePersistData($object)
{
diff --git a/src/Domain/Notification/Serializer/NotificationNormalizer.php b/src/Domain/Notification/Serializer/NotificationNormalizer.php
index b1b4edc29..1045439b7 100644
--- a/src/Domain/Notification/Serializer/NotificationNormalizer.php
+++ b/src/Domain/Notification/Serializer/NotificationNormalizer.php
@@ -152,14 +152,14 @@ class NotificationNormalizer extends ObjectNormalizer
public function supportsNormalization($data, $format = null, array $context = []): bool
{
- return $format == null && ($data instanceof Treatment
+ return null == $format && ($data instanceof Treatment
|| $data instanceof Contractor
|| $data instanceof Mesurement
|| $data instanceof Proof
|| $data instanceof Request
|| $data instanceof Document
|| $data instanceof Violation
- )
+ )
;
}
diff --git a/src/Domain/Registry/Controller/ContractorController.php b/src/Domain/Registry/Controller/ContractorController.php
index 7b4f2564c..8cb2ba7d8 100644
--- a/src/Domain/Registry/Controller/ContractorController.php
+++ b/src/Domain/Registry/Controller/ContractorController.php
@@ -29,7 +29,6 @@ use App\Application\Symfony\Security\UserProvider;
use App\Application\Traits\ServersideDatatablesTrait;
use App\Domain\Documentation\Model\Category;
use App\Domain\Registry\Form\Type\ContractorType;
-use App\Domain\Registry\Model;
use App\Domain\Registry\Model\Contractor;
use App\Domain\Registry\Repository;
use App\Domain\Reporting\Handler\WordHandler;
@@ -111,7 +110,7 @@ class ContractorController extends CRUDController
protected function getModelClass(): string
{
- return Model\Contractor::class;
+ return Contractor::class;
}
protected function getFormType(): string
@@ -179,7 +178,7 @@ class ContractorController extends CRUDController
);
$responseData = [];
- /** @var Model\Contractor $contractor */
+ /** @var Contractor $contractor */
foreach ($contractors as $contractor) {
$responseData[] = [
'value' => $contractor->getId()->toString(),
@@ -199,7 +198,7 @@ class ContractorController extends CRUDController
$yes = '<span class="badge bg-green">' . $this->translator->trans('global.label.yes') . '</span>';
$no = '<span class="badge bg-red">' . $this->translator->trans('global.label.no') . '</span>';
- /** @var Model\Contractor $contractor */
+ /** @var Contractor $contractor */
foreach ($contractors as $contractor) {
$contractorLink = '<a href="' . $this->router->generate('registry_contractor_show', ['id' => $contractor->getId()->toString()]) . '">
' . \htmlspecialchars($contractor->getName()) . '
@@ -227,7 +226,7 @@ class ContractorController extends CRUDController
return $jsonResponse;
}
- private function isContractorInUserServices(Model\Contractor $contractor): bool
+ private function isContractorInUserServices(Contractor $contractor): bool
{
$user = $this->userProvider->getAuthenticatedUser();
diff --git a/src/Domain/Registry/Controller/TreatmentController.php b/src/Domain/Registry/Controller/TreatmentController.php
index f7d162211..05182a2ab 100644
--- a/src/Domain/Registry/Controller/TreatmentController.php
+++ b/src/Domain/Registry/Controller/TreatmentController.php
@@ -35,7 +35,6 @@ use App\Domain\Registry\Dictionary\TreatmentLegalBasisDictionary;
use App\Domain\Registry\Dictionary\TreatmentStatutDictionary;
use App\Domain\Registry\Form\Type\TreatmentConfigurationType;
use App\Domain\Registry\Form\Type\TreatmentType;
-use App\Domain\Registry\Model;
use App\Domain\Registry\Model\PublicConfiguration;
use App\Domain\Registry\Model\Treatment;
use App\Domain\Registry\Repository;
@@ -115,7 +114,7 @@ class TreatmentController extends CRUDController
protected function getModelClass(): string
{
- return Model\Treatment::class;
+ return Treatment::class;
}
protected function getFormType(): string
@@ -293,7 +292,7 @@ class TreatmentController extends CRUDController
);
$responseData = [];
- /** @var Model\Treatment $treatment */
+ /** @var Treatment $treatment */
foreach ($treatments as $treatment) {
$responseData[] = [
'value' => $treatment->getId()->toString(),
@@ -325,7 +324,7 @@ class TreatmentController extends CRUDController
$reponse = $this->getBaseDataTablesResponse($request, $treatments, $criteria);
- /** @var Model\Treatment $treatment */
+ /** @var Treatment $treatment */
foreach ($treatments as $treatment) {
if (is_array($treatment)) {
$treatment = $treatment[0];
@@ -498,7 +497,7 @@ class TreatmentController extends CRUDController
return $values;
}
- private function isTreatmentInUserServices(Model\Treatment $treatment): bool
+ private function isTreatmentInUserServices(Treatment $treatment): bool
{
$user = $this->userProvider->getAuthenticatedUser();
if ($this->authorizationChecker->isGranted('ROLE_ADMIN')) {
@@ -508,7 +507,7 @@ class TreatmentController extends CRUDController
return $treatment->isInUserServices($user);
}
- private function generateActionCellContent(Model\Treatment $treatment)
+ private function generateActionCellContent(Treatment $treatment)
{
$id = $treatment->getId();
diff --git a/src/Domain/Registry/Form/Type/ProofType.php b/src/Domain/Registry/Form/Type/ProofType.php
index 476138cbd..d30074535 100644
--- a/src/Domain/Registry/Form/Type/ProofType.php
+++ b/src/Domain/Registry/Form/Type/ProofType.php
@@ -26,7 +26,6 @@ namespace App\Domain\Registry\Form\Type;
use App\Domain\Registry\Model;
use App\Domain\Registry\Model\Tool;
-use App\Domain\User\Model as UserModel;
use App\Domain\User\Model\User;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\EntityRepository;
@@ -68,7 +67,7 @@ class ProofType extends AbstractType
if (!\is_null($proof->getCollectivity())) {
$collectivity = $proof->getCollectivity();
} else {
- /** @var UserModel\User $authenticatedUser */
+ /** @var User $authenticatedUser */
$authenticatedUser = $this->security->getUser();
$collectivity = $authenticatedUser->getCollectivity();
}
@@ -92,9 +91,9 @@ class ProofType extends AbstractType
'required' => true,
'constraints' => [
new File([
- 'maxSize' => $this->maxSize,
+ 'maxSize' => $this->maxSize,
'mimeTypesMessage' => 'registry_proof.document_file.file',
- 'mimeTypes' => [
+ 'mimeTypes' => [
// JPG / PNG
'image/jpeg',
'image/png',
diff --git a/src/Domain/Registry/Form/Type/TreatmentType.php b/src/Domain/Registry/Form/Type/TreatmentType.php
index 5452c498d..2dcbd5571 100644
--- a/src/Domain/Registry/Form/Type/TreatmentType.php
+++ b/src/Domain/Registry/Form/Type/TreatmentType.php
@@ -382,7 +382,7 @@ class TreatmentType extends AbstractType
if ($this->authorizationChecker->isGranted('ROLE_ADMIN') || $this->authorizationChecker->isGranted('ROLE_REFERENT')) {
$builder
- ->add('dpoMessage', TextAreaType::class, [
+ ->add('dpoMessage', TextareaType::class, [
'label' => 'registry.treatment.label.dpoMessage',
'required' => false,
'purify_html' => true,
diff --git a/src/Domain/Registry/Model/Contractor.php b/src/Domain/Registry/Model/Contractor.php
index 49c9545fb..591d342f7 100644
--- a/src/Domain/Registry/Model/Contractor.php
+++ b/src/Domain/Registry/Model/Contractor.php
@@ -337,7 +337,7 @@ class Contractor implements LoggableSubject, CollectivityRelated
return $this->service;
}
- public function setService(Service $service = null): void
+ public function setService(?Service $service = null): void
{
$this->service = $service;
}
diff --git a/src/Domain/Registry/Model/Request.php b/src/Domain/Registry/Model/Request.php
index c07f4cc02..b892ee3ae 100644
--- a/src/Domain/Registry/Model/Request.php
+++ b/src/Domain/Registry/Model/Request.php
@@ -78,13 +78,11 @@ class Request implements LoggableSubject, CollectivityRelated
private $updatedBy;
/**
- *
* @var RequestApplicant|null
*/
private $applicant;
/**
- *
* @var RequestConcernedPeople|null
*/
private $concernedPeople;
@@ -106,13 +104,11 @@ class Request implements LoggableSubject, CollectivityRelated
/**
* @var RequestAnswer|null
- *
*/
private $answer;
/**
* @var iterable
- *
*/
private $proofs;
@@ -128,12 +124,9 @@ class Request implements LoggableSubject, CollectivityRelated
/**
* @var Service|null
- *
*/
private $service;
- /**
- */
private Collection $mesurements;
private Collection $treatments;
@@ -315,7 +308,7 @@ class Request implements LoggableSubject, CollectivityRelated
return $this->service;
}
- public function setService(Service $service = null): void
+ public function setService(?Service $service = null): void
{
$this->service = $service;
}
diff --git a/src/Domain/Registry/Model/Treatment.php b/src/Domain/Registry/Model/Treatment.php
index a3fe26f9b..9e17b840a 100644
--- a/src/Domain/Registry/Model/Treatment.php
+++ b/src/Domain/Registry/Model/Treatment.php
@@ -1088,7 +1088,7 @@ class Treatment implements LoggableSubject, CollectivityRelated
return $this->conformiteTraitement;
}
- public function setConformiteTraitement(ConformiteTraitement $conformiteTraitement = null): void
+ public function setConformiteTraitement(?ConformiteTraitement $conformiteTraitement = null): void
{
$this->conformiteTraitement = $conformiteTraitement;
}
@@ -1098,7 +1098,7 @@ class Treatment implements LoggableSubject, CollectivityRelated
return $this->service;
}
- public function setService(Service $service = null): void
+ public function setService(?Service $service = null): void
{
$this->service = $service;
}
diff --git a/src/Domain/Registry/Model/Violation.php b/src/Domain/Registry/Model/Violation.php
index 85020bbb3..b8343173e 100644
--- a/src/Domain/Registry/Model/Violation.php
+++ b/src/Domain/Registry/Model/Violation.php
@@ -377,7 +377,7 @@ class Violation implements LoggableSubject, CollectivityRelated
return $this->service;
}
- public function setService(Service $service = null): void
+ public function setService(?Service $service = null): void
{
$this->service = $service;
}
diff --git a/src/Domain/Registry/Repository/Mesurement.php b/src/Domain/Registry/Repository/Mesurement.php
index 50b64fecf..0654e1683 100644
--- a/src/Domain/Registry/Repository/Mesurement.php
+++ b/src/Domain/Registry/Repository/Mesurement.php
@@ -85,7 +85,7 @@ interface Mesurement extends CRUDRepositoryInterface, DataTablesRepository
*
* @return array
*/
- public function findAllByActiveCollectivity(bool $active = true, User $user = null);
+ public function findAllByActiveCollectivity(bool $active = true, ?User $user = null);
/**
* Find all by collectivity of their clonedFrom.
diff --git a/src/Domain/Registry/Repository/Tool.php b/src/Domain/Registry/Repository/Tool.php
index 360287d3b..53fecdc2b 100644
--- a/src/Domain/Registry/Repository/Tool.php
+++ b/src/Domain/Registry/Repository/Tool.php
@@ -30,5 +30,5 @@ use App\Domain\User\Model\Collectivity;
interface Tool extends CRUDRepositoryInterface, DataTablesRepository
{
- public function findAllByCollectivity(Collectivity $collectivity = null, array $order = []);
+ public function findAllByCollectivity(?Collectivity $collectivity = null, array $order = []);
}
diff --git a/src/Domain/Registry/Repository/Treatment.php b/src/Domain/Registry/Repository/Treatment.php
index 76864a232..ccb20c526 100644
--- a/src/Domain/Registry/Repository/Treatment.php
+++ b/src/Domain/Registry/Repository/Treatment.php
@@ -60,7 +60,7 @@ interface Treatment extends CRUDRepositoryInterface, DataTablesRepository
*
* @return array The array of treatments given by the collectivity
*/
- public function findAllActiveByCollectivity(Collectivity $collectivity = null, bool $active = true, array $order = []);
+ public function findAllActiveByCollectivity(?Collectivity $collectivity = null, bool $active = true, array $order = []);
/**
* Find all active treatments by associated collectivity and hasModuleConformiteTraitement active.
@@ -93,7 +93,7 @@ interface Treatment extends CRUDRepositoryInterface, DataTablesRepository
*
* @return array
*/
- public function findAllByActiveCollectivity(bool $active = true, User $user = null);
+ public function findAllByActiveCollectivity(bool $active = true, ?User $user = null);
/**
* Count all with no conformite traitement by collectivity.
diff --git a/src/Domain/Reporting/Generator/Csv/AbstractGenerator.php b/src/Domain/Reporting/Generator/Csv/AbstractGenerator.php
index 3d9e538b2..79820d965 100644
--- a/src/Domain/Reporting/Generator/Csv/AbstractGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/AbstractGenerator.php
@@ -62,7 +62,7 @@ abstract class AbstractGenerator implements GeneratorInterface
*
* @return string The parsed date with the good timezone
*/
- protected function getDate(?\DateTimeInterface $dateTime, string $format = null): string
+ protected function getDate(?\DateTimeInterface $dateTime, ?string $format = null): string
{
if (\is_null($dateTime)) {
return '';
diff --git a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
index 87d653553..36d8d25f6 100644
--- a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
@@ -251,7 +251,7 @@ class TreatmentGenerator extends AbstractGenerator
{
$detailsTrans = $this->translator->trans('registry.treatment.tab.details');
$concernedPeople = $this->translator->trans('registry.treatment.label.concerned_people');
- $delayTrans = $this->translator->trans('registry.treatment.label.shelflife');
+ $delayTrans = $this->translator->trans('registry.treatment.label.shelflife');
return [
$detailsTrans . ' - ' . $concernedPeople . ' - ' . $this->translator->trans('registry.treatment.label.concerned_people_particular'),
diff --git a/src/Domain/Reporting/Generator/Word/AbstractGenerator.php b/src/Domain/Reporting/Generator/Word/AbstractGenerator.php
index ba2d1f2d5..5250d11ed 100644
--- a/src/Domain/Reporting/Generator/Word/AbstractGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/AbstractGenerator.php
@@ -437,7 +437,7 @@ abstract class AbstractGenerator implements GeneratorInterface
*
* @return string The parsed date with the good timezone
*/
- protected function getDate(?\DateTimeInterface $dateTime, string $format = null): string
+ protected function getDate(?\DateTimeInterface $dateTime, ?string $format = null): string
{
if (\is_null($dateTime)) {
return '';
diff --git a/src/Domain/Reporting/Generator/Word/ConformiteOrganisationGenerator.php b/src/Domain/Reporting/Generator/Word/ConformiteOrganisationGenerator.php
index 24f08e7a4..e23b85047 100644
--- a/src/Domain/Reporting/Generator/Word/ConformiteOrganisationGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/ConformiteOrganisationGenerator.php
@@ -90,7 +90,7 @@ class ConformiteOrganisationGenerator extends AbstractGenerator implements Impre
}
}
- public function addGlobalOverview(Section $section, Evaluation $evaluation = null)
+ public function addGlobalOverview(Section $section, ?Evaluation $evaluation = null)
{
if (null === $evaluation) {
return;
diff --git a/src/Domain/Reporting/Generator/Word/OverviewGenerator.php b/src/Domain/Reporting/Generator/Word/OverviewGenerator.php
index 4f0fe5d97..f71f713c8 100644
--- a/src/Domain/Reporting/Generator/Word/OverviewGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/OverviewGenerator.php
@@ -196,7 +196,7 @@ class OverviewGenerator extends AbstractGenerator
array $maturity = [],
array $treatments = [],
array $mesurements = [],
- Evaluation $evaluation = null
+ ?Evaluation $evaluation = null
): void {
$section->addTitle('Système de management des données à caractère personnel et conformité', 1);
diff --git a/src/Domain/Reporting/Handler/WordHandler.php b/src/Domain/Reporting/Handler/WordHandler.php
index 2afd3c14e..a973b7890 100644
--- a/src/Domain/Reporting/Handler/WordHandler.php
+++ b/src/Domain/Reporting/Handler/WordHandler.php
@@ -143,7 +143,7 @@ class WordHandler
array $maturity = [],
array $requests = [],
array $violations = [],
- Evaluation $evaluation = null
+ ?Evaluation $evaluation = null
): BinaryFileResponse {
$title = 'Bilan de gestion des données à caractère personnel';
diff --git a/src/Domain/Reporting/Metrics/AdminMetric.php b/src/Domain/Reporting/Metrics/AdminMetric.php
index e36860a68..36d531578 100644
--- a/src/Domain/Reporting/Metrics/AdminMetric.php
+++ b/src/Domain/Reporting/Metrics/AdminMetric.php
@@ -79,7 +79,7 @@ class AdminMetric implements MetricInterface
$this->security = $security;
}
- public function getData(Referentiel $referentiel = null): array
+ public function getData(?Referentiel $referentiel = null): array
{
if (!$this->security->isGranted(UserRoleDictionary::ROLE_ADMIN)) {
$collectivities = $this->collectivityRepository->findByUserReferent($this->security->getUser());
diff --git a/src/Domain/Reporting/Metrics/MetricInterface.php b/src/Domain/Reporting/Metrics/MetricInterface.php
index f8465cddb..242bc2829 100644
--- a/src/Domain/Reporting/Metrics/MetricInterface.php
+++ b/src/Domain/Reporting/Metrics/MetricInterface.php
@@ -35,5 +35,5 @@ interface MetricInterface
/**
* Return all data for metric view.
*/
- public function getData(Referentiel $referentiel = null): array;
+ public function getData(?Referentiel $referentiel = null): array;
}
diff --git a/src/Domain/Reporting/Metrics/UserMetric.php b/src/Domain/Reporting/Metrics/UserMetric.php
index 35c0f29db..ca7f148c4 100644
--- a/src/Domain/Reporting/Metrics/UserMetric.php
+++ b/src/Domain/Reporting/Metrics/UserMetric.php
@@ -107,7 +107,7 @@ class UserMetric implements MetricInterface
$this->userLogJounalViewLimit = $userLogJounalViewLimit;
}
- public function getData(Referentiel $referentiel = null): array
+ public function getData(?Referentiel $referentiel = null): array
{
$data = [
'conformiteOrganisation' => [
diff --git a/src/Domain/Reporting/Symfony/EventSubscriber/Event/LogJournalEvent.php b/src/Domain/Reporting/Symfony/EventSubscriber/Event/LogJournalEvent.php
index 1b52e8857..14c5d208e 100644
--- a/src/Domain/Reporting/Symfony/EventSubscriber/Event/LogJournalEvent.php
+++ b/src/Domain/Reporting/Symfony/EventSubscriber/Event/LogJournalEvent.php
@@ -18,7 +18,7 @@ class LogJournalEvent extends Event
*/
protected $subject;
- public function __construct(LogJournal $logJournal, LoggableSubject $subject = null)
+ public function __construct(LogJournal $logJournal, ?LoggableSubject $subject = null)
{
$this->logJournal = $logJournal;
$this->subject = $subject;
diff --git a/src/Domain/User/Controller/SecurityController.php b/src/Domain/User/Controller/SecurityController.php
index 2303cae18..9656cd944 100644
--- a/src/Domain/User/Controller/SecurityController.php
+++ b/src/Domain/User/Controller/SecurityController.php
@@ -272,7 +272,7 @@ class SecurityController extends AbstractController
return $this->helper->redirectToRoute('login');
}
- private function _handleUserNotFound(string $logoutUrl = null): RedirectResponse
+ private function _handleUserNotFound(?string $logoutUrl = null): RedirectResponse
{
$this->helper->addFlash(
'danger',
diff --git a/src/Domain/User/Controller/UserController.php b/src/Domain/User/Controller/UserController.php
index b39088a37..cdc7411fb 100644
--- a/src/Domain/User/Controller/UserController.php
+++ b/src/Domain/User/Controller/UserController.php
@@ -30,7 +30,6 @@ use App\Application\Traits\ServersideDatatablesTrait;
use App\Domain\User\Dictionary\UserMoreInfoDictionary;
use App\Domain\User\Dictionary\UserRoleDictionary;
use App\Domain\User\Form\Type\UserType;
-use App\Domain\User\Model;
use App\Domain\User\Model\Collectivity;
use App\Domain\User\Model\Service;
use App\Domain\User\Model\User;
@@ -113,7 +112,7 @@ class UserController extends CRUDController
protected function getModelClass(): string
{
- return Model\User::class;
+ return User::class;
}
protected function getFormType(): string
@@ -182,7 +181,7 @@ class UserController extends CRUDController
$users = $this->getResults($request, $criteria);
$reponse = $this->getBaseDataTablesResponse($request, $users, $criteria);
- /** @var Model\User $user */
+ /** @var User $user */
foreach ($users as $user) {
$roles = '';
foreach ($user->getRoles() as $role) {
@@ -265,7 +264,7 @@ class UserController extends CRUDController
$criteria['archive'] = $request->query->getBoolean('archive');
if (!$this->security->isGranted('ROLE_ADMIN')) {
- /** @var Model\User $user */
+ /** @var User $user */
$user = $this->security->getUser();
$criteria['collectivitesReferees'] = $user->getCollectivitesReferees();
}
@@ -273,7 +272,7 @@ class UserController extends CRUDController
return $criteria;
}
- private function getActionCellsContent(Model\User $user)
+ private function getActionCellsContent(User $user)
{
$cellContent = '';
if ($this->security->getUser() !== $user && \is_null($user->getDeletedAt()) && !$this->isGranted('ROLE_PREVIOUS_ADMIN')) {
diff --git a/src/Domain/User/Doctrine/UserBelongsToCollectivityExtension.php b/src/Domain/User/Doctrine/UserBelongsToCollectivityExtension.php
index 4f6d6e1a7..edee407d4 100644
--- a/src/Domain/User/Doctrine/UserBelongsToCollectivityExtension.php
+++ b/src/Domain/User/Doctrine/UserBelongsToCollectivityExtension.php
@@ -22,12 +22,12 @@ final class UserBelongsToCollectivityExtension implements QueryCollectionExtensi
$this->security = $security;
}
- public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, Operation $operation = null, array $context = []): void
+ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
{
$this->addWhere($queryBuilder, $resourceClass);
}
- public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, array $identifiers, Operation $operation = null, array $context = []): void
+ public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, array $identifiers, ?Operation $operation = null, array $context = []): void
{
$this->addWhere($queryBuilder, $resourceClass);
}
diff --git a/src/Domain/User/Form/Type/UserType.php b/src/Domain/User/Form/Type/UserType.php
index 69fa4ac02..04471f7a7 100644
--- a/src/Domain/User/Form/Type/UserType.php
+++ b/src/Domain/User/Form/Type/UserType.php
@@ -216,7 +216,7 @@ class UserType extends AbstractType
'label' => 'global.label.contact.first_name',
'required' => true,
'attr' => [
- 'maxlength' => 255,
+ 'maxlength' => 255,
'autocomplete' => 'given-name',
],
'purify_html' => true,
@@ -225,7 +225,7 @@ class UserType extends AbstractType
'label' => 'global.label.contact.last_name',
'required' => true,
'attr' => [
- 'maxlength' => 255,
+ 'maxlength' => 255,
'autocomplete' => 'family-name',
],
'purify_html' => true,
@@ -234,7 +234,7 @@ class UserType extends AbstractType
'label' => 'global.label.contact.email',
'required' => true,
'attr' => [
- 'maxlength' => 255,
+ 'maxlength' => 255,
'autocomplete' => 'email',
],
])
diff --git a/src/Domain/User/Repository/Collectivity.php b/src/Domain/User/Repository/Collectivity.php
index a387b64f5..683423556 100644
--- a/src/Domain/User/Repository/Collectivity.php
+++ b/src/Domain/User/Repository/Collectivity.php
@@ -49,7 +49,7 @@ interface Collectivity extends CRUDRepositoryInterface, DataTablesRepository
*
* @return Model\Collectivity[]
*/
- public function findByTypes(array $types, Model\Collectivity $excludedCollectivity = null): array;
+ public function findByTypes(array $types, ?Model\Collectivity $excludedCollectivity = null): array;
/**
* Find all collectivity.
diff --git a/src/Infrastructure/ORM/Maturity/Repository/Survey.php b/src/Infrastructure/ORM/Maturity/Repository/Survey.php
index 9d6ab26dc..64cc6dc44 100644
--- a/src/Infrastructure/ORM/Maturity/Repository/Survey.php
+++ b/src/Infrastructure/ORM/Maturity/Repository/Survey.php
@@ -76,7 +76,7 @@ class Survey extends CRUDRepository implements Repository\Survey
;
}
- public function findAllByCollectivity(Collectivity $collectivity, array $order = [], int $limit = null, array $where = []): array
+ public function findAllByCollectivity(Collectivity $collectivity, array $order = [], ?int $limit = null, array $where = []): array
{
$qb = $this->createQueryBuilder();
@@ -155,7 +155,7 @@ class Survey extends CRUDRepository implements Repository\Survey
return $stmt->fetchColumn();
}
- public function findAllByCollectivities(array $collectivities, array $order = [], int $limit = null): iterable
+ public function findAllByCollectivities(array $collectivities, array $order = [], ?int $limit = null): iterable
{
$qb = $this->createQueryBuilder();
diff --git a/src/Infrastructure/ORM/Notification/Repository/Notification.php b/src/Infrastructure/ORM/Notification/Repository/Notification.php
index eda81d3ac..bfc904375 100644
--- a/src/Infrastructure/ORM/Notification/Repository/Notification.php
+++ b/src/Infrastructure/ORM/Notification/Repository/Notification.php
@@ -383,7 +383,7 @@ class Notification extends CRUDRepository implements Repository\Notification
}
}
- public function objectExists(\App\Domain\Notification\Model\Notification $notification): bool
+ public function objectExists(Model\Notification $notification): bool
{
if (!$notification->getObject()) {
return false;
@@ -397,7 +397,7 @@ class Notification extends CRUDRepository implements Repository\Notification
} elseif ('aipd' === $moduleName && 'notifications.actions.treatment_needs_aipd' === $notification->getAction()) {
$objectClass = ConformiteTraitement::class;
} else {
- $objectClass = array_flip(\App\Domain\Notification\Model\Notification::MODULES)[$moduleName];
+ $objectClass = array_flip(Model\Notification::MODULES)[$moduleName];
}
return (bool) $this->registry->getRepository($objectClass)->find($object->id);
diff --git a/src/Infrastructure/ORM/Notification/Repository/NotificationUser.php b/src/Infrastructure/ORM/Notification/Repository/NotificationUser.php
index 5eb195ae8..378db9a4d 100644
--- a/src/Infrastructure/ORM/Notification/Repository/NotificationUser.php
+++ b/src/Infrastructure/ORM/Notification/Repository/NotificationUser.php
@@ -39,6 +39,7 @@ class NotificationUser extends CRUDRepository implements Repository\Notification
public function saveUsers(Model\Notification $notification, $users): array
{
$nus = [];
+
foreach ($users as $user) {
$nu = $this->create();
$nu->setUser($user);
diff --git a/src/Infrastructure/ORM/Registry/Repository/Contractor.php b/src/Infrastructure/ORM/Registry/Repository/Contractor.php
index 2c1d7a55c..85d083af3 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Contractor.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Contractor.php
@@ -183,7 +183,7 @@ class Contractor extends CRUDRepository implements Repository\Contractor
}
}
- public function findAllByActiveCollectivity(bool $active = true, User $user = null)
+ public function findAllByActiveCollectivity(bool $active = true, ?User $user = null)
{
$qb = $this->createQueryBuilder();
diff --git a/src/Infrastructure/ORM/Registry/Repository/Mesurement.php b/src/Infrastructure/ORM/Registry/Repository/Mesurement.php
index 271e9e27c..260c73d9f 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Mesurement.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Mesurement.php
@@ -344,7 +344,7 @@ class Mesurement extends CRUDRepository implements Repository\Mesurement
}
}
- public function findAllByActiveCollectivity(bool $active = true, User $user = null)
+ public function findAllByActiveCollectivity(bool $active = true, ?User $user = null)
{
$qb = $this->createQueryBuilder();
@@ -381,7 +381,7 @@ class Mesurement extends CRUDRepository implements Repository\Mesurement
;
}
- public function getPlanifiedActionsDashBoard($limit = 1000, Collectivity $collectivity = null)
+ public function getPlanifiedActionsDashBoard($limit = 1000, ?Collectivity $collectivity = null)
{
// Add old actions again.
// Fixes https://gitlab.adullact.net/soluris/madis/-/issues/529
diff --git a/src/Infrastructure/ORM/Registry/Repository/Tool.php b/src/Infrastructure/ORM/Registry/Repository/Tool.php
index f165fe00d..62d9cc073 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Tool.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Tool.php
@@ -221,7 +221,7 @@ class Tool extends CRUDRepository implements Repository\Tool
}
}
- public function findAllByCollectivity(Collectivity $collectivity = null, array $order = [])
+ public function findAllByCollectivity(?Collectivity $collectivity = null, array $order = [])
{
$qb = $this->createQueryBuilder();
diff --git a/src/Infrastructure/ORM/Registry/Repository/Treatment.php b/src/Infrastructure/ORM/Registry/Repository/Treatment.php
index b0e383609..0ae66f504 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Treatment.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Treatment.php
@@ -104,7 +104,7 @@ class Treatment extends CRUDRepository implements Repository\Treatment
;
}
- public function findAllActiveByCollectivity(Collectivity $collectivity = null, bool $active = true, array $order = [])
+ public function findAllActiveByCollectivity(?Collectivity $collectivity = null, bool $active = true, array $order = [])
{
$qb = $this->createQueryBuilder();
@@ -152,7 +152,7 @@ class Treatment extends CRUDRepository implements Repository\Treatment
return $qb->getQuery()->getSingleScalarResult();
}
- public function findAllByActiveCollectivity(bool $active = true, User $user = null)
+ public function findAllByActiveCollectivity(bool $active = true, ?User $user = null)
{
$qb = $this->createQueryBuilder();
diff --git a/src/Infrastructure/ORM/User/Repository/Collectivity.php b/src/Infrastructure/ORM/User/Repository/Collectivity.php
index 9d4eb5133..0041974dc 100644
--- a/src/Infrastructure/ORM/User/Repository/Collectivity.php
+++ b/src/Infrastructure/ORM/User/Repository/Collectivity.php
@@ -53,7 +53,7 @@ class Collectivity extends CRUDRepository implements Repository\Collectivity
return $qb->getQuery()->getResult();
}
- public function findByTypes(array $types, Model\Collectivity $excludedCollectivity = null): array
+ public function findByTypes(array $types, ?Model\Collectivity $excludedCollectivity = null): array
{
$qb = $this->createQueryBuilder();
diff --git a/tests/Domain/Notification/Subscriber/NotificationEventSubscriberTest.php b/tests/Domain/Notification/Subscriber/NotificationEventSubscriberTest.php
index ad2132485..46788089b 100644
--- a/tests/Domain/Notification/Subscriber/NotificationEventSubscriberTest.php
+++ b/tests/Domain/Notification/Subscriber/NotificationEventSubscriberTest.php
@@ -193,6 +193,7 @@ class NotificationEventSubscriberTest extends TestCase
$collectivity = new Collectivity();
$collectivity->setName('coll');
$action = new Mesurement();
+ $action->setName('Action');
$action->setCollectivity($collectivity);
$action->setCreatedAt(new \DateTimeImmutable());
// $action->setPlanificationDate((new \DateTime())->sub(new \DateInterval('P3M')));
@@ -200,7 +201,7 @@ class NotificationEventSubscriberTest extends TestCase
$this->notificationRepository->findBy([
'module' => 'notification.modules.' . NotificationModuleDictionary::ACTION_PLAN,
'collectivity' => $action->getCollectivity(),
- 'action' => 'notifications.label.late_action',
+ 'action' => 'notifications.actions.late_action',
'name' => $action->__toString(),
])->shouldBeCalled()->willReturn([]);
@@ -211,7 +212,7 @@ class NotificationEventSubscriberTest extends TestCase
$notification->setModule('notification.modules.' . NotificationModuleDictionary::ACTION_PLAN);
$notification->setCollectivity($action->getCollectivity());
- $notification->setAction('notifications.label.late_action');
+ $notification->setAction('notifications.actions.late_action');
$notification->setName($action->__toString());
$notification->setDpo(true);
$notification->setObject((object) [
diff --git a/tests/Domain/Notification/Symfony/EventSubscriber/Doctrine/NotificationGenerationSubscriberTest.php b/tests/Domain/Notification/Symfony/EventSubscriber/Doctrine/NotificationGenerationSubscriberTest.php
index 922577c2f..b953cca38 100644
--- a/tests/Domain/Notification/Symfony/EventSubscriber/Doctrine/NotificationGenerationSubscriberTest.php
+++ b/tests/Domain/Notification/Symfony/EventSubscriber/Doctrine/NotificationGenerationSubscriberTest.php
@@ -201,7 +201,7 @@ class NotificationGenerationSubscriberTest extends TestCase
$notification->setCreatedBy(null);
$notification->setObject((object) []);
- $om->persist(new NotificationToken($notification))->shouldHaveBeenCalled();
+ $om->persist(new NotificationToken($notification))->shouldBeCalled();
$om->persist(Argument::type(\App\Domain\Notification\Model\NotificationUser::class))->shouldNotHaveBeenCalled();
$uow->computeChangeSet($this->notificationMetadata, Argument::type(\App\Domain\Notification\Model\Notification::class))->shouldHaveBeenCalled();
diff --git a/tests/Domain/Registry/Controller/MesurementControllerTest.php b/tests/Domain/Registry/Controller/MesurementControllerTest.php
index 2ac53074b..7bf2b26ba 100644
--- a/tests/Domain/Registry/Controller/MesurementControllerTest.php
+++ b/tests/Domain/Registry/Controller/MesurementControllerTest.php
@@ -29,7 +29,6 @@ use App\Application\Symfony\Security\UserProvider;
use App\Domain\Registry\Controller\MesurementController;
use App\Domain\Registry\Dictionary\MesurementStatusDictionary;
use App\Domain\Registry\Form\Type\MesurementType;
-use App\Domain\Registry\Model;
use App\Domain\Registry\Model\Mesurement;
use App\Domain\Registry\Repository;
use App\Domain\Reporting\Handler\WordHandler;
@@ -172,7 +171,7 @@ class MesurementControllerTest extends TestCase
public function testGetModelClass()
{
$this->assertEquals(
- Model\Mesurement::class,
+ Mesurement::class,
$this->invokeMethod($this->controller, 'getModelClass', [])
);
}
diff --git a/tests/Domain/User/Form/Type/CollectivityTypeTest.php b/tests/Domain/User/Form/Type/CollectivityTypeTest.php
index 3393e8f10..dd5dcf966 100644
--- a/tests/Domain/User/Form/Type/CollectivityTypeTest.php
+++ b/tests/Domain/User/Form/Type/CollectivityTypeTest.php
@@ -82,11 +82,19 @@ class CollectivityTypeTest extends FormTypeHelper
'type' => DictionaryType::class,
'siren' => NumberType::class,
'active' => ChoiceType::class,
- 'website' => UrlType::class,
+ 'hasModuleConformiteTraitement' => CheckboxType::class,
+ 'hasModuleConformiteOrganisation' => CheckboxType::class,
+ 'hasModuleTools' => CheckboxType::class,
'informationsComplementaires' => TextareaType::class,
+ 'finessGeo' => TextType::class,
+ 'isServicesEnabled' => CheckboxType::class,
+ 'services' => CollectionType::class,
+ 'population' => NumberType::class,
+ 'nbrAgents' => NumberType::class,
'address' => AddressType::class,
'legalManager' => ContactType::class,
'referent' => ContactType::class,
+ 'nbrCnil' => ContactType::class,
'differentDpo' => CheckboxType::class,
'dpo' => ContactType::class,
'differentItManager' => CheckboxType::class,
@@ -94,15 +102,7 @@ class CollectivityTypeTest extends FormTypeHelper
'reportingBlockManagementCommitment' => CKEditorType::class,
'reportingBlockContinuousImprovement' => CKEditorType::class,
'comiteIlContacts' => CollectionType::class,
- 'hasModuleConformiteTraitement' => CheckboxType::class,
- 'hasModuleConformiteOrganisation' => CheckboxType::class,
- 'hasModuleTools' => CheckboxType::class,
- 'isServicesEnabled' => CheckboxType::class,
- 'services' => CollectionType::class,
- 'finessGeo' => TextType::class,
- 'population' => NumberType::class,
- 'nbrAgents' => NumberType::class,
- 'nbrCnil' => NumberType::class,
+ 'website' => UrlType::class,
'updatedBy' => HiddenType::class,
];
@@ -116,8 +116,10 @@ class CollectivityTypeTest extends FormTypeHelper
$builder = [
'population' => NumberType::class,
'nbrAgents' => NumberType::class,
+ 'address' => AddressType::class,
'legalManager' => ContactType::class,
'referent' => ContactType::class,
+ 'nbrCnil' => ContactType::class,
'differentDpo' => CheckboxType::class,
'dpo' => ContactType::class,
'differentItManager' => CheckboxType::class,
diff --git a/tests/Functional/Api/CollectivityTest.php b/tests/Functional/Api/CollectivityTest.php
index b3a8a2282..aef94f1be 100644
--- a/tests/Functional/Api/CollectivityTest.php
+++ b/tests/Functional/Api/CollectivityTest.php
@@ -4,23 +4,9 @@ declare(strict_types=1);
namespace App\Tests\Functional\Api;
-use App\Domain\AIPD\Dictionary\ReponseAvisDictionary;
-use App\Domain\AIPD\Dictionary\StatutAnalyseImpactDictionary;
-use App\Domain\AIPD\Model\AnalyseImpact;
-use App\Domain\Notification\Model\NotificationUser;
-use App\Domain\Registry\Dictionary\RequestCivilityDictionary;
-use App\Domain\Registry\Dictionary\RequestStateDictionary;
-use App\Domain\Registry\Model\Request;
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
use App\Domain\User\Repository\User as UserRepository;
-use App\Infrastructure\ORM\AIPD\Repository\AnalyseImpact as AnalyseImpactRepository;
-use App\Infrastructure\ORM\Documentation\Repository\Document;
-use App\Infrastructure\ORM\Notification\Repository\Notification;
-use App\Infrastructure\ORM\Registry\Repository\Request as RequestRepository;
use Hautelook\AliceBundle\PhpUnit\RecreateDatabaseTrait;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
class CollectivityTest extends ApiTestCase
{
@@ -45,20 +31,20 @@ class CollectivityTest extends ApiTestCase
$this->assertCount(3, $data['hydra:member']);
$this->assertEquals(3, $data['hydra:totalItems']);
- $keys = [
- "@id",
- "@type",
- "name",
- "type",
- "siren",
- "active",
- "address",
- "legalManager",
- "referent",
- "finessGeo",
+ $keys = [
+ '@id',
+ '@type',
+ 'name',
+ 'type',
+ 'siren',
+ 'active',
+ 'address',
+ 'legalManager',
+ 'referent',
+ 'dpo',
+ 'finessGeo',
];
$this->assertEquals($keys, array_keys($data['hydra:member'][0]));
}
-
}
diff --git a/tests/Functional/Api/RequestTest.php b/tests/Functional/Api/RequestTest.php
index 12378ae76..935166d2f 100644
--- a/tests/Functional/Api/RequestTest.php
+++ b/tests/Functional/Api/RequestTest.php
@@ -4,24 +4,10 @@ declare(strict_types=1);
namespace App\Tests\Functional\Api;
-use App\Domain\AIPD\Dictionary\ReponseAvisDictionary;
-use App\Domain\AIPD\Dictionary\StatutAnalyseImpactDictionary;
-use App\Domain\AIPD\Model\AnalyseImpact;
-use App\Domain\Notification\Model\NotificationUser;
-use App\Domain\Registry\Dictionary\RequestCivilityDictionary;
-use App\Domain\Registry\Dictionary\RequestStateDictionary;
-use App\Domain\Registry\Model\Request;
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
use App\Domain\User\Repository\User as UserRepository;
-use App\Infrastructure\ORM\AIPD\Repository\AnalyseImpact as AnalyseImpactRepository;
-use App\Infrastructure\ORM\Documentation\Repository\Document;
-use App\Infrastructure\ORM\Notification\Repository\Notification;
use App\Infrastructure\ORM\Registry\Repository\Request as RequestRepository;
use Hautelook\AliceBundle\PhpUnit\RecreateDatabaseTrait;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
-use Symfony\Component\Serializer\Serializer;
class RequestTest extends ApiTestCase
{
@@ -49,7 +35,6 @@ class RequestTest extends ApiTestCase
$requestRepository = static::getContainer()->get(RequestRepository::class);
$request = $requestRepository->findOneById(str_replace('/api/requests/', '', $data['hydra:member'][0]['@id']));
-
$ser = static::getContainer()->get('serializer');
$req = $ser->serialize($request, 'jsonld');
@@ -59,12 +44,11 @@ class RequestTest extends ApiTestCase
unset($d['@context']);
foreach ($d as $k => $v) {
- if ($v === null) {
+ if (null === $v) {
unset($d[$k]);
}
}
$this->assertEquals(array_keys($d), array_keys($data['hydra:member'][0]));
}
-
}
diff --git a/tests/Functional/Api/TreatmentTest.php b/tests/Functional/Api/TreatmentTest.php
index 01a7d1806..0afd6372a 100644
--- a/tests/Functional/Api/TreatmentTest.php
+++ b/tests/Functional/Api/TreatmentTest.php
@@ -4,23 +4,9 @@ declare(strict_types=1);
namespace App\Tests\Functional\Api;
-use App\Domain\AIPD\Dictionary\ReponseAvisDictionary;
-use App\Domain\AIPD\Dictionary\StatutAnalyseImpactDictionary;
-use App\Domain\AIPD\Model\AnalyseImpact;
-use App\Domain\Notification\Model\NotificationUser;
-use App\Domain\Registry\Dictionary\RequestCivilityDictionary;
-use App\Domain\Registry\Dictionary\RequestStateDictionary;
-use App\Domain\Registry\Model\Request;
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
use App\Domain\User\Repository\User as UserRepository;
-use App\Infrastructure\ORM\AIPD\Repository\AnalyseImpact as AnalyseImpactRepository;
-use App\Infrastructure\ORM\Documentation\Repository\Document;
-use App\Infrastructure\ORM\Notification\Repository\Notification;
-use App\Infrastructure\ORM\Registry\Repository\Request as RequestRepository;
use Hautelook\AliceBundle\PhpUnit\RecreateDatabaseTrait;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
class TreatmentTest extends ApiTestCase
{
diff --git a/tests/Utils/FormTypeHelper.php b/tests/Utils/FormTypeHelper.php
index 59ce3b0e1..a0c8b21c7 100644
--- a/tests/Utils/FormTypeHelper.php
+++ b/tests/Utils/FormTypeHelper.php
@@ -44,7 +44,7 @@ class FormTypeHelper extends TestCase
*
* @return FormBuilderInterface|ObjectProphecy The prophesized FormBuilderInterface, revealled or not
*/
- protected function prophesizeBuilder(array $data, bool $reveal = true, EventSubscriberInterface $subscriber = null)
+ protected function prophesizeBuilder(array $data, bool $reveal = true, ?EventSubscriberInterface $subscriber = null)
{
$builderProphecy = $this->prophesize(FormBuilderInterface::class);
--
GitLab