From 95a15d18a73cf516b89e9acfa199826043751fc0 Mon Sep 17 00:00:00 2001 From: FreddleSpl0it Date: Tue, 16 May 2023 13:37:27 +0200 Subject: [PATCH] [Web] update guzzlehttp/psr7 --- data/web/inc/lib/composer.lock | 15 ++++++--------- data/web/inc/lib/vendor/composer/installed.json | 17 +++++++---------- data/web/inc/lib/vendor/composer/installed.php | 10 +++++----- .../inc/lib/vendor/guzzlehttp/psr7/CHANGELOG.md | 8 ++++++++ .../lib/vendor/guzzlehttp/psr7/composer.json | 3 --- .../lib/vendor/guzzlehttp/psr7/src/Message.php | 2 +- .../vendor/guzzlehttp/psr7/src/MessageTrait.php | 13 ++++++------- .../guzzlehttp/psr7/src/ServerRequest.php | 8 ++++---- 8 files changed, 37 insertions(+), 39 deletions(-) diff --git a/data/web/inc/lib/composer.lock b/data/web/inc/lib/composer.lock index 0d55230c4..516e9fec3 100644 --- a/data/web/inc/lib/composer.lock +++ b/data/web/inc/lib/composer.lock @@ -493,16 +493,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.4.4", + "version": "2.4.5", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf" + "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/0454e12ef0cd597ccd2adb036f7bda4e7fface66", + "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66", "shasum": "" }, "require": { @@ -528,9 +528,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "autoload": { @@ -592,7 +589,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.4" + "source": "https://github.com/guzzle/psr7/tree/2.4.5" }, "funding": [ { @@ -608,7 +605,7 @@ "type": "tidelift" } ], - "time": "2023-03-09T13:19:02+00:00" + "time": "2023-04-17T16:00:45+00:00" }, { "name": "illuminate/contracts", diff --git a/data/web/inc/lib/vendor/composer/installed.json b/data/web/inc/lib/vendor/composer/installed.json index 0b7725517..c5f82771a 100644 --- a/data/web/inc/lib/vendor/composer/installed.json +++ b/data/web/inc/lib/vendor/composer/installed.json @@ -501,17 +501,17 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.4.4", - "version_normalized": "2.4.4.0", + "version": "2.4.5", + "version_normalized": "2.4.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf" + "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/0454e12ef0cd597ccd2adb036f7bda4e7fface66", + "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66", "shasum": "" }, "require": { @@ -532,15 +532,12 @@ "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, - "time": "2023-03-09T13:19:02+00:00", + "time": "2023-04-17T16:00:45+00:00", "type": "library", "extra": { "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "installation-source": "dist", @@ -603,7 +600,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.4" + "source": "https://github.com/guzzle/psr7/tree/2.4.5" }, "funding": [ { diff --git a/data/web/inc/lib/vendor/composer/installed.php b/data/web/inc/lib/vendor/composer/installed.php index d7cc77743..0616e9a82 100644 --- a/data/web/inc/lib/vendor/composer/installed.php +++ b/data/web/inc/lib/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '34e7b3f613661fe2b3c3eb1d316a63dfe111022e', + 'reference' => '96390c2e12fd8d886495fde5514ad431e4e66069', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '34e7b3f613661fe2b3c3eb1d316a63dfe111022e', + 'reference' => '96390c2e12fd8d886495fde5514ad431e4e66069', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -80,9 +80,9 @@ 'dev_requirement' => false, ), 'guzzlehttp/psr7' => array( - 'pretty_version' => '2.4.4', - 'version' => '2.4.4.0', - 'reference' => '3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf', + 'pretty_version' => '2.4.5', + 'version' => '2.4.5.0', + 'reference' => '0454e12ef0cd597ccd2adb036f7bda4e7fface66', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/psr7', 'aliases' => array(), diff --git a/data/web/inc/lib/vendor/guzzlehttp/psr7/CHANGELOG.md b/data/web/inc/lib/vendor/guzzlehttp/psr7/CHANGELOG.md index 0eabd3048..49e0c12a4 100644 --- a/data/web/inc/lib/vendor/guzzlehttp/psr7/CHANGELOG.md +++ b/data/web/inc/lib/vendor/guzzlehttp/psr7/CHANGELOG.md @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## 2.4.5 - 2023-04-17 + +### Fixed + +- Prevent possible warnings on unset variables in `ServerRequest::normalizeNestedFileSpec` +- Fixed `Message::bodySummary` when `preg_match` fails +- Fixed header validation issue + ## 2.4.4 - 2023-03-09 ### Changed diff --git a/data/web/inc/lib/vendor/guzzlehttp/psr7/composer.json b/data/web/inc/lib/vendor/guzzlehttp/psr7/composer.json index cd91040cf..c0e7236c3 100644 --- a/data/web/inc/lib/vendor/guzzlehttp/psr7/composer.json +++ b/data/web/inc/lib/vendor/guzzlehttp/psr7/composer.json @@ -81,9 +81,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "config": { diff --git a/data/web/inc/lib/vendor/guzzlehttp/psr7/src/Message.php b/data/web/inc/lib/vendor/guzzlehttp/psr7/src/Message.php index 61c1a5dcc..c1e15f826 100644 --- a/data/web/inc/lib/vendor/guzzlehttp/psr7/src/Message.php +++ b/data/web/inc/lib/vendor/guzzlehttp/psr7/src/Message.php @@ -77,7 +77,7 @@ final class Message // Matches any printable character, including unicode characters: // letters, marks, numbers, punctuation, spacing, and separators. - if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/u', $summary)) { + if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/u', $summary) !== 0) { return null; } diff --git a/data/web/inc/lib/vendor/guzzlehttp/psr7/src/MessageTrait.php b/data/web/inc/lib/vendor/guzzlehttp/psr7/src/MessageTrait.php index d2dc28b60..464bdfaa4 100644 --- a/data/web/inc/lib/vendor/guzzlehttp/psr7/src/MessageTrait.php +++ b/data/web/inc/lib/vendor/guzzlehttp/psr7/src/MessageTrait.php @@ -224,12 +224,9 @@ trait MessageTrait )); } - if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/', $header)) { + if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/D', $header)) { throw new \InvalidArgumentException( - sprintf( - '"%s" is not valid header name', - $header - ) + sprintf('"%s" is not valid header name.', $header) ); } } @@ -257,8 +254,10 @@ trait MessageTrait // Clients must not send a request with line folding and a server sending folded headers is // likely very rare. Line folding is a fairly obscure feature of HTTP/1.1 and thus not accepting // folding is not likely to break any legitimate use case. - if (! preg_match('/^[\x20\x09\x21-\x7E\x80-\xFF]*$/', $value)) { - throw new \InvalidArgumentException(sprintf('"%s" is not valid header value', $value)); + if (! preg_match('/^[\x20\x09\x21-\x7E\x80-\xFF]*$/D', $value)) { + throw new \InvalidArgumentException( + sprintf('"%s" is not valid header value.', $value) + ); } } } diff --git a/data/web/inc/lib/vendor/guzzlehttp/psr7/src/ServerRequest.php b/data/web/inc/lib/vendor/guzzlehttp/psr7/src/ServerRequest.php index 43cbb502e..b2aa382da 100644 --- a/data/web/inc/lib/vendor/guzzlehttp/psr7/src/ServerRequest.php +++ b/data/web/inc/lib/vendor/guzzlehttp/psr7/src/ServerRequest.php @@ -144,10 +144,10 @@ class ServerRequest extends Request implements ServerRequestInterface foreach (array_keys($files['tmp_name']) as $key) { $spec = [ 'tmp_name' => $files['tmp_name'][$key], - 'size' => $files['size'][$key], - 'error' => $files['error'][$key], - 'name' => $files['name'][$key], - 'type' => $files['type'][$key], + 'size' => $files['size'][$key] ?? null, + 'error' => $files['error'][$key] ?? null, + 'name' => $files['name'][$key] ?? null, + 'type' => $files['type'][$key] ?? null, ]; $normalizedFiles[$key] = self::createUploadedFileFromSpec($spec); }