Prepare 7.4.0 release

thephpleague · Nov 24, 2023 · b009e3b · b009e3b
1 parent 13108c5
commit b009e3b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All Notable changes to `League\Uri` will be documented in this file
 
-## Next - TBD
+## [7.4.0](https://github.com/thephpleague/uri/compare/7.3.0...7.4.0) - 2023-09-09
 
 ### Added
 

diff --git a/Uri.php b/Uri.php
@@ -521,29 +521,30 @@ public static function fromData(string $data, string $mimetype = '', string $par
             default => throw new SyntaxError('Invalid mimeType, `'.$mimetype.'`.'),
         };
 
-        if ('' != $parameters) {
-            if (str_starts_with($parameters, ';')) {
-                $parameters = substr($parameters, 1);
-            }
-
-            $validateParameter = function (string $parameter): bool {
-                $properties = explode('=', $parameter);
+        if ('' === $parameters) {
+            return self::fromComponents([
+                'scheme' => 'data',
+                'path' => self::formatDataPath($mimetype.','.rawurlencode($data)),
+            ]);
+        }
 
-                return 2 != count($properties) || 'base64' === strtolower($properties[0]);
-            };
+        $isInvalidParameter = static function (string $parameter): bool {
+            $properties = explode('=', $parameter);
 
-            $params = array_filter(explode(';', $parameters));
-            if ([] !== array_filter($params, $validateParameter(...))) {
-                throw new SyntaxError(sprintf('Invalid mediatype parameters, `%s`.', $parameters));
-            }
+            return 2 !== count($properties) || 'base64' === strtolower($properties[0]);
+        };
 
-            $parameters = ';'.$parameters;
+        if (str_starts_with($parameters, ';')) {
+            $parameters = substr($parameters, 1);
         }
 
-        return self::fromComponents([
-            'scheme' => 'data',
-            'path' => self::formatDataPath($mimetype.$parameters.','.rawurlencode($data)),
-        ]);
+        return match ([]) {
+            array_filter(explode(';', $parameters), $isInvalidParameter) => self::fromComponents([
+               'scheme' => 'data',
+               'path' => self::formatDataPath($mimetype.';'.$parameters.','.rawurlencode($data)),
+            ]),
+            default => throw new SyntaxError(sprintf('Invalid mediatype parameters, `%s`.', $parameters))
+        };
     }
 
     /**