From 2be023dcc029e8da79e0aa21c5025db0ef10dc87 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 20 Jul 2023 09:39:12 -0300 Subject: [PATCH] Use MimeTypeGuesserInterface. --- composer.json | 2 +- openseadragon.info.yml | 2 +- src/File/FileInformation.php | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 206e012..8d02970 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "drupal/token": "^1.3" }, "conflict": { - "drupal/core": "<=8" + "drupal/core": "<9.1" }, "authors": [ { diff --git a/openseadragon.info.yml b/openseadragon.info.yml index 066f20a..76ac6b3 100644 --- a/openseadragon.info.yml +++ b/openseadragon.info.yml @@ -2,7 +2,7 @@ name: 'OpenSeadragon Viewer' type: module description: 'A light-weight, customizable OpenSeadragon field formatter' package: Media -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9.1 || ^10 dependencies: - token:token configure: openseadragon.admin_settings diff --git a/src/File/FileInformation.php b/src/File/FileInformation.php index 6bd88cd..8650abb 100644 --- a/src/File/FileInformation.php +++ b/src/File/FileInformation.php @@ -4,7 +4,7 @@ use Drupal\file\Entity\File; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Mime\MimeTypesInterface; +use Symfony\Component\Mime\MimeTypeGuesserInterface; /** * Gets file information for the image to be viewed. @@ -16,17 +16,17 @@ class FileInformation implements FileInformationInterface { /** * File MimeType Guesser to use extension to determine file type. * - * @var \Symfony\Component\Mime\MimeTypesInterface + * @var \Symfony\Component\Mime\MimeTypeGuesserInterface */ private $mimetypeGuesser; /** * FileInformation constructor. * - * @param \Symfony\Component\Mime\MimeTypesInterface $mimeTypeGuesser + * @param \Symfony\Component\Mime\MimeTypeGuesserInterface $mimeTypeGuesser * File mimetype guesser interface. */ - public function __construct(MimeTypesInterface $mimeTypeGuesser) { + public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser) { $this->mimetypeGuesser = $mimeTypeGuesser; } @@ -51,7 +51,7 @@ public function getFileData(File $file) { $mime_type = $file->getMimeType(); if (strpos($mime_type, 'image/') === FALSE) { // Try a better mimetype guesser. - $mime_type = $this->mimetypeGuesser->guess($uri); + $mime_type = $this->mimetypeGuesser->guessMimeType($uri); if (strpos($mime_type, 'image/') === FALSE) { // If we still don't have an image. Exit. return $output;