Olivier Massot vor 1 Jahr
Ursprung
Commit
58195b4a54

+ 0 - 2
src/ApiResources/Organization/OrganizationCreationRequest.php

@@ -132,8 +132,6 @@ class OrganizationCreationRequest
 
     /**
      * Statut de l'opération.
-     *
-     * @var string
      */
     private string $status = self::STATUS_PENDING;
 

+ 11 - 14
src/Service/Organization/OrganizationFactory.php

@@ -5,7 +5,6 @@ namespace App\Service\Organization;
 use App\ApiResources\Organization\OrganizationCreationRequest;
 use App\ApiResources\Organization\OrganizationMemberCreationRequest;
 use App\Entity\Access\Access;
-use App\Entity\Access\FunctionType;
 use App\Entity\Access\OrganizationFunction;
 use App\Entity\Core\AddressPostal;
 use App\Entity\Core\ContactPoint;
@@ -530,7 +529,7 @@ class OrganizationFactory
         $adminAccess->setAdminAccess(true);
         $adminAccess->setPerson($admin);
         $adminAccess->setLoginEnabled(true);
-        $adminAccess->setRoles(["ROLE_ADMIN","ROLE_ADMIN_CORE"]);
+        $adminAccess->setRoles(['ROLE_ADMIN', 'ROLE_ADMIN_CORE']);
         $adminAccess->setCreateDate($organizationCreationRequest->getCreationDate());
         $adminAccess->setCreatedBy($organizationCreationRequest->getAuthorId());
 
@@ -587,7 +586,7 @@ class OrganizationFactory
         int|OrganizationMemberCreationRequest $creationRequestData,
         FunctionEnum $function,
         \DateTime $creationDate,
-        int|null $authorId
+        ?int $authorId,
     ): Access {
         if (is_int($creationRequestData)) {
             $person = $this->personRepository->find($creationRequestData);
@@ -595,7 +594,7 @@ class OrganizationFactory
             $person = new Person();
 
             if ($this->personRepository->findOneBy(['username' => $creationRequestData->getUsername()])) {
-                throw new \RuntimeException('Username already in use : ' . $creationRequestData->getUsername());
+                throw new \RuntimeException('Username already in use : '.$creationRequestData->getUsername());
             }
 
             $person->setUsername($creationRequestData->getUsername());
@@ -649,9 +648,8 @@ class OrganizationFactory
     protected function makePersonPostalAddress(
         OrganizationMemberCreationRequest $organizationMemberCreationRequest,
         \DateTime $creationDate,
-        int|null $authorId
-    ): PersonAddressPostal
-    {
+        ?int $authorId,
+    ): PersonAddressPostal {
         $addressPostal = new AddressPostal();
         $addressPostal->setStreetAddress($organizationMemberCreationRequest->getStreetAddress1());
         $addressPostal->setStreetAddressSecond($organizationMemberCreationRequest->getStreetAddress2());
@@ -685,16 +683,15 @@ class OrganizationFactory
     protected function makePersonContactPoint(
         OrganizationMemberCreationRequest $organizationMemberCreationRequest,
         \DateTime $creationDate,
-        int|null $authorId
-    ): ContactPoint
-    {
+        ?int $authorId,
+    ): ContactPoint {
         if (!$this->phoneNumberUtil->isPossibleNumber($organizationMemberCreationRequest->getPhone())) {
-            throw new \RuntimeException('Phone number is invalid or missing (person: ' . $organizationMemberCreationRequest->getUsername() . ')');
+            throw new \RuntimeException('Phone number is invalid or missing (person: '.$organizationMemberCreationRequest->getUsername().')');
         }
         if (
-            $organizationMemberCreationRequest->getMobile() !== null &&
-            !$this->phoneNumberUtil->isPossibleNumber($organizationMemberCreationRequest->getMobile())) {
-            throw new \RuntimeException('Mobile phone number is invalid (person: ' . $organizationMemberCreationRequest->getUsername() . ')');
+            $organizationMemberCreationRequest->getMobile() !== null
+            && !$this->phoneNumberUtil->isPossibleNumber($organizationMemberCreationRequest->getMobile())) {
+            throw new \RuntimeException('Mobile phone number is invalid (person: '.$organizationMemberCreationRequest->getUsername().')');
         }
 
         $phoneNumber = $this->phoneNumberUtil->parse($organizationMemberCreationRequest->getPhone());

+ 4 - 4
tests/Unit/Service/Organization/OrganizationFactoryTest.php

@@ -115,17 +115,17 @@ class TestableOrganizationFactory extends OrganizationFactory
         return parent::makeCycles();
     }
 
-    public function makeAccess(int|OrganizationMemberCreationRequest $creationRequestData, FunctionEnum $function, \DateTime $creationDate, int|null $authorId): Access
+    public function makeAccess(int|OrganizationMemberCreationRequest $creationRequestData, FunctionEnum $function, \DateTime $creationDate, ?int $authorId): Access
     {
         return parent::makeAccess($creationRequestData, $function, $creationDate, $authorId);
     }
 
-    public function makePersonPostalAddress(OrganizationMemberCreationRequest $organizationMemberCreationRequest, \DateTime $creationDate, int|null $authorId): PersonAddressPostal
+    public function makePersonPostalAddress(OrganizationMemberCreationRequest $organizationMemberCreationRequest, \DateTime $creationDate, ?int $authorId): PersonAddressPostal
     {
         return parent::makePersonPostalAddress($organizationMemberCreationRequest, $creationDate, $authorId);
     }
 
-    public function makePersonContactPoint(OrganizationMemberCreationRequest $organizationMemberCreationRequest, \DateTime $creationDate, int|null $authorId): ContactPoint
+    public function makePersonContactPoint(OrganizationMemberCreationRequest $organizationMemberCreationRequest, \DateTime $creationDate, ?int $authorId): ContactPoint
     {
         return parent::makePersonContactPoint($organizationMemberCreationRequest, $creationDate, $authorId);
     }
@@ -208,7 +208,7 @@ class OrganizationFactoryTest extends TestCase
                     $this->bindFileService,
                     $this->organizationIdentificationRepository,
                     $this->apiLegacyRequestService,
-                    $this->functionTypeRepository
+                    $this->functionTypeRepository,
                 ])
             ->setMethodsExcept(['setLoggerInterface', 'setPhoneNumberUtil', $methodName])
             ->getMock();