Skip to content

Commit 48e8bec

Browse files
SeboboSebobo
authored
Merge pull request #267 from Flowpack/task/php84
TASK: PHP8.4 compatibility
2 parents 95a1387 + cb8c8ed commit 48e8bec

8 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎Classes/GraphQL/MediaApi.php‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ public function __construct(
8080
*/
8181
#[Query]
8282
public function assetCount(
83-
Types\AssetSourceId $assetSourceId = null,
84-
Types\AssetCollectionId $assetCollectionId = null,
85-
Types\MediaType $mediaType = null,
86-
Types\AssetType $assetType = null,
87-
Types\TagId $tagId = null,
88-
string $searchTerm = null,
83+
?Types\AssetSourceId $assetSourceId = null,
84+
?Types\AssetCollectionId $assetCollectionId = null,
85+
?Types\MediaType $mediaType = null,
86+
?Types\AssetType $assetType = null,
87+
?Types\TagId $tagId = null,
88+
?string $searchTerm = null,
8989
): int {
9090
$iterator = $this->assetProxyIteratorBuilder->build(
9191
$assetSourceId,
@@ -106,14 +106,14 @@ public function assetCount(
106106
#[Description('Provides a filterable list of asset proxies. These are the main entities for media management.')]
107107
#[Query]
108108
public function assets(
109-
Types\AssetSourceId $assetSourceId = null,
110-
Types\AssetCollectionId $assetCollectionId = null,
111-
Types\MediaType $mediaType = null,
112-
Types\AssetType $assetType = null,
113-
Types\TagId $tagId = null,
114-
Types\SortBy $sortBy = null,
115-
Types\SortDirection $sortDirection = null,
116-
string $searchTerm = null,
109+
?Types\AssetSourceId $assetSourceId = null,
110+
?Types\AssetCollectionId $assetCollectionId = null,
111+
?Types\MediaType $mediaType = null,
112+
?Types\AssetType $assetType = null,
113+
?Types\TagId $tagId = null,
114+
?Types\SortBy $sortBy = null,
115+
?Types\SortDirection $sortDirection = null,
116+
?string $searchTerm = null,
117117
int $limit = 20,
118118
int $offset = 0,
119119
): ?Types\Assets {
@@ -290,7 +290,7 @@ public function unusedAssets(int $limit = 20, int $offset = 0): Types\Assets
290290

291291
#[Description('Provides a list of changes to assets since a given timestamp')]
292292
#[Query]
293-
public function changedAssets(Types\DateTime $since = null): Types\ChangedAssetsResult
293+
public function changedAssets(?Types\DateTime $since = null): Types\ChangedAssetsResult
294294
{
295295
$changes = $this->assetChangeLog->getChanges($since);
296296
return instantiate(Types\ChangedAssetsResult::class, [
@@ -336,9 +336,9 @@ public function similarAssets(Types\AssetId $id, Types\AssetSourceId $assetSourc
336336
public function updateAsset(
337337
Types\AssetId $id,
338338
Types\AssetSourceId $assetSourceId,
339-
string $label = null,
340-
string $caption = null,
341-
string $copyrightNotice = null
339+
?string $label = null,
340+
?string $caption = null,
341+
?string $copyrightNotice = null
342342
): ?Types\Asset {
343343
return $this->assetMutator->updateAsset($id, $assetSourceId, $label, $caption, $copyrightNotice);
344344
}
@@ -490,9 +490,9 @@ public function importAsset(Types\AssetId $id, Types\AssetSourceId $assetSourceI
490490
*/
491491
#[Mutation]
492492
public function uploadFile(
493-
Types\UploadedFile $file = null,
494-
Types\TagId $tagId = null,
495-
Types\AssetCollectionId $assetCollectionId = null
493+
?Types\UploadedFile $file = null,
494+
?Types\TagId $tagId = null,
495+
?Types\AssetCollectionId $assetCollectionId = null
496496
): Types\FileUploadResult {
497497
return $this->assetMutator->uploadFile(
498498
$file,
@@ -506,9 +506,9 @@ public function uploadFile(
506506
*/
507507
#[Mutation]
508508
public function uploadFiles(
509-
Types\UploadedFiles $files = null,
510-
Types\TagId $tagId = null,
511-
Types\AssetCollectionId $assetCollectionId = null
509+
?Types\UploadedFiles $files = null,
510+
?Types\TagId $tagId = null,
511+
?Types\AssetCollectionId $assetCollectionId = null
512512
): Types\FileUploadResults {
513513
return $this->assetMutator->uploadFiles(
514514
$files,
@@ -521,7 +521,7 @@ public function uploadFiles(
521521
* @throws Exception|IllegalObjectTypeException
522522
*/
523523
#[Mutation]
524-
public function createTag(Types\TagLabel $label, Types\AssetCollectionId $assetCollectionId = null): Types\Tag
524+
public function createTag(Types\TagLabel $label, ?Types\AssetCollectionId $assetCollectionId = null): Types\Tag
525525
{
526526
return $this->tagMutator->createTag($label, $assetCollectionId);
527527
}
@@ -530,7 +530,7 @@ public function createTag(Types\TagLabel $label, Types\AssetCollectionId $assetC
530530
* @throws Exception|IllegalObjectTypeException
531531
*/
532532
#[Mutation]
533-
public function updateTag(Types\TagId $id, Types\TagLabel $label = null): Types\Tag
533+
public function updateTag(Types\TagId $id, ?Types\TagLabel $label = null): Types\Tag
534534
{
535535
return $this->tagMutator->updateTag($id, $label);
536536
}

‎Classes/GraphQL/Middleware/GraphQLMiddlewareFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public function create(
4747
string $uriPath,
4848
string $apiObjectName,
4949
array $typeNamespaces = [],
50-
string $simulateControllerObjectName = null,
51-
array $customResolversSettings = null,
50+
?string $simulateControllerObjectName = null,
51+
?array $customResolversSettings = null,
5252
): GraphQLMiddleware {
5353
return new GraphQLMiddleware(
5454
$uriPath,

‎Classes/GraphQL/Mutator/AssetCollectionMutator.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function localizedMessage(string $id, string $fallback = '', array $ar
5959
*/
6060
public function createAssetCollection(
6161
Types\AssetCollectionTitle $title,
62-
Types\AssetCollectionId $parent = null
62+
?Types\AssetCollectionId $parent = null
6363
): Types\AssetCollection {
6464
$newAssetCollection = new AssetCollection($title->value);
6565
if ($parent) {
@@ -121,8 +121,8 @@ public function deleteAssetCollection(Types\AssetCollectionId $id): MutationResu
121121
*/
122122
public function updateAssetCollection(
123123
Types\AssetCollectionId $id,
124-
Types\AssetCollectionTitle $title = null,
125-
Types\TagIds $tagIds = null
124+
?Types\AssetCollectionTitle $title = null,
125+
?Types\TagIds $tagIds = null
126126
): MutationResult {
127127
/** @var AssetCollection&HierarchicalAssetCollectionInterface $assetCollection */
128128
$assetCollection = $this->assetCollectionRepository->findByIdentifier($id->value);
@@ -166,7 +166,7 @@ public function updateAssetCollection(
166166
*/
167167
public function setAssetCollectionParent(
168168
Types\AssetCollectionId $id,
169-
Types\AssetCollectionId $parent = null
169+
?Types\AssetCollectionId $parent = null
170170
): MutationResult {
171171
/** @var AssetCollection $assetCollection */
172172
$assetCollection = $this->assetCollectionRepository->findByIdentifier($id->value);

‎Classes/GraphQL/Mutator/AssetMutator.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ protected function localizedMessageFromException(\Exception $exception): string
8484
public function updateAsset(
8585
Types\AssetId $id,
8686
Types\AssetSourceId $assetSourceId,
87-
string $label = null,
88-
string $caption = null,
89-
string $copyrightNotice = null
87+
?string $label = null,
88+
?string $caption = null,
89+
?string $copyrightNotice = null
9090
): ?Types\Asset {
9191
$asset = $this->assetSourceContext->getAsset($id, $assetSourceId);
9292
if (!$asset) {
@@ -439,8 +439,8 @@ public function importAsset(Types\AssetId $id, Types\AssetSourceId $assetSourceI
439439
*/
440440
public function uploadFile(
441441
?Types\UploadedFile $file,
442-
Types\TagId $tagId = null,
443-
Types\AssetCollectionId $assetCollectionId = null
442+
?Types\TagId $tagId = null,
443+
?Types\AssetCollectionId $assetCollectionId = null
444444
): Types\FileUploadResult {
445445
$success = false;
446446
$result = self::STATE_ERROR;
@@ -519,9 +519,9 @@ public function uploadFile(
519519
* Stores all given files and returns an array of results for each upload
520520
*/
521521
public function uploadFiles(
522-
Types\UploadedFiles $files = null,
523-
Types\TagId $tagId = null,
524-
Types\AssetCollectionId $assetCollectionId = null
522+
?Types\UploadedFiles $files = null,
523+
?Types\TagId $tagId = null,
524+
?Types\AssetCollectionId $assetCollectionId = null
525525
): Types\FileUploadResults {
526526
if (!$files) {
527527
return Types\FileUploadResults::empty();

‎Classes/GraphQL/Mutator/TagMutator.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected function localizedMessage(string $id, string $fallback = '', array $ar
5454
/**
5555
* @throws Exception|IllegalObjectTypeException
5656
*/
57-
public function createTag(Types\TagLabel $label, Types\AssetCollectionId $assetCollectionId = null): Types\Tag
57+
public function createTag(Types\TagLabel $label, ?Types\AssetCollectionId $assetCollectionId = null): Types\Tag
5858
{
5959
$tag = $this->tagRepository->findOneByLabel($label->value);
6060
if ($tag === null) {
@@ -82,7 +82,7 @@ public function createTag(Types\TagLabel $label, Types\AssetCollectionId $assetC
8282
/**
8383
* @throws Exception|IllegalObjectTypeException
8484
*/
85-
public function updateTag(Types\TagId $id, Types\TagLabel $label = null): Types\Tag
85+
public function updateTag(Types\TagId $id, ?Types\TagLabel $label = null): Types\Tag
8686
{
8787
/** @var Tag $tag */
8888
$tag = $this->tagRepository->findByIdentifier($id->value);

‎Classes/GraphQL/Resolver.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Resolver
4646
public function __construct(
4747
private readonly object $api,
4848
private readonly array $typeNamespaces,
49-
CustomResolvers $customResolvers = null,
49+
?CustomResolvers $customResolvers = null,
5050
) {
5151
$this->customResolvers = $customResolvers ?? CustomResolvers::create();
5252
}

‎Classes/Infrastructure/Neos/Media/AssetProxyIteratorBuilder.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public function __construct(
3636
}
3737

3838
public function build(
39-
Types\AssetSourceId $assetSourceId = null,
40-
Types\TagId $tagId = null,
41-
Types\AssetCollectionId $assetCollectionId = null,
42-
Types\MediaType $mediaType = null,
43-
Types\AssetType $assetType = null,
44-
SearchTerm $searchTerm = null,
45-
Types\SortBy $sortBy = null,
46-
Types\SortDirection $sortDirection = null,
39+
?Types\AssetSourceId $assetSourceId = null,
40+
?Types\TagId $tagId = null,
41+
?Types\AssetCollectionId $assetCollectionId = null,
42+
?Types\MediaType $mediaType = null,
43+
?Types\AssetType $assetType = null,
44+
?SearchTerm $searchTerm = null,
45+
?Types\SortBy $sortBy = null,
46+
?Types\SortDirection $sortDirection = null,
4747
): ?AssetProxyIteratorAggregate {
4848
$assetSourceId = $assetSourceId ?: Types\AssetSourceId::default();
4949

‎Classes/Service/AssetChangeLog.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function add(string $assetId, \DateTimeInterface $lastModified, string $t
6464
/**
6565
* Returns all changes since the given timestamp in ascending order
6666
*/
67-
public function getChanges(Types\DateTime $since = null): Types\AssetChanges
67+
public function getChanges(?Types\DateTime $since = null): Types\AssetChanges
6868
{
6969
try {
7070
$cachedChanges = $this->cache->getByTag('changedAssets');

0 commit comments

Comments
 (0)