Skip to content

Commit 5b4d5ac

Browse files
GrahamCampbellGrahamCampbell
authored
[2.6] Update deps (guzzle#609)
* Update deps * Fixes
1 parent a243f80 commit 5b4d5ac

8 files changed

Lines changed: 54 additions & 50 deletions

File tree

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
},
6262
"require-dev": {
6363
"bamarni/composer-bin-plugin": "^1.8.2",
64-
"http-interop/http-factory-tests": "^0.9",
65-
"phpunit/phpunit": "^8.5.36 || ^9.6.15"
64+
"http-interop/http-factory-tests": "0.9.0",
65+
"phpunit/phpunit": "^8.5.39 || ^9.6.20"
6666
},
6767
"suggest": {
6868
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,6 @@ parameters:
225225
count: 1
226226
path: src/Utils.php
227227

228-
-
229-
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\\.$#"
230-
count: 1
231-
path: src/Utils.php
232-
233228
-
234229
message: "#^Parameter \\#1 \\$source of class GuzzleHttp\\\\Psr7\\\\PumpStream constructor expects callable\\(int\\)\\: \\(string\\|false\\|null\\), Closure\\(\\)\\: mixed given\\.$#"
235230
count: 1

‎phpstan.neon.dist‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ includes:
33
- vendor-bin/phpstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon
44

55
parameters:
6-
checkMissingIterableValueType: false
6+
ignoreErrors:
7+
-
8+
identifier: missingType.iterableValue
79
level: max
810
paths:
911
- src

‎psalm-baseline.xml‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
2+
<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
33
<file src="src/FnStream.php">
44
<InvalidFunctionCall>
55
<code><![CDATA[($this->_fn___toString)()]]></code>
@@ -21,77 +21,82 @@
2121
</file>
2222
<file src="src/Header.php">
2323
<PossiblyUndefinedArrayOffset>
24-
<code>$m[0]</code>
24+
<code><![CDATA[$m[0]]]></code>
2525
</PossiblyUndefinedArrayOffset>
2626
</file>
2727
<file src="src/HttpFactory.php">
2828
<ParamNameMismatch>
29-
<code>$file</code>
29+
<code><![CDATA[$file]]></code>
3030
</ParamNameMismatch>
3131
</file>
3232
<file src="src/Message.php">
33+
<PossiblyNullArgument>
34+
<code><![CDATA[$matches[1] === '/' ? self::parseRequestUri($parts[1], $data['headers']) : $parts[1]]]></code>
35+
<code><![CDATA[$parts[1]]]></code>
36+
<code><![CDATA[$parts[1]]]></code>
37+
</PossiblyNullArgument>
3338
<PossiblyUndefinedArrayOffset>
34-
<code>$parts[1]</code>
35-
<code>$parts[1]</code>
36-
<code>$parts[1]</code>
37-
<code>$parts[1]</code>
39+
<code><![CDATA[$parts[1]]]></code>
40+
<code><![CDATA[$parts[1]]]></code>
41+
<code><![CDATA[$parts[1]]]></code>
42+
<code><![CDATA[$parts[1]]]></code>
3843
</PossiblyUndefinedArrayOffset>
3944
</file>
4045
<file src="src/MessageTrait.php">
4146
<LessSpecificImplementedReturnType>
42-
<code>MessageInterface</code>
43-
<code>MessageInterface</code>
44-
<code>MessageInterface</code>
45-
<code>MessageInterface</code>
46-
<code>MessageInterface</code>
47-
<code>array</code>
48-
<code>array</code>
47+
<code><![CDATA[MessageInterface]]></code>
48+
<code><![CDATA[MessageInterface]]></code>
49+
<code><![CDATA[MessageInterface]]></code>
50+
<code><![CDATA[MessageInterface]]></code>
51+
<code><![CDATA[MessageInterface]]></code>
52+
<code><![CDATA[array]]></code>
53+
<code><![CDATA[array]]></code>
4954
</LessSpecificImplementedReturnType>
5055
<ParamNameMismatch>
51-
<code>$header</code>
52-
<code>$header</code>
53-
<code>$header</code>
54-
<code>$header</code>
55-
<code>$header</code>
56-
<code>$header</code>
56+
<code><![CDATA[$header]]></code>
57+
<code><![CDATA[$header]]></code>
58+
<code><![CDATA[$header]]></code>
59+
<code><![CDATA[$header]]></code>
60+
<code><![CDATA[$header]]></code>
61+
<code><![CDATA[$header]]></code>
5762
</ParamNameMismatch>
5863
</file>
5964
<file src="src/Request.php">
6065
<NoValue>
61-
<code>$header</code>
66+
<code><![CDATA[$header]]></code>
6267
</NoValue>
6368
</file>
6469
<file src="src/Response.php">
6570
<RedundantCast>
66-
<code>(int) $code</code>
67-
<code>(string) $reasonPhrase</code>
71+
<code><![CDATA[(int) $code]]></code>
72+
<code><![CDATA[(string) $reasonPhrase]]></code>
6873
</RedundantCast>
6974
</file>
7075
<file src="src/ServerRequest.php">
7176
<InvalidArgument>
72-
<code>$_SERVER['SERVER_PORT']</code>
77+
<code><![CDATA[$_SERVER['SERVER_PORT']]]></code>
7378
</InvalidArgument>
7479
<InvalidArrayOffset>
75-
<code>$normalizedFiles[$key]</code>
80+
<code><![CDATA[$normalizedFiles[$key]]]></code>
7681
</InvalidArrayOffset>
7782
<InvalidReturnStatement>
78-
<code>$normalizedFiles</code>
83+
<code><![CDATA[$normalizedFiles]]></code>
7984
</InvalidReturnStatement>
8085
<InvalidReturnType>
81-
<code>UploadedFileInterface[]</code>
86+
<code><![CDATA[UploadedFileInterface[]]]></code>
8287
</InvalidReturnType>
8388
<ParamNameMismatch>
84-
<code>$attribute</code>
85-
<code>$attribute</code>
86-
<code>$attribute</code>
89+
<code><![CDATA[$attribute]]></code>
90+
<code><![CDATA[$attribute]]></code>
91+
<code><![CDATA[$attribute]]></code>
8792
</ParamNameMismatch>
8893
</file>
8994
<file src="src/Stream.php">
9095
<InvalidPropertyAssignmentValue>
9196
<code><![CDATA[$this->stream]]></code>
9297
</InvalidPropertyAssignmentValue>
9398
<RedundantCast>
94-
<code>(int) $whence</code>
99+
<code><![CDATA[(int) $whence]]></code>
95100
</RedundantCast>
96101
<RedundantPropertyInitializationCheck>
97102
<code><![CDATA[isset($this->stream)]]></code>
@@ -108,25 +113,25 @@
108113
</file>
109114
<file src="src/Uri.php">
110115
<PossiblyInvalidArgument>
111-
<code>$result</code>
116+
<code><![CDATA[$result]]></code>
112117
</PossiblyInvalidArgument>
113118
</file>
114119
<file src="src/UriResolver.php">
115120
<TypeDoesNotContainType>
116-
<code>'' === $relativePath</code>
121+
<code><![CDATA['' === $relativePath]]></code>
117122
</TypeDoesNotContainType>
118123
</file>
119124
<file src="src/Utils.php">
120125
<FalsableReturnStatement>
121-
<code>$contents</code>
126+
<code><![CDATA[$contents]]></code>
122127
</FalsableReturnStatement>
123128
<MissingDocblockType>
124-
<code>throw $ex;</code>
125-
<code>throw $ex;</code>
129+
<code><![CDATA[throw $ex;]]></code>
130+
<code><![CDATA[throw $ex;]]></code>
126131
</MissingDocblockType>
127132
<PossiblyUndefinedVariable>
128-
<code>$contents</code>
129-
<code>$handle</code>
133+
<code><![CDATA[$contents]]></code>
134+
<code><![CDATA[$handle]]></code>
130135
</PossiblyUndefinedVariable>
131136
</file>
132137
</files>

‎psalm.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
xmlns="https://getpsalm.org/schema/config"
77
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
88
errorBaseline="psalm-baseline.xml"
9+
findUnusedBaselineEntry="true"
10+
findUnusedCode="false"
911
>
1012
<projectFiles>
1113
<directory name="src" />

‎vendor-bin/php-cs-fixer/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.4 || ^8.0",
4-
"friendsofphp/php-cs-fixer": "3.52.1"
4+
"friendsofphp/php-cs-fixer": "3.59.3"
55
},
66
"config": {
77
"preferred-install": "dist"

‎vendor-bin/phpstan/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"require": {
33
"php": "^7.4 || ^8.0",
4-
"phpstan/phpstan": "1.10.47",
5-
"phpstan/phpstan-deprecation-rules": "1.1.4"
4+
"phpstan/phpstan": "1.11.7",
5+
"phpstan/phpstan-deprecation-rules": "1.2.0"
66
},
77
"config": {
88
"preferred-install": "dist"

‎vendor-bin/psalm/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.4 || ^8.0",
4-
"psalm/phar": "5.16.0"
4+
"psalm/phar": "5.25.0"
55
},
66
"config": {
77
"preferred-install": "dist"

0 commit comments

Comments
 (0)