Merge branch '5.1'

chalasr · chalasr · commit a184e54cb339 · 2020-06-24T17:21:47.000+02:00
* 5.1:
  fix merge
  Fix merge
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -41,7 +41,7 @@ public function testMissingKnownTags()
         $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';
diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/MimeTypes.php
@@ -1114,7 +1114,7 @@ public function guessMimeType(string $path): ?string
         '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'],

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testMissingKnownTags()`
`41`	`41`	`$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.');`
`42`	`42`	`}`
`43`	`43`
`44`		`- private function getWhitelistTags(): array`
	`44`	`+ private function getKnownTags(): array`
`45`	`45`	`{`
`46`	`46`	`// get tags in UnusedTagsPass`
`47`	`47`	`$target = \dirname(__DIR__, 3).'/DependencyInjection/Compiler/UnusedTagsPass.php';`