diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.1'

Browse Source 
* 5.1:
  fix merge
  Fix merge
This commit is contained in:
Robin Chalas 2020-06-24 17:21:47 +02:00
commit a184e54cb3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
View File

@ -41,7 +41,7 @@ class UnusedTagsPassTest extends TestCase
$this->assertSame(UnusedTagsPassUtils::getDefinedTags(), $this->getKnownTags(), 'The src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php file must be updated; run src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-known-tags.php.');
}
private function getWhitelistTags(): array
private function getKnownTags(): array
{
// get tags in UnusedTagsPass
$target = \dirname(__DIR__, 3).'/DependencyInjection/Compiler/UnusedTagsPass.php';

2
src/Symfony/Component/Mime/MimeTypes.php
View File

@ -1114,7 +1114,7 @@ final class MimeTypes implements MimeTypesInterface
'audio/mp2' => ['mp2'],
'audio/mp3' => ['mp3', 'mpga'],
'audio/mp4' => ['m4a', 'mp4a', 'f4a'],
'audio/mpeg' => ['mpga', 'mp2', 'mp2a', 'mp3', 'm2a', 'm3a'],
'audio/mpeg' => ['mp3', 'mpga', 'mp2', 'mp2a', 'm2a', 'm3a'],
'audio/mpegurl' => ['m3u', 'm3u8', 'vlc'],
'audio/ogg' => ['oga', 'ogg', 'spx', 'opus'],
'audio/prs.sid' => ['sid', 'psid'],