From 39a0effbf0c6a3d1f26e62094251e61ced97fa94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 16 May 2023 10:43:20 +0200 Subject: [PATCH] Update composer dependencies --- .../install/files/lib/system/api/composer.lock | 12 ++++++------ .../files/lib/system/api/composer/installed.json | 14 +++++++------- .../files/lib/system/api/composer/installed.php | 6 +++--- .../lib/system/api/guzzlehttp/guzzle/CHANGELOG.md | 6 ++++++ .../api/guzzlehttp/guzzle/src/Cookie/SetCookie.php | 8 +++++++- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock index da5debf795..46e794037b 100644 --- a/wcfsetup/install/files/lib/system/api/composer.lock +++ b/wcfsetup/install/files/lib/system/api/composer.lock @@ -253,16 +253,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.6.0", + "version": "7.6.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "733dd89533dd371a0987172727df15f500dab0ef" + "reference": "8444a2bacf1960bc6a2b62ed86b8e72e11eebe51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/733dd89533dd371a0987172727df15f500dab0ef", - "reference": "733dd89533dd371a0987172727df15f500dab0ef", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8444a2bacf1960bc6a2b62ed86b8e72e11eebe51", + "reference": "8444a2bacf1960bc6a2b62ed86b8e72e11eebe51", "shasum": "" }, "require": { @@ -358,7 +358,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.6.0" + "source": "https://github.com/guzzle/guzzle/tree/7.6.1" }, "funding": [ { @@ -374,7 +374,7 @@ "type": "tidelift" } ], - "time": "2023-05-14T11:23:39+00:00" + "time": "2023-05-15T20:43:01+00:00" }, { "name": "guzzlehttp/promises", diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json index c12222e7a3..5bf041b681 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.json +++ b/wcfsetup/install/files/lib/system/api/composer/installed.json @@ -259,17 +259,17 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.6.0", - "version_normalized": "7.6.0.0", + "version": "7.6.1", + "version_normalized": "7.6.1.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "733dd89533dd371a0987172727df15f500dab0ef" + "reference": "8444a2bacf1960bc6a2b62ed86b8e72e11eebe51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/733dd89533dd371a0987172727df15f500dab0ef", - "reference": "733dd89533dd371a0987172727df15f500dab0ef", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8444a2bacf1960bc6a2b62ed86b8e72e11eebe51", + "reference": "8444a2bacf1960bc6a2b62ed86b8e72e11eebe51", "shasum": "" }, "require": { @@ -295,7 +295,7 @@ "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, - "time": "2023-05-14T11:23:39+00:00", + "time": "2023-05-15T20:43:01+00:00", "type": "library", "extra": { "bamarni-bin": { @@ -367,7 +367,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.6.0" + "source": "https://github.com/guzzle/guzzle/tree/7.6.1" }, "funding": [ { diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php index 32c16a445f..07ae881a92 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.php +++ b/wcfsetup/install/files/lib/system/api/composer/installed.php @@ -56,9 +56,9 @@ 'dev_requirement' => false, ), 'guzzlehttp/guzzle' => array( - 'pretty_version' => '7.6.0', - 'version' => '7.6.0.0', - 'reference' => '733dd89533dd371a0987172727df15f500dab0ef', + 'pretty_version' => '7.6.1', + 'version' => '7.6.1.0', + 'reference' => '8444a2bacf1960bc6a2b62ed86b8e72e11eebe51', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/guzzle', 'aliases' => array(), diff --git a/wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/CHANGELOG.md b/wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/CHANGELOG.md index 0bc64f587a..2cd234a3dd 100644 --- a/wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/CHANGELOG.md +++ b/wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/CHANGELOG.md @@ -2,6 +2,12 @@ Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version. +## 7.6.1 - 2023-05-15 + +### Fixed + +- Fix `SetCookie::fromString` MaxAge deprecation warning and skip invalid MaxAge values + ## 7.6.0 - 2023-05-14 ### Added diff --git a/wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/src/Cookie/SetCookie.php index cf1e03c1a0..3f04e307ff 100644 --- a/wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/src/Cookie/SetCookie.php +++ b/wcfsetup/install/files/lib/system/api/guzzlehttp/guzzle/src/Cookie/SetCookie.php @@ -58,7 +58,13 @@ class SetCookie } else { foreach (\array_keys(self::$defaults) as $search) { if (!\strcasecmp($search, $key)) { - $data[$search] = $value; + if ($search === 'Max-Age') { + if (is_numeric($value)) { + $data[$search] = (int) $value; + } + } else { + $data[$search] = $value; + } continue 2; } } -- 2.20.1