From a17b3d7e5e493833dc4b9700d635dbdedb2eeed5 Mon Sep 17 00:00:00 2001
From: DragoonBoots <4589231+DragoonBoots@users.noreply.github.com>
Date: Wed, 7 Aug 2019 12:55:18 -0400
Subject: [PATCH] Fix Mime type guessing

---
 libs/Server/ExtensionMimeTypeGuesser.php | 21 +++++++++++++++++++--
 libs/Server/Server.php                   |  5 +++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/libs/Server/ExtensionMimeTypeGuesser.php b/libs/Server/ExtensionMimeTypeGuesser.php
index cfd83e4..1dff5d8 100644
--- a/libs/Server/ExtensionMimeTypeGuesser.php
+++ b/libs/Server/ExtensionMimeTypeGuesser.php
@@ -1,11 +1,12 @@
 <?php namespace Todaymade\Daux\Server;
 
-use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface as FileMimeTypeGuesserInterface;
+use Symfony\Component\Mime\MimeTypeGuesserInterface;
 
 /**
  * Guesses the mime type using the file's extension
  */
-class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface
+class ExtensionMimeTypeGuesser implements FileMimeTypeGuesserInterface, MimeTypeGuesserInterface
 {
     /**
      * {@inheritdoc}
@@ -22,4 +23,20 @@ class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface
             return "application/javascript";
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isGuesserSupported(): bool
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function guessMimeType(string $path): ?string
+    {
+        return $this->guess($path);
+    }
 }
diff --git a/libs/Server/Server.php b/libs/Server/Server.php
index d0c66cc..6f3c726 100755
--- a/libs/Server/Server.php
+++ b/libs/Server/Server.php
@@ -4,7 +4,7 @@ use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
+use Symfony\Component\Mime\MimeTypes;
 use Todaymade\Daux\Daux;
 use Todaymade\Daux\DauxHelper;
 use Todaymade\Daux\Exception;
@@ -97,7 +97,8 @@ class Server
      */
     public function createResponse(Page $page) {
 
-        MimeTypeGuesser::getInstance()->register(new ExtensionMimeTypeGuesser);
+        $mimeTypes = MimeTypes::getDefault();
+        $mimeTypes->registerGuesser(new ExtensionMimeTypeGuesser());
 
         if ($page instanceof RawPage) {
             return new BinaryFileResponse($page->getFile());