move logic for checking if POST data is allowed

Author: anlutro

src/Request.php

@@ -21,6 +21,21 @@ class Request
 	const ENCODING_JSON = 1;
 	const ENCODING_RAW = 2;
 
+	/**
+	 * Allowed methods => allows postdata
+	 *
+	 * @var array
+	 */
+	public static $methods = array(
+		'get'     => false,
+		'head'    => false,
+		'post'    => true,
+		'put'     => true,
+		'patch'   => true,
+		'delete'  => false,
+		'options' => false,
+	);
+
 	/**
 	 * The HTTP method to use. Defaults to GET.
 	 *
@@ -101,10 +116,14 @@ public function setMethod($method)
 	{
 		$method = strtolower($method);
 
-		if (!array_key_exists($method, $this->curl->getAllowedMethods())) {
+		if (!array_key_exists($method, static::$methods)) {
 			throw new \InvalidArgumentException("Method [$method] not a valid HTTP method.");
 		}
 
+		if ($this->data && !static::$methods[$method]) {
+			throw new \LogicException('Request has POST data, but tried changing HTTP method to one that does not allow POST data');
+		}
+
 		$this->method = $method;
 
 		return $this;
@@ -302,11 +321,25 @@ public function formatHeaders()
 	 */
 	public function setData($data)
 	{
+		if ($data && !static::$methods[$this->method]) {
+			throw new \InvalidArgumentException("HTTP method [$this->method] does not allow POST data.");
+		}
+
 		$this->data = $data;
 
 		return $this;
 	}
 
+	/**
+	 * Check whether the request has any data.
+	 *
+	 * @return boolean
+	 */
+	public function hasData()
+	{
+		return (bool) $this->data;
+	}
+
 	/**
 	 * Get the POST data to be sent with the request.
 	 *

src/cURL.php

@@ -38,21 +38,6 @@ class cURL
 	 */
 	protected $ch;
 
-	/**
-	 * Allowed methods => allows postdata
-	 *
-	 * @var array
-	 */
-	protected $methods = array(
-		'get'     => false,
-		'head'    => false,
-		'post'    => true,
-		'put'     => true,
-		'patch'   => true,
-		'delete'  => false,
-		'options' => false,
-	);
-
 	/**
 	 * The request class to use.
 	 *
@@ -88,7 +73,7 @@ class cURL
 	 */
 	public function getAllowedMethods()
 	{
-		return $this->methods;
+		return Request::$methods;
 	}
 
 	/**
@@ -278,7 +263,7 @@ public function prepareRequest(Request $request)
 
 		curl_setopt($this->ch, CURLOPT_HTTPHEADER, $request->formatHeaders());
 
-		if ($this->methods[$method] === true) {
+		if ($request->hasData()) {
 			curl_setopt($this->ch, CURLOPT_POSTFIELDS, $request->encodeData());
 		}
 
@@ -358,7 +343,7 @@ public function __call($func, $args)
 			$method = substr($method, 3);
 		}
 
-		if (!array_key_exists($method, $this->methods)) {
+		if (!array_key_exists($method, Request::$methods)) {
 			throw new \BadMethodCallException("Method [$method] not a valid HTTP method.");
 		}
 
@@ -368,9 +353,6 @@ public function __call($func, $args)
 		$url = $args[0];
 
 		if (isset($args[1])) {
-			if (!$this->methods[$method]) {
-				throw new \InvalidArgumentException("HTTP method [$method] does not allow POST data.");
-			}
 			$data = $args[1];
 		} else {
 			$data = null;

tests/unit/RequestTest.php

@@ -37,6 +37,7 @@ public function settersAndGetters()
 	public function encodeData()
 	{
 		$r = $this->makeRequest();
+		$r->setMethod('post');
 
 		$r->setData(array('foo' => 'bar', 'bar' => 'baz'));
 		$this->assertEquals('foo=bar&bar=baz', $r->encodeData());