Skip to content

Commit

Permalink
Merge branch '3.4' into 4.3
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Oct 12, 2019
1 parent 32f7157 commit a6b152c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion FileBinaryMimeTypeGuesser.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit a6b152c

Please sign in to comment.