From 38f95d8e5b52b71aa829e90da880a1221c36a677 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Mon, 3 Jul 2023 14:10:38 -0300
Subject: [PATCH 1/3] Remove deprecated prophecy calls and
 MimeTypeGuesserInterface.

---
 src/File/FileInformation.php                |  6 +++---
 tests/src/Kernel/ConfigTests.php            | 13 +++++++++----
 tests/src/Kernel/IIIFManifestParserTest.php |  3 +++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/File/FileInformation.php b/src/File/FileInformation.php
index f732956..a2141d5 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\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
+use Symfony\Component\Mime\MimeTypesInterface;
 
 /**
  * Gets file information for the image to be viewed.
@@ -16,7 +16,7 @@ class FileInformation implements FileInformationInterface {
   /**
    * File MimeType Guesser to use extension to determine file type.
    *
-   * @var \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface
+   * @var \Symfony\Component\Mime\MimeTypesInterface
    */
   private $mimetypeGuesser;
 
@@ -26,7 +26,7 @@ class FileInformation implements FileInformationInterface {
    * @param \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface $mimeTypeGuesser
    *   File mimetype guesser interface.
    */
-  public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser) {
+  public function __construct(MimeTypesInterface $mimeTypeGuesser) {
     $this->mimetypeGuesser = $mimeTypeGuesser;
   }
 
diff --git a/tests/src/Kernel/ConfigTests.php b/tests/src/Kernel/ConfigTests.php
index 0e7dad3..31ca554 100644
--- a/tests/src/Kernel/ConfigTests.php
+++ b/tests/src/Kernel/ConfigTests.php
@@ -6,7 +6,9 @@
 use Drupal\file\Entity\File;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\openseadragon\File\FileInformation;
-use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Prophecy\ObjectProphecy;
+use Symfony\Component\Mime\MimeTypesInterface;
 
 /**
  * Tests the Config class.
@@ -16,6 +18,9 @@
  * @coversDefaultClass Drupal\openseadragon\File\FileInformation
  */
 class ConfigTests extends KernelTestBase {
+
+  use ProphecyTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -27,14 +32,14 @@ class ConfigTests extends KernelTestBase {
   /**
    * The mimetype guesser prophecy.
    *
-   * @var Prophecy\Prophet
+   * @var \Prophecy\Prophecy\ObjectProphecy
    */
   private $mimeProphet;
 
   /**
    * The file entity prophecy.
    *
-   * @var Prophecy\Prophet
+   * @var \Prophecy\Prophecy\ObjectProphecy
    */
   private $fileProphet;
 
@@ -44,7 +49,7 @@ class ConfigTests extends KernelTestBase {
   public function setUp(): void {
     parent::setUp();
 
-    $this->mimeProphet = $this->prophesize(MimeTypeGuesserInterface::class);
+    $this->mimeProphet = $this->prophesize(MimeTypesInterface::class);
     $this->fileProphet = $this->prophesize(File::class);
   }
 
diff --git a/tests/src/Kernel/IIIFManifestParserTest.php b/tests/src/Kernel/IIIFManifestParserTest.php
index 266490c..5f37d0b 100644
--- a/tests/src/Kernel/IIIFManifestParserTest.php
+++ b/tests/src/Kernel/IIIFManifestParserTest.php
@@ -11,6 +11,7 @@
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -22,6 +23,8 @@
  */
 class IIIFManifestParserTest extends KernelTestBase {
 
+  use ProphecyTrait;
+
   /**
    * {@inheritdoc}
    */

From b2840e35d31632fa9a4d2d302d7b03fc5236251e Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Mon, 3 Jul 2023 14:52:29 -0300
Subject: [PATCH 2/3] Test on released 10.1.x.

---
 .github/workflows/build-2.x.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
index 629c819..07befb3 100644
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ["8.1"]
-        drupal-version: ["9.5.x", "10.0.x", "10.1.x-dev"]
+        drupal-version: ["9.5.x", "10.0.x", "10.1.x"]
         allowed_failure: [false]
         mysql: ["8.0"]
 

From b614f6647a83403324e732c1750e8c74da5b9559 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Mon, 3 Jul 2023 19:28:49 -0300
Subject: [PATCH 3/3] Additional instance of MimeTypeGuesser.

---
 src/File/FileInformation.php     | 2 +-
 tests/src/Kernel/ConfigTests.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/File/FileInformation.php b/src/File/FileInformation.php
index a2141d5..6bd88cd 100644
--- a/src/File/FileInformation.php
+++ b/src/File/FileInformation.php
@@ -23,7 +23,7 @@ class FileInformation implements FileInformationInterface {
   /**
    * FileInformation constructor.
    *
-   * @param \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface $mimeTypeGuesser
+   * @param \Symfony\Component\Mime\MimeTypesInterface $mimeTypeGuesser
    *   File mimetype guesser interface.
    */
   public function __construct(MimeTypesInterface $mimeTypeGuesser) {
diff --git a/tests/src/Kernel/ConfigTests.php b/tests/src/Kernel/ConfigTests.php
index 31ca554..3322169 100644
--- a/tests/src/Kernel/ConfigTests.php
+++ b/tests/src/Kernel/ConfigTests.php
@@ -7,7 +7,6 @@
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\openseadragon\File\FileInformation;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Mime\MimeTypesInterface;
 
 /**