Skip to content

Commit a7b4320

Browse files
GrahamCampbellGrahamCampbell
authored
Upgrade actions and SA tools (#479)
1 parent b71e948 commit a7b4320

File tree

9 files changed

+200
-45
lines changed

9 files changed

+200
-45
lines changed

‎.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717

1818
- name: Composer normalize
1919
uses: docker://ergebnis/composer-normalize-action

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
extensions: mbstring
2121

2222
- name: Checkout code
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v3
2424

2525
- name: Install dependencies
2626
run: composer update --no-interaction --prefer-stable --prefer-lowest --no-progress
@@ -45,7 +45,7 @@ jobs:
4545
extensions: mbstring
4646

4747
- name: Checkout code
48-
uses: actions/checkout@v2
48+
uses: actions/checkout@v3
4949

5050
- name: Mimic PHP 8.0
5151
run: composer config platform.php 8.0.999

‎.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
coverage: none
2525

2626
- name: Checkout code
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2828

2929
- name: Mimic PHP 8.0
3030
run: composer config platform.php 8.0.999

‎.github/workflows/static.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717

1818
- name: Setup PHP
1919
uses: shivammathur/setup-php@v2
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout code
41-
uses: actions/checkout@v2
41+
uses: actions/checkout@v3
4242

4343
- name: Setup PHP
4444
uses: shivammathur/setup-php@v2
@@ -63,7 +63,7 @@ jobs:
6363

6464
steps:
6565
- name: Checkout code
66-
uses: actions/checkout@v2
66+
uses: actions/checkout@v3
6767

6868
- name: Setup PHP
6969
uses: shivammathur/setup-php@v2

‎phpstan-baseline.neon

Lines changed: 179 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
parameters:
22
ignoreErrors:
3+
-
4+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
5+
count: 1
6+
path: src/AppendStream.php
7+
8+
-
9+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
10+
count: 1
11+
path: src/CachingStream.php
12+
13+
-
14+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
15+
count: 1
16+
path: src/DroppingStream.php
17+
318
-
419
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn___toString\\.$#"
520
count: 1
@@ -16,17 +31,27 @@ parameters:
1631
path: src/FnStream.php
1732

1833
-
19-
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_getSize\\.$#"
34+
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_eof\\.$#"
2035
count: 1
2136
path: src/FnStream.php
2237

2338
-
24-
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_tell\\.$#"
39+
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_getContents\\.$#"
2540
count: 1
2641
path: src/FnStream.php
2742

2843
-
29-
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_eof\\.$#"
44+
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_getMetadata\\.$#"
45+
count: 1
46+
path: src/FnStream.php
47+
48+
-
49+
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_getSize\\.$#"
50+
count: 1
51+
path: src/FnStream.php
52+
53+
-
54+
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_isReadable\\.$#"
3055
count: 1
3156
path: src/FnStream.php
3257

@@ -35,6 +60,16 @@ parameters:
3560
count: 1
3661
path: src/FnStream.php
3762

63+
-
64+
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_isWritable\\.$#"
65+
count: 1
66+
path: src/FnStream.php
67+
68+
-
69+
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_read\\.$#"
70+
count: 1
71+
path: src/FnStream.php
72+
3873
-
3974
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_rewind\\.$#"
4075
count: 1
@@ -46,7 +81,7 @@ parameters:
4681
path: src/FnStream.php
4782

4883
-
49-
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_isWritable\\.$#"
84+
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_tell\\.$#"
5085
count: 1
5186
path: src/FnStream.php
5287

@@ -56,22 +91,62 @@ parameters:
5691
path: src/FnStream.php
5792

5893
-
59-
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_isReadable\\.$#"
94+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:__toString\\(\\) should return string but returns mixed\\.$#"
6095
count: 1
6196
path: src/FnStream.php
6297

6398
-
64-
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_read\\.$#"
99+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:detach\\(\\) should return resource\\|null but returns mixed\\.$#"
65100
count: 1
66101
path: src/FnStream.php
67102

68103
-
69-
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_getContents\\.$#"
104+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:eof\\(\\) should return bool but returns mixed\\.$#"
70105
count: 1
71106
path: src/FnStream.php
72107

73108
-
74-
message: "#^Access to an undefined property GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:\\$_fn_getMetadata\\.$#"
109+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:getContents\\(\\) should return string but returns mixed\\.$#"
110+
count: 1
111+
path: src/FnStream.php
112+
113+
-
114+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:getSize\\(\\) should return int\\|null but returns mixed\\.$#"
115+
count: 1
116+
path: src/FnStream.php
117+
118+
-
119+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:isReadable\\(\\) should return bool but returns mixed\\.$#"
120+
count: 1
121+
path: src/FnStream.php
122+
123+
-
124+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:isSeekable\\(\\) should return bool but returns mixed\\.$#"
125+
count: 1
126+
path: src/FnStream.php
127+
128+
-
129+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:isWritable\\(\\) should return bool but returns mixed\\.$#"
130+
count: 1
131+
path: src/FnStream.php
132+
133+
-
134+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:read\\(\\) should return string but returns mixed\\.$#"
135+
count: 1
136+
path: src/FnStream.php
137+
138+
-
139+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:tell\\(\\) should return int but returns mixed\\.$#"
140+
count: 1
141+
path: src/FnStream.php
142+
143+
-
144+
message: "#^Method GuzzleHttp\\\\Psr7\\\\FnStream\\:\\:write\\(\\) should return int but returns mixed\\.$#"
145+
count: 1
146+
path: src/FnStream.php
147+
148+
-
149+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
75150
count: 1
76151
path: src/FnStream.php
77152

@@ -81,14 +156,19 @@ parameters:
81156
path: src/Header.php
82157

83158
-
84-
message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|null given\\.$#"
159+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
85160
count: 1
86-
path: src/Message.php
161+
path: src/InflateStream.php
87162

88163
-
89-
message: "#^Variable \\$headerLines in PHPDoc tag @var does not match assigned variable \\$count\\.$#"
164+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
90165
count: 1
91-
path: src/Message.php
166+
path: src/LazyOpenStream.php
167+
168+
-
169+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
170+
count: 1
171+
path: src/LimitStream.php
92172

93173
-
94174
message: "#^Parameter \\#1 \\$haystack of function substr_count expects string, string\\|null given\\.$#"
@@ -101,37 +181,92 @@ parameters:
101181
path: src/Message.php
102182

103183
-
104-
message: "#^Parameter \\#1 \\$path of function basename expects string, string\\|null given\\.$#"
184+
message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|null given\\.$#"
105185
count: 1
106-
path: src/MultipartStream.php
186+
path: src/Message.php
187+
188+
-
189+
message: "#^Variable \\$headerLines in PHPDoc tag @var does not match assigned variable \\$count\\.$#"
190+
count: 1
191+
path: src/Message.php
107192

108193
-
109-
message: "#^Parameter \\#1 \\$filename of static method GuzzleHttp\\\\Psr7\\\\MimeType\\:\\:fromFilename\\(\\) expects string, string\\|null given\\.$#"
194+
message: "#^Method GuzzleHttp\\\\Psr7\\\\MultipartStream\\:\\:getHeader\\(\\) has no return type specified\\.$#"
110195
count: 1
111196
path: src/MultipartStream.php
112197

113198
-
114-
message: "#^Method GuzzleHttp\\\\Psr7\\\\MultipartStream\\:\\:getHeader\\(\\) has no return typehint specified\\.$#"
199+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
115200
count: 1
116201
path: src/MultipartStream.php
117202

203+
-
204+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
205+
count: 1
206+
path: src/NoSeekStream.php
207+
208+
-
209+
message: "#^Parameter \\#1 \\$string of function strlen expects string, mixed given\\.$#"
210+
count: 1
211+
path: src/PumpStream.php
212+
213+
-
214+
message: "#^Parameter \\#1 \\$string of method GuzzleHttp\\\\Psr7\\\\BufferStream\\:\\:write\\(\\) expects string, mixed given\\.$#"
215+
count: 1
216+
path: src/PumpStream.php
217+
218+
-
219+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
220+
count: 1
221+
path: src/PumpStream.php
222+
223+
-
224+
message: "#^Parameter \\#2 \\$subject of function preg_match expects string, mixed given\\.$#"
225+
count: 1
226+
path: src/Request.php
227+
228+
-
229+
message: "#^Property GuzzleHttp\\\\Psr7\\\\Request\\:\\:\\$requestTarget \\(string\\|null\\) does not accept mixed\\.$#"
230+
count: 1
231+
path: src/Request.php
232+
118233
-
119234
message: "#^Method GuzzleHttp\\\\Psr7\\\\ServerRequest\\:\\:normalizeNestedFileSpec\\(\\) should return array\\<Psr\\\\Http\\\\Message\\\\UploadedFileInterface\\> but returns array\\<int\\|string, array\\<Psr\\\\Http\\\\Message\\\\UploadedFileInterface\\>\\|Psr\\\\Http\\\\Message\\\\UploadedFileInterface\\>\\.$#"
120235
count: 1
121236
path: src/ServerRequest.php
122237

238+
-
239+
message: "#^Offset 'size' on array\\{0\\: int, 1\\: int, 2\\: int, 3\\: int, 4\\: int, 5\\: int, 6\\: int, 7\\: int, \\.\\.\\.\\} in isset\\(\\) always exists and is not nullable\\.$#"
240+
count: 1
241+
path: src/Stream.php
242+
243+
-
244+
message: "#^Property GuzzleHttp\\\\Psr7\\\\Stream\\:\\:\\$stream \\(resource\\) in isset\\(\\) is not nullable\\.$#"
245+
count: 10
246+
path: src/Stream.php
247+
248+
-
249+
message: "#^Property GuzzleHttp\\\\Psr7\\\\Stream\\:\\:\\$uri \\(string\\|null\\) does not accept mixed\\.$#"
250+
count: 1
251+
path: src/Stream.php
252+
253+
-
254+
message: "#^Unreachable statement \\- code above always terminates\\.$#"
255+
count: 1
256+
path: src/Stream.php
257+
123258
-
124259
message: "#^Method GuzzleHttp\\\\Psr7\\\\StreamWrapper\\:\\:getResource\\(\\) should return resource but returns resource\\|false\\.$#"
125260
count: 1
126261
path: src/StreamWrapper.php
127262

128263
-
129-
message: "#^Method GuzzleHttp\\\\Psr7\\\\UploadedFile\\:\\:isStringNotEmpty\\(\\) has parameter \\$param with no typehint specified\\.$#"
264+
message: "#^Method GuzzleHttp\\\\Psr7\\\\UploadedFile\\:\\:isStringNotEmpty\\(\\) has parameter \\$param with no type specified\\.$#"
130265
count: 1
131266
path: src/UploadedFile.php
132267

133268
-
134-
message: "#^Method GuzzleHttp\\\\Psr7\\\\Uri\\:\\:filterUserInfoComponent\\(\\) should return string but returns string\\|null\\.$#"
269+
message: "#^Cannot cast mixed to int\\.$#"
135270
count: 1
136271
path: src/Uri.php
137272

@@ -145,6 +280,16 @@ parameters:
145280
count: 1
146281
path: src/Uri.php
147282

283+
-
284+
message: "#^Method GuzzleHttp\\\\Psr7\\\\Uri\\:\\:filterUserInfoComponent\\(\\) should return string but returns string\\|null\\.$#"
285+
count: 1
286+
path: src/Uri.php
287+
288+
-
289+
message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(int\\|string\\)\\: mixed\\)\\|null, 'urldecode' given\\.$#"
290+
count: 1
291+
path: src/Uri.php
292+
148293
-
149294
message: "#^Parameter \\#1 \\$path of method Psr\\\\Http\\\\Message\\\\UriInterface\\:\\:withPath\\(\\) expects string, string\\|null given\\.$#"
150295
count: 3
@@ -155,13 +300,23 @@ parameters:
155300
count: 2
156301
path: src/UriNormalizer.php
157302

303+
-
304+
message: "#^Strict comparison using \\=\\=\\= between '' and non\\-empty\\-string will always evaluate to false\\.$#"
305+
count: 1
306+
path: src/UriResolver.php
307+
308+
-
309+
message: "#^Offset 'uri' on array\\{timed_out\\: bool, blocked\\: bool, eof\\: bool, unread_bytes\\: int, stream_type\\: string, wrapper_type\\: string, wrapper_data\\: mixed, mode\\: string, \\.\\.\\.\\} on left side of \\?\\? always exists and is not nullable\\.$#"
310+
count: 1
311+
path: src/Utils.php
312+
158313
-
159314
message: "#^Parameter \\#1 \\$keys of static method GuzzleHttp\\\\Psr7\\\\Utils\\:\\:caselessRemove\\(\\) expects array\\<string\\>, array\\<int, int\\|string\\> given\\.$#"
160315
count: 1
161316
path: src/Utils.php
162317

163318
-
164-
message: "#^Variable \\$handle might not be defined\\.$#"
319+
message: "#^Parameter \\#1 \\$source of class GuzzleHttp\\\\Psr7\\\\PumpStream constructor expects callable\\(int\\)\\: string\\|false\\|null, Closure\\(\\)\\: mixed given\\.$#"
165320
count: 1
166321
path: src/Utils.php
167322

@@ -170,3 +325,8 @@ parameters:
170325
count: 1
171326
path: src/Utils.php
172327

328+
-
329+
message: "#^Variable \\$handle might not be defined\\.$#"
330+
count: 1
331+
path: src/Utils.php
332+

0 commit comments

Comments
 (0)