Always override request method if CURLOPT_CUSTOMREQUEST is set

Author: tmdk

src/VCR/Request.php

@@ -148,6 +148,10 @@ public function getBody()
  */
  public function getMethod()
  {
+ if ($this->getCurlOption(CURLOPT_CUSTOMREQUEST) !== null) {
+ return $this->getCurlOption(CURLOPT_CUSTOMREQUEST);
+ }
+
  return $this->method;
  }
 

src/VCR/Util/CurlHelper.php

@@ -140,7 +140,7 @@ public static function setCurlOptionOnRequest(Request $request, $option, $value,
  $request->setUrl($value);
  break;
  case CURLOPT_CUSTOMREQUEST:
- $request->setMethod($value);
+ $request->setCurlOption(CURLOPT_CUSTOMREQUEST, $value);
  break;
  case CURLOPT_POST:
  if ($value == true) {

tests/VCR/RequestTest.php

@@ -215,4 +215,19 @@ public function testGetHostReturnsBothHostAndPort()
  $request = new Request('GET', 'http://example.com:5000/foo?param=key');
  $this->assertEquals('example.com:5000', $request->getHost());
  }
+
+ public function testCurlCustomRequestOverridesMethod()
+ {
+ $postRequest = new Request('POST', 'http://example.com');
+ $getRequest = new Request('GET', 'http://example.com');
+
+ $this->assertEquals('POST', $postRequest->getMethod());
+ $this->assertEquals('GET', $getRequest->getMethod());
+
+ $postRequest->setCurlOption(CURLOPT_CUSTOMREQUEST, 'PUT');
+ $getRequest->setCurlOption(CURLOPT_CUSTOMREQUEST, 'POST');
+
+ $this->assertEquals('PUT', $postRequest->getMethod());
+ $this->assertEquals('POST', $getRequest->getMethod());
+ }
 }

tests/VCR/Util/CurlHelperTest.php

@@ -402,4 +402,26 @@ public function getCurlOptionProvider()
  ),
  );
  }
+
+ public function testSetCurlOptionCustomRequest()
+ {
+ $request = new Request('POST', 'http://example.com');
+
+ CurlHelper::setCurlOptionOnRequest($request, CURLOPT_CUSTOMREQUEST, 'PUT');
+
+ $this->assertEquals('PUT', $request->getCurlOption(CURLOPT_CUSTOMREQUEST));
+ }
+
+ public function testCurlCustomRequestAlwaysOverridesMethod()
+ {
+ $request = new Request('POST', 'http://example.com');
+
+ CurlHelper::setCurlOptionOnRequest($request, CURLOPT_CUSTOMREQUEST, 'DELETE');
+
+ $this->assertEquals('DELETE', $request->getMethod());
+
+ CurlHelper::setCurlOptionOnRequest($request, CURLOPT_POSTFIELDS, array('some' => 'test'));
+
+ $this->assertEquals('DELETE', $request->getMethod());
+ }
 }