bug #29975 [Mime] fix adding extensions when creating a MimeTypes instance (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 0901bbe18d29 · 2019-01-25T10:56:29.000+01:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [Mime] fix adding extensions when creating a MimeTypes instance | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 6c7d034 [Mime] fix adding extensions when creating a MimeTypes instance
diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/MimeTypes.php
@@ -34,13 +34,14 @@
  */
 final class MimeTypes implements MimeTypesInterface
 {
+    private $extensions = [];
     private $guessers = [];
     private static $default;
 
     public function __construct(array $map = [])
     {
         foreach ($map as $mimeType => $extensions) {
-            self::$extensions[$mimeType] = $extensions;
+            $this->extensions[$mimeType] = $extensions;
         }
         $this->registerGuesser(new FileBinaryMimeTypeGuesser());
         $this->registerGuesser(new FileinfoMimeTypeGuesser());
@@ -71,7 +72,7 @@ public function registerGuesser(MimeTypeGuesserInterface $guesser)
      */
     public function getExtensions(string $mimeType): array
     {
-        return self::$map[$mimeType] ?? [];
+        return $this->extensions[$mimeType] ?? self::$map[$mimeType] ?? [];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,14 @@`
`34`	`34`	`*/`
`35`	`35`	`final class MimeTypes implements MimeTypesInterface`
`36`	`36`	`{`
	`37`	`+ private $extensions = [];`
`37`	`38`	`private $guessers = [];`
`38`	`39`	`private static $default;`
`39`	`40`
`40`	`41`	`public function __construct(array $map = [])`
`41`	`42`	`{`
`42`	`43`	`foreach ($map as $mimeType => $extensions) {`
`43`		`- self::$extensions[$mimeType] = $extensions;`
	`44`	`+ $this->extensions[$mimeType] = $extensions;`
`44`	`45`	`}`
`45`	`46`	`$this->registerGuesser(new FileBinaryMimeTypeGuesser());`
`46`	`47`	`$this->registerGuesser(new FileinfoMimeTypeGuesser());`
`@@ -71,7 +72,7 @@ public function registerGuesser(MimeTypeGuesserInterface $guesser)`
`71`	`72`	`*/`
`72`	`73`	`public function getExtensions(string $mimeType): array`
`73`	`74`	`{`
`74`		`- return self::$map[$mimeType] ?? [];`
	`75`	`+ return $this->extensions[$mimeType] ?? self::$map[$mimeType] ?? [];`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`/**`