Request class no longer depends on mb_parse_str

Author: Athlon1600

src/Http/Request.php

@@ -114,8 +114,38 @@ public function getMethod(){
 		return $this->method;
 	}
 
-	public function setUrl($url){
+	// https://github.com/guzzle/psr7/blob/master/src/functions.php
+	public static function parseQuery($query){
+		
+		$result = array();
+		
+		foreach(explode('&', $query) as $kvp){
+			$parts = explode('=', $kvp);
+			$key = rawurldecode($parts[0]);
+			if(substr($key, -2) == '[]'){
+				$key = substr($key, 0, -2);
+            }
+			
+			// keys with NULL will be ignored in http_build_query - that's why it has to be ''
+			$value = isset($parts[1]) ? rawurldecode($parts[1]) : '';
+			
+			// brand new key=value
+			if(!isset($result[$key])){
+				$result[$key] = $value;
+			} else {
+				// key already exists in some form...
+				if(!is_array($result[$key])){
+					$result[$key] = array($result[$key]);
+				}
+				
+				$result[$key][] = $value;
+			}
+		}
+		
+		return $result;
+	}
 
+	public function setUrl($url){
 		// remove hashtag - preg_replace so we don't have to check for its existence first - is it possible preserving hashtag?
 		$url = preg_replace('/#.*/', '', $url);
 
@@ -124,16 +154,15 @@ public function setUrl($url){
 
 		// remove it and add the query params to get collection
 		if($query){
-			$url = str_replace('?'.$query, '', $url);
-			
-			$temp = array();
-			mb_parse_str($query, $temp);
+			//$url = str_replace('?'.$query, '', $url);
+			$url = preg_replace('/\?.*/', '', $url);
 
-			$this->get->replace($temp);
+			$result = self::parseQuery($query);
+			$this->get->replace($result);
 		}
 
+		// url without query params - those will be appended later
 		$this->url = $url;
-		
 		$this->headers->set('host', parse_url($url, PHP_URL_HOST));
 	}