[HttpFoundation] Make dependency on Mime component optional

atailouloute · atailouloute · commit 11cef32ff7d6 · 2020-02-07T21:28:17.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -12,6 +12,7 @@ CHANGELOG
    `__construct()` instead)
  * added `Request::preferSafeContent()` and `Response::setContentSafe()` to handle "safe" HTTP preference
    according to [RFC 8674](https://tools.ietf.org/html/rfc8674)
+ * made the Mime component an optional dependency
 
 5.0.0
 -----
diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php
@@ -54,6 +54,10 @@ public function __construct(string $path, bool $checkPath = true)
      */
     public function guessExtension()
     {
+        if (!class_exists(MimeTypes::class)) {
+            throw new \LogicException('You cannot guess the extension as the Mime component is not installed. Try running "composer require symfony/mime".');
+        }
+
         return MimeTypes::getDefault()->getExtensions($this->getMimeType())[0] ?? null;
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -133,6 +133,10 @@ public function getClientMimeType()
      */
     public function guessClientExtension()
     {
+        if (!class_exists(MimeTypes::class)) {
+            throw new \LogicException('You cannot guess the extension as the Mime component is not installed. Try running "composer require symfony/mime".');
+        }
+
         return MimeTypes::getDefault()->getExtensions($this->getClientMimeType())[0] ?? null;
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
@@ -17,13 +17,16 @@
     ],
     "require": {
         "php": "^7.2.5",
-        "symfony/mime": "^4.4|^5.0",
         "symfony/polyfill-mbstring": "~1.1"
     },
     "require-dev": {
         "predis/predis": "~1.0",
+        "symfony/mime": "^4.4|^5.0",
         "symfony/expression-language": "^4.4|^5.0"
     },
+    "suggest" : {
+        "symfony/mime": "To use the file extension guesser"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
         "exclude-from-classmap": [

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ public function __construct(string $path, bool $checkPath = true)`
`54`	`54`	`*/`
`55`	`55`	`public function guessExtension()`
`56`	`56`	`{`
	`57`	`+ if (!class_exists(MimeTypes::class)) {`
	`58`	`+ throw new \LogicException('You cannot guess the extension as the Mime component is not installed. Try running "composer require symfony/mime".');`
	`59`	`+ }`
	`60`	`+`
`57`	`61`	`return MimeTypes::getDefault()->getExtensions($this->getMimeType())[0] ?? null;`
`58`	`62`	`}`
`59`	`63`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,10 @@ public function getClientMimeType()`
`133`	`133`	`*/`
`134`	`134`	`public function guessClientExtension()`
`135`	`135`	`{`
	`136`	`+ if (!class_exists(MimeTypes::class)) {`
	`137`	`+ throw new \LogicException('You cannot guess the extension as the Mime component is not installed. Try running "composer require symfony/mime".');`
	`138`	`+ }`
	`139`	`+`
`136`	`140`	`return MimeTypes::getDefault()->getExtensions($this->getClientMimeType())[0] ?? null;`
`137`	`141`	`}`
`138`	`142`