From 4df526c700ba416142985821b9402a7d59aa6e38 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 11 Apr 2023 00:36:37 +0200 Subject: [PATCH] Update composer dependencies --- .../files/lib/system/api/composer.json | 8 +- .../files/lib/system/api/composer.lock | 101 ++++++++-------- .../lib/system/api/composer/installed.json | 111 +++++++++--------- .../lib/system/api/composer/installed.php | 36 +++--- .../FilterUsingXForwardedHeaders.php | 8 +- .../api/laminas/laminas-diactoros/src/Uri.php | 25 +++- .../laminas-diactoros/src/UriFactory.php | 11 +- .../laminas-httphandlerrunner/composer.json | 16 +-- .../src/Emitter/EmitterStack.php | 3 - .../lib/system/api/psr/http-client/README.md | 2 +- .../system/api/psr/http-client/composer.json | 4 +- .../system/api/psr/http-factory/.gitignore | 2 - .../api/psr/http-factory/.pullapprove.yml | 7 -- .../lib/system/api/psr/http-factory/README.md | 12 +- .../system/api/psr/http-factory/composer.json | 4 +- .../api/psr/http-server-handler/README.md | 14 ++- .../api/psr/http-server-handler/composer.json | 4 +- .../api/psr/http-server-middleware/README.md | 12 +- .../psr/http-server-middleware/composer.json | 4 +- 19 files changed, 202 insertions(+), 182 deletions(-) delete mode 100644 wcfsetup/install/files/lib/system/api/psr/http-factory/.gitignore delete mode 100644 wcfsetup/install/files/lib/system/api/psr/http-factory/.pullapprove.yml diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json index 6069ec8723..9372aab214 100644 --- a/wcfsetup/install/files/lib/system/api/composer.json +++ b/wcfsetup/install/files/lib/system/api/composer.json @@ -16,16 +16,16 @@ "ezyang/htmlpurifier": "^4.16", "guzzlehttp/guzzle": "^7.5", "guzzlehttp/psr7": "^2.4.4", - "laminas/laminas-diactoros": "^2.25", - "laminas/laminas-httphandlerrunner": "^2.5", + "laminas/laminas-diactoros": "^2.25.1", + "laminas/laminas-httphandlerrunner": "^2.6", "laminas/laminas-progressbar": "^2.11", "paragonie/constant_time_encoding": "^2.6.3", "pelago/emogrifier": "^7.0.0", "psr/clock": "^1.0", "psr/event-dispatcher": "^1.0", "psr/http-message": "^1.1.0", - "psr/http-server-handler": "^1.0.1", - "psr/http-server-middleware": "^1.0.1", + "psr/http-server-handler": "^1.0.2", + "psr/http-server-middleware": "^1.0.2", "psr/log": "^3.0", "scssphp/scssphp": "^1.11", "sebastian/diff": "^5.0.1", diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock index e70c45d865..27829b6fa7 100644 --- a/wcfsetup/install/files/lib/system/api/composer.lock +++ b/wcfsetup/install/files/lib/system/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "377e92279621e76f6a9be59974e3bf7d", + "content-hash": "9a967c993f3ede8f6332f2cf4a78a0d7", "packages": [ { "name": "cuyz/valinor", @@ -584,16 +584,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.25.0", + "version": "2.25.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f" + "reference": "13f45e5ba09c9b27752247d3be186fc49c2ca3a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f", - "reference": "0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/13f45e5ba09c9b27752247d3be186fc49c2ca3a5", + "reference": "13f45e5ba09c9b27752247d3be186fc49c2ca3a5", "shasum": "" }, "require": { @@ -677,34 +677,34 @@ "type": "community_bridge" } ], - "time": "2023-04-06T19:01:57+00:00" + "time": "2023-04-08T00:31:34+00:00" }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "7a47834aaad7852816d2ec4fdbb0492163b039ae" + "reference": "4845298215708c660f76a2d5d8b78e67979457c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/7a47834aaad7852816d2ec4fdbb0492163b039ae", - "reference": "7a47834aaad7852816d2ec4fdbb0492163b039ae", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/4845298215708c660f76a2d5d8b78e67979457c5", + "reference": "4845298215708c660f76a2d5d8b78e67979457c5", "shasum": "" }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", - "psr/http-message": "^1.0", + "php": "~8.1.0 || ~8.2.0", + "psr/http-message": "^1.0 || ^2.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-diactoros": "^2.18", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "laminas/laminas-coding-standard": "~2.5.0", + "laminas/laminas-diactoros": "^2.25.1", + "phpunit/phpunit": "^10.0.19", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.9" }, "type": "library", "extra": { @@ -744,7 +744,7 @@ "type": "community_bridge" } ], - "time": "2023-01-05T21:54:03+00:00" + "time": "2023-04-09T21:49:08+00:00" }, { "name": "laminas/laminas-progressbar", @@ -1111,21 +1111,21 @@ }, { "name": "psr/http-client", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -1145,7 +1145,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -1157,27 +1157,27 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/master" + "source": "https://github.com/php-fig/http-client/tree/1.0.2" }, - "time": "2020-06-29T06:28:15+00:00" + "time": "2023-04-10T20:12:12+00:00" }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -1197,7 +1197,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -1212,9 +1212,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { "name": "psr/http-message", @@ -1271,21 +1271,21 @@ }, { "name": "psr/http-server-handler", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-server-handler.git", - "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7" + "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7", - "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7", + "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4", + "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4", "shasum": "" }, "require": { "php": ">=7.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -1305,7 +1305,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP server-side request handler", @@ -1321,28 +1321,27 @@ "server" ], "support": { - "issues": "https://github.com/php-fig/http-server-handler/issues", - "source": "https://github.com/php-fig/http-server-handler/tree/master" + "source": "https://github.com/php-fig/http-server-handler/tree/1.0.2" }, - "time": "2018-10-30T16:46:14+00:00" + "time": "2023-04-10T20:06:20+00:00" }, { "name": "psr/http-server-middleware", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-server-middleware.git", - "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5" + "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5", - "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5", + "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829", + "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829", "shasum": "" }, "require": { "php": ">=7.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0 || ^2.0", "psr/http-server-handler": "^1.0" }, "type": "library", @@ -1363,7 +1362,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP server-side middleware", @@ -1379,9 +1378,9 @@ ], "support": { "issues": "https://github.com/php-fig/http-server-middleware/issues", - "source": "https://github.com/php-fig/http-server-middleware/tree/master" + "source": "https://github.com/php-fig/http-server-middleware/tree/1.0.2" }, - "time": "2018-10-30T17:12:04+00:00" + "time": "2023-04-11T06:14:47+00:00" }, { "name": "psr/log", diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json index 368f81864f..05c1f29e39 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.json +++ b/wcfsetup/install/files/lib/system/api/composer/installed.json @@ -599,17 +599,17 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.25.0", - "version_normalized": "2.25.0.0", + "version": "2.25.1", + "version_normalized": "2.25.1.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f" + "reference": "13f45e5ba09c9b27752247d3be186fc49c2ca3a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f", - "reference": "0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/13f45e5ba09c9b27752247d3be186fc49c2ca3a5", + "reference": "13f45e5ba09c9b27752247d3be186fc49c2ca3a5", "shasum": "" }, "require": { @@ -636,7 +636,7 @@ "psalm/plugin-phpunit": "^0.18.4", "vimeo/psalm": "^5.6" }, - "time": "2023-04-06T19:01:57+00:00", + "time": "2023-04-08T00:31:34+00:00", "type": "library", "extra": { "laminas": { @@ -699,33 +699,33 @@ }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.5.0", - "version_normalized": "2.5.0.0", + "version": "2.6.0", + "version_normalized": "2.6.0.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "7a47834aaad7852816d2ec4fdbb0492163b039ae" + "reference": "4845298215708c660f76a2d5d8b78e67979457c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/7a47834aaad7852816d2ec4fdbb0492163b039ae", - "reference": "7a47834aaad7852816d2ec4fdbb0492163b039ae", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/4845298215708c660f76a2d5d8b78e67979457c5", + "reference": "4845298215708c660f76a2d5d8b78e67979457c5", "shasum": "" }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", - "psr/http-message": "^1.0", + "php": "~8.1.0 || ~8.2.0", + "psr/http-message": "^1.0 || ^2.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-diactoros": "^2.18", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "laminas/laminas-coding-standard": "~2.5.0", + "laminas/laminas-diactoros": "^2.25.1", + "phpunit/phpunit": "^10.0.19", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.9" }, - "time": "2023-01-05T21:54:03+00:00", + "time": "2023-04-09T21:49:08+00:00", "type": "library", "extra": { "laminas": { @@ -1150,24 +1150,24 @@ }, { "name": "psr/http-client", - "version": "1.0.1", - "version_normalized": "1.0.1.0", + "version": "1.0.2", + "version_normalized": "1.0.2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, - "time": "2020-06-29T06:28:15+00:00", + "time": "2023-04-10T20:12:12+00:00", "type": "library", "extra": { "branch-alias": { @@ -1187,7 +1187,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -1199,30 +1199,30 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/master" + "source": "https://github.com/php-fig/http-client/tree/1.0.2" }, "install-path": "../psr/http-client" }, { "name": "psr/http-factory", - "version": "1.0.1", - "version_normalized": "1.0.1.0", + "version": "1.0.2", + "version_normalized": "1.0.2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, - "time": "2019-04-30T12:38:16+00:00", + "time": "2023-04-10T20:10:41+00:00", "type": "library", "extra": { "branch-alias": { @@ -1242,7 +1242,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -1257,7 +1257,7 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" }, "install-path": "../psr/http-factory" }, @@ -1319,24 +1319,24 @@ }, { "name": "psr/http-server-handler", - "version": "1.0.1", - "version_normalized": "1.0.1.0", + "version": "1.0.2", + "version_normalized": "1.0.2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-server-handler.git", - "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7" + "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7", - "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7", + "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4", + "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4", "shasum": "" }, "require": { "php": ">=7.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, - "time": "2018-10-30T16:46:14+00:00", + "time": "2023-04-10T20:06:20+00:00", "type": "library", "extra": { "branch-alias": { @@ -1356,7 +1356,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP server-side request handler", @@ -1372,32 +1372,31 @@ "server" ], "support": { - "issues": "https://github.com/php-fig/http-server-handler/issues", - "source": "https://github.com/php-fig/http-server-handler/tree/master" + "source": "https://github.com/php-fig/http-server-handler/tree/1.0.2" }, "install-path": "../psr/http-server-handler" }, { "name": "psr/http-server-middleware", - "version": "1.0.1", - "version_normalized": "1.0.1.0", + "version": "1.0.2", + "version_normalized": "1.0.2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-server-middleware.git", - "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5" + "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5", - "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5", + "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829", + "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829", "shasum": "" }, "require": { "php": ">=7.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0 || ^2.0", "psr/http-server-handler": "^1.0" }, - "time": "2018-10-30T17:12:04+00:00", + "time": "2023-04-11T06:14:47+00:00", "type": "library", "extra": { "branch-alias": { @@ -1417,7 +1416,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP server-side middleware", @@ -1433,7 +1432,7 @@ ], "support": { "issues": "https://github.com/php-fig/http-server-middleware/issues", - "source": "https://github.com/php-fig/http-server-middleware/tree/master" + "source": "https://github.com/php-fig/http-server-middleware/tree/1.0.2" }, "install-path": "../psr/http-server-middleware" }, diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php index 24f8419ded..ef2cdf8fea 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.php +++ b/wcfsetup/install/files/lib/system/api/composer/installed.php @@ -83,18 +83,18 @@ 'dev_requirement' => false, ), 'laminas/laminas-diactoros' => array( - 'pretty_version' => '2.25.0', - 'version' => '2.25.0.0', - 'reference' => '0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f', + 'pretty_version' => '2.25.1', + 'version' => '2.25.1.0', + 'reference' => '13f45e5ba09c9b27752247d3be186fc49c2ca3a5', 'type' => 'library', 'install_path' => __DIR__ . '/../laminas/laminas-diactoros', 'aliases' => array(), 'dev_requirement' => false, ), 'laminas/laminas-httphandlerrunner' => array( - 'pretty_version' => '2.5.0', - 'version' => '2.5.0.0', - 'reference' => '7a47834aaad7852816d2ec4fdbb0492163b039ae', + 'pretty_version' => '2.6.0', + 'version' => '2.6.0.0', + 'reference' => '4845298215708c660f76a2d5d8b78e67979457c5', 'type' => 'library', 'install_path' => __DIR__ . '/../laminas/laminas-httphandlerrunner', 'aliases' => array(), @@ -161,9 +161,9 @@ 'dev_requirement' => false, ), 'psr/http-client' => array( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621', + 'pretty_version' => '1.0.2', + 'version' => '1.0.2.0', + 'reference' => '0955afe48220520692d2d09f7ab7e0f93ffd6a31', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-client', 'aliases' => array(), @@ -176,9 +176,9 @@ ), ), 'psr/http-factory' => array( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'reference' => '12ac7fcd07e5b077433f5f2bee95b3a771bf61be', + 'pretty_version' => '1.0.2', + 'version' => '1.0.2.0', + 'reference' => 'e616d01114759c4c489f93b099585439f795fe35', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-factory', 'aliases' => array(), @@ -206,18 +206,18 @@ ), ), 'psr/http-server-handler' => array( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'reference' => 'aff2f80e33b7f026ec96bb42f63242dc50ffcae7', + 'pretty_version' => '1.0.2', + 'version' => '1.0.2.0', + 'reference' => '84c4fb66179be4caaf8e97bd239203245302e7d4', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-server-handler', 'aliases' => array(), 'dev_requirement' => false, ), 'psr/http-server-middleware' => array( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'reference' => '2296f45510945530b9dceb8bcedb5cb84d40c5f5', + 'pretty_version' => '1.0.2', + 'version' => '1.0.2.0', + 'reference' => 'c1481f747daaa6a0782775cd6a8c26a1bf4a3829', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-server-middleware', 'aliases' => array(), diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/ServerRequestFilter/FilterUsingXForwardedHeaders.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/ServerRequestFilter/FilterUsingXForwardedHeaders.php index fbd650901c..1ddcb53391 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/ServerRequestFilter/FilterUsingXForwardedHeaders.php +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/ServerRequestFilter/FilterUsingXForwardedHeaders.php @@ -6,6 +6,7 @@ namespace Laminas\Diactoros\ServerRequestFilter; use Laminas\Diactoros\Exception\InvalidForwardedHeaderNameException; use Laminas\Diactoros\Exception\InvalidProxyAddressException; +use Laminas\Diactoros\UriFactory; use Psr\Http\Message\ServerRequestInterface; use function assert; @@ -78,7 +79,12 @@ final class FilterUsingXForwardedHeaders implements FilterServerRequestInterface switch ($headerName) { case self::HEADER_HOST: - $uri = $uri->withHost($header); + [$host, $port] = UriFactory::marshalHostAndPortFromHeader($header); + $uri = $uri + ->withHost($host); + if ($port !== null) { + $uri = $uri->withPort($port); + } break; case self::HEADER_PORT: $uri = $uri->withPort((int) $header); diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Uri.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Uri.php index 95c7af9367..59f776eee8 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Uri.php +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Uri.php @@ -38,6 +38,8 @@ use function substr; * might change state are implemented such that they retain the internal * state of the current instance and return a new instance that contains the * changed state. + * + * @psalm-immutable */ class Uri implements UriInterface, Stringable { @@ -67,8 +69,7 @@ class Uri implements UriInterface, Stringable private string $host = ''; - /** @var int|null */ - private $port; + private ?int $port = null; private string $path = ''; @@ -110,6 +111,7 @@ class Uri implements UriInterface, Stringable return $this->uriString; } + /** @psalm-suppress ImpureMethodCall, InaccessibleProperty */ $this->uriString = static::createUriString( $this->scheme, $this->getAuthority(), @@ -442,6 +444,9 @@ class Uri implements UriInterface, Stringable /** * Parse a URI into its parts, and set the properties + * + * @psalm-suppress InaccessibleProperty Method is only called in {@see Uri::__construct} and thus immutability is + * still given. */ private function parseUri(string $uri): void { @@ -552,8 +557,12 @@ class Uri implements UriInterface, Stringable { $part = $this->filterInvalidUtf8($part); - // Note the addition of `%` to initial charset; this allows `|` portion - // to match and thus prevent double-encoding. + /** + * @psalm-suppress ImpureFunctionCall Even tho the callback targets this immutable class, + * psalm reports an issue here. + * Note the addition of `%` to initial charset; this allows `|` portion + * to match and thus prevent double-encoding. + */ return preg_replace_callback( '/(?:[^%' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . ']+|%(?![A-Fa-f0-9]{2}))/u', [$this, 'urlEncodeChar'], @@ -568,6 +577,10 @@ class Uri implements UriInterface, Stringable { $path = $this->filterInvalidUtf8($path); + /** + * @psalm-suppress ImpureFunctionCall Even tho the callback targets this immutable class, + * psalm reports an issue here. + */ return preg_replace_callback( '/(?:[^' . self::CHAR_UNRESERVED . ')(:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/u', [$this, 'urlEncodeChar'], @@ -656,6 +669,10 @@ class Uri implements UriInterface, Stringable { $value = $this->filterInvalidUtf8($value); + /** + * @psalm-suppress ImpureFunctionCall Even tho the callback targets this immutable class, + * psalm reports an issue here. + */ return preg_replace_callback( '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/u', [$this, 'urlEncodeChar'], diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/UriFactory.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/UriFactory.php index ba3bd78e1b..31f5a1de86 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/UriFactory.php +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/UriFactory.php @@ -14,7 +14,6 @@ use function count; use function explode; use function gettype; use function implode; -use function is_array; use function is_bool; use function is_scalar; use function is_string; @@ -232,16 +231,14 @@ class UriFactory implements UriFactoryInterface } /** - * @param string|list $host + * @internal + * * @return array{string, int|null} Array of two items, host and port, in that order (can be * passed to a list() operation). + * @psalm-mutation-free */ - private static function marshalHostAndPortFromHeader($host): array + public static function marshalHostAndPortFromHeader(string $host): array { - if (is_array($host)) { - $host = implode(', ', $host); - } - $port = null; // works for regname, IPv4 & IPv6 diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-httphandlerrunner/composer.json b/wcfsetup/install/files/lib/system/api/laminas/laminas-httphandlerrunner/composer.json index 701c89a5ca..973aa252c7 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-httphandlerrunner/composer.json +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-httphandlerrunner/composer.json @@ -21,7 +21,7 @@ "config": { "sort-packages": true, "platform": { - "php": "8.0.99" + "php": "8.1.99" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true @@ -33,17 +33,17 @@ } }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", - "psr/http-message": "^1.0", + "php": "~8.1.0 || ~8.2.0", + "psr/http-message": "^1.0 || ^2.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-diactoros": "^2.18", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "laminas/laminas-coding-standard": "~2.5.0", + "laminas/laminas-diactoros": "^2.25.1", + "phpunit/phpunit": "^10.0.19", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.9" }, "autoload": { "psr-4": { diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-httphandlerrunner/src/Emitter/EmitterStack.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-httphandlerrunner/src/Emitter/EmitterStack.php index 984ee14745..aaea4ef2aa 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-httphandlerrunner/src/Emitter/EmitterStack.php +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-httphandlerrunner/src/Emitter/EmitterStack.php @@ -53,7 +53,6 @@ class EmitterStack extends SplStack implements EmitterInterface #[ReturnTypeWillChange] public function offsetSet($index, $emitter) { - /** @psalm-suppress RedundantConditionGivenDocblockType */ $this->validateEmitter($emitter); parent::offsetSet($index, $emitter); } @@ -68,7 +67,6 @@ class EmitterStack extends SplStack implements EmitterInterface #[ReturnTypeWillChange] public function push($emitter) { - /** @psalm-suppress RedundantConditionGivenDocblockType */ $this->validateEmitter($emitter); parent::push($emitter); } @@ -83,7 +81,6 @@ class EmitterStack extends SplStack implements EmitterInterface #[ReturnTypeWillChange] public function unshift($emitter) { - /** @psalm-suppress RedundantConditionGivenDocblockType */ $this->validateEmitter($emitter); parent::unshift($emitter); } diff --git a/wcfsetup/install/files/lib/system/api/psr/http-client/README.md b/wcfsetup/install/files/lib/system/api/psr/http-client/README.md index 6876b84036..84af5c55d5 100644 --- a/wcfsetup/install/files/lib/system/api/psr/http-client/README.md +++ b/wcfsetup/install/files/lib/system/api/psr/http-client/README.md @@ -7,6 +7,6 @@ Note that this is not a HTTP Client implementation of its own. It is merely abst The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist. -[psr-url]: http://www.php-fig.org/psr/psr-18 +[psr-url]: https://www.php-fig.org/psr/psr-18 [package-url]: https://packagist.org/packages/psr/http-client [implementation-url]: https://packagist.org/providers/psr/http-client-implementation diff --git a/wcfsetup/install/files/lib/system/api/psr/http-client/composer.json b/wcfsetup/install/files/lib/system/api/psr/http-client/composer.json index c195f8ff15..e4cab2f3ea 100644 --- a/wcfsetup/install/files/lib/system/api/psr/http-client/composer.json +++ b/wcfsetup/install/files/lib/system/api/psr/http-client/composer.json @@ -7,12 +7,12 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "autoload": { "psr-4": { diff --git a/wcfsetup/install/files/lib/system/api/psr/http-factory/.gitignore b/wcfsetup/install/files/lib/system/api/psr/http-factory/.gitignore deleted file mode 100644 index d8a7996ab3..0000000000 --- a/wcfsetup/install/files/lib/system/api/psr/http-factory/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -composer.lock -vendor/ diff --git a/wcfsetup/install/files/lib/system/api/psr/http-factory/.pullapprove.yml b/wcfsetup/install/files/lib/system/api/psr/http-factory/.pullapprove.yml deleted file mode 100644 index 8cf081942c..0000000000 --- a/wcfsetup/install/files/lib/system/api/psr/http-factory/.pullapprove.yml +++ /dev/null @@ -1,7 +0,0 @@ -extends: default -reviewers: - - - name: contributors - required: 1 - teams: - - http-factory-contributors diff --git a/wcfsetup/install/files/lib/system/api/psr/http-factory/README.md b/wcfsetup/install/files/lib/system/api/psr/http-factory/README.md index 41d362a625..bf8913b576 100644 --- a/wcfsetup/install/files/lib/system/api/psr/http-factory/README.md +++ b/wcfsetup/install/files/lib/system/api/psr/http-factory/README.md @@ -1,10 +1,12 @@ HTTP Factories ============== -This repository holds all interfaces related to [PSR-17 (HTTP Message Factories)][psr-17]. -Please refer to the specification for a description. +This repository holds all interfaces related to [PSR-17 (HTTP Factories)][psr-url]. -You can find implementations of the specification by looking for packages providing the -[psr/http-factory-implementation](https://packagist.org/providers/psr/http-factory-implementation) virtual package. +Note that this is not a HTTP Factory implementation of its own. It is merely interfaces that describe the components of a HTTP Factory. -[psr-17]: https://www.php-fig.org/psr/psr-17/ +The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist. + +[psr-url]: https://www.php-fig.org/psr/psr-17/ +[package-url]: https://packagist.org/packages/psr/http-factory +[implementation-url]: https://packagist.org/providers/psr/http-factory-implementation diff --git a/wcfsetup/install/files/lib/system/api/psr/http-factory/composer.json b/wcfsetup/install/files/lib/system/api/psr/http-factory/composer.json index af62b290f9..d1bbddeea3 100644 --- a/wcfsetup/install/files/lib/system/api/psr/http-factory/composer.json +++ b/wcfsetup/install/files/lib/system/api/psr/http-factory/composer.json @@ -15,12 +15,12 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "autoload": { "psr-4": { diff --git a/wcfsetup/install/files/lib/system/api/psr/http-server-handler/README.md b/wcfsetup/install/files/lib/system/api/psr/http-server-handler/README.md index 1b7b4860c1..111a9ed2e8 100644 --- a/wcfsetup/install/files/lib/system/api/psr/http-server-handler/README.md +++ b/wcfsetup/install/files/lib/system/api/psr/http-server-handler/README.md @@ -1,6 +1,12 @@ -HTTP Server Handler -=================== +HTTP Server Request Handlers for Middleware +=========================================== -Provides the `RequestHandlerInterface` of [PSR-15][psr-15]. +This repository holds the `RequestHandlerInterface` related to [PSR-15 (HTTP Server Request Handlers)][psr-url]. -[psr-15]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-15-request-handlers.md +Note that this is not a Server Request Handler implementation of its own. It is merely the interface that describe a Server Request Handler. + +The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist. + +[psr-url]: https://www.php-fig.org/psr/psr-15/ +[package-url]: https://packagist.org/packages/psr/http-server-handler +[implementation-url]: https://packagist.org/providers/psr/http-server-handler-implementation diff --git a/wcfsetup/install/files/lib/system/api/psr/http-server-handler/composer.json b/wcfsetup/install/files/lib/system/api/psr/http-server-handler/composer.json index 9e8b51d1ee..c54b2dee82 100644 --- a/wcfsetup/install/files/lib/system/api/psr/http-server-handler/composer.json +++ b/wcfsetup/install/files/lib/system/api/psr/http-server-handler/composer.json @@ -16,12 +16,12 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "require": { "php": ">=7.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "autoload": { "psr-4": { diff --git a/wcfsetup/install/files/lib/system/api/psr/http-server-middleware/README.md b/wcfsetup/install/files/lib/system/api/psr/http-server-middleware/README.md index 8359bd05c1..7b0a9550e5 100644 --- a/wcfsetup/install/files/lib/system/api/psr/http-server-middleware/README.md +++ b/wcfsetup/install/files/lib/system/api/psr/http-server-middleware/README.md @@ -1,6 +1,12 @@ HTTP Server Middleware -====================== +============== -Provides the `MiddlewareInterface` of [PSR-15][psr-15]. +This repository holds the `MiddlewareInterface` related to [PSR-15 (HTTP Server Request Handlers)][psr-url]. -[psr-15]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-15-request-handlers.md +Note that this is not a Middleware implementation of its own. It is merely the interface that describe a Middleware. + +The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist. + +[psr-url]: https://www.php-fig.org/psr/psr-15/ +[package-url]: https://packagist.org/packages/psr/http-server-middleware +[implementation-url]: https://packagist.org/providers/psr/http-server-middleware-implementation diff --git a/wcfsetup/install/files/lib/system/api/psr/http-server-middleware/composer.json b/wcfsetup/install/files/lib/system/api/psr/http-server-middleware/composer.json index 1595513c30..1511671483 100644 --- a/wcfsetup/install/files/lib/system/api/psr/http-server-middleware/composer.json +++ b/wcfsetup/install/files/lib/system/api/psr/http-server-middleware/composer.json @@ -15,12 +15,12 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "require": { "php": ">=7.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0 || ^2.0", "psr/http-server-handler": "^1.0" }, "autoload": { -- 2.20.1