Merge pull request #2447 from yolcuiskender/keepnumericalindexes

array_merge was re-indexing arrays with numerical index

Author: designermonkey

Slim/Http/Request.php

@@ -1211,7 +1211,7 @@ public function getParams(array $only = null)
         $params = $this->getQueryParams();
         $postParams = $this->getParsedBody();
         if ($postParams) {
-            $params = array_merge($params, (array)$postParams);
+            $params = array_replace($params, (array)$postParams);
         }
 
         if ($only) {

tests/Http/RequestTest.php

@@ -213,6 +213,26 @@ public function testCreateFromEnvironmentWithMultipart()
         $this->assertEquals(['foo' => 'bar'], $request->getParsedBody());
     }
 
+    public function testCreateFromEnvironmentWithMultipartAndQueryParams()
+    {
+        $_POST['123'] = 'bar';
+
+        $env = Environment::mock([
+            'SCRIPT_NAME' => '/index.php',
+            'REQUEST_URI' => '/foo',
+            'REQUEST_METHOD' => 'POST',
+            'QUERY_STRING' => '123=zar',
+            'HTTP_CONTENT_TYPE' => 'multipart/form-data; boundary=---foo'
+        ]);
+
+        $request = Request::createFromEnvironment($env);
+        unset($_POST);
+
+        # Fixes the bug that would make it previously return [ 0 => 'bar' ]
+        $this->assertEquals(['123' => 'bar'], $request->getParams());
+        $this->assertEquals(['123' => 'zar'], $request->getQueryParams());
+    }
+
     /**
      * @covers Slim\Http\Request::createFromEnvironment
      */