Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup

Remove last occurences of OC_Helper::getMimeType()

5 files changed, 3 insertions, 38 deletions

diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php
index e108d7662d4..5ec05a3529e 100644
--- a/lib/private/files/objectstore/objectstorestorage.php
+++ b/lib/private/files/objectstore/objectstorestorage.php
@@ -370,7 +370,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 		$stat['size'] = filesize($tmpFile);
 		$stat['mtime'] = $mTime;
 		$stat['storage_mtime'] = $mTime;
-		$stat['mimetype'] = \OC_Helper::getMimeType($tmpFile);
+		$stat['mimetype'] = \OC::$server->getMimeTypeDetector()->detect($tmpFile);
 		$stat['etag'] = $this->getETag($path);
 
 		$fileId = $this->getCache()->put($path, $stat);
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 109b9b7ac08..fc7653baf6f 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -402,18 +402,6 @@ class OC_Helper {
 	}
 
 	/**
-	 * get the mimetype form a local file
-	 *
-	 * @param string $path
-	 * @return string
-	 * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
-	 * @deprecated 8.2.0 Use \OC::$server->getMimeTypeDetector()->detect($path)
-	 */
-	static function getMimeType($path) {
-		return \OC::$server->getMimeTypeDetector()->detect($path);
-	}
-
-	/**
 	 * Get a secure mimetype that won't expose potential XSS.
 	 *
 	 * @param string $mimeType
diff --git a/lib/private/installer.php b/lib/private/installer.php
index 86968a7c189..021e496392f 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -278,7 +278,7 @@ class OC_Installer{
 		}
 
 		//detect the archive type
-		$mime=OC_Helper::getMimeType($path);
+		$mime = \OC::$server->getMimeTypeDetector()->detect($path);
 		if ($mime !=='application/zip' && $mime !== 'application/x-gzip' && $mime !== 'application/x-bzip2') {
 			throw new \Exception($l->t("Archives of type %s are not supported", array($mime)));
 		}
diff --git a/lib/public/files.php b/lib/public/files.php
index c1dcffcbefb..e3582375f38 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -60,7 +60,7 @@ class Files {
 	 * @since 5.0.0
 	 */
 	static function getMimeType( $path ) {
-		return(\OC_Helper::getMimeType( $path ));
+		return \OC::$server->getMimeTypeDetector()->detect($path);
 	}
 
 	/**
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 85655c69e63..b7deb3fc13d 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -71,29 +71,6 @@ class Test_Helper extends \Test\TestCase {
 		];
 	}
 
-	function testGetMimeType() {
-		$dir=OC::$SERVERROOT.'/tests/data';
-		$result = OC_Helper::getMimeType($dir."/");
-		$expected = 'httpd/unix-directory';
-		$this->assertEquals($result, $expected);
-
-		$result = OC_Helper::getMimeType($dir."/data.tar.gz");
-		$expected = 'application/x-gzip';
-		$this->assertEquals($result, $expected);
-
-		$result = OC_Helper::getMimeType($dir."/data.zip");
-		$expected = 'application/zip';
-		$this->assertEquals($result, $expected);
-
-		$result = OC_Helper::getMimeType($dir."/desktopapp.svg");
-		$expected = 'image/svg+xml';
-		$this->assertEquals($result, $expected);
-
-		$result = OC_Helper::getMimeType($dir."/desktopapp.png");
-		$expected = 'image/png';
-		$this->assertEquals($result, $expected);
-	}
-
 	function testGetSecureMimeType() {
 		$dir=OC::$SERVERROOT.'/tests/data';