From a6b152c922ee0d392fca4110bd5a954f5e324db7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 12 Oct 2019 11:11:50 +0200
Subject: [PATCH] Merge branch '3.4' into 4.3

* 3.4:
  Add plus character `+` to legal mime subtype
  [Dotenv] search variable values in ENV first then env file
  [VarDumper] fix resetting the "bold" state in CliDumper
  SCA: added missing break in a loop
---
 FileBinaryMimeTypeGuesser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FileBinaryMimeTypeGuesser.php b/FileBinaryMimeTypeGuesser.php
index a25ebe4..e00ce65 100644
--- a/FileBinaryMimeTypeGuesser.php
+++ b/FileBinaryMimeTypeGuesser.php
@@ -85,7 +85,7 @@ public function guessMimeType(string $path): ?string
 
         $type = trim(ob_get_clean());
 
-        if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {
+        if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\+\.]+)#i', $type, $match)) {
             // it's not a type, but an error message
             return null;
         }