Utils classes: update imports with as statements

src/DataPersister/Access/AdminAccessDataPersister.php

@@ -5,7 +5,7 @@ namespace App\DataPersister\Access;
 
 use ApiPlatform\Core\DataPersister\ContextAwareDataPersisterInterface;
 use App\Entity\Access\Access;
-use App\Service\Access\Utils;
+use App\Service\Access\Utils as AccessUtils;
 use App\Service\Core\ContactPointUtils;
 use Exception;
 use App\ApiResources\Access\AdminAccess;
@@ -21,7 +21,7 @@ class AdminAccessDataPersister implements ContextAwareDataPersisterInterface
     public function __construct(
         private Security $security,
         private EntityManagerInterface $entityManager,
-        private Utils $accessUtils,
+        private AccessUtils $accessUtils,
         private ContactPointUtils $contactPointUtils
     )
     { }

src/Security/Voter/CotisationVoter.php

@@ -5,8 +5,7 @@ namespace App\Security\Voter;
 
 use App\ApiResources\Cotisation\Cotisation;
 use App\Entity\Access\Access;
-use App\Enum\Network\NetworkEnum;
-use App\Service\Network\Utils;
+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;
@@ -16,7 +15,7 @@ class CotisationVoter extends Voter
 {
     public function __construct(
         private Security $security,
-        private Utils $networkUtils)
+        private NetworkUtils $networkUtils)
     { }
 
     protected function supports($attribute, $subject): bool

src/Service/Access/OptionalsRoles/CriteriaNotationOptionalRole.php

@@ -6,12 +6,10 @@ namespace App\Service\Access\OptionalsRoles;
 use App\Entity\Access\Access;
 use App\Repository\Access\AccessRepository;
 use App\Service\Access\OptionalsRolesInterface;
-use App\Service\Access\Utils;
 use App\Enum\Access\FunctionEnum;
 
 class CriteriaNotationOptionalRole implements OptionalsRolesInterface {
     public function __construct(
-        private Utils $accessUtils,
         private AccessRepository $accessRepository
     )
     {
@@ -27,4 +25,4 @@ class CriteriaNotationOptionalRole implements OptionalsRolesInterface {
     {
         return 'ROLE_CRITERIANOTATION';
     }
-}
+}

src/Service/Constraint/ActivityYearConstraint.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace App\Service\Constraint;
 
 use App\Entity\Access\Access;
-use App\Service\Organization\Utils as organizationUtils;
+use App\Service\Organization\Utils as OrganizationUtils;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
@@ -15,7 +15,7 @@ class ActivityYearConstraint extends AbstractTimeConstraintUtils
 {
     public function __construct(
         private EntityManagerInterface $entityManager,
-        private \App\Service\Organization\Utils $organizationUtils
+        private OrganizationUtils $organizationUtils
     )
     { }
 
@@ -57,8 +57,8 @@ class ActivityYearConstraint extends AbstractTimeConstraintUtils
     private function getRangeYear(Access $access, string $dateStart, string $dateEnd): array{
         $organization = $access->getOrganization();
         return [
-            organizationUtils::START_DATE_KEY => $this->organizationUtils->getActivityYearSwitchDate($organization, new \DateTime($dateStart)),
-            organizationUtils::END_DATE_KEY => $this->organizationUtils->getActivityYearSwitchDate($organization, new \DateTime($dateEnd))
+            OrganizationUtils::START_DATE_KEY => $this->organizationUtils->getActivityYearSwitchDate($organization, new \DateTime($dateStart)),
+            OrganizationUtils::END_DATE_KEY => $this->organizationUtils->getActivityYearSwitchDate($organization, new \DateTime($dateEnd))
         ];
     }
 
@@ -114,8 +114,8 @@ class ActivityYearConstraint extends AbstractTimeConstraintUtils
     private function customConstraint($years): array{
         return [
             self::START_KEY => [
-                $years[organizationUtils::START_DATE_KEY]  => self::SUP + self::EQUAL,
-                $years[organizationUtils::END_DATE_KEY] => self::INF + self::EQUAL
+                $years[OrganizationUtils::START_DATE_KEY]  => self::SUP + self::EQUAL,
+                $years[OrganizationUtils::END_DATE_KEY] => self::INF + self::EQUAL
             ]
         ];
     }

src/Service/Constraint/DateTimeConstraint.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace App\Service\Constraint;
 
 use App\Entity\Access\Access;
-use App\Service\Organization\Utils as organizationUtils;
+use App\Service\Organization\Utils as OrganizationUtils;
 use App\Tests\Service\Constraint\DateTimeConstraintTest;
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -16,7 +16,7 @@ class DateTimeConstraint extends AbstractTimeConstraintUtils
 {
     public function __construct(
         private EntityManagerInterface $entityManager,
-        private \App\Service\Organization\Utils $organizationUtils
+        private OrganizationUtils $organizationUtils
     )
     { }
 
@@ -58,8 +58,8 @@ class DateTimeConstraint extends AbstractTimeConstraintUtils
      */
     private function getCustomPeriods(string $dateStart, string $dateEnd): array{
         return [
-            organizationUtils::START_DATE_KEY => $dateStart,
-            organizationUtils::END_DATE_KEY => $dateEnd
+            OrganizationUtils::START_DATE_KEY => $dateStart,
+            OrganizationUtils::END_DATE_KEY => $dateEnd
         ];
     }
 
@@ -79,7 +79,7 @@ class DateTimeConstraint extends AbstractTimeConstraintUtils
         //Si l'année courante est l'année d'affichage choisie par l'utilisateur, alors la date de début est aujourd'hui
         if($activityYear === $currentActivityYear){
             $today = new \DateTime('now');
-            $periods[organizationUtils::START_DATE_KEY] = $today->format('Y-m-d');
+            $periods[OrganizationUtils::START_DATE_KEY] = $today->format('Y-m-d');
         }
 
         return $periods;
@@ -97,10 +97,10 @@ class DateTimeConstraint extends AbstractTimeConstraintUtils
     private function presentConstraint(array $periods): array{
         return [
           self::START_KEY => [
-              $periods[organizationUtils::END_DATE_KEY] => self::INF + self::EQUAL
+              $periods[OrganizationUtils::END_DATE_KEY] => self::INF + self::EQUAL
           ],
           self::END_KEY => [
-              $periods[organizationUtils::START_DATE_KEY] => self::SUP + self::EQUAL,
+              $periods[OrganizationUtils::START_DATE_KEY] => self::SUP + self::EQUAL,
               self::NULL_VALUE => self::NULL
           ]
         ];
@@ -116,7 +116,7 @@ class DateTimeConstraint extends AbstractTimeConstraintUtils
     private function pastConstraint($periods): array{
         return [
             self::END_KEY => [
-                $periods[organizationUtils::START_DATE_KEY] => self::INF
+                $periods[OrganizationUtils::START_DATE_KEY] => self::INF
             ]
         ];
     }
@@ -131,7 +131,7 @@ class DateTimeConstraint extends AbstractTimeConstraintUtils
     private function futurConstraint($periods): array{
         return [
             self::START_KEY => [
-                $periods[organizationUtils::END_DATE_KEY] => self::SUP
+                $periods[OrganizationUtils::END_DATE_KEY] => self::SUP
             ]
         ];
     }

src/Service/MailHub.php

@@ -4,6 +4,7 @@ namespace App\Service;
 
 use App\Entity\Access\Access;
 use App\Entity\Organization\Organization;
+use App\Service\Access\Utils as AccessUtils;
 use App\Service\Core\ContactPointUtils;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
@@ -16,7 +17,7 @@ class MailHub
         private MailerInterface $mailer,
         private string $opentalentNoReplyEmailAddress,
         private ContactPointUtils $contactPointUtils,
-        private \App\Service\Access\Utils $accessUtils
+        private AccessUtils $accessUtils
     ) {}
 
     /**

src/Service/OnChange/Organization/OnParametersChange.php

@@ -13,10 +13,11 @@ use App\Message\Command\Typo3\Typo3DeleteCommand;
 use App\Message\Command\Typo3\Typo3UndeleteCommand;
 use App\Message\Command\Typo3\Typo3UpdateCommand;
 use App\Repository\Booking\CourseRepository;
+use App\Service\Network\Utils as NetworkUtils;
 use App\Service\OnChange\OnChangeContext;
 use App\Service\OnChange\OnChangeDefault;
 use App\Test\Service\OnChange\Organization\OnParametersChangeTest;
-use App\Service\Organization\Utils as organizationUtils;
+use App\Service\Organization\Utils as OrganizationUtils;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 /**
@@ -26,8 +27,8 @@ class OnParametersChange extends OnChangeDefault
 {
     public function __construct(
         private CourseRepository $courseRepository,
-        private \App\Service\Network\Utils $networkUtils,
-        private \App\Service\Organization\Utils $organizationUtils,
+        private NetworkUtils $networkUtils,
+        private OrganizationUtils $organizationUtils,
         private MessageBusInterface $messageBus
     ){ }
 

src/Service/OnChange/Organization/OnSubdomainChange.php

@@ -4,9 +4,11 @@ namespace App\Service\OnChange\Organization;
 
 use App\Entity\Organization\Subdomain;
 use App\Message\Command\Typo3\Typo3UpdateCommand;
+use App\Service\Access\Utils as AccessUtils;
 use App\Service\MailHub;
 use App\Service\OnChange\OnChangeContext;
 use App\Service\OnChange\OnChangeDefault;
+use App\Service\Organization\Utils as OrganizationUtils;
 use App\Service\Typo3\BindFileService;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -14,8 +16,8 @@ use Symfony\Component\Messenger\MessageBusInterface;
 class OnSubdomainChange extends OnChangeDefault
 {
     public function __construct(
-        private \App\Service\Organization\Utils $organizationUtils,
-        private \App\Service\Access\Utils $accessUtils,
+        private OrganizationUtils $organizationUtils,
+        private AccessUtils $accessUtils,
         private MailHub $mailHub,
         private BindFileService $bindFileService,
         private MessageBusInterface $messageBus,

src/Service/Organization/OrganizationProfileCreator.php

@@ -8,7 +8,7 @@ use App\Entity\Organization\Organization;
 use App\Enum\Organization\PrincipalTypeEnum;
 use App\Service\Network\Tree;
 use App\Service\Security\Module;
-use App\Service\Organization\Utils as organizationUtils;
+use App\Service\Organization\Utils as OrganizationUtils;
 use App\Test\Service\Organization\OrganizationProfileCreatorTest;
 
 /**
@@ -20,7 +20,7 @@ class OrganizationProfileCreator
     public function __construct(
         private Module $module,
         private Tree $tree,
-        private \App\Service\Organization\Utils $organizationUtils
+        private OrganizationUtils $organizationUtils
     )
     { }