Merge branch 'feature/Symfony-6.2-Deprecated' into develop

.gitignore

@@ -33,3 +33,8 @@ symfony.lock
 
 /coverage/
 
+
+###> phpunit/phpunit ###
+/phpunit.xml
+.phpunit.result.cache
+###< phpunit/phpunit ###

composer.json

@@ -20,8 +20,8 @@
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.9",
         "egulias/email-validator": "^3.0",
-        "jbouzekri/phumbor-bundle": "^2.1",
-        "knplabs/knp-gaufrette-bundle": "^0.7.1",
+        "jbouzekri/phumbor-bundle": "^3.1.0",
+        "knplabs/knp-gaufrette-bundle": "^0.8.0",
         "knplabs/knp-snappy-bundle": "^1.9",
         "lcobucci/jwt": "^4.1",
         "lexik/jwt-authentication-bundle": "^2.8",
@@ -30,7 +30,6 @@
         "nelmio/cors-bundle": "^2.1",
         "odolbeau/phone-number-bundle": "^3.1",
         "phpdocumentor/reflection-docblock": "^5.2",
-        "ralouphie/mimey": "^1.0",
         "ramsey/uuid": "^4.2",
         "symfony/asset": "6.2.*",
         "symfony/console": "6.2.*",
@@ -61,12 +60,14 @@
         "twig/cssinliner-extra": "^3.4",
         "twig/extra-bundle": "^3.4",
         "twig/inky-extra": "^3.4",
-        "vincent/foselastica": "1.2",
-        "webonyx/graphql-php": "^14.3"
+        "vincent/foselastica": "1.3",
+        "webonyx/graphql-php": "^14.3",
+        "xantios/mimey": "*"
     },
     "require-dev": {
         "cyclonedx/cyclonedx-php-composer": "^3.4",
         "phpstan/phpstan": "^1.9",
+        "phpunit/phpunit": "^9.6",
         "rector/rector": "^0.15.13",
         "symfony/debug-bundle": "6.2.*",
         "symfony/maker-bundle": "^1.21",

config/packages/security.yaml

@@ -134,8 +134,6 @@ security:
                 class: App\Entity\Person\Person
                 property: username
 
-    enable_authenticator_manager: true
-
     firewalls:
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/

src/DataPersister/Access/AdminAccessDataPersister.php

@@ -7,10 +7,9 @@ use ApiPlatform\Core\DataPersister\ContextAwareDataPersisterInterface;
 use App\Entity\Access\Access;
 use App\Service\Access\Utils as AccessUtils;
 use App\Service\Core\ContactPointUtils;
-use Exception;
 use App\ApiResources\Access\AdminAccess;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 
 /**

src/DataPersister/Export/LicenceCmf/ExportRequestDataPersister.php

@@ -11,7 +11,7 @@ use App\Message\Command\Export;
 use App\Service\ServiceIterator\ExporterIterator;
 use Exception;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 class ExportRequestDataPersister implements ContextAwareDataPersisterInterface
 {

src/DataProvider/Access/AccessProfileDataProvider.php

@@ -10,7 +10,7 @@ use App\ApiResources\Profile\AccessProfile;
 use App\Entity\Access\Access;
 use App\Service\Access\AccessProfileCreator;
 use Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class AccessProfileDataProvider : custom provider pour assurer l'alimentation de la réponse du GET my_profile

src/DataProvider/Access/AdminAccessDataProvider.php

@@ -9,7 +9,7 @@ use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
 use App\ApiResources\Access\AdminAccess;
 use App\Entity\Access\Access;
 use App\Service\Access\AdminAccessUtils;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class AccessProfileDataProvider : custom provider pour la resource AdminAccess

src/DataProvider/Core/DownloadRequestDataProvider.php

@@ -12,8 +12,7 @@ use App\Service\File\FileManager;
 use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Custom provider pour le téléchargement des fichiers du LocalStorage

src/Doctrine/Access/CurrentAccessExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Service\ServiceIterator\CurrentAccessExtensionIterator;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentAccessExtension : Filtre de sécurité par défaut pour une resource Access

src/Doctrine/Access/CurrentUserPersonalizedListExtension.php

@@ -6,7 +6,7 @@ namespace App\Doctrine\Access;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\PersonalizedList;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentUserPersonalizedListExtension : Filtre de sécurité par défaut pour une resource PersonalizedList

src/Doctrine/Billing/CurrentResidenceAreaExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Billing\ResidenceArea;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentResidenceAreaExtension : Filtre de sécurité par défaut pour une resource ResidenceArea

src/Doctrine/Booking/CurrentCoursesExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Booking\Course;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentCoursesExtension : Filtre de sécurité par défaut pour une resource Course

src/Doctrine/Core/AllowedAddressPostalExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Core\AddressPostal;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class AllowedAddressPostalExtension : Filtre de sécurité par défaut pour une resource AddressPostal

src/Doctrine/Core/CurrentNotificationUserExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Core\NotificationUser;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Filtre de sécurité par défaut pour une resource NotificationUser

src/Doctrine/Core/CurrentUserNotificationExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Core\Notification;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class NotificationExtension : Filtre de sécurité par défaut pour une resource Notification

src/Doctrine/Education/CurrentCycleExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Education\Cycle;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentCycleExtension : Filtre de sécurité par défaut pour une resource Cycle

src/Doctrine/Education/CurrentEducationNotationConfigExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Education\EducationNotationConfig;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentEducationNotationConfigExtension : Filtre de sécurité par défaut pour une resource EducationNotationConfig

src/Doctrine/Education/CurrentEducationTimingExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Education\EducationTiming;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentEducationTimingExtension : Filtre de sécurité par défaut pour une resource CurrentEducationTiming

src/Doctrine/Network/CurrentNetworkOrganizationExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Network\NetworkOrganization;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentNetworkOrganizationExtension : Filtre de sécurité par défaut pour une resource NetworkOrganization

src/Doctrine/Organization/CurrentOrganizationAddressPostalExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Organization\OrganizationAddressPostal;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class OrganizationAddressPosteExtension : Filtre de sécurité par défaut pour une resource OrganizationAddressPostal

src/Doctrine/Organization/CurrentOrganizationArticleExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Organization\OrganizationArticle;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentOrganizationArticleExtension : Filtre de sécurité par défaut pour une resource OrganizationArticle

src/Doctrine/Organization/CurrentOrganizationExtension.php

@@ -7,7 +7,7 @@ use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Organization\Organization;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Class CurrentOrganizationExtension : Filtre de sécurité par défaut pour une resource Organization

src/EventListener/DoctrineFilter/DoctrineFilterListener.php

@@ -8,7 +8,7 @@ use App\Service\Constraint\DateTimeConstraint;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Classe DoctrineFilterListener qui permet d'assurer l'injection de dépendance pour le SQL Filter

src/Message/Handler/ExportHandler.php

@@ -8,9 +8,10 @@ use App\Repository\Access\AccessRepository;
 use App\Service\MercureHub;
 use App\Service\Notifier;
 use App\Service\ServiceIterator\ExporterIterator;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-class ExportHandler implements MessageHandlerInterface
+#[AsMessageHandler(priority: 1)]
+class ExportHandler
 {
     public function __construct(
         private ExporterIterator $handler,

src/Message/Handler/MailerHandler.php

@@ -9,9 +9,10 @@ use App\Message\Command\MailerCommand;
 use App\Repository\Access\AccessRepository;
 use App\Service\Mailer\Mailer;
 use App\Service\Notifier;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-class MailerHandler implements MessageHandlerInterface
+#[AsMessageHandler(priority: 1)]
+class MailerHandler
 {
     public function __construct(
         private Mailer           $mailer,

src/Message/Handler/Parameters/AverageChangeHandler.php

@@ -7,12 +7,13 @@ use App\Message\Command\Parameters\AverageChange;
 use App\Repository\Education\EducationNotationRepository;
 use App\Repository\Organization\ParametersRepository;
 use App\Service\Elasticsearch\EducationNotationUpdater;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
 /**
  * Classe AverageChangeHandler qui traite les messages AverageChange
  */
-class AverageChangeHandler implements MessageHandlerInterface
+#[AsMessageHandler(priority: 1)]
+class AverageChangeHandler
 {
     public function __construct(
         private EducationNotationUpdater $educationNotationUpdater,

src/Message/Handler/Typo3/Typo3DeleteCommandHandler.php

@@ -4,9 +4,10 @@ namespace App\Message\Handler\Typo3;
 
 use App\Message\Command\Typo3\Typo3DeleteCommand;
 use App\Service\Typo3\Typo3Service;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-class Typo3DeleteCommandHandler implements MessageHandlerInterface
+#[AsMessageHandler(priority: 1)]
+class Typo3DeleteCommandHandler
 {
     public function __construct(
         private Typo3Service $typo3Service

src/Message/Handler/Typo3/Typo3UndeleteCommandHandler.php

@@ -4,9 +4,10 @@ namespace App\Message\Handler\Typo3;
 
 use App\Message\Command\Typo3\Typo3UndeleteCommand;
 use App\Service\Typo3\Typo3Service;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-class Typo3UndeleteCommandHandler implements MessageHandlerInterface
+#[AsMessageHandler(priority: 1)]
+class Typo3UndeleteCommandHandler
 {
     public function __construct(
         private Typo3Service $typo3Service

src/Message/Handler/Typo3/Typo3UpdateCommandHandler.php

@@ -4,9 +4,10 @@ namespace App\Message\Handler\Typo3;
 
 use App\Message\Command\Typo3\Typo3UpdateCommand;
 use App\Service\Typo3\Typo3Service;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-class Typo3UpdateCommandHandler implements MessageHandlerInterface
+#[AsMessageHandler(priority: 1)]
+class Typo3UpdateCommandHandler
 {
     public function __construct(
         private Typo3Service $typo3Service

src/Security/Voter/BankAccountVoter.php

@@ -7,7 +7,7 @@ use App\Entity\Access\Access;
 use App\Entity\Core\BankAccount;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 class BankAccountVoter extends Voter

src/Security/Voter/ContactPointVoter.php

@@ -7,7 +7,7 @@ use App\Entity\Access\Access;
 use App\Entity\Core\ContactPoint;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 class ContactPointVoter extends Voter

src/Security/Voter/CotisationVoter.php

@@ -8,7 +8,7 @@ use App\Entity\Access\Access;
 use App\Service\Network\Utils as NetworkUtils;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 class CotisationVoter extends Voter

src/Security/Voter/SwitchUserVoter.php

@@ -6,7 +6,7 @@ namespace App\Security\Voter;
 use App\Service\Security\SwitchUser;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 class SwitchUserVoter extends Voter

src/Serializer/AccessContextBuilder.php

@@ -7,7 +7,7 @@ use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use App\Entity\Access\Access;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 /**
  * Classe servant à ajouter le groupe de denormalization à la ressource Access par rapport au role de l'utilisateur

src/Serializer/DefaultNormalizer.php

@@ -5,7 +5,7 @@ namespace App\Serializer;
 
 use App\Entity\Access\Access;
 use App\Service\Utils\EntityUtils;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerAwareInterface;
@@ -27,7 +27,7 @@ final class DefaultNormalizer implements NormalizerInterface, DenormalizerInterf
         }
     }
 
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $this->decorated->supportsNormalization($data, $format);
     }
@@ -37,7 +37,7 @@ final class DefaultNormalizer implements NormalizerInterface, DenormalizerInterf
         return $this->decorated->normalize($object, $format, $context);
     }
 
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         return $this->decorated->supportsDenormalization($data, $type, $format);
     }

src/Service/ApiLegacy/ApiLegacyRequestService.php

@@ -8,7 +8,7 @@ use Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Security\Core\Authentication\Token\NullToken;
 use Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 

src/Service/OnChange/Organization/OnSubdomainChange.php

@@ -16,7 +16,7 @@ use App\Service\Typo3\BindFileService;
 use App\Tests\Service\OnChange\Organization\OnSubdomainChangeTest;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 class OnSubdomainChange extends OnChangeDefault
 {

tests/Service/ApiLegacy/ApiLegacyRequestServiceTest.php

@@ -11,7 +11,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Security\Core\Authentication\Token\NullToken;
 use Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 

tests/Service/OnChange/Organization/OnSubdomainChangeTest.php

@@ -18,7 +18,7 @@ use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 class OnSubdomainChangeTest extends TestCase
 {