Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions Classes/GraphQL/MediaApi.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 {
Expand Down Expand Up @@ -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, [
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions Classes/GraphQL/Middleware/GraphQLMiddlewareFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions Classes/GraphQL/Mutator/AssetCollectionMutator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
16 changes: 8 additions & 8 deletions Classes/GraphQL/Mutator/AssetMutator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions Classes/GraphQL/Mutator/TagMutator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Classes/GraphQL/Resolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
16 changes: 8 additions & 8 deletions Classes/Infrastructure/Neos/Media/AssetProxyIteratorBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion Classes/Service/AssetChangeLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Loading