Olivier Massot 1 год назад
Родитель
Сommit
9224c20764

+ 1 - 1
composer.json

@@ -76,7 +76,7 @@
     "cyclonedx/cyclonedx-php-composer": "^3.4",
     "dg/bypass-finals": "^1.4",
     "doctrine/doctrine-fixtures-bundle": "^3.4",
-    "friendsofphp/php-cs-fixer": "^3.49",
+    "friendsofphp/php-cs-fixer": "^3.52.1",
     "hautelook/alice-bundle": "^2.11",
     "justinrainbow/json-schema": "^5.2",
     "phpstan/extension-installer": "^1.2",

+ 5 - 5
src/ApiResources/Export/LicenceCmf/LicenceCmfOrganizationER.php

@@ -20,11 +20,11 @@ use App\State\Processor\Export\LicenceCmf\ExportRequestProcessor;
  */
 #[ApiResource(
     operations: [
-new Post(
-    uriTemplate: '/cmf-licence/organization',
-    security: '(is_granted("ROLE_ADMIN_CORE") or is_granted("ROLE_ADMINISTRATIF_MANAGER_CORE"))'
-),
-],
+        new Post(
+            uriTemplate: '/cmf-licence/organization',
+            security: '(is_granted("ROLE_ADMIN_CORE") or is_granted("ROLE_ADMINISTRATIF_MANAGER_CORE"))'
+        ),
+    ],
     routePrefix: '/export',
     processor: ExportRequestProcessor::class
 )]

+ 3 - 3
src/Service/Constraint/ActivityYearConstraint.php

@@ -80,9 +80,9 @@ class ActivityYearConstraint extends AbstractTimeConstraintUtils implements Time
     protected function presentConstraint(int $year): array
     {
         return [
-          self::START_KEY => [
-              $year => self::EQUAL,
-          ],
+            self::START_KEY => [
+                $year => self::EQUAL,
+            ],
         ];
     }
 

+ 7 - 7
src/Service/Constraint/DateTimeConstraint.php

@@ -113,13 +113,13 @@ class DateTimeConstraint extends AbstractTimeConstraintUtils implements TimeCons
     protected function presentConstraint(array $periods): array
     {
         return [
-          self::START_KEY => [
-              $periods[OrganizationUtils::END_DATE_KEY] => self::INF + self::EQUAL,
-          ],
-          self::END_KEY => [
-              $periods[OrganizationUtils::START_DATE_KEY] => self::SUP + self::EQUAL,
-              self::NULL_VALUE => self::NULL,
-          ],
+            self::START_KEY => [
+                $periods[OrganizationUtils::END_DATE_KEY] => self::INF + self::EQUAL,
+            ],
+            self::END_KEY => [
+                $periods[OrganizationUtils::START_DATE_KEY] => self::SUP + self::EQUAL,
+                self::NULL_VALUE => self::NULL,
+            ],
         ];
     }
 

+ 3 - 3
src/Service/Dolibarr/DolibarrSyncService.php

@@ -695,9 +695,9 @@ class DolibarrSyncService
                     return $this->translator->trans(
                         $m,
                         ['gender' => [
-                                GenderEnum::MISS->value => 'F',
-                                GenderEnum::MISTER->value => 'M',
-                            ][$gender] ?? 'X']
+                            GenderEnum::MISS->value => 'F',
+                            GenderEnum::MISTER->value => 'M',
+                        ][$gender] ?? 'X']
                     );
                 },
                 array_filter(

+ 1 - 1
src/Service/OnlineRegistration/OnlineRegistrationService.php

@@ -14,7 +14,7 @@ class OnlineRegistrationService
     /**
      * Retourne le premier AccessWish correspondant à l'année en cours, ou null si aucun n'est trouvé.
      */
-    public function getCurrentAccessWish(Access $access): AccessWish|null
+    public function getCurrentAccessWish(Access $access): ?AccessWish
     {
         $currentYear = DatesUtils::new()->format('Y');
 

+ 2 - 2
src/Service/OnlineRegistration/RegistrationStatusService.php

@@ -28,7 +28,7 @@ class RegistrationStatusService
     /**
      * Détermine er retourne le statut de l'enregistrement en ligne d'un Access.
      */
-    public function getStatus(Access $access): RegistrationStatusEnum|null
+    public function getStatus(Access $access): ?RegistrationStatusEnum
     {
         $currentAccessWish = $this->onlineRegistrationService->getCurrentAccessWish($access);
         if (null === $currentAccessWish) {
@@ -93,7 +93,7 @@ class RegistrationStatusService
      *
      * @return array<string, int>|null
      */
-    protected function countEducationsByRegistrationStatus(AccessWish $currentAccessWish): array|null
+    protected function countEducationsByRegistrationStatus(AccessWish $currentAccessWish): ?array
     {
         $wishes = $currentAccessWish->getEducationStudentWishes();
         $reregistrationWishes = $currentAccessWish->getEducationStudentReregistrationsWishes();

+ 1 - 1
src/Service/Utils/DatesUtils.php

@@ -12,7 +12,7 @@ use DateTime;
 class DatesUtils
 {
     // For testing purpose, see setFakeDatetime and clearFakeDatetime method
-    protected static string|null $fakeDateTime = null;
+    protected static ?string $fakeDateTime = null;
 
     /**
      * @throws \Exception

+ 1 - 1
tests/Application/OtWebTestCase.php

@@ -110,7 +110,7 @@ abstract class OtWebTestCase extends ApiTestCase
      * @param array<mixed> $data
      * @param array<mixed> $headers
      */
-    protected function request(string $method, string $route, array|null $data = null, array $headers = []): ResponseInterface
+    protected function request(string $method, string $route, ?array $data = null, array $headers = []): ResponseInterface
     {
         if ($this->user) {
             $headers = array_merge(

+ 6 - 6
tests/Unit/Service/Dolibarr/DolibarrSyncServiceTest.php

@@ -399,8 +399,8 @@ class DolibarrSyncServiceTest extends TestCase
             ->expects(self::exactly(2))
             ->method('getOrganizationPostalAddress')
             ->willReturnMap([
-               [$organization1, $addressPostal],
-               [$organization2, null],
+                [$organization1, $addressPostal],
+                [$organization2, null],
             ]);
 
         $this->addressPostalUtils
@@ -521,8 +521,8 @@ class DolibarrSyncServiceTest extends TestCase
         ]);
 
         $dolibarrSyncService->method('findDolibarrContactFor')->willReturnMap([
-           [$dolibarrSocietyContacts1, $person1, $contactData1],
-           [$dolibarrSocietyContacts2, $person2, null],
+            [$dolibarrSocietyContacts1, $person1, $contactData1],
+            [$dolibarrSocietyContacts2, $person2, null],
         ]);
 
         $contactPoint1 = $this->getMockBuilder(ContactPoint::class)->getMock();
@@ -538,8 +538,8 @@ class DolibarrSyncServiceTest extends TestCase
         $contactPoint1->method('getMobilPhone')->willReturn($mobilePhone);
 
         $dolibarrSyncService->method('getPersonContact')->willReturnMap([
-           [$person1, $contactPoint1],
-           [$person2, null],
+            [$person1, $contactPoint1],
+            [$person2, null],
         ]);
 
         $dolibarrSyncService->method('formatContactPosition')->willReturnMap([

+ 5 - 5
tests/Unit/Service/Utils/GpsCoordinateUtilsTest.php

@@ -166,10 +166,10 @@ class GpsCoordinateUtilsTest extends TestCase
         $addressTransformed = $gpsCoordinateUtils->transformAddress($arrayAddress);
 
         $this->assertEquals([
-              'streetAddress' => 'foo',
-              'streetAddressSecond' => 'bar',
-              'city' => 'alpha',
-              'cp' => '12345',
-            ], $addressTransformed);
+            'streetAddress' => 'foo',
+            'streetAddressSecond' => 'bar',
+            'city' => 'alpha',
+            'cp' => '12345',
+        ], $addressTransformed);
     }
 }