GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

MediaFile loses dependency on PEAR::MIME

Browse Source 
At the same time we remove the "filecommand" setting, since we will
likely not have use of it thanks to PECL fileinfo.

Also the "supported" list for attachment mime types has changed
format, so we can keep track of at least some known file extensions.
This commit is contained in:
Mikael Nordfeldth
2014-03-08 03:03:04 +01:00
parent 0eb38b8f84
commit 6faed0e451
5 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/MediaFileTest.php
View File

@@ -29,13 +29,13 @@ class MediaFileTest extends PHPUnit_Framework_TestCase
* @dataProvider fileTypeCases
*
*/
public function testFileType($filename, $expectedType)
public function testMimeType($filename, $expectedType)
{
if (!file_exists($filename)) {
throw new Exception("WTF? $filename test file missing");
}
$type = MediaFile::getUploadedFileType($filename, basename($filename));
$type = MediaFile::getUploadedMimeType($filename, basename($filename));
$this->assertEquals($expectedType, $type);
}
@@ -43,7 +43,7 @@ class MediaFileTest extends PHPUnit_Framework_TestCase
* @dataProvider fileTypeCases
*
*/
public function testUploadedFileType($filename, $expectedType)
public function testUploadedMimeType($filename, $expectedType)
{
if (!file_exists($filename)) {
throw new Exception("WTF? $filename test file missing");
@@ -52,7 +52,7 @@ class MediaFileTest extends PHPUnit_Framework_TestCase
fwrite($tmp, file_get_contents($filename));
$tmp_metadata = stream_get_meta_data($tmp);
$type = MediaFile::getUploadedFileType($tmp_metadata['uri'], basename($filename));
$type = MediaFile::getUploadedMimeType($tmp_metadata['uri'], basename($filename));
$this->assertEquals($expectedType, $type);
}