diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 6e001e18a..b77def664 100644
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -138,6 +138,7 @@
+
diff --git a/core/lib/Thelia/Controller/Admin/FileController.php b/core/lib/Thelia/Controller/Admin/FileController.php
index d571d491f..595e661b9 100644
--- a/core/lib/Thelia/Controller/Admin/FileController.php
+++ b/core/lib/Thelia/Controller/Admin/FileController.php
@@ -54,6 +54,16 @@ class FileController extends BaseAdminController
return $this->container->get('thelia.file_manager');
}
+ /**
+ * Get the mime type tools
+ *
+ * @return MimeTypeTools
+ */
+ public function getMimeTypeTools()
+ {
+ return $this->container->get('tools.mime_type');
+ }
+
/**
* Manage how a file collection has to be saved
*
@@ -97,7 +107,7 @@ class FileController extends BaseAdminController
}
$mimeType = $fileBeingUploaded->getMimeType();
- $mimeTypeTools = MimeTypeTools::getInstance();
+ $mimeTypeTools = $this->getMimeTypeTools();
$validateMimeType = $mimeTypeTools
->validateMimeTypeExtension(
$mimeType,
diff --git a/core/lib/Thelia/Tools/MimeTypeTools.php b/core/lib/Thelia/Tools/MimeTypeTools.php
index 807e8f5ad..0b15512b5 100644
--- a/core/lib/Thelia/Tools/MimeTypeTools.php
+++ b/core/lib/Thelia/Tools/MimeTypeTools.php
@@ -27,22 +27,8 @@ class MimeTypeTools
const TYPE_NOT_MATCH = 1;
const TYPE_MATCH = 2;
- protected static $instance;
-
protected static $typesCache;
- /**
- * @return $this
- */
- public static function getInstance()
- {
- if (null === static::$instance) {
- static::$instance = new static();
- }
-
- return static::$instance;
- }
-
/**
* @param $mimeType
* @return array|bool