Skip to content

Commit 7b7036a

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch '7.8' into 7.9
2 parents 1ee81e5 + 367c5d4 commit 7b7036a

File tree

9 files changed

+79
-71
lines changed

9 files changed

+79
-71
lines changed

‎.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ jobs:
5151
strategy:
5252
max-parallel: 10
5353
matrix:
54-
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
55-
psr7: ['^1.9.1', '^2.5.1']
54+
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
55+
psr7: ['^1.9.1', '^2.6.3']
5656
include:
57-
- php: '8.0'
58-
psr7: '^1.9.1@dev'
59-
- php: '8.3'
60-
psr7: '^2.5.1@dev'
57+
- php: '8.4'
58+
psr7: '^2.6.3@dev'
6159
exclude:
6260
- php: '8.1'
6361
psr7: '^1.9.1'
6462
- php: '8.2'
6563
psr7: '^1.9.1'
6664
- php: '8.3'
6765
psr7: '^1.9.1'
66+
- php: '8.4'
67+
psr7: '^1.9.1'
6868

6969
steps:
7070
- name: Set up PHP
@@ -106,7 +106,7 @@ jobs:
106106
strategy:
107107
max-parallel: 10
108108
matrix:
109-
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
109+
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
110110

111111
steps:
112112
- name: Set up PHP

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
"require": {
8282
"php": "^7.2.5 || ^8.0",
8383
"ext-json": "*",
84-
"guzzlehttp/promises": "^1.5.3 || ^2.0.1",
85-
"guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
84+
"guzzlehttp/promises": "^1.5.3 || ^2.0.3",
85+
"guzzlehttp/psr7": "^1.9.1 || ^2.6.3",
8686
"psr/http-client": "^1.0",
8787
"symfony/deprecation-contracts": "^2.2 || ^3.0"
8888
},
@@ -94,7 +94,7 @@
9494
"bamarni/composer-bin-plugin": "^1.8.2",
9595
"guzzle/client-integration-tests": "3.0.2",
9696
"php-http/message-factory": "^1.1",
97-
"phpunit/phpunit": "^8.5.36 || ^9.6.15",
97+
"phpunit/phpunit": "^8.5.39 || ^9.6.20",
9898
"psr/log": "^1.1 || ^2.0 || ^3.0"
9999
},
100100
"suggest": {

‎phpstan-baseline.neon

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@ parameters:
150150
count: 1
151151
path: src/Handler/CurlMultiHandler.php
152152

153+
-
154+
message: "#^Strict comparison using \\=\\=\\= between false and resource will always evaluate to false\\.$#"
155+
count: 1
156+
path: src/Handler/CurlMultiHandler.php
157+
153158
-
154159
message: "#^Property GuzzleHttp\\\\Handler\\\\EasyHandle\\:\\:\\$handle has unknown class CurlHandle as its type\\.$#"
155160
count: 1

‎phpstan.neon.dist

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

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

‎psalm-baseline.xml

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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/Client.php">
44
<PossiblyUndefinedVariable>
5-
<code>$options</code>
5+
<code><![CDATA[$options]]></code>
66
</PossiblyUndefinedVariable>
77
<UndefinedInterfaceMethod>
8-
<code>getBoundary</code>
8+
<code><![CDATA[getBoundary]]></code>
99
</UndefinedInterfaceMethod>
1010
</file>
1111
<file src="src/Cookie/CookieJar.php">
@@ -16,42 +16,42 @@
1616
<code><![CDATA[\ArrayIterator<int, SetCookie>]]></code>
1717
</InvalidReturnType>
1818
<PossiblyFalseOperand>
19-
<code>$result</code>
19+
<code><![CDATA[$result]]></code>
2020
</PossiblyFalseOperand>
2121
</file>
2222
<file src="src/Cookie/SetCookie.php">
2323
<RedundantCast>
24-
<code>(bool) $discard</code>
25-
<code>(bool) $httpOnly</code>
26-
<code>(bool) $secure</code>
27-
<code>(int) $maxAge</code>
28-
<code>(string) $domain</code>
29-
<code>(string) $name</code>
30-
<code>(string) $path</code>
31-
<code>(string) $timestamp</code>
32-
<code>(string) $value</code>
24+
<code><![CDATA[(bool) $discard]]></code>
25+
<code><![CDATA[(bool) $httpOnly]]></code>
26+
<code><![CDATA[(bool) $secure]]></code>
27+
<code><![CDATA[(int) $maxAge]]></code>
28+
<code><![CDATA[(string) $domain]]></code>
29+
<code><![CDATA[(string) $name]]></code>
30+
<code><![CDATA[(string) $path]]></code>
31+
<code><![CDATA[(string) $timestamp]]></code>
32+
<code><![CDATA[(string) $value]]></code>
3333
</RedundantCast>
3434
<UndefinedFunction>
35-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
36-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
37-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
38-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
39-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
40-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
41-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
42-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
43-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int, string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
35+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
36+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
37+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
38+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
39+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
40+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
41+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
42+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
43+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int, string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
4444
</UndefinedFunction>
4545
</file>
4646
<file src="src/Handler/CurlFactory.php">
4747
<FalseOperand>
48-
<code>$timeoutRequiresNoSignal</code>
48+
<code><![CDATA[$timeoutRequiresNoSignal]]></code>
4949
</FalseOperand>
5050
<InvalidOperand>
5151
<code><![CDATA[$options['connect_timeout'] < 1]]></code>
5252
</InvalidOperand>
5353
<PossiblyFalseOperand>
54-
<code>$timeoutRequiresNoSignal</code>
54+
<code><![CDATA[$timeoutRequiresNoSignal]]></code>
5555
</PossiblyFalseOperand>
5656
<PossiblyInvalidArgument>
5757
<code><![CDATA[$easy->handle]]></code>
@@ -60,22 +60,25 @@
6060
<code><![CDATA[$easy->handle]]></code>
6161
<code><![CDATA[$easy->handle]]></code>
6262
<code><![CDATA[$easy->handle]]></code>
63-
<code>$handle</code>
64-
<code>$resource</code>
65-
<code>$resource</code>
66-
<code>$resource</code>
67-
<code>$resource</code>
68-
<code>$resource</code>
69-
<code>$resource</code>
70-
<code>$sslKey</code>
63+
<code><![CDATA[$handle]]></code>
64+
<code><![CDATA[$resource]]></code>
65+
<code><![CDATA[$resource]]></code>
66+
<code><![CDATA[$resource]]></code>
67+
<code><![CDATA[$resource]]></code>
68+
<code><![CDATA[$resource]]></code>
69+
<code><![CDATA[$resource]]></code>
70+
<code><![CDATA[$sslKey]]></code>
7171
</PossiblyInvalidArgument>
7272
<PossiblyInvalidCast>
73-
<code>$sslKey</code>
73+
<code><![CDATA[$sslKey]]></code>
7474
</PossiblyInvalidCast>
7575
<UndefinedDocblockClass>
76-
<code>private $handles = [];</code>
77-
<code>resource[]|\CurlHandle[]</code>
76+
<code><![CDATA[private $handles = [];]]></code>
77+
<code><![CDATA[resource[]|\CurlHandle[]]]></code>
7878
</UndefinedDocblockClass>
79+
<UndefinedVariable>
80+
<code><![CDATA[$startingResponse]]></code>
81+
</UndefinedVariable>
7982
</file>
8083
<file src="src/Handler/CurlHandler.php">
8184
<PossiblyInvalidArgument>
@@ -104,36 +107,37 @@
104107
<code><![CDATA[isset($this->_mh)]]></code>
105108
</RedundantPropertyInitializationCheck>
106109
<TypeDoesNotContainType>
107-
<code>false === $multiHandle</code>
110+
<code><![CDATA[false === $multiHandle]]></code>
108111
</TypeDoesNotContainType>
109112
<UndefinedDocblockClass>
110-
<code>resource|\CurlMultiHandle</code>
111-
<code>resource|\CurlMultiHandle</code>
113+
<code><![CDATA[resource|\CurlMultiHandle]]></code>
114+
<code><![CDATA[resource|\CurlMultiHandle]]></code>
112115
</UndefinedDocblockClass>
113116
<UndefinedFunction>
114-
<code>trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an integer to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)</code>
117+
<code><![CDATA[trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an integer to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__)]]></code>
115118
</UndefinedFunction>
116119
</file>
117120
<file src="src/Handler/EasyHandle.php">
118121
<InvalidReturnType>
119-
<code>void</code>
122+
<code><![CDATA[void]]></code>
120123
</InvalidReturnType>
121124
<UndefinedDocblockClass>
122-
<code>resource|\CurlHandle</code>
125+
<code><![CDATA[resource|\CurlHandle]]></code>
123126
</UndefinedDocblockClass>
124127
</file>
125128
<file src="src/Handler/MockHandler.php">
126129
<ArgumentTypeCoercion>
127-
<code>(int) $options['delay'] * 1000</code>
130+
<code><![CDATA[(int) $options['delay'] * 1000]]></code>
128131
</ArgumentTypeCoercion>
129132
</file>
130133
<file src="src/Handler/StreamHandler.php">
131-
<ImplicitToStringCast>
132-
<code>$uri</code>
133-
</ImplicitToStringCast>
134134
<RedundantCondition>
135-
<code>empty($options)</code>
135+
<code><![CDATA[!empty($options)]]></code>
136+
<code><![CDATA[empty($options)]]></code>
136137
</RedundantCondition>
138+
<UndefinedVariable>
139+
<code><![CDATA[$http_response_header]]></code>
140+
</UndefinedVariable>
137141
</file>
138142
<file src="src/MessageFormatter.php">
139143
<InvalidArgument>
@@ -246,29 +250,24 @@
246250
</file>
247251
<file src="src/Middleware.php">
248252
<InvalidArgument>
249-
<code>$request</code>
253+
<code><![CDATA[$request]]></code>
250254
</InvalidArgument>
251255
</file>
252-
<file src="src/RedirectMiddleware.php">
253-
<ImplicitToStringCast>
254-
<code>$location</code>
255-
</ImplicitToStringCast>
256-
</file>
257256
<file src="src/RetryMiddleware.php">
258257
<TooManyArguments>
259258
<code><![CDATA[($this->delay)(++$options['retries'], $response, $request)]]></code>
260259
</TooManyArguments>
261260
</file>
262261
<file src="src/Utils.php">
263262
<ArgumentTypeCoercion>
264-
<code>$depth</code>
265-
<code>$depth</code>
263+
<code><![CDATA[$depth]]></code>
264+
<code><![CDATA[$depth]]></code>
266265
</ArgumentTypeCoercion>
267266
<ForbiddenCode>
268-
<code>\var_dump($input)</code>
267+
<code><![CDATA[\var_dump($input)]]></code>
269268
</ForbiddenCode>
270269
<PossiblyInvalidCast>
271-
<code>$_SERVER[$name]</code>
270+
<code><![CDATA[$_SERVER[$name]]]></code>
272271
</PossiblyInvalidCast>
273272
</file>
274273
</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)