Merge pull request #8085 from ecamp/renovate/friendsofphp-php-cs-fixer-3.x

Update dependency friendsofphp/php-cs-fixer to v3.87.1

Author: renovate[bot]

api/composer.json

@@ -62,7 +62,7 @@
     "require-dev": {
         "api-platform/graphql": "4.1.20",
         "brianium/paratest": "v7.11.0",
-        "friendsofphp/php-cs-fixer": "3.86.0",
+        "friendsofphp/php-cs-fixer": "3.87.1",
         "hautelook/alice-bundle": "2.15.1",
         "justinrainbow/json-schema": "6.5.1",
         "php-coveralls/php-coveralls": "2.8.0",

api/composer.lock

@@ -138,7 +138,7 @@ class Category extends BaseEntity implements BelongsToCampInterface, CopyFromPro
      */
     #[ApiProperty(example: '/categories/1a2b3c4d')]
     #[Groups(['create'])]
-    public null|Activity|Category $copyCategorySource;
+    public Activity|Category|null $copyCategorySource;
 
     /**
      * The id of the category that was used as a template for creating this category. Internal for now, is

api/src/Entity/Category.php

@@ -20,7 +20,7 @@ public function supportsNormalization($data, $format = null, array $context = []
         return $this->decorated->supportsNormalization($data, $format, $context);
     }
 
-    public function normalize($data, $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
+    public function normalize($data, $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
         $normalized_data = $this->decorated->normalize($data, $format, $context);
 
         if (isset($normalized_data['_embedded'], $normalized_data['_embedded']['item'])) {

api/src/Serializer/Normalizer/CollectionItemsNormalizer.php

@@ -25,7 +25,7 @@ public function supportsNormalization($data, $format = null, array $context = []
         return $this->decorated->supportsNormalization($data, $format, $context);
     }
 
-    public function normalize($data, $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
+    public function normalize($data, $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
         $normalized_data = $this->decorated->normalize($data, $format, $context);
 
         if ($data instanceof ContentType && null !== $data->entityClass) {

api/src/Serializer/Normalizer/ContentTypeNormalizer.php

@@ -106,7 +106,7 @@ public function supportsNormalization($data, $format = null, array $context = []
         return $this->decorated->supportsNormalization($data, $format, $context);
     }
 
-    public function normalize($data, $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
+    public function normalize($data, $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
         $normalized_data = $this->decorated->normalize($data, $format, $context);
 
         if (!isset($normalized_data['_links'])) {

api/src/Serializer/Normalizer/RelatedCollectionLinkNormalizer.php

@@ -23,7 +23,7 @@ public function supportsNormalization($data, $format = null, array $context = []
         return $this->decorated->supportsNormalization($data, $format, $context);
     }
 
-    public function normalize($data, $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
+    public function normalize($data, $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
         $result = $this->decorated->normalize($data, $format, $context);
 
         foreach ($result['_links'] as $rel => $link) {

api/src/Serializer/Normalizer/UriTemplateNormalizer.php

@@ -13,7 +13,7 @@ class ValidationErrorNormalizer implements NormalizerInterface {
         self::TITLE => 'An error occurred',
     ];
 
-    public function normalize(mixed $data, ?string $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
         return [
             'type' => $context[self::TYPE] ?? $this->defaultContext[self::TYPE],
             'title' => $context[self::TITLE] ?? $this->defaultContext[self::TITLE],

api/src/Serializer/Normalizer/ValidationErrorNormalizer.php

@@ -29,7 +29,7 @@ public function __construct(
      * @throws NonUniqueResultException
      * @throws NoResultException
      */
-    public function provide(Operation $operation, array $uriVariables = [], array $context = []): null|array|PersonalInvitation {
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): array|PersonalInvitation|null {
         if (isset($uriVariables['id'])) {
             $id = $uriVariables['id'];
 

api/src/State/PersonalInvitationProvider.php

@@ -26,7 +26,7 @@ public function __construct(
     /**
      * @psalm-suppress InvalidReturnStatement
      */
-    public function provide(Operation $operation, array $uriVariables = [], array $context = []): null|array|object {
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): array|object|null {
         $request = $context['request'];
         $exception = $request?->attributes->get('exception');
         if (!($request ?? null) || !$operation instanceof HttpOperation || null === $exception) {