Skip to content
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

fix: when request body is 0, $body will be null #8161

Merged
merged 5 commits into from
Nov 7, 2023
Merged

fix: when request body is 0, $body will be null #8161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82c2977
test: fix typo in method name
kenjis Nov 7, 2023
ee34dca
test: rename test method
kenjis Nov 7, 2023
5e4e13b
test: add test when body is '0'
kenjis Nov 7, 2023
05966db
fix: bug that if body is '0', $this->body will be null
kenjis Nov 7, 2023
42be01d
chore: update phpstan-baseline.php
kenjis Nov 7, 2023
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
2 changes: 1 addition & 1 deletion phpstan-baseline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2148,7 +2148,7 @@
];
$ignoreErrors[] = [
'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
'count' => 6,
'count' => 5,
'path' => __DIR__ . '/system/HTTP/IncomingRequest.php',
];
$ignoreErrors[] = [
Expand Down
7 changes: 6 additions & 1 deletion system/HTTP/IncomingRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,14 @@ public function __construct($config, ?URI $uri = null, $body = 'php://input', ?U
$body = file_get_contents('php://input');
}

// If file_get_contents() returns false or empty string, set null.
if ($body === false || $body === '') {
$body = null;
}

$this->config = $config;
$this->uri = $uri;
$this->body = ! empty($body) ? $body : null;
$this->body = $body;
$this->userAgent = $userAgent;
$this->validLocales = $config->supportedLocales;

Expand Down
11 changes: 9 additions & 2 deletions tests/system/HTTP/IncomingRequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ public function testGetJsonVarReturnsNullFromNullBody(): void
$this->assertNull($request->getJsonVar('myKey'));
}

public function testgetJSONReturnsNullFromNullBody(): void
public function testGetJSONReturnsNullFromNullBody(): void
{
$config = new App();
$config->baseURL = 'http://example.com/';
Expand Down Expand Up @@ -847,7 +847,7 @@ public function testGetPostSecondStreams(): void
$this->assertSame(array_merge($_POST, $_GET), $this->request->getGetPost());
}

public function testWithFalseBody(): void
public function testGetBodyWithFalseBody(): void
{
// Use `false` here to simulate file_get_contents returning a false value
$request = $this->createRequest(null, false);
Expand All @@ -856,6 +856,13 @@ public function testWithFalseBody(): void
$this->assertNull($request->getBody());
}

public function testGetBodyWithZero(): void
{
$request = $this->createRequest(null, '0');

$this->assertSame('0', $request->getBody());
}

/**
* @see https://github.com/codeigniter4/CodeIgniter4/issues/3020
*/
Expand Down
Loading