Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 993c0281850a · 2018-05-25T13:07:31.000+02:00
* 2.8:
  [HttpFoundation] Fix perf issue during MimeTypeGuesser intialization
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -46,7 +46,7 @@
         "twig/twig": "~1.34|~2.4"
     },
     "conflict": {
-        "symfony/security": "4.1.0-beta1,4.1.0-beta2",
+        "symfony/security": "4.1.0-beta1|4.1.0-beta2",
         "symfony/var-dumper": "<3.3",
         "symfony/event-dispatcher": "<3.4",
         "symfony/framework-bundle": "<3.4",
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
@@ -80,13 +80,8 @@ public static function reset()
      */
     private function __construct()
     {
-        if (FileBinaryMimeTypeGuesser::isSupported()) {
-            $this->register(new FileBinaryMimeTypeGuesser());
-        }
-
-        if (FileinfoMimeTypeGuesser::isSupported()) {
-            $this->register(new FileinfoMimeTypeGuesser());
-        }
+        $this->register(new FileBinaryMimeTypeGuesser());
+        $this->register(new FileinfoMimeTypeGuesser());
     }
 
     /**
@@ -125,18 +120,14 @@ public function guess($path)
             throw new AccessDeniedException($path);
         }
 
-        if (!$this->guessers) {
-            $msg = 'Unable to guess the mime type as no guessers are available';
-            if (!FileinfoMimeTypeGuesser::isSupported()) {
-                $msg .= ' (Did you enable the php_fileinfo extension?)';
-            }
-            throw new \LogicException($msg);
-        }
-
         foreach ($this->guessers as $guesser) {
             if (null !== $mimeType = $guesser->guess($path)) {
                 return $mimeType;
             }
         }
+
+        if (2 === \count($this->guessers) && !FileBinaryMimeTypeGuesser::isSupported() && !FileinfoMimeTypeGuesser::isSupported()) {
+            throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?)');
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -80,13 +80,8 @@ public static function reset()`
`80`	`80`	`*/`
`81`	`81`	`private function __construct()`
`82`	`82`	`{`
`83`		`- if (FileBinaryMimeTypeGuesser::isSupported()) {`
`84`		`- $this->register(new FileBinaryMimeTypeGuesser());`
`85`		`- }`
`86`		`-`
`87`		`- if (FileinfoMimeTypeGuesser::isSupported()) {`
`88`		`- $this->register(new FileinfoMimeTypeGuesser());`
`89`		`- }`
	`83`	`+ $this->register(new FileBinaryMimeTypeGuesser());`
	`84`	`+ $this->register(new FileinfoMimeTypeGuesser());`
`90`	`85`	`}`
`91`	`86`
`92`	`87`	`/**`
`@@ -125,18 +120,14 @@ public function guess($path)`
`125`	`120`	`throw new AccessDeniedException($path);`
`126`	`121`	`}`
`127`	`122`
`128`		`- if (!$this->guessers) {`
`129`		`- $msg = 'Unable to guess the mime type as no guessers are available';`
`130`		`- if (!FileinfoMimeTypeGuesser::isSupported()) {`
`131`		`- $msg .= ' (Did you enable the php_fileinfo extension?)';`
`132`		`- }`
`133`		`- throw new \LogicException($msg);`
`134`		`- }`
`135`		`-`
`136`	`123`	`foreach ($this->guessers as $guesser) {`
`137`	`124`	`if (null !== $mimeType = $guesser->guess($path)) {`
`138`	`125`	`return $mimeType;`
`139`	`126`	`}`
`140`	`127`	`}`
	`128`	`+`
	`129`	`+ if (2 === \count($this->guessers) && !FileBinaryMimeTypeGuesser::isSupported() && !FileinfoMimeTypeGuesser::isSupported()) {`
	`130`	`+ throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?)');`
	`131`	`+ }`
`141`	`132`	`}`
`142`	`133`	`}`