php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 22:57:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test break and JSON MIME type. Fixes issue #2978.

Browse Source
This commit is contained in:
lubosdz
2014-04-04 13:50:58 +02:00
parent a97a35bab7
commit 164459f90a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/helpers/mimeTypes.php
View File

@ -71,6 +71,8 @@ return [
'jpeg' => 'image/jpeg', 'jpeg' => 'image/jpeg',
'jpg' => 'image/jpeg', 'jpg' => 'image/jpeg',
'js' => 'application/x-javascript', 'js' => 'application/x-javascript',
'json' => 'application/json',
'jsonp' => 'text/javascript',
'kar' => 'audio/midi', 'kar' => 'audio/midi',
'latex' => 'application/x-latex', 'latex' => 'application/x-latex',
'lha' => 'application/octet-stream', 'lha' => 'application/octet-stream',

6
tests/unit/framework/helpers/FileHelperTest.php
View File

@ -349,9 +349,13 @@ class FileHelperTest extends TestCase
file_put_contents($file, 'some text'); file_put_contents($file, 'some text');
$this->assertEquals('text/plain', FileHelper::getMimeType($file)); $this->assertEquals('text/plain', FileHelper::getMimeType($file));
// see http://stackoverflow.com/questions/477816/what-is-the-correct-json-content-type
// JSON/JSONP should not use text/plain - see http://jibbering.com/blog/?p=514
// with "fileinfo" extension enabled, returned MIME is not quite correctly "text/plain"
// without "fileinfo" it falls back to getMimeTypeByExtension() and returns application/json
$file = $this->testFilePath . DIRECTORY_SEPARATOR . 'mime_type_test.json'; $file = $this->testFilePath . DIRECTORY_SEPARATOR . 'mime_type_test.json';
file_put_contents($file, '{"a": "b"}'); file_put_contents($file, '{"a": "b"}');
$this->assertEquals('text/plain', FileHelper::getMimeType($file)); $this->assertTrue(in_array(FileHelper::getMimeType($file), array('application/json', 'text/plain')));
} }
public function testNormalizePath() public function testNormalizePath()