[Serializer] Don't pass null to preg_match()

derrabus · derrabus · commit 4e6ea37f9962 · 2021-09-17T10:50:49.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -109,13 +109,13 @@ public function supportsNormalization($data, $format = null)
      */
     public function denormalize($data, $type, $format = null, array $context = [])
     {
-        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)) {
+        if (null === $data || !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)) {
             throw new NotNormalizableValueException('The provided "data:" URI is not valid.');
         }
 
         try {
             switch ($type) {
-                case 'Symfony\Component\HttpFoundation\File\File':
+                case File::class:
                     return new File($data, false);
 
                 case 'SplFileObject':
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php
@@ -139,6 +139,7 @@ public function invalidUriProvider()
             ['data:text/html;charset,%3Ch1%3EHello!%3C%2Fh1%3E'],
             ['data:base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC'],
             [''],
+            [null],
             ['http://wikipedia.org'],
             ['base64'],
             ['iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC'],

Original file line number	Diff line number	Diff line change
`@@ -109,13 +109,13 @@ public function supportsNormalization($data, $format = null)`
`109`	`109`	`*/`
`110`	`110`	`public function denormalize($data, $type, $format = null, array $context = [])`
`111`	`111`	`{`
`112`		`- 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)) {`
	`112`	`+ if (null === $data \|\| !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)) {`
`113`	`113`	`throw new NotNormalizableValueException('The provided "data:" URI is not valid.');`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`try {`
`117`	`117`	`switch ($type) {`
`118`		`- case 'Symfony\Component\HttpFoundation\File\File':`
	`118`	`+ case File::class:`
`119`	`119`	`return new File($data, false);`
`120`	`120`
`121`	`121`	`case 'SplFileObject':`
7CE6