From cb8c8ed6d6a5f75ee40173dce93c438f5367cb00 Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Thu, 26 Feb 2026 22:30:35 +0100 Subject: [PATCH] TASK: PHP8.4 compatibility --- Classes/GraphQL/MediaApi.php | 52 +++++++++---------- .../Middleware/GraphQLMiddlewareFactory.php | 4 +- .../Mutator/AssetCollectionMutator.php | 8 +-- Classes/GraphQL/Mutator/AssetMutator.php | 16 +++--- Classes/GraphQL/Mutator/TagMutator.php | 4 +- Classes/GraphQL/Resolver.php | 2 +- .../Neos/Media/AssetProxyIteratorBuilder.php | 16 +++--- Classes/Service/AssetChangeLog.php | 2 +- 8 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Classes/GraphQL/MediaApi.php b/Classes/GraphQL/MediaApi.php index afe36dd04..f2b200f0a 100644 --- a/Classes/GraphQL/MediaApi.php +++ b/Classes/GraphQL/MediaApi.php @@ -80,12 +80,12 @@ public function __construct( */ #[Query] public function assetCount( - Types\AssetSourceId $assetSourceId = null, - Types\AssetCollectionId $assetCollectionId = null, - Types\MediaType $mediaType = null, - Types\AssetType $assetType = null, - Types\TagId $tagId = null, - string $searchTerm = null, + ?Types\AssetSourceId $assetSourceId = null, + ?Types\AssetCollectionId $assetCollectionId = null, + ?Types\MediaType $mediaType = null, + ?Types\AssetType $assetType = null, + ?Types\TagId $tagId = null, + ?string $searchTerm = null, ): int { $iterator = $this->assetProxyIteratorBuilder->build( $assetSourceId, @@ -106,14 +106,14 @@ public function assetCount( #[Description('Provides a filterable list of asset proxies. These are the main entities for media management.')] #[Query] public function assets( - Types\AssetSourceId $assetSourceId = null, - Types\AssetCollectionId $assetCollectionId = null, - Types\MediaType $mediaType = null, - Types\AssetType $assetType = null, - Types\TagId $tagId = null, - Types\SortBy $sortBy = null, - Types\SortDirection $sortDirection = null, - string $searchTerm = null, + ?Types\AssetSourceId $assetSourceId = null, + ?Types\AssetCollectionId $assetCollectionId = null, + ?Types\MediaType $mediaType = null, + ?Types\AssetType $assetType = null, + ?Types\TagId $tagId = null, + ?Types\SortBy $sortBy = null, + ?Types\SortDirection $sortDirection = null, + ?string $searchTerm = null, int $limit = 20, int $offset = 0, ): ?Types\Assets { @@ -290,7 +290,7 @@ public function unusedAssets(int $limit = 20, int $offset = 0): Types\Assets #[Description('Provides a list of changes to assets since a given timestamp')] #[Query] - public function changedAssets(Types\DateTime $since = null): Types\ChangedAssetsResult + public function changedAssets(?Types\DateTime $since = null): Types\ChangedAssetsResult { $changes = $this->assetChangeLog->getChanges($since); return instantiate(Types\ChangedAssetsResult::class, [ @@ -336,9 +336,9 @@ public function similarAssets(Types\AssetId $id, Types\AssetSourceId $assetSourc public function updateAsset( Types\AssetId $id, Types\AssetSourceId $assetSourceId, - string $label = null, - string $caption = null, - string $copyrightNotice = null + ?string $label = null, + ?string $caption = null, + ?string $copyrightNotice = null ): ?Types\Asset { return $this->assetMutator->updateAsset($id, $assetSourceId, $label, $caption, $copyrightNotice); } @@ -490,9 +490,9 @@ public function importAsset(Types\AssetId $id, Types\AssetSourceId $assetSourceI */ #[Mutation] public function uploadFile( - Types\UploadedFile $file = null, - Types\TagId $tagId = null, - Types\AssetCollectionId $assetCollectionId = null + ?Types\UploadedFile $file = null, + ?Types\TagId $tagId = null, + ?Types\AssetCollectionId $assetCollectionId = null ): Types\FileUploadResult { return $this->assetMutator->uploadFile( $file, @@ -506,9 +506,9 @@ public function uploadFile( */ #[Mutation] public function uploadFiles( - Types\UploadedFiles $files = null, - Types\TagId $tagId = null, - Types\AssetCollectionId $assetCollectionId = null + ?Types\UploadedFiles $files = null, + ?Types\TagId $tagId = null, + ?Types\AssetCollectionId $assetCollectionId = null ): Types\FileUploadResults { return $this->assetMutator->uploadFiles( $files, @@ -521,7 +521,7 @@ public function uploadFiles( * @throws Exception|IllegalObjectTypeException */ #[Mutation] - public function createTag(Types\TagLabel $label, Types\AssetCollectionId $assetCollectionId = null): Types\Tag + public function createTag(Types\TagLabel $label, ?Types\AssetCollectionId $assetCollectionId = null): Types\Tag { return $this->tagMutator->createTag($label, $assetCollectionId); } @@ -530,7 +530,7 @@ public function createTag(Types\TagLabel $label, Types\AssetCollectionId $assetC * @throws Exception|IllegalObjectTypeException */ #[Mutation] - public function updateTag(Types\TagId $id, Types\TagLabel $label = null): Types\Tag + public function updateTag(Types\TagId $id, ?Types\TagLabel $label = null): Types\Tag { return $this->tagMutator->updateTag($id, $label); } diff --git a/Classes/GraphQL/Middleware/GraphQLMiddlewareFactory.php b/Classes/GraphQL/Middleware/GraphQLMiddlewareFactory.php index 26ba68fff..d3f7a47a2 100644 --- a/Classes/GraphQL/Middleware/GraphQLMiddlewareFactory.php +++ b/Classes/GraphQL/Middleware/GraphQLMiddlewareFactory.php @@ -47,8 +47,8 @@ public function create( string $uriPath, string $apiObjectName, array $typeNamespaces = [], - string $simulateControllerObjectName = null, - array $customResolversSettings = null, + ?string $simulateControllerObjectName = null, + ?array $customResolversSettings = null, ): GraphQLMiddleware { return new GraphQLMiddleware( $uriPath, diff --git a/Classes/GraphQL/Mutator/AssetCollectionMutator.php b/Classes/GraphQL/Mutator/AssetCollectionMutator.php index 72b5d1532..0f1831000 100644 --- a/Classes/GraphQL/Mutator/AssetCollectionMutator.php +++ b/Classes/GraphQL/Mutator/AssetCollectionMutator.php @@ -59,7 +59,7 @@ protected function localizedMessage(string $id, string $fallback = '', array $ar */ public function createAssetCollection( Types\AssetCollectionTitle $title, - Types\AssetCollectionId $parent = null + ?Types\AssetCollectionId $parent = null ): Types\AssetCollection { $newAssetCollection = new AssetCollection($title->value); if ($parent) { @@ -121,8 +121,8 @@ public function deleteAssetCollection(Types\AssetCollectionId $id): MutationResu */ public function updateAssetCollection( Types\AssetCollectionId $id, - Types\AssetCollectionTitle $title = null, - Types\TagIds $tagIds = null + ?Types\AssetCollectionTitle $title = null, + ?Types\TagIds $tagIds = null ): MutationResult { /** @var AssetCollection&HierarchicalAssetCollectionInterface $assetCollection */ $assetCollection = $this->assetCollectionRepository->findByIdentifier($id->value); @@ -166,7 +166,7 @@ public function updateAssetCollection( */ public function setAssetCollectionParent( Types\AssetCollectionId $id, - Types\AssetCollectionId $parent = null + ?Types\AssetCollectionId $parent = null ): MutationResult { /** @var AssetCollection $assetCollection */ $assetCollection = $this->assetCollectionRepository->findByIdentifier($id->value); diff --git a/Classes/GraphQL/Mutator/AssetMutator.php b/Classes/GraphQL/Mutator/AssetMutator.php index f0f4dc276..a008c7390 100644 --- a/Classes/GraphQL/Mutator/AssetMutator.php +++ b/Classes/GraphQL/Mutator/AssetMutator.php @@ -84,9 +84,9 @@ protected function localizedMessageFromException(\Exception $exception): string public function updateAsset( Types\AssetId $id, Types\AssetSourceId $assetSourceId, - string $label = null, - string $caption = null, - string $copyrightNotice = null + ?string $label = null, + ?string $caption = null, + ?string $copyrightNotice = null ): ?Types\Asset { $asset = $this->assetSourceContext->getAsset($id, $assetSourceId); if (!$asset) { @@ -439,8 +439,8 @@ public function importAsset(Types\AssetId $id, Types\AssetSourceId $assetSourceI */ public function uploadFile( ?Types\UploadedFile $file, - Types\TagId $tagId = null, - Types\AssetCollectionId $assetCollectionId = null + ?Types\TagId $tagId = null, + ?Types\AssetCollectionId $assetCollectionId = null ): Types\FileUploadResult { $success = false; $result = self::STATE_ERROR; @@ -519,9 +519,9 @@ public function uploadFile( * Stores all given files and returns an array of results for each upload */ public function uploadFiles( - Types\UploadedFiles $files = null, - Types\TagId $tagId = null, - Types\AssetCollectionId $assetCollectionId = null + ?Types\UploadedFiles $files = null, + ?Types\TagId $tagId = null, + ?Types\AssetCollectionId $assetCollectionId = null ): Types\FileUploadResults { if (!$files) { return Types\FileUploadResults::empty(); diff --git a/Classes/GraphQL/Mutator/TagMutator.php b/Classes/GraphQL/Mutator/TagMutator.php index dcacc9852..31a107188 100644 --- a/Classes/GraphQL/Mutator/TagMutator.php +++ b/Classes/GraphQL/Mutator/TagMutator.php @@ -54,7 +54,7 @@ protected function localizedMessage(string $id, string $fallback = '', array $ar /** * @throws Exception|IllegalObjectTypeException */ - public function createTag(Types\TagLabel $label, Types\AssetCollectionId $assetCollectionId = null): Types\Tag + public function createTag(Types\TagLabel $label, ?Types\AssetCollectionId $assetCollectionId = null): Types\Tag { $tag = $this->tagRepository->findOneByLabel($label->value); if ($tag === null) { @@ -82,7 +82,7 @@ public function createTag(Types\TagLabel $label, Types\AssetCollectionId $assetC /** * @throws Exception|IllegalObjectTypeException */ - public function updateTag(Types\TagId $id, Types\TagLabel $label = null): Types\Tag + public function updateTag(Types\TagId $id, ?Types\TagLabel $label = null): Types\Tag { /** @var Tag $tag */ $tag = $this->tagRepository->findByIdentifier($id->value); diff --git a/Classes/GraphQL/Resolver.php b/Classes/GraphQL/Resolver.php index a25672849..7db88b1d1 100644 --- a/Classes/GraphQL/Resolver.php +++ b/Classes/GraphQL/Resolver.php @@ -46,7 +46,7 @@ class Resolver public function __construct( private readonly object $api, private readonly array $typeNamespaces, - CustomResolvers $customResolvers = null, + ?CustomResolvers $customResolvers = null, ) { $this->customResolvers = $customResolvers ?? CustomResolvers::create(); } diff --git a/Classes/Infrastructure/Neos/Media/AssetProxyIteratorBuilder.php b/Classes/Infrastructure/Neos/Media/AssetProxyIteratorBuilder.php index 9c39678e2..8cbf740bb 100644 --- a/Classes/Infrastructure/Neos/Media/AssetProxyIteratorBuilder.php +++ b/Classes/Infrastructure/Neos/Media/AssetProxyIteratorBuilder.php @@ -36,14 +36,14 @@ public function __construct( } public function build( - Types\AssetSourceId $assetSourceId = null, - Types\TagId $tagId = null, - Types\AssetCollectionId $assetCollectionId = null, - Types\MediaType $mediaType = null, - Types\AssetType $assetType = null, - SearchTerm $searchTerm = null, - Types\SortBy $sortBy = null, - Types\SortDirection $sortDirection = null, + ?Types\AssetSourceId $assetSourceId = null, + ?Types\TagId $tagId = null, + ?Types\AssetCollectionId $assetCollectionId = null, + ?Types\MediaType $mediaType = null, + ?Types\AssetType $assetType = null, + ?SearchTerm $searchTerm = null, + ?Types\SortBy $sortBy = null, + ?Types\SortDirection $sortDirection = null, ): ?AssetProxyIteratorAggregate { $assetSourceId = $assetSourceId ?: Types\AssetSourceId::default(); diff --git a/Classes/Service/AssetChangeLog.php b/Classes/Service/AssetChangeLog.php index cdb4ded0a..a17bc415f 100644 --- a/Classes/Service/AssetChangeLog.php +++ b/Classes/Service/AssetChangeLog.php @@ -64,7 +64,7 @@ public function add(string $assetId, \DateTimeInterface $lastModified, string $t /** * Returns all changes since the given timestamp in ascending order */ - public function getChanges(Types\DateTime $since = null): Types\AssetChanges + public function getChanges(?Types\DateTime $since = null): Types\AssetChanges { try { $cachedChanges = $this->cache->getByTag('changedAssets');