Remove deprecated prophecy calls and MimeTypeGuesserInterface. (#50)

* Remove deprecated prophecy calls and MimeTypeGuesserInterface. * Test on released 10.1.x. * Additional instance of MimeTypeGuesser.
Islandora · Jul 18, 2023 · 0ba57c3 · 0ba57c3
1 parent 862d653
commit 0ba57c3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git 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"]
 

diff --git 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,17 +16,17 @@ 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;
 
   /**
    * FileInformation constructor.
    *
-   * @param \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface $mimeTypeGuesser
+   * @param \Symfony\Component\Mime\MimeTypesInterface $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
@@ -6,7 +6,8 @@
 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 Symfony\Component\Mime\MimeTypesInterface;
 
 /**
  * Tests the Config class.
@@ -16,6 +17,9 @@
  * @coversDefaultClass Drupal\openseadragon\File\FileInformation
  */
 class ConfigTests extends KernelTestBase {
+
+  use ProphecyTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -27,14 +31,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 +48,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
@@ -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}
    */