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.

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

tool changes #247

Merged
merged 3 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,16 @@ jobs:
matrix:
php-versions: ['8.0', '8.1', '8.2', '8.3']
coverage: ['xdebug']
code-style: ['yes']
code-analysis: ['no']
include:
- php-versions: '7.4'
coverage: 'xdebug'
code-style: 'yes'
code-analysis: 'yes'
- php-versions: '8.4'
coverage: 'xdebug'
code-style: 'yes'
code-analysis: 'yes'
steps:
- name: Checkout
Expand Down Expand Up @@ -45,8 +52,8 @@ jobs:
run: composer install --no-progress --prefer-dist --optimize-autoloader

- name: Code Analysis (PHP CS-Fixer)
if: matrix.code-analysis == 'yes'
run: php vendor/bin/php-cs-fixer fix --dry-run --diff
if: matrix.code-style == 'yes'
run: PHP_CS_FIXER_IGNORE_ENV=true php vendor/bin/php-cs-fixer fix --dry-run --diff

- name: Code Analysis (PHPStan)
if: matrix.code-analysis == 'yes'
Expand Down
4 changes: 4 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
$config->setRules([
'@PSR1' => true,
'@Symfony' => true,
'nullable_type_declaration' => [
'syntax' => 'question_mark',
],
'nullable_type_declaration_for_default_null_value' => true,
]);

return $config;
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"sabre/uri" : "^2.3 || ^3.0"
},
"require-dev" : {
"friendsofphp/php-cs-fixer": "^3.56",
"friendsofphp/php-cs-fixer": "^3.64",
"phpstan/phpstan": "^1.11",
"phpstan/phpstan-phpunit": "^1.4",
"phpstan/phpstan-strict-rules": "^1.6",
Expand Down Expand Up @@ -53,7 +53,7 @@
"phpstan analyse lib tests"
],
"cs-fixer": [
"php-cs-fixer fix"
"PHP_CS_FIXER_IGNORE_ENV=true php-cs-fixer fix"
],
"phpunit": [
"phpunit --configuration tests/phpunit.xml"
Expand Down
4 changes: 2 additions & 2 deletions lib/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ protected function parseCurlResponse(array $headerLines, string $body, $curlHand
list(
$curlInfo,
$curlErrNo,
$curlErrMsg
$curlErrMsg,
) = $this->curlStuff($curlHandle);

if (0 !== $curlErrNo) {
Expand Down Expand Up @@ -531,7 +531,7 @@ protected function parseCurlResult(string $response, $curlHandle): array
list(
$curlInfo,
$curlErrNo,
$curlErrMsg
$curlErrMsg,
) = $this->curlStuff($curlHandle);

if (0 !== $curlErrNo) {
Expand Down
2 changes: 1 addition & 1 deletion lib/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public function setStatus($status): void
} else {
list(
$statusCode,
$statusText
$statusText,
) = explode(' ', $status, 2);
}
$statusCode = (int) $statusCode;
Expand Down
12 changes: 12 additions & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ parameters:
message: "#^Left side of || is always false.$#"
count: 6
path: lib/Client.php
-
message: "#^Else branch is unreachable because ternary operator condition is always true.$#"
count: 1
path: lib/Auth/Digest.php
-
message: "#^Strict comparison using !== between '' and non-empty-string will always evaluate to true.$#"
count: 1
path: lib/Auth/Digest.php
-
message: "#^Casting to string something that's already string.$#"
count: 1
Expand All @@ -22,6 +30,10 @@ parameters:
message: "#^Strict comparison using === between null and array<string, mixed> will always evaluate to false.$#"
count: 1
path: lib/functions.php
-
message: "#^Offset 'value' on array.* in isset\\(\\) always exists and is not nullable.$#"
count: 1
path: lib/functions.php
-
message: "#^.* will always evaluate to true\\.$#"
count: 4
Expand Down