[HttpFoundation] updated File code

fabpot · fabpot · commit d7ee0ecc491b · 2019-01-16T23:56:01.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php
@@ -55,28 +55,23 @@ public function __construct(string $path, bool $checkPath = true)
      */
     public function guessExtension()
     {
-        $type = $this->getMimeType();
-        $guesser = ExtensionGuesser::getInstance();
-
-        return $guesser->guess($type);
+        return ExtensionGuesser::getInstance()->guess($this->getMimeType());
     }
 
     /**
      * Returns the mime type of the file.
      *
-     * The mime type is guessed using a MimeTypeGuesser instance, which uses finfo(),
-     * mime_content_type() and the system binary "file" (in this order), depending on
-     * which of those are available.
+     * The mime type is guessed using a MimeTypeGuesserInterface instance,
+     * which uses finfo_file() then the "file" system binary,
+     * depending on which of those are available.
      *
      * @return string|null The guessed mime type (e.g. "application/pdf")
      *
      * @see MimeTypeGuesser
      */
     public function getMimeType()
     {
-        $guesser = MimeTypeGuesser::getInstance();
-
-        return $guesser->guess($this->getPathname());
+        return MimeTypeGuesser::getInstance()->guess($this->getPathname());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -140,10 +140,7 @@ public function getClientMimeType()
      */
     public function guessClientExtension()
     {
-        $type = $this->getClientMimeType();
-        $guesser = ExtensionGuesser::getInstance();
-
-        return $guesser->guess($type);
+        return ExtensionGuesser::getInstance()->guess($this->getClientMimeType());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -55,28 +55,23 @@ public function __construct(string $path, bool $checkPath = true)`
`55`	`55`	`*/`
`56`	`56`	`public function guessExtension()`
`57`	`57`	`{`
`58`		`- $type = $this->getMimeType();`
`59`		`- $guesser = ExtensionGuesser::getInstance();`
`60`		`-`
`61`		`- return $guesser->guess($type);`
	`58`	`+ return ExtensionGuesser::getInstance()->guess($this->getMimeType());`
`62`	`59`	`}`
`63`	`60`
`64`	`61`	`/**`
`65`	`62`	`* Returns the mime type of the file.`
`66`	`63`	`*`
`67`		`- * The mime type is guessed using a MimeTypeGuesser instance, which uses finfo(),`
`68`		`- * mime_content_type() and the system binary "file" (in this order), depending on`
`69`		`- * which of those are available.`
	`64`	`+ * The mime type is guessed using a MimeTypeGuesserInterface instance,`
	`65`	`+ * which uses finfo_file() then the "file" system binary,`
	`66`	`+ * depending on which of those are available.`
`70`	`67`	`*`
`71`	`68`	`* @return string\|null The guessed mime type (e.g. "application/pdf")`
`72`	`69`	`*`
`73`	`70`	`* @see MimeTypeGuesser`
`74`	`71`	`*/`
`75`	`72`	`public function getMimeType()`
`76`	`73`	`{`
`77`		`- $guesser = MimeTypeGuesser::getInstance();`
`78`		`-`
`79`		`- return $guesser->guess($this->getPathname());`
	`74`	`+ return MimeTypeGuesser::getInstance()->guess($this->getPathname());`
`80`	`75`	`}`
`81`	`76`
`82`	`77`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,7 @@ public function getClientMimeType()`
`140`	`140`	`*/`
`141`	`141`	`public function guessClientExtension()`
`142`	`142`	`{`
`143`		`- $type = $this->getClientMimeType();`
`144`		`- $guesser = ExtensionGuesser::getInstance();`
`145`		`-`
`146`		`- return $guesser->guess($type);`
	`143`	`+ return ExtensionGuesser::getInstance()->guess($this->getClientMimeType());`
`147`	`144`	`}`
`148`	`145`
`149`	`146`	`/**`