From b26c61be96ab50847612a618012490c17c0a39ea Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Mon, 28 Jul 2014 15:11:02 +0200
Subject: [PATCH] =?UTF-8?q?Refactor=20MimeTypeTools=20as=20a=20service=20?=
 =?UTF-8?q?=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Conf?=
 =?UTF-8?q?ig/Resources/config.xml=20=09modifi=C3=A9:=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20core/lib/Thelia/Controller/Admin/FileController.php=20=09?=
 =?UTF-8?q?modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Tools/M?=
 =?UTF-8?q?imeTypeTools.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/lib/Thelia/Config/Resources/config.xml        |  1 +
 .../lib/Thelia/Controller/Admin/FileController.php | 12 +++++++++++-
 core/lib/Thelia/Tools/MimeTypeTools.php            | 14 --------------
 3 files changed, 12 insertions(+), 15 deletions(-)

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 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
+        <service id="tools.mime_type" class="Thelia\Tools\MimeTypeTools" />
         <!-- Archive builders -->
 
         <service id="thelia.manager.archive_builder_manager" class="Thelia\Core\FileFormat\Archive\ArchiveBuilderManager">
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