Merge pull request ecamp#8431 from BacLuc/rector-php84

BacLuc · web-flow · commit 803c10476675 · 2025-11-09T09:14:22.000Z
chore(api): rector to php84
diff --git a/api/config/bootstrap.php b/api/config/bootstrap.php
@@ -11,10 +11,10 @@
 // Load cached env vars if the .env.local.php file exists
 // Run "composer dump-env prod" to create it (requires symfony/flex >=1.2)
 if (is_array($env = @include dirname(__DIR__).'/.env.local.php') && (!isset($env['APP_ENV']) || ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? $env['APP_ENV']) === $env['APP_ENV'])) {
-    (new Dotenv())->usePutenv(false)->populate($env);
+    new Dotenv()->usePutenv(false)->populate($env);
 } else {
     // load all the .env files
-    (new Dotenv())->usePutenv(false)->loadEnv(dirname(__DIR__).'/.env');
+    new Dotenv()->usePutenv(false)->loadEnv(dirname(__DIR__).'/.env');
 }
 
 $_SERVER += $_ENV;
diff --git a/api/rector.php b/api/rector.php
@@ -37,7 +37,7 @@
     ->withComposerBased(doctrine: true, phpunit: true, symfony: true)
     ->withPreparedSets(deadCode: true, codeQuality: true, privatization: true, rectorPreset: true, phpunitCodeQuality: true, symfonyCodeQuality: true)
     ->withAttributesSets(all: true)
-    ->withPhpSets(php83: true)
+    ->withPhpSets(php84: true)
     ->withConfiguredRule(RenameFunctionRector::class, [
         'implode' => 'join',
         'join' => 'join',
diff --git a/api/src/Doctrine/Orm/Extension/FilterEagerLoadingsExtension.php b/api/src/Doctrine/Orm/Extension/FilterEagerLoadingsExtension.php
@@ -98,23 +98,11 @@ private function usesAnyToMany($toManyAliases, $wherePart) {
     }
 
     private function usesAnyToManyAndx($toManyAliases, Andx $and) {
-        foreach ($and->getParts() as $part) {
-            if ($this->usesAnyToMany($toManyAliases, $part)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any($and->getParts(), fn ($part) => $this->usesAnyToMany($toManyAliases, $part));
     }
 
     private function usesAnyToManyOrx($toManyAliases, Orx $or) {
-        foreach ($or->getParts() as $part) {
-            if ($this->usesAnyToMany($toManyAliases, $part)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any($or->getParts(), fn ($part) => $this->usesAnyToMany($toManyAliases, $part));
     }
 
     private function usesAnyToManyComparison($toManyAliases, Comparison $comparison) {
@@ -124,13 +112,7 @@ private function usesAnyToManyComparison($toManyAliases, Comparison $comparison)
     }
 
     private function usesAnyToManyFunc($toManyAliases, Func $func) {
-        foreach ($func->getArguments() as $argument) {
-            if ($this->usesAnyToMany($toManyAliases, $argument)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any($func->getArguments(), fn ($argument) => $this->usesAnyToMany($toManyAliases, $argument));
     }
 
     private function usesAnyToManyString($toManyAliases, string $comparison) {
diff --git a/api/src/Service/MailService.php b/api/src/Service/MailService.php
@@ -26,7 +26,7 @@ public function __construct(
     ) {}
 
     public function sendInviteToCampMail(User $byUser, Camp $camp, string $key, string $emailToInvite): void {
-        $email = (new TemplatedEmail())
+        $email = new TemplatedEmail()
             ->from(new Address($this->senderEmail, $this->senderName))
             ->to(new Address($emailToInvite))
             ->subject($this->translator->trans('inviteToCamp.subject', ['campTitle' => $camp->title], self::TRANSLATE_DOMAIN, $byUser->profile->language))
@@ -48,7 +48,7 @@ public function sendInviteToCampMail(User $byUser, Camp $camp, string $key, stri
     }
 
     public function sendUserActivationMail(User $user, string $key): void {
-        $email = (new TemplatedEmail())
+        $email = new TemplatedEmail()
             ->from(new Address($this->senderEmail, $this->senderName))
             ->to(new Address($user->getEmail()))
             ->subject($this->translator->trans('userActivation.subject', [], self::TRANSLATE_DOMAIN, $user->profile->language))
@@ -68,7 +68,7 @@ public function sendUserActivationMail(User $user, string $key): void {
     }
 
     public function sendPasswordResetLink(User $user, ResetPassword $data): void {
-        $email = (new TemplatedEmail())
+        $email = new TemplatedEmail()
             ->from(new Address($this->senderEmail, $this->senderName))
             ->to(new Address($user->getEmail()))
             ->subject($this->translator->trans('passwordReset.subject', [], self::TRANSLATE_DOMAIN, $user->profile->language))
@@ -88,7 +88,7 @@ public function sendPasswordResetLink(User $user, ResetPassword $data): void {
     }
 
     public function sendEmailVerificationMail(User $user, Profile $data): void {
-        $email = (new TemplatedEmail())
+        $email = new TemplatedEmail()
             ->from(new Address($this->senderEmail, $this->senderName))
             ->to(new Address($data->untrustedEmail))
             ->subject($this->translator->trans('emailVerification.subject', [], self::TRANSLATE_DOMAIN, $user->profile->language))
diff --git a/api/src/Types/Doctrine/UTCDateTimeType.php b/api/src/Types/Doctrine/UTCDateTimeType.php
@@ -44,7 +44,7 @@ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform)
             $value = $value->setTimeZone(self::getUtc());
 
             if ($value instanceof \DateTimeImmutable) {
-                return (new DateTimeImmutableType())->convertToDatabaseValue($value, $platform);
+                return new DateTimeImmutableType()->convertToDatabaseValue($value, $platform);
             }
 
             return parent::convertToDatabaseValue($value, $platform);
diff --git a/api/src/Types/Doctrine/UTCDateType.php b/api/src/Types/Doctrine/UTCDateType.php
@@ -27,7 +27,7 @@ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform)
         }
 
         if ($value instanceof \DateTimeImmutable) {
-            return (new DateImmutableType())->convertToDatabaseValue($value, $platform);
+            return new DateImmutableType()->convertToDatabaseValue($value, $platform);
         }
 
         return parent::convertToDatabaseValue($value, $platform);
diff --git a/api/src/Validator/AllowTransition/AssertAllowTransitionsValidator.php b/api/src/Validator/AllowTransition/AssertAllowTransitionsValidator.php
@@ -29,7 +29,7 @@ public function validate($value, Constraint $constraint): void {
         $allFrom = $transitions->map(fn (array $elem) => $elem['from'])->toArray();
         $allTo = $transitions->map(fn (array $elem) => $elem['to'])->toArray();
         $allTo = array_merge(...array_values($allTo));
-        if (!(new ArrayCollection($allTo))->forAll(fn ($_, $to) => in_array($to, $allFrom, true))) {
+        if (!new ArrayCollection($allTo)->forAll(fn ($_, $to) => in_array($to, $allFrom, true))) {
             throw new InvalidArgumentException('All to must appear in a from again');
         }
 
diff --git a/api/src/Validator/Period/AssertNotOverlappingWithOtherPeriodsValidator.php b/api/src/Validator/Period/AssertNotOverlappingWithOtherPeriodsValidator.php
@@ -34,7 +34,7 @@ public function validate(mixed $value, Constraint $constraint): void {
             return;
         }
         $periods = $camp->getPeriods();
-        $overlappingExists = (new ArrayCollection($periods))
+        $overlappingExists = new ArrayCollection($periods)
             ->filter(fn (Period $p) => $p !== $object)
             ->exists(fn ($_, Period $p) => self::overlaps($value, $p))
         ;
diff --git a/api/tests/Entity/ScheduleEntryTest.php b/api/tests/Entity/ScheduleEntryTest.php
@@ -164,7 +164,7 @@ public function testGetDayReturnsNullIfDayEntityIsMissing() {
     }
 
     protected function setCreateTime(ScheduleEntry $scheduleEntry, \DateTime $createTime) {
-        $createTimeProperty = (new \ReflectionClass(ScheduleEntry::class))->getProperty('createTime');
+        $createTimeProperty = new \ReflectionClass(ScheduleEntry::class)->getProperty('createTime');
         $createTimeProperty->setValue($scheduleEntry, $createTime);
     }
 }
diff --git a/api/tests/HttpCache/PurgeHttpCacheListenerTest.php b/api/tests/HttpCache/PurgeHttpCacheListenerTest.php
@@ -102,10 +102,10 @@ protected function setUp(): void {
         $this->propertyAccessorProphecy->getValue(Argument::type(Dummy::class), 'relatedOwningDummy')->willReturn(null);
 
         $this->metadataFactoryProphecy = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
-        $operation = (new GetCollection())->withShortName('Dummy')->withClass(Dummy::class);
-        $operation2 = (new GetCollection())->withShortName('DummyAsSubresource')->withClass(Dummy::class);
+        $operation = new GetCollection()->withShortName('Dummy')->withClass(Dummy::class);
+        $operation2 = new GetCollection()->withShortName('DummyAsSubresource')->withClass(Dummy::class);
         $this->metadataFactoryProphecy->create(Dummy::class)->willReturn(new ResourceMetadataCollection('Dummy', [
-            (new ApiResource('Dummy'))
+            new ApiResource('Dummy')
                 ->withShortName('Dummy')
                 ->withOperations(new Operations([
                     'get_collection' => $operation,
@@ -143,16 +143,16 @@ public function testOnFlush(): void {
         $cacheManagerProphecy->flush()->willReturn(0);
 
         $metadataFactoryProphecy = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
-        $operation = (new GetCollection())->withShortName('Dummy')->withClass(Dummy::class);
+        $operation = new GetCollection()->withShortName('Dummy')->withClass(Dummy::class);
         $metadataFactoryProphecy->create(Dummy::class)->willReturn(new ResourceMetadataCollection('Dummy', [
-            (new ApiResource('Dummy'))
+            new ApiResource('Dummy')
                 ->withShortName('Dummy')
                 ->withOperations(new Operations([
                     'get' => $operation,
                 ])),
         ]))->shouldBeCalled();
         $metadataFactoryProphecy->create(DummyNoGetOperation::class)->willReturn(new ResourceMetadataCollection('DummyNoGetOperation', [
-            (new ApiResource('DummyNoGetOperation'))
+            new ApiResource('DummyNoGetOperation')
                 ->withShortName('DummyNoGetOperation'),
         ]))->shouldBeCalled();
 
@@ -345,7 +345,7 @@ public function testPropertyIsNotAResourceClass(): void {
 
         $metadataFactoryProphecy = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
         $metadataFactoryProphecy->create(ContainNonResource::class)->willReturn(new ResourceMetadataCollection('ContainNonResource', [
-            (new ApiResource('ContainNonResource'))
+            new ApiResource('ContainNonResource')
                 ->withShortName('ContainNonResource'),
         ]))->shouldBeCalled();
 
diff --git a/api/tests/Metadata/Resource/Factory/UriTemplateFactoryTest.php b/api/tests/Metadata/Resource/Factory/UriTemplateFactoryTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void {
         $this->resourceNameCollection = new ResourceNameCollection(['Dummy']);
         $this->resourceMetadataCollection = new ResourceMetadataCollection('Dummy');
 
-        $this->apiResource = (new ApiResource())->withShortName('Dummy')->withOperations(new Operations([
+        $this->apiResource = new ApiResource()->withShortName('Dummy')->withOperations(new Operations([
             new Get(
                 name: '_api_/dummys/{id}{._format}_get'
             ),
@@ -81,7 +81,7 @@ public function testCreatesNonTemplatedUri() {
                 name: '_api_/dummys{._format}_get_collection'
             ),
         ]);
-        $apiResource = (new ApiResource())->withShortName('Dummy')->withOperations($operations);
+        $apiResource = new ApiResource()->withShortName('Dummy')->withOperations($operations);
         $this->resourceMetadataCollection->append($apiResource);
 
         $this->createFactory();
@@ -111,7 +111,7 @@ public function testCreatesTemplatedUriWithIdPathParameter() {
     public function testCreatesTemplatedUriWithFilterQueryParameter() {
         // given
         $resource = 'Dummy';
-        $this->resourceMetadataCollection->append((new ApiResource())->withShortName('Dummy')->withOperations(new Operations([
+        $this->resourceMetadataCollection->append(new ApiResource()->withShortName('Dummy')->withOperations(new Operations([
             new Get(
                 name: '_api_/dummys/{id}{._format}_get'
             ),
@@ -152,7 +152,7 @@ public function testCreatesTemplatedUriWithAdvancedPaginationQueryParameters() {
         // given
         $resource = 'Dummy';
         $this->paginationOptions = new PaginationOptions(true);
-        $this->resourceMetadataCollection->append((new ApiResource())->withShortName('Dummy')->withOperations(new Operations([
+        $this->resourceMetadataCollection->append(new ApiResource()->withShortName('Dummy')->withOperations(new Operations([
             new Get(
                 name: '_api_/dummys/{id}{._format}_get'
             ),
@@ -176,7 +176,7 @@ public function testCreatesTemplatedUriWithActionPathParameters() {
         // given
         $resource = 'Dummy';
 
-        $this->resourceMetadataCollection->append((new ApiResource())->withShortName('Dummy')->withOperations(new Operations([
+        $this->resourceMetadataCollection->append(new ApiResource()->withShortName('Dummy')->withOperations(new Operations([
             new Get(
                 name: '_api_/dummys/{id}{._format}_get'
             ),
@@ -202,7 +202,7 @@ public function testCreatesTemplatedUriWithActionPathParameters() {
     public function testIgnoresRoutesWithNoSlashAtEnd() {
         // given
         $resource = 'Dummy';
-        $this->resourceMetadataCollection->append((new ApiResource())->withShortName('Dummy')->withOperations(new Operations([
+        $this->resourceMetadataCollection->append(new ApiResource()->withShortName('Dummy')->withOperations(new Operations([
             new Get(
                 name: '_api_/dummys/{id}{._format}_get'
             ),
@@ -223,7 +223,7 @@ public function testIgnoresRoutesWithNoSlashAtEnd() {
     public function testIgnoreActionPathsOfOtherRouteStarts() {
         // given
         $resource = 'Dummy';
-        $this->resourceMetadataCollection->append((new ApiResource())->withShortName('Dummy')->withOperations(new Operations([
+        $this->resourceMetadataCollection->append(new ApiResource()->withShortName('Dummy')->withOperations(new Operations([
             new Get(
                 name: '_api_/dummys/{id}{._format}_get'
             ),
diff --git a/api/tests/Metadata/Resource/OperationHelperTest.php b/api/tests/Metadata/Resource/OperationHelperTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void {
 
     public function testFindGet() {
         // given
-        $apiResource = (new ApiResource())->withOperations(new Operations([
+        $apiResource = new ApiResource()->withOperations(new Operations([
             new Get(
                 name: 'get'
             ),
@@ -44,7 +44,7 @@ public function testFindGet() {
 
     public function testReturnsNullForMissingOperation() {
         // given
-        $apiResource = (new ApiResource())->withOperations(new Operations([
+        $apiResource = new ApiResource()->withOperations(new Operations([
             new Get(
                 name: 'get'
             ),
@@ -61,7 +61,7 @@ public function testReturnsNullForMissingOperation() {
 
     public function testFindsFirstOperation() {
         // given
-        $apiResource = (new ApiResource())->withOperations(new Operations([
+        $apiResource = new ApiResource()->withOperations(new Operations([
             new Get(
                 name: 'get1'
             ),
@@ -80,12 +80,12 @@ public function testFindsFirstOperation() {
 
     public function testFindsOperationInMultipleResources() {
         // given
-        $apiResource1 = (new ApiResource())->withOperations(new Operations([
+        $apiResource1 = new ApiResource()->withOperations(new Operations([
             new GetCollection(
                 name: 'get_collection'
             ),
         ]));
-        $apiResource2 = (new ApiResource())->withOperations(new Operations([
+        $apiResource2 = new ApiResource()->withOperations(new Operations([
             new Get(
                 name: 'get1'
             ),
@@ -105,7 +105,7 @@ public function testFindsOperationInMultipleResources() {
 
     public function testFindGraphQlOperation() {
         // given
-        $apiResource = (new ApiResource())->withGraphQlOperations([
+        $apiResource = new ApiResource()->withGraphQlOperations([
             new Query(name: 'query'),
             new QueryCollection(name: 'queryCollection'),
         ]);
diff --git a/api/tests/Serializer/Normalizer/RelatedCollectionLinkNormalizerTest.php b/api/tests/Serializer/Normalizer/RelatedCollectionLinkNormalizerTest.php
@@ -446,7 +446,7 @@ public function testNormalizeDoesntReplaceWhenMissingGetCollectionOperation() {
         ]));
 
         $metadataCollection = new ResourceMetadataCollection('Dummy');
-        $metadataCollection->append((new ApiResource())->withOperations(new Operations([new Get()])));
+        $metadataCollection->append(new ApiResource()->withOperations(new Operations([new Get()])));
         $this->resourceMetadataCollectionFactoryMock->method('create')->willReturn($metadataCollection);
 
         $this->mockGeneratedRoute();
@@ -484,7 +484,7 @@ protected function mockRelatedResourceMetadata($collectionOperationMetadata) {
         $collectionOperationMetadata['name'] = '_api_/dummys{._format}_get_collection';
 
         $metadataCollection = new ResourceMetadataCollection('Dummy');
-        $metadataCollection->append((new ApiResource())->withOperations(new Operations([
+        $metadataCollection->append(new ApiResource()->withOperations(new Operations([
             new GetCollection(
                 ...$collectionOperationMetadata
             ),
diff --git a/api/tests/Validator/AllowTransitions/AssertAllowTransitionTest.php b/api/tests/Validator/AllowTransitions/AssertAllowTransitionTest.php
@@ -45,7 +45,7 @@ public function testNotValidWhenPreviousValueIsNotInFrom() {
 
         $this->validator->validate($testClass->a, new AssertAllowTransitions(self::TRANSITIONS));
 
-        $allFrom = (new ArrayCollection(self::TRANSITIONS))->map(fn ($elem) => $elem['from'])->toArray();
+        $allFrom = new ArrayCollection(self::TRANSITIONS)->map(fn ($elem) => $elem['from'])->toArray();
         $this->buildViolation(AssertAllowTransitionsValidator::FROM_VIOLATION_MESSAGE)
             ->setParameter('{{ from }}', join(',', $allFrom))
             ->setParameter('{{ previousValue }}', $this->before->a)
diff --git a/api/tests/bootstrap.php b/api/tests/bootstrap.php
@@ -6,7 +6,7 @@
 require dirname(__DIR__).'/vendor/autoload.php';
 
 if (method_exists(Dotenv::class, 'bootEnv')) {
-    (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+    new Dotenv()->bootEnv(dirname(__DIR__).'/.env');
 }
 
 if ($_SERVER['APP_DEBUG']) {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform)`
`44`	`44`	`$value = $value->setTimeZone(self::getUtc());`
`45`	`45`
`46`	`46`	`if ($value instanceof \DateTimeImmutable) {`
`47`		`- return (new DateTimeImmutableType())->convertToDatabaseValue($value, $platform);`
	`47`	`+ return new DateTimeImmutableType()->convertToDatabaseValue($value, $platform);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`return parent::convertToDatabaseValue($value, $platform);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`if ($value instanceof \DateTimeImmutable) {`
`30`		`- return (new DateImmutableType())->convertToDatabaseValue($value, $platform);`
	`30`	`+ return new DateImmutableType()->convertToDatabaseValue($value, $platform);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`return parent::convertToDatabaseValue($value, $platform);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function validate($value, Constraint $constraint): void {`
`29`	`29`	`$allFrom = $transitions->map(fn (array $elem) => $elem['from'])->toArray();`
`30`	`30`	`$allTo = $transitions->map(fn (array $elem) => $elem['to'])->toArray();`
`31`	`31`	`$allTo = array_merge(...array_values($allTo));`
`32`		`- if (!(new ArrayCollection($allTo))->forAll(fn ($_, $to) => in_array($to, $allFrom, true))) {`
	`32`	`+ if (!new ArrayCollection($allTo)->forAll(fn ($_, $to) => in_array($to, $allFrom, true))) {`
`33`	`33`	`throw new InvalidArgumentException('All to must appear in a from again');`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function validate(mixed $value, Constraint $constraint): void {`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`	`$periods = $camp->getPeriods();`
`37`		`- $overlappingExists = (new ArrayCollection($periods))`
	`37`	`+ $overlappingExists = new ArrayCollection($periods)`
`38`	`38`	`->filter(fn (Period $p) => $p !== $object)`
`39`	`39`	`->exists(fn ($_, Period $p) => self::overlaps($value, $p))`
`40`	`40`	`;`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public function testGetDayReturnsNullIfDayEntityIsMissing() {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`protected function setCreateTime(ScheduleEntry $scheduleEntry, \DateTime $createTime) {`
`167`		`- $createTimeProperty = (new \ReflectionClass(ScheduleEntry::class))->getProperty('createTime');`
	`167`	`+ $createTimeProperty = new \ReflectionClass(ScheduleEntry::class)->getProperty('createTime');`
`168`	`168`	`$createTimeProperty->setValue($scheduleEntry, $createTime);`
`169`	`169`	`}`
`170`	`170`	`}`