Skip to content

Grab status code from response with only one HTTP version number #1

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
abetwothree wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Grab status code from response with only one HTTP version number #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c45ae75
Grab status code from response with only one HTTP version number
abetwothree Dec 5, 2022
0cec20d
Update tests to check for single HTTP version value
abetwothree Dec 5, 2022
a34deda
Fix test
abetwothree Dec 5, 2022
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
7 changes: 7 additions & 0 deletions src/Facebook/Http/GraphRawResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ public function getHttpResponseCode()
public function setHttpResponseCodeFromHeader($rawResponseHeader)
{
preg_match('|HTTP/\d\.\d\s+(\d+)\s+.*|', $rawResponseHeader, $match);

if (isset($match[1])) {
$this->httpResponseCode = (int)$match[1];
}

preg_match('|HTTP/\d\s+(\d+)\s+.*|', $rawResponseHeader, $match);

$this->httpResponseCode = (int)$match[1];
}

Expand Down
28 changes: 28 additions & 0 deletions tests/Http/GraphRawResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,24 @@ class GraphRawResponseTest extends \PHPUnit_Framework_TestCase
'X-FB-Debug' => '02QQiffE7JG2rV6i/Agzd0gI2/OOQ2lk5UW0=',
'Access-Control-Allow-Origin' => '*',
];

protected $fakeRawHeaderVersion2 = <<<HEADER
HTTP/2 200 OK
Etag: "9d86b21aa74d74e574bbb35ba13524a52deb96e5"
Content-Type: text/javascript; charset=UTF-8
X-FB-Rev: 9244769
Date: Mon, 5 December 2022 18:37:17 GMT
X-FB-Debug: 02QQiffE7JG2rV6i/Agzd0gI2/OOQ2lk5UW0=
Access-Control-Allow-Origin: *\r\n\r\n
HEADER;
protected $fakeHeadersAsArrayVersion2 = [
'Etag' => '"9d86b21aa74d74e574bbb35ba13524a52deb96e5"',
'Content-Type' => 'text/javascript; charset=UTF-8',
'X-FB-Rev' => '9244769',
'Date' => 'Mon, 5 December 2022 18:37:17 GMT',
'X-FB-Debug' => '02QQiffE7JG2rV6i/Agzd0gI2/OOQ2lk5UW0=',
'Access-Control-Allow-Origin' => '*',
];

public function testCanSetTheHeadersFromAnArray()
{
Expand Down Expand Up @@ -79,4 +97,14 @@ public function testWillIgnoreProxyHeaders()
$this->assertEquals($this->fakeHeadersAsArray, $headers);
$this->assertEquals(200, $httpResponseCode);
}

public function testCanSetTheHeadersFromAStringWithVersionTwo()
{
$response = new GraphRawResponse($this->fakeRawHeaderVersion2, '');
$headers = $response->getHeaders();
$httpResponseCode = $response->getHttpResponseCode();

$this->assertEquals($this->fakeHeadersAsArrayVersion2, $headers);
$this->assertEquals(200, $httpResponseCode);
}
}