Skip to content

Commit 2d72bab

Browse files
committed
Merge branch '3.1'
* 3.1: [TwigBridge] fix tests Tag the FormFieldRegistry as being internal [Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds [FrameworkBundle] Register the ArrayDenormalizer [Serializer] Fix DataUriNormalizer's regex [Validator] Added missing swedish translation [TranslationDebug] workaround for getFallbackLocales. [Translation] fixed nested fallback catalogue using multiple locales. fixed phpdoc [Command] Fixed method comments as phpDoc syntax Added single quotes for upgrade guides.
2 parents f25e8c1 + 85b5903 commit 2d72bab

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Normalizer/DataUriNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function supportsNormalization($data, $format = null)
8585
*/
8686
public function denormalize($data, $class, $format = null, array $context = array())
8787
{
88-
if (!preg_match('/^data:([a-z0-9]+\/[a-z0-9]+(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
88+
if (!preg_match('/^data:([a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}\/[a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
8989
throw new UnexpectedValueException('The provided "data:" URI is not valid.');
9090
}
9191

0 commit comments

Comments
 (0)