Skip to content

Commit ae5a66b

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: fix PHP 5.6 compatibility [Cache] fixed TagAwareAdapter returning invalid cache Add plus character `+` to legal mime subtype Make Symfony\Contracts\Service\Test\ServiceLocatorTest abstract bug #33942 [DI] Add extra type check to php dumper [Dotenv] search variable values in ENV first then env file [PropertyInfo] Respect property name case when guessing from public method name [VarDumper] fix resetting the "bold" state in CliDumper Missing argument in method_exists SCA: added missing break in a loop
2 parents 592a01c + a6b152c commit ae5a66b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

FileBinaryMimeTypeGuesser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function guessMimeType(string $path): ?string
8383

8484
$type = trim(ob_get_clean());
8585

86-
if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {
86+
if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\+\.]+)#i', $type, $match)) {
8787
// it's not a type, but an error message
8888
return null;
8989
}

0 commit comments

Comments
 (0)