minor #30001 [FrameworkBundle] consolidate the mime types service definition (xabbuh)

fabpot · fabpot · commit b9b8f9da98ce · 2019-02-12T08:31:46.000+01:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [FrameworkBundle] consolidate the mime types service definition | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | I wonder if we couldn't simplify things by just initializing the default `MimeTypes` instance once the first one is going to be created. Commits ------- ce546f5 consolidate the mime types service definition
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/Bundle/FrameworkBundle/Resources/config/mime_type.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mime_type.xml
@@ -7,6 +7,10 @@
     <services>
         <defaults public="false" />
 
-        <service id="mime_types" class="Symfony\Component\Mime\MimeTypes" public="true" />
+        <service id="mime_types" class="Symfony\Component\Mime\MimeTypes">
+            <call method="setDefault">
+                <argument type="service" id="mime_types" />
+            </call>
+        </service>
     </services>
 </container>

Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,6 @@ public function boot()`
`73`	`73`	`if ($trustedHosts = $this->container->getParameter('kernel.trusted_hosts')) {`
`74`	`74`	`Request::setTrustedHosts($trustedHosts);`
`75`	`75`	`}`
`76`		`-`
`77`		`- if ($this->container->has('mime_types')) {`
`78`		`- $mt = $this->container->get('mime_types');`
`79`		`- $mt->setDefault($mt);`
`80`		`- }`
`81`	`76`	`}`
`82`	`77`
`83`	`78`	`public function build(ContainerBuilder $container)`