merge $_POST and $_FILES recursively when using SAPIs

Author: tamagokun

lib/Rackem/Request.php

@@ -229,9 +229,9 @@ private function parse_query($qs)
 		return $data;
 	}
 
-	private function parse_multipart($d)
-	{
-		if(!empty($_POST) || !empty($_FILES)) return array_merge($_POST, $_FILES);
-		return Utils::parse_form_data($d, $this->content_type());
-	}
+    private function parse_multipart($d)
+    {
+        if (!empty($_POST) || !empty($_FILES)) return Utils::array_merge_recursive($_POST, $_FILES);
+        return Utils::parse_form_data($d, $this->content_type());
+    }
 }

lib/Rackem/Utils.php

@@ -24,6 +24,8 @@ public static function parse_form_data($body, $content_type)
                 fwrite($file, $m[4]);
                 rewind($file);
                 $fields = self::parse_nested_query("{$m[1]}[name]={$m[2]}&{$m[1]}[type]={$m[3]}&{$m[1]}[tmp_name]={$file_name}");
+                error_log("FIELDS FROM FILE MATCH");
+                error_log(print_r($fields, true));
                 $data = self::array_merge_recursive($data, $fields);
             } else {
                 preg_match('/name=\"([^\"]*)\".*?[\n|\r]+([^\n\r].*)?$/m', $chunk, $m);
@@ -208,28 +210,26 @@ public static function status_code($status)
 		return self::$http_status_codes[$status];
 	}
 
-//private
-	private static function array_merge_recursive()
-	{
-		$arrays = func_get_args();
-		$base = array_shift($arrays);
+    public static function array_merge_recursive()
+    {
+        $arrays = func_get_args();
+        $base = array_shift($arrays);
 
-		foreach ($arrays as $array)
-		{
-			reset($base);
-			while (list($key, $value) = @each($array))
-			{
-				if(is_array($value) && isset($base[$key]) && is_array($base[$key]))
-					$base[$key] = self::array_merge_recursive($base[$key], $value);
-				elseif(isset($base[$key]))
-					$base[] = $value;
-				else
-					$base[$key] = $value;
-			}
-		}
-		return $base;
-	}
+        foreach ($arrays as $array) {
+            reset($base);
+            while (list($key, $value) = @each($array)) {
+                if(is_array($value) && isset($base[$key]) && is_array($base[$key]))
+                    $base[$key] = self::array_merge_recursive($base[$key], $value);
+                elseif(isset($base[$key]))
+                    $base[] = $value;
+                else
+                    $base[$key] = $value;
+            }
+        }
+        return $base;
+    }
 
+//private
 	private static $http_status_codes = array(
 		100  => 'Continue',
 		101  => 'Switching Protocols',