chore(api): rector to php80

BacLuc · BacLuc · commit 6a23a9292da9 · 2025-10-28T20:37:49.000+01:00
I know we started with php 8 with this version of the backend,
but it seems we did not write php8 code.
Disable ClosureToArrowFunctionRector for now because too much would change,
and one can argue that it's a choice to use a closure instead
of an arrow function.
diff --git a/api/config/bootstrap.php b/api/config/bootstrap.php
@@ -19,5 +19,5 @@
 
 $_SERVER += $_ENV;
 $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
-$_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
+$_SERVER['APP_DEBUG'] ??= $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
 $_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';
diff --git a/api/rector.php b/api/rector.php
@@ -13,6 +13,8 @@
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;
 use Rector\Doctrine\Bundle230\Rector\Class_\AddAnnotationToRepositoryRector;
+use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
+use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
 use Rector\PHPUnit\CodeQuality\Rector\ClassMethod\AddInstanceofAssertForNullableInstanceRector;
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector;
@@ -34,6 +36,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(php80: true)
     ->withConfiguredRule(RenameFunctionRector::class, [
         'implode' => 'join',
         'join' => 'join',
@@ -42,6 +45,7 @@
         AddAnnotationToRepositoryRector::class,
         AddInstanceofAssertForNullableInstanceRector::class,
         AssertEmptyNullableObjectToAssertInstanceofRector::class,
+        ClosureToArrowFunctionRector::class,
         CombineIfRector::class,
         ConstraintOptionsToNamedArgumentsRector::class,
         DeclareStrictTypesRector::class,
@@ -56,5 +60,8 @@
         SimplifyIfReturnBoolRector::class,
         ThrowWithPreviousExceptionRector::class,
         UseIdenticalOverEqualWithSameTypeRector::class,
+        ClassPropertyAssignToConstructorPromotionRector::class => [
+            __DIR__.'/src/DTO/*',
+        ],
     ])
 ;
diff --git a/api/src/Doctrine/Filter/ExpressionDateTimeFilter.php b/api/src/Doctrine/Filter/ExpressionDateTimeFilter.php
@@ -134,7 +134,7 @@ protected function addWhere(
     ) {
         try {
             $value = new \DateTime($value);
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             // Silently ignore this filter if it can not be transformed to a \DateTime
             $this->logger->notice('Invalid filter ignored', [
                 'exception' => new InvalidArgumentException(sprintf('The field "%s" has a wrong date format. Use one accepted by the \DateTime constructor', $field)),
diff --git a/api/src/Doctrine/FilterByCurrentUserExtension.php b/api/src/Doctrine/FilterByCurrentUserExtension.php
@@ -13,13 +13,7 @@
 use Symfony\Bundle\SecurityBundle\Security;
 
 final class FilterByCurrentUserExtension implements QueryCollectionExtensionInterface, QueryItemExtensionInterface {
-    private Security $security;
-    private EntityManagerInterface $entityManager;
-
-    public function __construct(Security $security, EntityManagerInterface $entityManager) {
-        $this->security = $security;
-        $this->entityManager = $entityManager;
-    }
+    public function __construct(private Security $security, private EntityManagerInterface $entityManager) {}
 
     public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, ?string $resourceClass = null, ?Operation $operation = null, array $context = []): void {
         $extraProperties = $operation->getExtraProperties();
diff --git a/api/src/Doctrine/Orm/Extension/FilterEagerLoadingsExtension.php b/api/src/Doctrine/Orm/Extension/FilterEagerLoadingsExtension.php
@@ -62,7 +62,7 @@ private function buildAliasMap(EntityManagerInterface $em, ClassMetadata $classM
 
         foreach ($joins as $join) {
             // @var Join $join
-            list($fromAlias, $fromProperty) = explode('.', $join->getJoin(), 2);
+            [$fromAlias, $fromProperty] = explode('.', $join->getJoin(), 2);
             $toAlias = $join->getAlias();
 
             $fromClassMetadata = $aliasMap[$fromAlias][0];
diff --git a/api/src/Entity/Activity.php b/api/src/Entity/Activity.php
@@ -144,7 +144,7 @@ class Activity extends BaseEntity implements BelongsToCampInterface {
      */
     #[ApiProperty(example: '/activities/1a2b3c4d')]
     #[Groups(['create'])]
-    public ?Activity $copyActivitySource;
+    public ?Activity $copyActivitySource = null;
 
     /**
      * The current assigned ProgressLabel.
diff --git a/api/src/Entity/Camp.php b/api/src/Entity/Camp.php
@@ -246,7 +246,7 @@ class Camp extends BaseEntity implements BelongsToCampInterface, CopyFromPrototy
     #[ApiProperty(example: 'SoLa 2022')]
     #[Groups(['read', 'write'])]
     #[ORM\Column(type: 'text', nullable: true)]
-    public ?string $shortTitle;
+    public ?string $shortTitle = null;
 
     /**
      * The full title of the camp. Used for identifying the camp in lists of camps, so
diff --git a/api/src/Entity/Category.php b/api/src/Entity/Category.php
@@ -140,7 +140,7 @@ class Category extends BaseEntity implements BelongsToCampInterface, CopyFromPro
      */
     #[ApiProperty(example: '/categories/1a2b3c4d')]
     #[Groups(['create'])]
-    public Activity|Category|null $copyCategorySource;
+    public Activity|Category|null $copyCategorySource = null;
 
     /**
      * The id of the category that was used as a template for creating this category. Internal for now, is
@@ -257,25 +257,14 @@ public function removeActivity(Activity $activity): void {
     }
 
     public function getStyledNumber(int $num): string {
-        switch ($this->numberingStyle) {
-            case 'a':
-                return strtolower($this->getAlphaNum($num));
-
-            case 'A':
-                return strtoupper($this->getAlphaNum($num));
-
-            case 'i':
-                return strtolower($this->getRomanNum($num));
-
-            case 'I':
-                return strtoupper($this->getRomanNum($num));
-
-            case '-':
-                return '';
-
-            default:
-                return strval($num);
-        }
+        return match ($this->numberingStyle) {
+            'a' => strtolower($this->getAlphaNum($num)),
+            'A' => strtoupper($this->getAlphaNum($num)),
+            'i' => strtolower($this->getRomanNum($num)),
+            'I' => strtoupper($this->getRomanNum($num)),
+            '-' => '',
+            default => strval($num),
+        };
     }
 
     /**
diff --git a/api/src/Entity/Checklist.php b/api/src/Entity/Checklist.php
@@ -96,7 +96,7 @@ class Checklist extends BaseEntity implements BelongsToCampInterface, CopyFromPr
      */
     #[ApiProperty(example: '/checklists/1a2b3c4d')]
     #[Groups(['create'])]
-    public ?Checklist $copyChecklistSource;
+    public ?Checklist $copyChecklistSource = null;
 
     /**
      * All ChecklistItems that belong to this Checklist.
diff --git a/api/src/Entity/Day.php b/api/src/Entity/Day.php
@@ -157,7 +157,7 @@ public function getStart(): ?\DateTime {
             $start?->add(new \DateInterval('P'.$this->dayOffset.'D'));
 
             return $start;
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             return null;
         }
     }
@@ -173,7 +173,7 @@ public function getEnd(): ?\DateTime {
             $end?->add(new \DateInterval('P'.($this->dayOffset + 1).'D'));
 
             return $end;
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             return null;
         }
     }
diff --git a/api/src/InputFilter/CleanHTMLFilter.php b/api/src/InputFilter/CleanHTMLFilter.php
@@ -3,11 +3,7 @@
 namespace App\InputFilter;
 
 class CleanHTMLFilter extends InputFilter {
-    private \HTMLPurifier $htmlPurifier;
-
-    public function __construct(\HTMLPurifier $htmlPurifier) {
-        $this->htmlPurifier = $htmlPurifier;
-    }
+    public function __construct(private \HTMLPurifier $htmlPurifier) {}
 
     /**
      * {@inheritdoc}
diff --git a/api/src/InputFilter/FilterAttribute.php b/api/src/InputFilter/FilterAttribute.php
@@ -12,8 +12,6 @@
  * FilterAttribute instances are immutable and serializable.
  */
 abstract class FilterAttribute {
-    protected int $priority;
-
     /**
      * Initializes the input filter with options.
      *
@@ -25,9 +23,7 @@ abstract class FilterAttribute {
      * @param int   $priority The priority of this input filter. Higher priorities are executed first.
      *                        Priorities are evaluated for the whole entity class at once.
      */
-    public function __construct(array $options = [], int $priority = 0) {
-        $this->priority = $priority;
-
+    public function __construct(array $options = [], protected int $priority = 0) {
         foreach ($options as $name => $value) {
             $this->{$name} = $value;
         }
diff --git a/api/src/InputFilter/InvalidOptionsException.php b/api/src/InputFilter/InvalidOptionsException.php
@@ -3,12 +3,8 @@
 namespace App\InputFilter;
 
 class InvalidOptionsException extends \RuntimeException {
-    private array $options;
-
-    public function __construct(string $message, array $options) {
+    public function __construct(string $message, private array $options) {
         parent::__construct($message);
-
-        $this->options = $options;
     }
 
     public function getOptions() {
diff --git a/api/src/OAuth/JWTStateOAuth2Client.php b/api/src/OAuth/JWTStateOAuth2Client.php
@@ -72,7 +72,7 @@ public function redirect(array $scopes = [], array $options = []): RedirectRespo
 
         try {
             $response->headers->setCookie(
-                Cookie::create($this->getCookieName($this->cookiePrefix))
+                Cookie::create(static::getCookieName($this->cookiePrefix))
                     ->withValue($this->encodeStateJWT(array_merge($options['additionalData'] ?? [], [
                         'state' => $state,
                         'iat' => $now,
@@ -83,7 +83,7 @@ public function redirect(array $scopes = [], array $options = []): RedirectRespo
                     ->withSecure('dev' !== $this->appEnv) // in local development, we don't use https
                     ->withExpires($expires)
             );
-        } catch (JWTEncodeFailureException $e) {
+        } catch (JWTEncodeFailureException) {
             throw new \LogicException('Could not create a JWT token for storing the state parameter securely');
         }
 
@@ -108,7 +108,7 @@ public function redirect(array $scopes = [], array $options = []): RedirectRespo
      * @throws IdentityProviderException
      */
     public function getAccessToken(array $options = []): AccessTokenInterface {
-        $jwt = $this->getCurrentRequest()->cookies->get($this->getCookieName($this->cookiePrefix));
+        $jwt = $this->getCurrentRequest()->cookies->get(static::getCookieName($this->cookiePrefix));
         if (null === $jwt) {
             throw new InvalidStateException('Expired state');
         }
@@ -122,7 +122,7 @@ public function getAccessToken(array $options = []): AccessTokenInterface {
 
             $now = new \DateTime('@'.time());
             $persistedState = $this->stateRepository->findOneUnexpiredBy($actualState, $now);
-        } catch (JWTDecodeFailureException|NonUniqueResultException|NoResultException $e) {
+        } catch (JWTDecodeFailureException|NonUniqueResultException|NoResultException) {
             throw new InvalidStateException('Invalid state');
         }
 
diff --git a/api/src/Repository/UserRepository.php b/api/src/Repository/UserRepository.php
@@ -28,7 +28,7 @@ public function __construct(ManagerRegistry $registry) {
      */
     public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void {
         if (!$user instanceof User) {
-            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
+            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', $user::class));
         }
 
         $user->password = $newHashedPassword;
diff --git a/api/src/Serializer/Normalizer/CollectionItemsNormalizer.php b/api/src/Serializer/Normalizer/CollectionItemsNormalizer.php
@@ -10,11 +10,7 @@
  * under the relation name `items` instead of `item`.
  */
 class CollectionItemsNormalizer implements NormalizerInterface, NormalizerAwareInterface {
-    private NormalizerInterface $decorated;
-
-    public function __construct(NormalizerInterface $decorated) {
-        $this->decorated = $decorated;
-    }
+    public function __construct(private NormalizerInterface $decorated) {}
 
     public function supportsNormalization($data, $format = null, array $context = []): bool {
         return $this->decorated->supportsNormalization($data, $format, $context);
diff --git a/api/src/Serializer/Normalizer/Error/TranslationInfoOfConstraintViolation.php b/api/src/Serializer/Normalizer/Error/TranslationInfoOfConstraintViolation.php
@@ -7,7 +7,7 @@
 class TranslationInfoOfConstraintViolation {
     public function extract(ConstraintViolationInterface $constraintViolation): TranslationInfo {
         $constraint = $constraintViolation->getConstraint();
-        $constraintClass = get_class($constraint);
+        $constraintClass = null !== $constraint ? $constraint::class : self::class;
         $key = str_replace('\\', '.', $constraintClass);
         $key = strtolower($key);
         $paramsWithoutCurlyBraces = self::removeCurlyBraces($constraintViolation->getParameters());
diff --git a/api/src/Serializer/Normalizer/RelatedCollectionLinkNormalizer.php b/api/src/Serializer/Normalizer/RelatedCollectionLinkNormalizer.php
@@ -223,7 +223,7 @@ protected function getRelatedCollectionLinkAnnotation(string $className, string
             $attributes = $method->getAttributes(RelatedCollectionLink::class);
 
             return ($attributes[0] ?? null)?->newInstance();
-        } catch (\ReflectionException $e) {
+        } catch (\ReflectionException) {
             return null;
         }
     }
diff --git a/api/src/Serializer/SerializerContextBuilder.php b/api/src/Serializer/SerializerContextBuilder.php
@@ -16,11 +16,7 @@
  * building the payload schemas for the API documentation.
  */
 final class SerializerContextBuilder implements SerializerContextBuilderInterface {
-    private SerializerContextBuilderInterface $decorated;
-
-    public function __construct(SerializerContextBuilderInterface $decorated) {
-        $this->decorated = $decorated;
-    }
+    public function __construct(private SerializerContextBuilderInterface $decorated) {}
 
     public function createFromRequest(Request $request, bool $normalization, ?array $extractedAttributes = null): array {
         $context = $this->decorated->createFromRequest($request, $normalization, $extractedAttributes);
diff --git a/api/src/Service/ClaimInvitationService.php b/api/src/Service/ClaimInvitationService.php
@@ -46,7 +46,7 @@ public function claimInvitations(User $user, string $email): void {
                 $invitation->user = $user;
                 $this->em->persist($invitation);
                 $this->em->flush();
-            } catch (UniqueConstraintViolationException $e) {
+            } catch (UniqueConstraintViolationException) {
                 // Even though we already handle this case above, it could still happen due
                 // to race conditions. Just ignore it.
                 $this->em->clear();
diff --git a/api/src/State/ChecklistCreateProcessor.php b/api/src/State/ChecklistCreateProcessor.php
@@ -20,7 +20,7 @@ public function __construct(ProcessorInterface $decorated) {
      * @param Checklist $data
      */
     public function onBefore($data, Operation $operation, array $uriVariables = [], array $context = []): Checklist {
-        if (isset($data->copyChecklistSource)) {
+        if (null !== $data->copyChecklistSource) {
             // CopyChecklist Source is set -> copy it's content
             $entityMap = new EntityMap($data->camp);
             $data->copyFromPrototype($data->copyChecklistSource, $entityMap);
diff --git a/api/src/State/CommentCreateProcessor.php b/api/src/State/CommentCreateProcessor.php
@@ -13,11 +13,8 @@
  * @template-extends AbstractPersistProcessor<Comment>
  */
 class CommentCreateProcessor extends AbstractPersistProcessor {
-    private Security $security;
-
-    public function __construct(ProcessorInterface $decorated, Security $security) {
+    public function __construct(ProcessorInterface $decorated, private Security $security) {
         parent::__construct($decorated);
-        $this->security = $security;
     }
 
     /**
diff --git a/api/src/Util/CamelPascalNamingStrategy.php b/api/src/Util/CamelPascalNamingStrategy.php
@@ -55,7 +55,7 @@ public function joinKeyColumnName($entityName, $referencedColumnName = null): st
      * @param string $className
      */
     private function unqualifiedClassName($className): string {
-        if (false !== strpos($className, '\\')) {
+        if (str_contains($className, '\\')) {
             return substr($className, strrpos($className, '\\') + 1);
         }
 
diff --git a/api/src/Validator/AssertBelongsToSameCamp.php b/api/src/Validator/AssertBelongsToSameCamp.php
@@ -7,17 +7,15 @@
 #[\Attribute]
 class AssertBelongsToSameCamp extends Constraint {
     public string $message = 'Must belong to the same camp.';
-    public bool $compareToPrevious = false;
 
     /**
      * AssertBelongsToSameCamp constructor.
      *
      * @param bool $compareToPrevious in case the camp getter considers the annotated property, use this option (only when updating)
      */
-    public function __construct(?array $options = null, bool $compareToPrevious = false, ?string $message = null, ?array $groups = null, mixed $payload = null) {
+    public function __construct(?array $options = null, public bool $compareToPrevious = false, ?string $message = null, ?array $groups = null, mixed $payload = null) {
         parent::__construct($options ?? [], $groups, $payload);
 
         $this->message = $message ?? $this->message;
-        $this->compareToPrevious = $compareToPrevious;
     }
 }
diff --git a/api/src/Validator/ColumnLayout/AssertColumWidthsSumTo12Validator.php b/api/src/Validator/ColumnLayout/AssertColumWidthsSumTo12Validator.php
@@ -17,11 +17,7 @@ public function validate($value, Constraint $constraint): void {
         }
 
         $columnWidths = array_sum(array_map(function ($col) {
-            if (isset($col['width'])) {
-                return $col['width'];
-            }
-
-            return 0;
+            return $col['width'] ?? 0;
         }, $value['columns']));
 
         if (12 !== $columnWidths) {
diff --git a/api/src/Validator/ColumnLayout/AssertNoOrphanChildrenValidator.php b/api/src/Validator/ColumnLayout/AssertNoOrphanChildrenValidator.php
@@ -36,11 +36,7 @@ public function validate($value, Constraint $constraint): void {
         }
 
         $slots = array_map(function ($col) {
-            if (isset($col['slot'])) {
-                return $col['slot'];
-            }
-
-            return null;
+            return $col['slot'] ?? null;
         }, $array);
 
         $childSlots = $layout->children->map(function (ContentNode $child) {
diff --git a/api/tests/Api/ECampApiTestCase.php b/api/tests/Api/ECampApiTestCase.php
diff --git a/api/tests/Api/SnapshotTests/EndpointPerformanceTest.php b/api/tests/Api/SnapshotTests/EndpointPerformanceTest.php
diff --git a/api/tests/Constraints/CompatibleHalResponse.php b/api/tests/Constraints/CompatibleHalResponse.php
diff --git a/api/tests/HttpCache/PurgeHttpCacheListenerTest.php b/api/tests/HttpCache/PurgeHttpCacheListenerTest.php
diff --git a/api/tests/Integration/State/ValidationErrorProviderIntegrationTest.php b/api/tests/Integration/State/ValidationErrorProviderIntegrationTest.php
diff --git a/api/tests/Serializer/Denormalizer/InputFilterDenormalizerTest.php b/api/tests/Serializer/Denormalizer/InputFilterDenormalizerTest.php
diff --git a/api/tests/Serializer/Normalizer/RelatedCollectionLinkNormalizerTest.php b/api/tests/Serializer/Normalizer/RelatedCollectionLinkNormalizerTest.php
diff --git a/api/tests/Serializer/Normalizer/UriTemplateNormalizerTest.php b/api/tests/Serializer/Normalizer/UriTemplateNormalizerTest.php
diff --git a/api/tests/Validator/AllowTransitions/AssertAllowTransitionTest.php b/api/tests/Validator/AllowTransitions/AssertAllowTransitionTest.php
diff --git a/api/tests/Validator/AssertBelongsToSameCampValidatorTest.php b/api/tests/Validator/AssertBelongsToSameCampValidatorTest.php
diff --git a/api/tests/Validator/AssertEitherIsNullValidatorTest.php b/api/tests/Validator/AssertEitherIsNullValidatorTest.php
diff --git a/api/tests/Validator/AssertLastCollectionItemIsNotDeletedValidatorTest.php b/api/tests/Validator/AssertLastCollectionItemIsNotDeletedValidatorTest.php

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function getStart(): ?\DateTime {`
`157`	`157`	`$start?->add(new \DateInterval('P'.$this->dayOffset.'D'));`
`158`	`158`
`159`	`159`	`return $start;`
`160`		`- } catch (\Exception $e) {`
	`160`	`+ } catch (\Exception) {`
`161`	`161`	`return null;`
`162`	`162`	`}`
`163`	`163`	`}`
`@@ -173,7 +173,7 @@ public function getEnd(): ?\DateTime {`
`173`	`173`	`$end?->add(new \DateInterval('P'.($this->dayOffset + 1).'D'));`
`174`	`174`
`175`	`175`	`return $end;`
`176`		`- } catch (\Exception $e) {`
	`176`	`+ } catch (\Exception) {`
`177`	`177`	`return null;`
`178`	`178`	`}`
`179`	`179`	`}`