geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-10-07 20:46:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update PHP_CodeSniffer ruleset: PSR2 → PSR12

Browse Source
This commit is contained in:
Zach Borboa
2023-06-30 01:23:37 -07:00
parent 9bd4776b73
commit cd924d10c3
115 changed files with 269 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/ArrayUtil.php
+3 -1
View File
@@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace Curl;
src/Curl/BaseCurl.php
+3 -1
View File
@@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace Curl;
src/Curl/CaseInsensitiveArray.php
+3 -2
View File
@@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace Curl;
@@ -7,7 +9,6 @@ namespace Curl;
*/
class CaseInsensitiveArray implements \ArrayAccess, \Countable, \Iterator
{
/**
* @var mixed[] Data storage with lowercase keys.
*
src/Curl/Curl.php
+27 -13
View File
@@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace Curl;
@@ -142,7 +144,8 @@ class Curl extends BaseCurl
$binary_data = false;
// Return JSON-encoded string when the request's content-type is JSON and the data is serializable.
if (isset($this->headers['Content-Type']) &&
if (
isset($this->headers['Content-Type']) &&
preg_match($this->jsonPattern, $this->headers['Content-Type']) &&
(
is_array($data) ||
@@ -151,7 +154,8 @@ class Curl extends BaseCurl
interface_exists('JsonSerializable', false) &&
$data instanceof \JsonSerializable
)
)) {
)
) {
$data = \Curl\Encoder::encodeJson($data);
} elseif (is_array($data)) {
// Manually build a single-dimensional array from a multi-dimensional array as using curl_setopt($ch,
@@ -179,12 +183,14 @@ class Curl extends BaseCurl
}
}
if (!$binary_data &&
if (
!$binary_data &&
(is_array($data) || is_object($data)) &&
(
!isset($this->headers['Content-Type']) ||
!preg_match('/^multipart\/form-data/', $this->headers['Content-Type'])
)) {
)
) {
// Avoid using http_build_query() as keys with null values are
// unexpectedly excluded from the resulting string.
//
@@ -1310,10 +1316,12 @@ class Curl extends BaseCurl
echo 'Request contained ' . ($request_body_empty ? 'no body' : 'a body') . '.' . "\n";
if ($request_headers_count === 0 && (
if (
$request_headers_count === 0 && (
$this->getOpt(CURLOPT_VERBOSE) ||
!$this->getOpt(CURLINFO_HEADER_OUT)
)) {
)
) {
echo
'Warning: Request headers (Curl::requestHeaders) are expected to be empty ' .
'(CURLOPT_VERBOSE was enabled or CURLINFO_HEADER_OUT was disabled).' . "\n";
@@ -1378,8 +1386,10 @@ class Curl extends BaseCurl
echo 'Response content length (calculated): ' . $response_calculated_length . "\n";
}
if (isset($this->responseHeaders['Content-Type']) &&
preg_match($this->jsonPattern, $this->responseHeaders['Content-Type'])) {
if (
isset($this->responseHeaders['Content-Type']) &&
preg_match($this->jsonPattern, $this->responseHeaders['Content-Type'])
) {
$parsed_response = json_decode($this->rawResponse, true);
if ($parsed_response !== null) {
$messages = [];
@@ -1617,8 +1627,10 @@ class Curl extends BaseCurl
public function __get($name)
{
$return = null;
if (in_array($name, self::$deferredProperties, true) &&
is_callable([$this, $getter = 'get' . ucfirst($name)])) {
if (
in_array($name, self::$deferredProperties, true) &&
is_callable([$this, $getter = 'get' . ucfirst($name)])
) {
$return = $this->$name = $this->$getter();
}
return $return;
@@ -1915,8 +1927,10 @@ class Curl extends BaseCurl
}
}
if (isset($response_headers['Content-Encoding']) && $response_headers['Content-Encoding'] === 'gzip' &&
is_string($response)) {
if (
isset($response_headers['Content-Encoding']) && $response_headers['Content-Encoding'] === 'gzip' &&
is_string($response)
) {
// Use @ to suppress message "Warning gzdecode(): data error".
$decoded_response = @gzdecode($response);
if ($decoded_response !== false) {
src/Curl/Decoder.php
+3 -1
View File
@@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace Curl;
src/Curl/Encoder.php
+3 -1
View File
@@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace Curl;
src/Curl/MultiCurl.php
+13 -6
View File
@@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace Curl;
@@ -519,8 +521,10 @@ class MultiCurl extends BaseCurl
// unexpectedly changing the request url after is has been specified.
if ($option === CURLOPT_URL) {
foreach ($this->queuedCurls as $curl_id => $curl) {
if (!isset($this->instanceSpecificOptions[$curl_id][$option]) ||
$this->instanceSpecificOptions[$curl_id][$option] === null) {
if (
!isset($this->instanceSpecificOptions[$curl_id][$option]) ||
$this->instanceSpecificOptions[$curl_id][$option] === null
) {
$this->instanceSpecificOptions[$curl_id][$option] = $value;
}
}
@@ -644,7 +648,8 @@ class MultiCurl extends BaseCurl
$this->currentRequestCount = 0;
do {
while (count($this->queuedCurls) &&
while (
count($this->queuedCurls) &&
count($this->activeCurls) < $this->concurrency &&
(!$this->rateLimitEnabled || $this->hasRequestQuota())
) {
@@ -690,8 +695,10 @@ class MultiCurl extends BaseCurl
}
}
while ((is_resource($this->multiCurl) || $this->multiCurl instanceof \CurlMultiHandle) &&
(($info_array = curl_multi_info_read($this->multiCurl)) !== false)) {
while (
(is_resource($this->multiCurl) || $this->multiCurl instanceof \CurlMultiHandle) &&
(($info_array = curl_multi_info_read($this->multiCurl)) !== false)
) {
if ($info_array['msg'] === CURLMSG_DONE) {
foreach ($this->activeCurls as $key => $curl) {
if ($curl->curl === $info_array['handle']) {
src/Curl/StringUtil.php
+3 -1
View File
@@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace Curl;
src/Curl/Url.php
+4 -2
View File
@@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace Curl;
@@ -13,7 +15,7 @@ class Url
$this->relativeUrl = $relative_url;
}
public function __toString() : string
public function __toString(): string
{
return $this->absolutizeUrl();
}