Skip to content

forcefully set content type as "application/json; charset=utf-8" #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srmd-tl wants to merge 2 commits into
base: master
Choose a base branch
from
Open

forcefully set content type as "application/json; charset=utf-8" #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
582bf13
forcely set content type header from response to 'application/json; c…
srmd-tl Dec 31, 2020
68e5580
forcely set content type header from response to 'application/json; c…
srmd-tl Dec 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 31 additions & 14 deletions src/Query/CurlQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ class CurlQuery
private $expectJSON_ignoreResContentType;
/** @var bool */
private $debug;
/** @var string */
private string $responseType;

/**
* CurlQuery constructor.
Expand Down Expand Up @@ -85,19 +87,6 @@ public function auth(): Authentication
return $this->auth;
}

/**
* @return SSL
* @throws \Comely\Http\Exception\SSL_Exception
*/
public function ssl(): SSL
{
if (!$this->ssl) {
$this->ssl = new SSL();
}

return $this->ssl;
}

/**
* @param int $version
* @return CurlQuery
Expand All @@ -112,6 +101,16 @@ public function useHttpVersion(int $version): self
return $this;
}

/**
* @param string|null $responseType
* @return $this
*/
public function forceResponseType(?string $responseType = null): self
{
$this->responseType = $responseType ?? "application/json; charset=utf-8";
return $this;
}

/**
* @param string|null $agent
* @return CurlQuery
Expand Down Expand Up @@ -271,16 +270,21 @@ public function send(): CurlResponse
$responseIsJSON = is_string($responseType) && preg_match('/json/', $responseType) ? true : $this->expectJSON;
if ($responseIsJSON) {
if (!$this->expectJSON_ignoreResContentType) {
if ($this->responseType) {
$responseType = $this->responseType;
}
if (!is_string($responseType)) {
throw new HttpResponseException('Invalid "Content-type" header received, expecting JSON', $responseCode);
}

if (strtolower(trim(explode(";", $responseType)[0])) !== "application/json") {

throw new HttpResponseException(
sprintf('Expected "application/json", got "%s"', $responseType),
$responseCode
);
}

}

// Decode JSON body
Expand All @@ -296,11 +300,24 @@ public function send(): CurlResponse
throw new HttpResponseException('An error occurred while decoding JSON body');
}

if(is_array($json)) {
if (is_array($json)) {
$response->payload()->use($json);
}
}

return $response;
}

/**
* @return SSL
* @throws \Comely\Http\Exception\SSL_Exception
*/
public function ssl(): SSL
{
if (!$this->ssl) {
$this->ssl = new SSL();
}

return $this->ssl;
}
}