Skip to content

Commit e6ac862

Browse files
kesselbkesselb
authored
Merge pull request #2119 from nextcloud/dependabot/composer/guzzlehttp/guzzle-7.10.0
build(deps): Bump guzzlehttp/guzzle from 7.9.3 to 7.10.0
2 parents 7881d62 + 4a4ada3 commit e6ac862

11 files changed

Lines changed: 88 additions & 71 deletions

File tree

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"egulias/email-validator": "^4.0.4",
3030
"fusonic/opengraph": "^3.0.0",
3131
"giggsey/libphonenumber-for-php-lite": "^9.0.9",
32-
"guzzlehttp/guzzle": "^7.9.3",
32+
"guzzlehttp/guzzle": "^7.10.0",
3333
"icewind/searchdav": "^3.2.0",
3434
"icewind/smb": "^3.8.1",
3535
"icewind/streams": "^0.7.8",

‎composer.lock‎

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎composer/installed.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,23 +1009,23 @@
10091009
},
10101010
{
10111011
"name": "guzzlehttp/guzzle",
1012-
"version": "7.9.3",
1013-
"version_normalized": "7.9.3.0",
1012+
"version": "7.10.0",
1013+
"version_normalized": "7.10.0.0",
10141014
"source": {
10151015
"type": "git",
10161016
"url": "https://github.com/guzzle/guzzle.git",
1017-
"reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
1017+
"reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
10181018
},
10191019
"dist": {
10201020
"type": "zip",
1021-
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
1022-
"reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
1021+
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
1022+
"reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
10231023
"shasum": ""
10241024
},
10251025
"require": {
10261026
"ext-json": "*",
1027-
"guzzlehttp/promises": "^1.5.3 || ^2.0.3",
1028-
"guzzlehttp/psr7": "^2.7.0",
1027+
"guzzlehttp/promises": "^2.3",
1028+
"guzzlehttp/psr7": "^2.8",
10291029
"php": "^7.2.5 || ^8.0",
10301030
"psr/http-client": "^1.0",
10311031
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1046,7 +1046,7 @@
10461046
"ext-intl": "Required for Internationalized Domain Name (IDN) support",
10471047
"psr/log": "Required for using the Log middleware"
10481048
},
1049-
"time": "2025-03-27T13:37:11+00:00",
1049+
"time": "2025-08-23T22:36:01+00:00",
10501050
"type": "library",
10511051
"extra": {
10521052
"bamarni-bin": {
@@ -1118,7 +1118,7 @@
11181118
],
11191119
"support": {
11201120
"issues": "https://github.com/guzzle/guzzle/issues",
1121-
"source": "https://github.com/guzzle/guzzle/tree/7.9.3"
1121+
"source": "https://github.com/guzzle/guzzle/tree/7.10.0"
11221122
},
11231123
"funding": [
11241124
{
@@ -1138,27 +1138,27 @@
11381138
},
11391139
{
11401140
"name": "guzzlehttp/promises",
1141-
"version": "2.2.0",
1142-
"version_normalized": "2.2.0.0",
1141+
"version": "2.3.0",
1142+
"version_normalized": "2.3.0.0",
11431143
"source": {
11441144
"type": "git",
11451145
"url": "https://github.com/guzzle/promises.git",
1146-
"reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
1146+
"reference": "481557b130ef3790cf82b713667b43030dc9c957"
11471147
},
11481148
"dist": {
11491149
"type": "zip",
1150-
"url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
1151-
"reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
1150+
"url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
1151+
"reference": "481557b130ef3790cf82b713667b43030dc9c957",
11521152
"shasum": ""
11531153
},
11541154
"require": {
11551155
"php": "^7.2.5 || ^8.0"
11561156
},
11571157
"require-dev": {
11581158
"bamarni/composer-bin-plugin": "^1.8.2",
1159-
"phpunit/phpunit": "^8.5.39 || ^9.6.20"
1159+
"phpunit/phpunit": "^8.5.44 || ^9.6.25"
11601160
},
1161-
"time": "2025-03-27T13:27:01+00:00",
1161+
"time": "2025-08-22T14:34:08+00:00",
11621162
"type": "library",
11631163
"extra": {
11641164
"bamarni-bin": {
@@ -1204,7 +1204,7 @@
12041204
],
12051205
"support": {
12061206
"issues": "https://github.com/guzzle/promises/issues",
1207-
"source": "https://github.com/guzzle/promises/tree/2.2.0"
1207+
"source": "https://github.com/guzzle/promises/tree/2.3.0"
12081208
},
12091209
"funding": [
12101210
{
@@ -1224,17 +1224,17 @@
12241224
},
12251225
{
12261226
"name": "guzzlehttp/psr7",
1227-
"version": "2.7.1",
1228-
"version_normalized": "2.7.1.0",
1227+
"version": "2.8.0",
1228+
"version_normalized": "2.8.0.0",
12291229
"source": {
12301230
"type": "git",
12311231
"url": "https://github.com/guzzle/psr7.git",
1232-
"reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
1232+
"reference": "21dc724a0583619cd1652f673303492272778051"
12331233
},
12341234
"dist": {
12351235
"type": "zip",
1236-
"url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
1237-
"reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
1236+
"url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
1237+
"reference": "21dc724a0583619cd1652f673303492272778051",
12381238
"shasum": ""
12391239
},
12401240
"require": {
@@ -1250,12 +1250,12 @@
12501250
"require-dev": {
12511251
"bamarni/composer-bin-plugin": "^1.8.2",
12521252
"http-interop/http-factory-tests": "0.9.0",
1253-
"phpunit/phpunit": "^8.5.39 || ^9.6.20"
1253+
"phpunit/phpunit": "^8.5.44 || ^9.6.25"
12541254
},
12551255
"suggest": {
12561256
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
12571257
},
1258-
"time": "2025-03-27T12:30:47+00:00",
1258+
"time": "2025-08-23T21:21:41+00:00",
12591259
"type": "library",
12601260
"extra": {
12611261
"bamarni-bin": {
@@ -1323,7 +1323,7 @@
13231323
],
13241324
"support": {
13251325
"issues": "https://github.com/guzzle/psr7/issues",
1326-
"source": "https://github.com/guzzle/psr7/tree/2.7.1"
1326+
"source": "https://github.com/guzzle/psr7/tree/2.8.0"
13271327
},
13281328
"funding": [
13291329
{

‎composer/installed.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,27 +137,27 @@
137137
'dev_requirement' => false,
138138
),
139139
'guzzlehttp/guzzle' => array(
140-
'pretty_version' => '7.9.3',
141-
'version' => '7.9.3.0',
142-
'reference' => '7b2f29fe81dc4da0ca0ea7d42107a0845946ea77',
140+
'pretty_version' => '7.10.0',
141+
'version' => '7.10.0.0',
142+
'reference' => 'b51ac707cfa420b7bfd4e4d5e510ba8008e822b4',
143143
'type' => 'library',
144144
'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
145145
'aliases' => array(),
146146
'dev_requirement' => false,
147147
),
148148
'guzzlehttp/promises' => array(
149-
'pretty_version' => '2.2.0',
150-
'version' => '2.2.0.0',
151-
'reference' => '7c69f28996b0a6920945dd20b3857e499d9ca96c',
149+
'pretty_version' => '2.3.0',
150+
'version' => '2.3.0.0',
151+
'reference' => '481557b130ef3790cf82b713667b43030dc9c957',
152152
'type' => 'library',
153153
'install_path' => __DIR__ . '/../guzzlehttp/promises',
154154
'aliases' => array(),
155155
'dev_requirement' => false,
156156
),
157157
'guzzlehttp/psr7' => array(
158-
'pretty_version' => '2.7.1',
159-
'version' => '2.7.1.0',
160-
'reference' => 'c2270caaabe631b3b44c85f99e5a04bbb8060d16',
158+
'pretty_version' => '2.8.0',
159+
'version' => '2.8.0.0',
160+
'reference' => '21dc724a0583619cd1652f673303492272778051',
161161
'type' => 'library',
162162
'install_path' => __DIR__ . '/../guzzlehttp/psr7',
163163
'aliases' => array(),

‎guzzlehttp/guzzle/package-lock.json‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎guzzlehttp/guzzle/src/Handler/CurlFactory.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ public function release(EasyHandle $easy): void
125125
unset($easy->handle);
126126

127127
if (\count($this->handles) >= $this->maxHandles) {
128-
\curl_close($resource);
128+
if (PHP_VERSION_ID < 80000) {
129+
\curl_close($resource);
130+
}
129131
} else {
130132
// Remove all callback functions as they can hold onto references
131133
// and are not cleaned up by curl_reset. Using curl_setopt_array
@@ -729,7 +731,10 @@ private function createHeaderFn(EasyHandle $easy): callable
729731
public function __destruct()
730732
{
731733
foreach ($this->handles as $id => $handle) {
732-
\curl_close($handle);
734+
if (PHP_VERSION_ID < 80000) {
735+
\curl_close($handle);
736+
}
737+
733738
unset($this->handles[$id]);
734739
}
735740
}

‎guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,10 @@ private function cancel($id): bool
240240
$handle = $this->handles[$id]['easy']->handle;
241241
unset($this->delays[$id], $this->handles[$id]);
242242
\curl_multi_remove_handle($this->_mh, $handle);
243-
\curl_close($handle);
243+
244+
if (PHP_VERSION_ID < 80000) {
245+
\curl_close($handle);
246+
}
244247

245248
return true;
246249
}

‎guzzlehttp/guzzle/src/Handler/StreamHandler.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,15 @@ static function () use ($context, $params) {
333333
);
334334

335335
return $this->createResource(
336-
function () use ($uri, &$http_response_header, $contextResource, $context, $options, $request) {
336+
function () use ($uri, $contextResource, $context, $options, $request) {
337337
$resource = @\fopen((string) $uri, 'r', false, $contextResource);
338+
339+
// See https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_the_http_response_header_predefined_variable
340+
if (function_exists('http_get_last_response_headers')) {
341+
/** @var array|null */
342+
$http_response_header = \http_get_last_response_headers();
343+
}
344+
338345
$this->lastHeaders = $http_response_header ?? [];
339346

340347
if (false === $resource) {

0 commit comments

Comments
 (0)