Skip to content

Commit c475b01

Browse files
committed
Apply changed cs-fixer rule
1 parent 924b669 commit c475b01

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

api/src/Entity/Category.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class Category extends BaseEntity implements BelongsToCampInterface, CopyFromPro
138138
*/
139139
#[ApiProperty(example: '/categories/1a2b3c4d')]
140140
#[Groups(['create'])]
141-
public null|Activity|Category $copyCategorySource;
141+
public Activity|Category|null $copyCategorySource;
142142

143143
/**
144144
* The id of the category that was used as a template for creating this category. Internal for now, is

api/src/Serializer/Normalizer/CollectionItemsNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function supportsNormalization($data, $format = null, array $context = []
2020
return $this->decorated->supportsNormalization($data, $format, $context);
2121
}
2222

23-
public function normalize($data, $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
23+
public function normalize($data, $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
2424
$normalized_data = $this->decorated->normalize($data, $format, $context);
2525

2626
if (isset($normalized_data['_embedded'], $normalized_data['_embedded']['item'])) {

api/src/Serializer/Normalizer/ContentTypeNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function supportsNormalization($data, $format = null, array $context = []
2525
return $this->decorated->supportsNormalization($data, $format, $context);
2626
}
2727

28-
public function normalize($data, $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
28+
public function normalize($data, $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
2929
$normalized_data = $this->decorated->normalize($data, $format, $context);
3030

3131
if ($data instanceof ContentType && null !== $data->entityClass) {

api/src/Serializer/Normalizer/RelatedCollectionLinkNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function supportsNormalization($data, $format = null, array $context = []
106106
return $this->decorated->supportsNormalization($data, $format, $context);
107107
}
108108

109-
public function normalize($data, $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
109+
public function normalize($data, $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
110110
$normalized_data = $this->decorated->normalize($data, $format, $context);
111111

112112
if (!isset($normalized_data['_links'])) {

api/src/Serializer/Normalizer/UriTemplateNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function supportsNormalization($data, $format = null, array $context = []
2323
return $this->decorated->supportsNormalization($data, $format, $context);
2424
}
2525

26-
public function normalize($data, $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
26+
public function normalize($data, $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
2727
$result = $this->decorated->normalize($data, $format, $context);
2828

2929
foreach ($result['_links'] as $rel => $link) {

api/src/Serializer/Normalizer/ValidationErrorNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ValidationErrorNormalizer implements NormalizerInterface {
1313
self::TITLE => 'An error occurred',
1414
];
1515

16-
public function normalize(mixed $data, ?string $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string {
16+
public function normalize(mixed $data, ?string $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null {
1717
return [
1818
'type' => $context[self::TYPE] ?? $this->defaultContext[self::TYPE],
1919
'title' => $context[self::TITLE] ?? $this->defaultContext[self::TITLE],

api/src/State/PersonalInvitationProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct(
2929
* @throws NonUniqueResultException
3030
* @throws NoResultException
3131
*/
32-
public function provide(Operation $operation, array $uriVariables = [], array $context = []): null|array|PersonalInvitation {
32+
public function provide(Operation $operation, array $uriVariables = [], array $context = []): array|PersonalInvitation|null {
3333
if (isset($uriVariables['id'])) {
3434
$id = $uriVariables['id'];
3535

api/src/State/ValidationErrorProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function __construct(
2626
/**
2727
* @psalm-suppress InvalidReturnStatement
2828
*/
29-
public function provide(Operation $operation, array $uriVariables = [], array $context = []): null|array|object {
29+
public function provide(Operation $operation, array $uriVariables = [], array $context = []): array|object|null {
3030
$request = $context['request'];
3131
$exception = $request?->attributes->get('exception');
3232
if (!($request ?? null) || !$operation instanceof HttpOperation || null === $exception) {

api/tests/Serializer/Normalizer/RelatedCollectionLinkNormalizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class RelatedCollectionLinkNormalizerTest extends TestCase {
4848
private MockObject|PropertyAccessorInterface $propertyAccessor;
4949
private EntityManagerInterface|MockObject $entityManager;
5050

51-
private null|DateFilter|SearchFilterInterface $filterInstance;
51+
private DateFilter|SearchFilterInterface|null $filterInstance;
5252

5353
protected function setUp(): void {
5454
$filterLocatorMock = $this->createMock(ServiceLocator::class);

0 commit comments

Comments
 (0)