Fix merge conflicts

getkirby · Aug 13, 2024 · 9777f08 · 9777f08
1 parent e09870c
commit 9777f08
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 93 deletions.
diff --git a/src/Panel/Ui/FilePreviews/FileDefaultPreview.php b/src/Panel/Ui/FilePreviews/FileDefaultPreview.php
diff --git a/src/Panel/Ui/FilePreviews/FileImagePreview.php b/src/Panel/Ui/FilePreviews/FileImagePreview.php
@@ -3,6 +3,7 @@
 namespace Kirby\Panel\Ui\FilePreviews;
 
 use Kirby\Cms\File;
+use Kirby\Panel\Ui\FilePreview;
 use Kirby\Toolkit\I18n;
 
 /**
@@ -14,9 +15,13 @@
  * @since     5.0.0
  * @internal
  */
-class FileImagePreview extends FileDefaultPreview
+class FileImagePreview extends FilePreview
 {
-	public string $component = 'k-file-image-preview';
+	public function __construct(
+		public File $file,
+		public string $component = 'k-file-image-preview'
+	) {
+	}
 
 	public static function accepts(File $file): bool
 	{

diff --git a/tests/Panel/Ui/FilePreviewTest.php b/tests/Panel/Ui/FilePreviewTest.php
@@ -70,7 +70,7 @@ public function testDetails()
 	public function testFactory()
 	{
 		$page = new Page(['slug' => 'test']);
-		$file = new File(['filename' => 'test.jpg', 'parent' => $page]);
+		$file = new File(['filename' => 'test.pdf', 'parent' => $page]);
 
 		$component = FilePreview::factory($file);
 		$this->assertInstanceOf(DefaultFilePreview::class, $component);

diff --git a/tests/Panel/Ui/FilePreviews/FileDefaultPreviewTest.php b/tests/Panel/Ui/FilePreviews/FileDefaultPreviewTest.php