Skip to content

[stable34] build(deps): Composer audit updates #61697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 3 commits into from
Jul 2, 2026
+14 −5
Merged

[stable34] build(deps): Composer audit updates #61697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e31739f
build(deps): Composer audit updates
nickvergessen Jul 1, 2026
ab64ab5
fix(files_drop): Fix wrong deduplication of slashes in URL
nickvergessen Jul 2, 2026
ed96926
test: Don't fail due to deprecations from guzzlehttp 7.12
nickvergessen Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 99 files
+2 −2 composer.json
+75 −69 composer.lock
+6 −0 composer/autoload_classmap.php
+6 −0 composer/autoload_static.php
+83 −77 composer/installed.json
+27 −27 composer/installed.php
+871 −29 guzzlehttp/guzzle/src/Client.php
+29 −13 guzzlehttp/guzzle/src/Cookie/CookieJar.php
+18 −3 guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
+76 −20 guzzlehttp/guzzle/src/Cookie/SetCookie.php
+0 −2 guzzlehttp/guzzle/src/Exception/ConnectException.php
+4 −0 guzzlehttp/guzzle/src/Exception/RequestException.php
+1,426 −208 guzzlehttp/guzzle/src/Handler/CurlFactory.php
+26 −3 guzzlehttp/guzzle/src/Handler/CurlHandler.php
+281 −34 guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
+182 −0 guzzlehttp/guzzle/src/Handler/CurlShareHandleState.php
+200 −0 guzzlehttp/guzzle/src/Handler/CurlVersion.php
+18 −3 guzzlehttp/guzzle/src/Handler/EasyHandle.php
+36 −1 guzzlehttp/guzzle/src/Handler/HeaderProcessor.php
+1 −2 guzzlehttp/guzzle/src/Handler/MockHandler.php
+30 −0 guzzlehttp/guzzle/src/Handler/Proxy.php
+113 −0 guzzlehttp/guzzle/src/Handler/ProxyEnvironment.php
+454 −42 guzzlehttp/guzzle/src/Handler/StreamHandler.php
+84 −0 guzzlehttp/guzzle/src/Handler/TlsVersion.php
+18 −4 guzzlehttp/guzzle/src/HandlerStack.php
+1 −1 guzzlehttp/guzzle/src/Middleware.php
+12 −0 guzzlehttp/guzzle/src/Pool.php
+1 −1 guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
+7 −6 guzzlehttp/guzzle/src/RedirectMiddleware.php
+119 −57 guzzlehttp/guzzle/src/RequestOptions.php
+7 −1 guzzlehttp/guzzle/src/RetryMiddleware.php
+14 −0 guzzlehttp/guzzle/src/TransportSharing.php
+536 −46 guzzlehttp/guzzle/src/Utils.php
+1 −1 guzzlehttp/guzzle/src/functions.php
+4 −1 guzzlehttp/promises/src/Coroutine.php
+10 −0 guzzlehttp/promises/src/Create.php
+23 −0 guzzlehttp/promises/src/Each.php
+25 −0 guzzlehttp/promises/src/EachPromise.php
+46 −2 guzzlehttp/promises/src/Utils.php
+49 −0 guzzlehttp/psr7/src/AppendStream.php
+45 −0 guzzlehttp/psr7/src/BufferStream.php
+76 −3 guzzlehttp/psr7/src/CachingStream.php
+9 −0 guzzlehttp/psr7/src/DroppingStream.php
+48 −3 guzzlehttp/psr7/src/FnStream.php
+45 −1 guzzlehttp/psr7/src/Header.php
+34 −3 guzzlehttp/psr7/src/LimitStream.php
+136 −11 guzzlehttp/psr7/src/Message.php
+82 −0 guzzlehttp/psr7/src/MessageTrait.php
+124 −20 guzzlehttp/psr7/src/MultipartStream.php
+18 −0 guzzlehttp/psr7/src/NoSeekStream.php
+65 −14 guzzlehttp/psr7/src/PumpStream.php
+25 −2 guzzlehttp/psr7/src/Query.php
+37 −1 guzzlehttp/psr7/src/Request.php
+27 −3 guzzlehttp/psr7/src/Response.php
+25 −0 guzzlehttp/psr7/src/Rfc3986.php
+89 −0 guzzlehttp/psr7/src/Rfc7230.php
+142 −24 guzzlehttp/psr7/src/ServerRequest.php
+46 −1 guzzlehttp/psr7/src/Stream.php
+45 −0 guzzlehttp/psr7/src/StreamDecoratorTrait.php
+7 −1 guzzlehttp/psr7/src/StreamWrapper.php
+189 −55 guzzlehttp/psr7/src/Uri.php
+10 −2 guzzlehttp/psr7/src/UriComparator.php
+29 −13 guzzlehttp/psr7/src/UriNormalizer.php
+22 −26 guzzlehttp/psr7/src/UriResolver.php
+225 −37 guzzlehttp/psr7/src/Utils.php
+0 −1 masterminds/html5/src/HTML5.php
+1 −1 masterminds/html5/src/HTML5/Parser/CharacterReference.php
+0 −2 masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php
+7 −2 masterminds/html5/src/HTML5/Parser/Tokenizer.php
+0 −1 masterminds/html5/src/HTML5/Parser/TreeBuildingRules.php
+8 −2 masterminds/html5/src/HTML5/Serializer/OutputRules.php
+2 −4 mtdowling/jmespath.php/src/AstRuntime.php
+38 −4 mtdowling/jmespath.php/src/CompilerRuntime.php
+5 −5 mtdowling/jmespath.php/src/DebugRuntime.php
+4 −1 mtdowling/jmespath.php/src/Env.php
+109 −26 mtdowling/jmespath.php/src/FnDispatcher.php
+27 −2 mtdowling/jmespath.php/src/Lexer.php
+11 −1 mtdowling/jmespath.php/src/Parser.php
+1 −0 mtdowling/jmespath.php/src/SyntaxErrorException.php
+5 −5 mtdowling/jmespath.php/src/TreeCompiler.php
+3 −2 mtdowling/jmespath.php/src/TreeInterpreter.php
+50 −15 mtdowling/jmespath.php/src/Utils.php
+17 −5 phpseclib/phpseclib/phpseclib/File/ASN1.php
+64 −7 phpseclib/phpseclib/phpseclib/File/X509.php
+9 −21 symfony/dom-crawler/AbstractUriElement.php
+128 −87 symfony/dom-crawler/Crawler.php
+12 −18 symfony/dom-crawler/Field/ChoiceFormField.php
+8 −18 symfony/dom-crawler/Field/FileFormField.php
+10 −33 symfony/dom-crawler/Field/FormField.php
+1 −3 symfony/dom-crawler/Field/InputFormField.php
+1 −3 symfony/dom-crawler/Field/TextareaFormField.php
+20 −26 symfony/dom-crawler/Form.php
+1 −1 symfony/dom-crawler/FormFieldRegistry.php
+1 −4 symfony/dom-crawler/Image.php
+1 −4 symfony/dom-crawler/Link.php
+1 −1 symfony/dom-crawler/UriResolver.php
+1 −0 symfony/http-foundation/IpUtils.php
+102 −24 symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+1 −1 symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
8 changes: 4 additions & 4 deletions build/integration/features/bootstrap/FilesDropContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public function droppingFileWith($path, $content, $nickname = null) {
$token = $this->lastShareData->data[0]->token;
}

$base = substr($this->baseUrl, 0, -4);
$fullUrl = str_replace('//', '/', $base . "/public.php/dav/files/$token/$path");
$base = rtrim(substr($this->baseUrl, 0, -4), '/');
$fullUrl = $base . str_replace('//', '/', "/public.php/dav/files/$token/$path");

$options['headers'] = [
'X-REQUESTED-WITH' => 'XMLHttpRequest',
Expand Down Expand Up @@ -66,8 +66,8 @@ public function creatingFolderInDrop($folder, $nickname = null) {
$token = $this->lastShareData->data[0]->token;
}

$base = substr($this->baseUrl, 0, -4);
$fullUrl = str_replace('//', '/', $base . "/public.php/dav/files/$token/$folder");
$base = rtrim(substr($this->baseUrl, 0, -4), '/');
$fullUrl = $base . str_replace('//', '/', "/public.php/dav/files/$token/$folder");

$options['headers'] = [
'X-REQUESTED-WITH' => 'XMLHttpRequest',
Expand Down
6 changes: 6 additions & 0 deletions tests/lib/Files/ObjectStore/ObjectStoreTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ public function testDelete(): void {
try {
set_error_handler(
function (int $errno, string $errstr) use (&$warnings): void {
if ($errno === E_DEPRECATED || $errno === E_USER_DEPRECATED) {
return;
}
$warnings[] = $errstr;
},
);
Expand All @@ -105,6 +108,9 @@ public function testReadNonExisting(): void {
try {
set_error_handler(
function (int $errno, string $errstr) use (&$warnings): void {
if ($errno === E_DEPRECATED || $errno === E_USER_DEPRECATED) {
return;
}
$warnings[] = $errstr;
},
);
Expand Down
3 changes: 3 additions & 0 deletions tests/lib/Files/ObjectStore/S3Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ public function testEmptyUpload(): void {
$warnings = [];
set_error_handler(
function (int $errno, string $errstr) use (&$warnings): void {
if ($errno === E_DEPRECATED || $errno === E_USER_DEPRECATED) {
return;
}
$warnings[] = $errstr;
},
);
Expand Down
Loading