diff --git a/composer.json b/composer.json index b086711..51cb5ec 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,8 @@ ], "require": { "php": ">=7.4", - "laravel/framework": "^8.0|^9.0|^10.0|^11.0", - "laravel/nova": "^4.0", + "laravel/framework": "^8.0|^9.0|^10.0|^11.0|^12.0", + "laravel/nova": "^5.0", "spatie/laravel-medialibrary": "^8.0|^9.0|^10.0|^11.0" }, "autoload": { diff --git a/src/Fields/HandlesCustomPropertiesTrait.php b/src/Fields/HandlesCustomPropertiesTrait.php index e0234fe..fa0087b 100644 --- a/src/Fields/HandlesCustomPropertiesTrait.php +++ b/src/Fields/HandlesCustomPropertiesTrait.php @@ -82,9 +82,9 @@ private function fillMediaCustomPropertiesFromRequest(NovaRequest $request, Medi // If we are dealing with nested resources or multiple panels, custom property fields are prefixed. $key = str_replace($collection, '__media-custom-properties__.'.$collection, $requestAttribute); $targetAttribute = "custom_properties->{$field->attribute}"; - $requestAttribute = "{$key}.{$index}.{$field->attribute}"; + $targetRequestAttribute = "{$key}.{$index}.{$field->attribute}"; - $field->fillInto($request, $media, $targetAttribute, $requestAttribute); + $field->fillInto($request, $media, $targetAttribute, $targetRequestAttribute); } $media->save(); diff --git a/src/Fields/Media.php b/src/Fields/Media.php index 8c6443e..17008b6 100644 --- a/src/Fields/Media.php +++ b/src/Fields/Media.php @@ -287,7 +287,7 @@ private function removeDeletedMedia($data, Collection $medias): Collection * @param HasMedia|InteractsWithMedia $resource * @param null $attribute */ - public function resolve($resource, $attribute = null): void + public function resolve($resource, ?string $attribute = null): void { $collectionName = $attribute ?? $this->attribute;