initialize the default MimeTypes instance in its constructor

symfony · Jan 27, 2019 · a6a5fab · a6a5fab
1 parent 1aa652e
commit a6a5fab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -73,11 +73,6 @@ public function boot()
         if ($trustedHosts = $this->container->getParameter('kernel.trusted_hosts')) {
             Request::setTrustedHosts($trustedHosts);
         }
-
-        if ($this->container->has('mime_types')) {
-            $mt = $this->container->get('mime_types');
-            $mt->setDefault($mt);
-        }
     }
 
     public function build(ContainerBuilder $container)

diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/MimeTypes.php
@@ -45,6 +45,10 @@ public function __construct(array $map = [])
         }
         $this->registerGuesser(new FileBinaryMimeTypeGuesser());
         $this->registerGuesser(new FileinfoMimeTypeGuesser());
+
+        if (null === self::$default) {
+            self::$default = $this;
+        }
     }
 
     public static function setDefault(self $default)
@@ -54,7 +58,7 @@ public static function setDefault(self $default)
 
     public static function getDefault(): self
     {
-        return self::$default ?? self::$default = new self();
+        return self::$default;
     }
 
     /**