diff --git a/main/mashape/http/UrlUtils.php b/main/mashape/http/UrlUtils.php index 938f121..75dd4e2 100755 --- a/main/mashape/http/UrlUtils.php +++ b/main/mashape/http/UrlUtils.php @@ -32,18 +32,26 @@ class UrlUtils { $parameters = array(); } // Remove null parameters - $parameters = array_filter($parameters, function($value) { return !is_null($value); }); + $keys = array_keys($parameters); + for ($i = 0;$i 1) { - $bracketedMatches = $matches[0]; + $bracketedMatches = $matches[0]; $plainMatches = $matches[1]; foreach ($plainMatches as $index => $key) { if (array_key_exists($key, $parameters)) { - $finalUrl = str_replace($bracketedMatches[$index], rawurlencode($parameters[$key]), $finalUrl); + $finalUrl = str_replace($bracketedMatches[$index], rawurlencode($parameters[$key]), $finalUrl); unset($parameters[$key]); } else { $finalUrl = preg_replace("/&?[\w]*=?\{" . $key . "\}/", "", $finalUrl); @@ -76,7 +84,7 @@ class UrlUtils { foreach ($queryStringParameters as $queryStringParameter) { $queryStringParameterParts = explode("=", $queryStringParameter); if (count($queryStringParameterParts) > 1) { - list($paramKey, $paramValue) = $queryStringParameterParts; + list($paramKey, $paramValue) = $queryStringParameterParts; if (!self::isPlaceHolder($paramValue)) { $parameters[$paramKey] = $paramValue; }