Merge pull request #1195 from abraham/json

Default v2 to JSON payload

Author: abraham

src/TwitterOAuth.php

@@ -242,15 +242,19 @@ public function get(string $path, array $parameters = [])
  *
  * @param string $path
  * @param array $parameters
- * @param bool  $json
+ * @param ?bool $json
  *
  * @return array|object
  */
  public function post(
  string $path,
  array $parameters = [],
- bool $json = false,
+ ?bool $json = null,
  ) {
+ if (is_null($json)) {
+ $json = $this->useJsonBody();
+ }
+
  return $this->http('POST', self::API_HOST, $path, $parameters, $json);
  }
 
@@ -272,15 +276,19 @@ public function delete(string $path, array $parameters = [])
  *
  * @param string $path
  * @param array $parameters
- * @param bool  $json
+ * @param ?bool $json
  *
  * @return array|object
  */
  public function put(
  string $path,
  array $parameters = [],
- bool $json = false,
+ ?bool $json = null,
  ) {
+ if (is_null($json)) {
+ $json = $this->useJsonBody();
+ }
+
  return $this->http('PUT', self::API_HOST, $path, $parameters, $json);
  }
 
@@ -467,6 +475,19 @@ private function extension()
  ][$this->apiVersion];
  }
 
+ /**
+ * Default content type for sending data.
+ *
+ * @return bool
+ */
+ private function useJsonBody()
+ {
+ return [
+ '1.1' => false,
+ '2' => true,
+ ][$this->apiVersion];
+ }
+
  /**
  * @param string $method
  * @param string $host