Browse Source

Remove last occurences of OC_Helper::getMimeType()

* ref #4774
tags/v9.0beta1
Morris Jobke 8 years ago
parent
commit
9318606faf

+ 1
- 1
lib/private/files/objectstore/objectstorestorage.php View File

@@ -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);

+ 1
- 1
lib/private/installer.php View File

@@ -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)));
}

+ 1
- 1
lib/public/files.php View File

@@ -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);
}

/**

+ 0
- 23
tests/lib/helper.php View File

@@ -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';


Loading…
Cancel
Save