[REF] Switch to using a non abondoned library for getting a mapping o…

…f mimetpyes to extensions
civicrm · Jan 31, 2020 · 0b2b2ef · 0b2b2ef
1 parent fd4aac2
commit 0b2b2ef
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 57 deletions.
diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
@@ -15,6 +15,8 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use MimeTyper\Repository\ExtendedRepository;
+
 /**
  * class to provide simple static functions for file objects
  */
@@ -1083,14 +1085,8 @@ public static function isValidFileName($fileName = NULL) {
    * @return array
    */
   public static function getAcceptableExtensionsForMimeType($mimeType = NULL) {
-    $mapping = \MimeType\Mapping::$types;
-    $extensions = [];
-    foreach ($mapping as $extension => $type) {
-      if ($mimeType == $type) {
-        $extensions[] = $extension;
-      }
-    }
-    return $extensions;
+    $mimeRepostory = new ExtendedRepository();
+    return $mimeRepostory->findExtensions($mimeType);
   }
 
   /**

diff --git a/composer.json b/composer.json
@@ -67,7 +67,7 @@
     "psr/simple-cache": "~1.0.1",
     "cweagans/composer-patches": "~1.0",
     "pear/log": "1.13.1",
-    "katzien/php-mime-type": "2.1.0",
+    "adrienrn/php-mimetyper": "0.2.2",
     "civicrm/composer-downloads-plugin": "^2.0",
     "league/csv": "^9.2",
     "tplaner/when": "~3.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/phpunit/CRM/Utils/FileTest.php b/tests/phpunit/CRM/Utils/FileTest.php
@@ -115,7 +115,7 @@ public function testPathToExtension($path, $expectedExtension) {
 
   public function mimeTypeToExtension() {
     $cases = [];
-    $cases[] = ['text/plain', ['txt', 'text', 'conf', 'def', 'list', 'log', 'in']];
+    $cases[] = ['text/plain', ['txt', 'text', 'conf', 'def', 'list', 'log', 'in', 'ini']];
     $cases[] = ['image/jpeg', ['jpeg', 'jpg', 'jpe']];
     $cases[] = ['image/png', ['png']];
     return $cases;