Skip to content

Commit 95b1eb0

Browse files
GrahamCampbellGrahamCampbell
committed
Upgraded static analyzers
1 parent 4f55a7d commit 95b1eb0

File tree

13 files changed

+42
-253
lines changed

13 files changed

+42
-253
lines changed

‎.gitattributes‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@
1414
/psalm.xml export-ignore
1515
/CHANGELOG.md export-ignore
1616
/README.md export-ignore
17-
/rector.php export-ignore

‎.github/workflows/static.yml‎

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: 7.4
19+
php-version: '8.0'
2020
tools: composer:2.1
2121
coverage: none
2222

@@ -48,7 +48,7 @@ jobs:
4848
- name: Setup PHP
4949
uses: shivammathur/setup-php@v2
5050
with:
51-
php-version: 7.4
51+
php-version: '8.0'
5252
tools: composer:2.1
5353
coverage: none
5454

@@ -68,42 +68,3 @@ jobs:
6868

6969
- name: Execute Psalm
7070
run: vendor/bin/psalm.phar --no-progress --output-format=github
71-
72-
rector:
73-
name: Rector
74-
runs-on: ubuntu-20.04
75-
76-
steps:
77-
- name: Checkout code
78-
uses: actions/checkout@v2
79-
80-
- name: Setup PHP
81-
uses: shivammathur/setup-php@v2
82-
with:
83-
php-version: 7.4
84-
tools: composer:2.1, cs2pr
85-
coverage: none
86-
87-
- name: Install Dependencies
88-
uses: nick-invision/retry@v1
89-
with:
90-
timeout_minutes: 5
91-
max_attempts: 5
92-
command: composer update --no-interaction --no-progress
93-
94-
- name: Install PHPUnit
95-
uses: nick-invision/retry@v1
96-
with:
97-
timeout_minutes: 5
98-
max_attempts: 5
99-
command: composer bin phpunit update --no-interaction --no-progress
100-
101-
- name: Install Rector
102-
uses: nick-invision/retry@v1
103-
with:
104-
timeout_minutes: 5
105-
max_attempts: 5
106-
command: composer bin rector update --no-interaction --no-progress
107-
108-
- name: Execute Rector
109-
run: vendor/bin/rector process --dry-run --output-format=checkstyle | cs2pr

‎Makefile‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
11
install:
2-
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:7.4-base update
3-
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:7.4-base bin all update
2+
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.0-base update
3+
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.0-base bin all update
44

55
phpunit:
6-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
6+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:8.0-cli
77

88
phpstan-analyze:
9-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:7.4-cli analyze
9+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.0-cli analyze
1010

1111
phpstan-baseline:
12-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:7.4-cli analyze --generate-baseline
12+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.0-cli analyze --generate-baseline
1313

1414
psalm-analyze:
15-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
15+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.0-cli
1616

1717
psalm-baseline:
18-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli --set-baseline=psalm-baseline.xml
18+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.0-cli --set-baseline=psalm-baseline.xml
1919

2020
psalm-show-info:
21-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli --show-info=true
21+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.0-cli --show-info=true
2222

23-
rector-dry-run:
24-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/rector --rm registry.gitlab.com/grahamcampbell/php:7.4-cli process --dry-run
25-
26-
rector-fix:
27-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/rector --rm registry.gitlab.com/grahamcampbell/php:7.4-cli process
28-
29-
test: phpunit phpstan-analyze psalm-analyze rector-dry-run
23+
test: phpunit phpstan-analyze psalm-analyze
3024

3125
clean:
3226
@rm -rf .phpunit.result.cache composer.lock vendor vendor-bin/*/composer.lock vendor-bin/*/vendor

‎phpstan-baseline.neon‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@ parameters:
55
count: 1
66
path: src/Api/AbstractApi.php
77

8+
-
9+
message: "#^Parameter \\#2 \\$resource of method Http\\\\Message\\\\MultipartStream\\\\MultipartStreamBuilder\\:\\:addResource\\(\\) expects Psr\\\\Http\\\\Message\\\\StreamInterface\\|resource\\|string, mixed given\\.$#"
10+
count: 1
11+
path: src/Api/AbstractApi.php
12+
13+
-
14+
message: "#^Property Gitlab\\\\Api\\\\AbstractApi\\:\\:\\$perPage is never written, only read\\.$#"
15+
count: 1
16+
path: src/Api/AbstractApi.php
17+
18+
-
19+
message: "#^Cannot cast mixed to string\\.$#"
20+
count: 1
21+
path: src/HttpClient/Util/QueryStringBuilder.php
22+
823
-
924
message: "#^Variable method call on Gitlab\\\\Api\\\\AbstractApi\\.$#"
1025
count: 1

‎phpstan.neon.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ parameters:
1818
paths:
1919
- src
2020
ignoreErrors:
21-
- "#Anonymous function should have native return typehint#"
2221
- '#Only booleans are allowed in an if condition#'
22+
- '#PHPDoc tag \@var above a method has no effect.#'

‎psalm-baseline.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.3.1@2feba22a005a18bf31d4c7b9bdb9252c73897476">
2+
<files psalm-version="4.x-dev@">
33
<file src="src/Api/AbstractApi.php">
44
<InvalidArgument occurrences="1"/>
55
</file>
6-
<file src="src/HttpClient/Util/JsonArray.php">
7-
<UndefinedFunction occurrences="1">
8-
<code>\get_debug_type($data)</code>
9-
</UndefinedFunction>
10-
</file>
116
<file src="src/ResultPager.php">
127
<InaccessibleProperty occurrences="1">
138
<code>$clone-&gt;perPage</code>

‎psalm.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
88
errorBaseline="psalm-baseline.xml"
99
>
10+
<issueHandlers>
11+
<PossiblyInvalidDocblockTag errorLevel="info" />
12+
</issueHandlers>
1013
<projectFiles>
1114
<directory name="src" />
1215
</projectFiles>

‎rector.php‎

Lines changed: 0 additions & 170 deletions
This file was deleted.

‎vendor-bin/phpstan/composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"require": {
3-
"php": "^7.2.5 || ^8.0",
4-
"phpstan/phpstan": "0.12.82",
5-
"phpstan/phpstan-deprecation-rules": "0.12.6",
6-
"phpstan/phpstan-strict-rules": "0.12.9",
7-
"thecodingmachine/phpstan-strict-rules": "0.12.1",
8-
"ergebnis/phpstan-rules": "0.15.3"
3+
"php": "^8.0.2",
4+
"phpstan/phpstan": "1.2.0",
5+
"phpstan/phpstan-deprecation-rules": "1.0.0",
6+
"phpstan/phpstan-strict-rules": "1.1.0",
7+
"thecodingmachine/phpstan-strict-rules": "1.0.0",
8+
"ergebnis/phpstan-rules": "1.0.0"
99
},
1010
"config": {
1111
"preferred-install": "dist"

‎vendor-bin/phpunit/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
3-
"php": "^7.2.5 || ^8.0",
4-
"phpunit/phpunit": "^8.5.15 || ^9.5.4"
3+
"php": "^7.2.5 || ^8.0.2",
4+
"phpunit/phpunit": "^8.5.22 || ^9.5.11"
55
},
66
"config": {
77
"preferred-install": "dist"

0 commit comments

Comments
 (0)