refactor: prevent using empty() on CURLRequest
#9195
+13
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
system/HTTP/CURLRequest.php
Outdated
| @@ -469,7 +469,7 @@ protected function applyMethod(string $method, array $curlOptions): array | |||
| */ | |||
| protected function applyBody(array $curlOptions = []): array | |||
| { | |||
| if (! empty($this->body)) { | |||
| if ($this->body !== '' && $this->body !== null) { | |||
There was a problem hiding this comment.
can we just cast to string then check against empty string?
There was a problem hiding this comment.
You mean like this?
$ git diff system/HTTP/CURLRequest.php
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index c78f088ff7..40e197abb5 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -469,8 +469,10 @@ class CURLRequest extends OutgoingRequest
*/
protected function applyBody(array $curlOptions = []): array
{
- if ($this->body !== '' && $this->body !== null) {
- $curlOptions[CURLOPT_POSTFIELDS] = (string) $this->getBody();
+ $requestBody = (string) $this->getBody();
+
+ if ($requestBody !== '') {
+ $curlOptions[CURLOPT_POSTFIELDS] = $requestBody;
}
return $curlOptions;| @@ -575,7 +575,7 @@ protected function setCURLOptions(array $curlOptions = [], array $config = []) | |||
| } | |||
|
|
|||
| // Decode Content | |||
| if (! empty($config['decode_content'])) { | |||
| if (array_key_exists('decode_content', $config) && $config['decode_content']) { | |||
There was a problem hiding this comment.
for right side, pls be more specific what we are checking against
system/HTTP/CURLRequest.php
Outdated
| @@ -650,7 +650,7 @@ protected function setCURLOptions(array $curlOptions = [], array $config = []) | |||
| } | |||
|
|
|||
| // version | |||
| if (! empty($config['version'])) { | |||
| if (array_key_exists('version', $config) && $config['version']) { | |||
There was a problem hiding this comment.
right side change to is_string and !== ''?
There was a problem hiding this comment.
Based documentation float and string
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Decrease PHPStan baseline.
Checklist: