Utility/Uri::withParsedValues() - handle null values

Author: bkdotcom

src/HttpMessage/Utility/Uri.php

@@ -59,8 +59,7 @@ public static function fromGlobals(): BdkUri
      */
     public static function fromParsed(array $parsed): BdkUri
     {
-        $uri = new BdkUri();
-        return self::withParsedValues($uri, $parsed);
+        return self::withParsedValues(new BdkUri(), $parsed);
     }
 
     /**
@@ -128,8 +127,7 @@ public static function resolve(UriInterface $base, UriInterface $rel): UriInterf
         if ($rel->getScheme() !== '') {
             // rel specified scheme
             //   return rel (with path cleaned up)
-            return $rel
-                ->withPath(self::pathRemoveDots($rel->getPath()));
+            return $rel->withPath(self::pathRemoveDots($rel->getPath()));
         }
         $targetValues = array(
             'fragment' => $rel->getFragment(),
@@ -158,27 +156,27 @@ public static function resolve(UriInterface $base, UriInterface $rel): UriInterf
      * Apply component values to a Uri
      *
      * @param UriInterface $uri    UriInterface instance
-     * @param array        $parsed Component values
+     * @param array        $values Component values
      *
      * @return UriInterface
      *
      * @since x3.4
      */
     public static function withParsedValues(UriInterface $uri, array $values): UriInterface
     {
-        $uriKeys = ['fragment', 'host', 'path', 'port', 'query', 'scheme', 'userInfo'];
-        $values = \array_intersect_key(self::parsedPartsPrep($values), \array_flip($uriKeys));
-        if (\array_key_exists('path', $values) && $values['path'] === null) {
-            $values['path'] = '';
-        }
-        foreach ($values as $key => $value) {
+        $keys = ['fragment', 'host', 'path', 'port', 'query', 'scheme', 'userInfo'];
+        $nullToStringKeys = ['fragment', 'host', 'path', 'query', 'scheme'];
+        $values = \array_intersect_key(self::parsedPartsPrep($values), \array_flip($keys));
+        \array_walk($values, static function ($value, $key) use ($nullToStringKeys, &$uri) {
+            if ($value === null && \in_array($key, $nullToStringKeys, true)) {
+                $value = '';
+            }
             $method = 'with' . \ucfirst($key);
             // using call_user_func_array...  some methods (withUserInfo) accept multiple arguments
-            $args = $value === null
+            $uri = \call_user_func_array([$uri, $method], $value === null
                 ? array(null)
-                : (array) $value;
-            $uri = \call_user_func_array([$uri, $method], $args);
-        }
+                : (array) $value);
+        });
         return $uri;
     }
 

tests/HttpMessage/Utility/UriTest.php

@@ -181,6 +181,19 @@ public static function providerFromParsed()
                 ),
                 'http://0:0@example.com:1234/0?0#0'
             ),
+            'nullValues' => array(
+                array(
+                    'fragment' => null,
+                    'host' => null,
+                    'username' => null,
+                    'password' => null,
+                    'path' => null,
+                    'port' => null,
+                    'query' => null,
+                    'scheme' => null,
+                ),
+                '',
+            ),
         );
     }