Merge remote-tracking branch 'origin/1.x' into 1.x

# Conflicts: # src/GraphQL/FieldHelper/AssetFieldHelper.php
pimcore · Oct 24, 2024 · 5093925 · 5093925
2 parents ab6f652 + f595258
commit 5093925
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/GraphQL/FieldHelper/AssetFieldHelper.php b/src/GraphQL/FieldHelper/AssetFieldHelper.php
@@ -41,8 +41,7 @@ public function getVideoThumbnail(Asset\Video $asset, string | Video\Thumbnail\C
         return null;
     }
 
-    public function getImageDocumentThumbnail(Asset $asset, string | Image\Thumbnail\Config $thumbNailConfig, string $thumbNailFormat = null): mixed
-    {
+    public function getImageDocumentThumbnail(Asset $asset, string | Image\Thumbnail\Config $thumbNailConfig, string $thumbNailFormat = null): mixed {
         $thumb = null;
 
         if ($asset instanceof Asset\Document || $asset instanceof Asset\Video) {
@@ -57,8 +56,7 @@ public function getImageDocumentThumbnail(Asset $asset, string | Image\Thumbnail
         return $thumb;
     }
 
-    public function getAssetThumbnail(Asset $asset, string | Image\Thumbnail\Config | Video\Thumbnail\Config $thumbNailConfig, string $thumbNailFormat = null): mixed
-    {
+    public function getAssetThumbnail(Asset $asset, string | Image\Thumbnail\Config | Video\Thumbnail\Config $thumbNailConfig, string $thumbNailFormat = null): mixed {
         if (($asset instanceof Asset\Video) && (is_string($thumbNailConfig) || $thumbNailConfig instanceof Video\Thumbnail\Config)) {
             return $this->getVideoThumbnail($asset, $thumbNailConfig, $thumbNailFormat);
         } else {