Merge branch 'hotfix/zendframework/zendframework#6959-set-correct-enc…

…oding-in-http-client-when-sending' Close zendframework/zendframework#6959
zendframework · Dec 16, 2014 · 71f5cac · 71f5cac
2 parents c7dd86c + adf1a60
commit 71f5cac
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -863,6 +863,9 @@ public function send(Request $request = null)
             // method
             $method = $this->getRequest()->getMethod();
 
+            // this is so the correct Encoding Type is set
+            $this->setMethod($method);
+
             // body
             $body = $this->prepareBody();
 

diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -406,4 +406,20 @@ public function testHttpQueryParametersCastToString()
 
         $client->send($request);
     }
+
+    /**
+     * @group 6959
+     */
+    public function testClientRequestMethod()
+    {
+        $request = new Request;
+        $request->setMethod(Request::METHOD_POST);
+        $request->getPost()->set('data', 'random');
+
+        $client = new Client;
+        $client->setAdapter('Zend\Http\Client\Adapter\Test');
+        $client->send($request);
+
+        $this->assertSame(Client::ENC_URLENCODED, $client->getEncType());
+    }
 }