Fixed php-vcr#48: Allows data to be passed to CURLOPT_POSTFIELDS.

Author: adri

src/VCR/Util/CurlHelper.php

@@ -141,12 +141,13 @@ public static function setCurlOptionOnRequest(Request $request, $option, $value,
  }
  break;
  case CURLOPT_POSTFIELDS:
- // check for file @
- if (is_string($value)) {
- parse_str($value, $value);
- }
- foreach ($value as $name => $fieldValue) {
- $request->setPostField($name, $fieldValue);
+ // todo: check for file @
+ if (is_array($value)) {
+ foreach ($value as $name => $fieldValue) {
+ $request->setPostField($name, $fieldValue);
+ }
+ } else {
+ $request->setBody($value);
  }
  break;
  case CURLOPT_HTTPHEADER:

tests/VCR/Util/CurlHelperTest.php

@@ -38,6 +38,37 @@ public function getHttpMethodsProvider()
  );
  }
 
+ public function testSetCurlOptionOnRequestPostFieldsQueryString()
+ {
+ $request = new Request('POST', 'example.com');
+ $payload = 'para1=val1&para2=val2';
+
+ CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, $payload);
+
+ $this->assertEquals($payload, (string) $request->getBody());
+ }
+
+ public function testSetCurlOptionOnRequestPostFieldsArray()
+ {
+ $request = new Request('POST', 'example.com');
+ $payload = array('some' => 'test');
+
+ CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, $payload);
+
+ $this->assertNull($request->getBody());
+ $this->assertEquals($payload, $request->getPostFields()->toArray());
+ }
+
+ public function testSetCurlOptionOnRequestPostFieldsString()
+ {
+ $request = new Request('POST', 'example.com');
+ $payload = json_encode(array('some' => 'test'));
+
+ CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, $payload);
+
+ $this->assertEquals($payload, (string) $request->getBody());
+ }
+
  public function testSetCurlOptionOnRequestSetSingleHeader()
  {
  $request = new Request('GET', 'example.com');