From 95ff90a1c3a8e4bf321a699f2ffea7a5d7552293 Mon Sep 17 00:00:00 2001 From: Christoph Hauert Date: Sun, 3 Sep 2023 18:37:27 -0700 Subject: [PATCH 1/2] fix album decorations album decoration settings were missing from returned array with config settings --- app/Http/Resources/ConfigurationResource.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Resources/ConfigurationResource.php b/app/Http/Resources/ConfigurationResource.php index 230cf91c3ff..b5410dd3571 100644 --- a/app/Http/Resources/ConfigurationResource.php +++ b/app/Http/Resources/ConfigurationResource.php @@ -4,6 +4,8 @@ use App\DTO\AlbumSortingCriterion; use App\DTO\PhotoSortingCriterion; +use App\Enum\AlbumDecorationType; +use App\Enum\AlbumDecorationOrientation; use App\Enum\DefaultAlbumProtectionType; use App\Enum\ThumbAlbumSubtitleType; use App\Exceptions\Handler; @@ -118,6 +120,8 @@ public function toArray($request): array ], ]), + 'album_decoration' => Configs::getValueAsEnum('album_decoration', AlbumDecorationType::class), + 'album_decoration_orientation' => Configs::getValueAsEnum('album_decoration_orientation', AlbumDecorationOrientation::class), 'album_subtitle_type' => Configs::getValueAsEnum('album_subtitle_type', ThumbAlbumSubtitleType::class), 'check_for_updates' => Configs::getValueAsBool('check_for_updates'), 'default_album_protection' => Configs::getValueAsEnum('default_album_protection', DefaultAlbumProtectionType::class), From 911098347c2f11025b9e04b1e15299793010fbe6 Mon Sep 17 00:00:00 2001 From: Christoph Hauert Date: Sun, 3 Sep 2023 18:43:38 -0700 Subject: [PATCH 2/2] make phpstan happy proper alphabetical order of use's --- app/Http/Resources/ConfigurationResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/ConfigurationResource.php b/app/Http/Resources/ConfigurationResource.php index b5410dd3571..611ba009e82 100644 --- a/app/Http/Resources/ConfigurationResource.php +++ b/app/Http/Resources/ConfigurationResource.php @@ -4,8 +4,8 @@ use App\DTO\AlbumSortingCriterion; use App\DTO\PhotoSortingCriterion; -use App\Enum\AlbumDecorationType; use App\Enum\AlbumDecorationOrientation; +use App\Enum\AlbumDecorationType; use App\Enum\DefaultAlbumProtectionType; use App\Enum\ThumbAlbumSubtitleType; use App\Exceptions\Handler;