Update composer dependencies

diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json
index d8aec66f1b97886017c974da3034f09c45860aad..6069ec8723f5ddb33f861f26056371892610acf6 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer.json
+++ b/wcfsetup/install/files/lib/system/api/composer.json
@@ -16,14 +16,14 @@
         "ezyang/htmlpurifier": "^4.16",
         "guzzlehttp/guzzle": "^7.5",
         "guzzlehttp/psr7": "^2.4.4",
-        "laminas/laminas-diactoros": "^2.24",
+        "laminas/laminas-diactoros": "^2.25",
         "laminas/laminas-httphandlerrunner": "^2.5",
         "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.0.1",
+        "psr/http-message": "^1.1.0",
         "psr/http-server-handler": "^1.0.1",
         "psr/http-server-middleware": "^1.0.1",
         "psr/log": "^3.0",

diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock
index 051126fd258464ab048799201bb2fe771e35ab01..e70c45d86502280183803e40a3c100b19c261273 100644 (file)
--- 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": "4911991e9bda1b201db48af57cfdbb38",
+    "content-hash": "377e92279621e76f6a9be59974e3bf7d",
     "packages": [
         {
             "name": "cuyz/valinor",
@@ -584,22 +584,22 @@
         },
         {
             "name": "laminas/laminas-diactoros",
-            "version": "2.24.0",
+            "version": "2.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-diactoros.git",
-                "reference": "6028af6c3b5ced4d063a680d2483cce67578b902"
+                "reference": "0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6028af6c3b5ced4d063a680d2483cce67578b902",
-                "reference": "6028af6c3b5ced4d063a680d2483cce67578b902",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f",
+                "reference": "0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f",
                 "shasum": ""
             },
             "require": {
                 "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
                 "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.1"
             },
             "conflict": {
                 "zendframework/zend-diactoros": "*"
@@ -614,11 +614,11 @@
                 "ext-gd": "*",
                 "ext-libxml": "*",
                 "http-interop/http-factory-tests": "^0.9.0",
-                "laminas/laminas-coding-standard": "^2.4.0",
+                "laminas/laminas-coding-standard": "^2.5",
                 "php-http/psr7-integration-tests": "^1.2",
-                "phpunit/phpunit": "^9.5.27",
+                "phpunit/phpunit": "^9.5.28",
                 "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.4"
+                "vimeo/psalm": "^5.6"
             },
             "type": "library",
             "extra": {
@@ -677,7 +677,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-12-20T12:22:40+00:00"
+            "time": "2023-04-06T19:01:57+00:00"
         },
         {
             "name": "laminas/laminas-httphandlerrunner",

diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json
index 1e67bdb7b19f0b545a99e71b072950897eefdc18..368f81864f4c7f4e8a3bdb99ca595449e1b873c7 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/installed.json
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.json
@@ -599,23 +599,23 @@
         },
         {
             "name": "laminas/laminas-diactoros",
-            "version": "2.24.0",
-            "version_normalized": "2.24.0.0",
+            "version": "2.25.0",
+            "version_normalized": "2.25.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-diactoros.git",
-                "reference": "6028af6c3b5ced4d063a680d2483cce67578b902"
+                "reference": "0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6028af6c3b5ced4d063a680d2483cce67578b902",
-                "reference": "6028af6c3b5ced4d063a680d2483cce67578b902",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f",
+                "reference": "0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f",
                 "shasum": ""
             },
             "require": {
                 "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
                 "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.1"
             },
             "conflict": {
                 "zendframework/zend-diactoros": "*"
@@ -630,13 +630,13 @@
                 "ext-gd": "*",
                 "ext-libxml": "*",
                 "http-interop/http-factory-tests": "^0.9.0",
-                "laminas/laminas-coding-standard": "^2.4.0",
+                "laminas/laminas-coding-standard": "^2.5",
                 "php-http/psr7-integration-tests": "^1.2",
-                "phpunit/phpunit": "^9.5.27",
+                "phpunit/phpunit": "^9.5.28",
                 "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.4"
+                "vimeo/psalm": "^5.6"
             },
-            "time": "2022-12-20T12:22:40+00:00",
+            "time": "2023-04-06T19:01:57+00:00",
             "type": "library",
             "extra": {
                 "laminas": {

diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php
index ca458388d93a1f402c2cbeb4e903b0fd7ab9590f..24f8419dedb79477251f55ac6ed0f2c8650092d7 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/installed.php
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.php
@@ -83,9 +83,9 @@
             'dev_requirement' => false,
         ),
         'laminas/laminas-diactoros' => array(
-            'pretty_version' => '2.24.0',
-            'version' => '2.24.0.0',
-            'reference' => '6028af6c3b5ced4d063a680d2483cce67578b902',
+            'pretty_version' => '2.25.0',
+            'version' => '2.25.0.0',
+            'reference' => '0e9dd2516460be1a9c26ccdf9091ef293a1c3c6f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-diactoros',
             'aliases' => array(),

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/composer.json b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/composer.json
index 37210111093885f7bd45a6b5aab8a97335d33db5..c141b3843865a91c321f308c98f87573059c8c3b 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/composer.json
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/composer.json
@@ -36,7 +36,7 @@
     "require": {
         "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.1"
     },
     "require-dev": {
         "ext-curl": "*",
@@ -44,11 +44,11 @@
         "ext-gd": "*",
         "ext-libxml": "*",
         "http-interop/http-factory-tests": "^0.9.0",
-        "laminas/laminas-coding-standard": "^2.4.0",
+        "laminas/laminas-coding-standard": "^2.5",
         "php-http/psr7-integration-tests": "^1.2",
-        "phpunit/phpunit": "^9.5.27",
+        "phpunit/phpunit": "^9.5.28",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.4"
+        "vimeo/psalm": "^5.6"
     },
     "provide": {
         "psr/http-factory-implementation": "1.0",

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 2327646d544b0e5eff38cdac0729f4802ded6619..fbd650901c57ba4a6f7b64273a9a3260189ec442 100644 (file)
--- 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
@@ -8,6 +8,8 @@ use Laminas\Diactoros\Exception\InvalidForwardedHeaderNameException;
 use Laminas\Diactoros\Exception\InvalidProxyAddressException;
 use Psr\Http\Message\ServerRequestInterface;
 
+use function assert;
+use function count;
 use function explode;
 use function filter_var;
 use function in_array;
@@ -224,7 +226,9 @@ final class FilterUsingXForwardedHeaders implements FilterServerRequestInterface
         $address = $cidr;
         $mask    = null;
         if (str_contains($cidr, '/')) {
-            [$address, $mask] = explode('/', $cidr, 2);
+            $parts = explode('/', $cidr, 2);
+            assert(count($parts) >= 2);
+            [$address, $mask] = $parts;
             $mask             = (int) $mask;
         }
 

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/ServerRequestFilter/IPRange.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/ServerRequestFilter/IPRange.php
index cdf16d0bc909a748c13a24b2bce98c958d288b75..fbdb65ee8ff734568833eca59e0497ced68de0bb 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/ServerRequestFilter/IPRange.php
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/ServerRequestFilter/IPRange.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Laminas\Diactoros\ServerRequestFilter;
 
+use function assert;
+use function count;
 use function explode;
 use function inet_pton;
 use function intval;
@@ -43,7 +45,9 @@ final class IPRange
         $subnet = $cidr;
 
         if (str_contains($cidr, '/')) {
-            [$subnet, $mask] = explode('/', $cidr, 2);
+            $parts = explode('/', $cidr, 2);
+            assert(count($parts) >= 2);
+            [$subnet, $mask] = $parts;
             $mask            = (int) $mask;
         }
 
@@ -73,7 +77,9 @@ final class IPRange
         $subnet = $cidr;
 
         if (str_contains($cidr, '/')) {
-            [$subnet, $mask] = explode('/', $cidr, 2);
+            $parts = explode('/', $cidr, 2);
+            assert(count($parts) >= 2);
+            [$subnet, $mask] = $parts;
             $mask            = (int) $mask;
         }
 

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Stream.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Stream.php
index e3ef4717f4fbc64919be7274ba921379ccf05e60..96c0982ebddbe4ffb3027decd4cc088248488cb2 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Stream.php
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Stream.php
@@ -44,11 +44,11 @@ class Stream implements StreamInterface, Stringable
     /** @var resource|null */
     protected $resource;
 
-    /** @var string|resource */
+    /** @var string|object|resource|null */
     protected $stream;
 
     /**
-     * @param string|resource $stream
+     * @param string|object|resource $stream
      * @param string $mode Mode with which to open stream
      * @throws Exception\InvalidArgumentException
      */
@@ -103,7 +103,7 @@ class Stream implements StreamInterface, Stringable
     /**
      * Attach a new stream/resource to the instance.
      *
-     * @param string|resource $resource
+     * @param string|object|resource $resource
      * @throws Exception\InvalidArgumentException For stream identifier that cannot be cast to a resource.
      * @throws Exception\InvalidArgumentException For non-resource stream.
      */
@@ -313,7 +313,7 @@ class Stream implements StreamInterface, Stringable
     /**
      * Set the internal stream resource.
      *
-     * @param string|resource $stream String stream target or stream resource.
+     * @param string|object|resource $stream String stream target or stream resource.
      * @param string $mode Resource mode for stream target.
      * @throws Exception\InvalidArgumentException For invalid streams or resources.
      */

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 d0ce13af997f0b93f3d8e8b6d7bc93b9e634b931..ba3bd78e1b3da495744f28a577ca808ada29ef38 100644 (file)
--- 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
@@ -9,6 +9,8 @@ use Psr\Http\Message\UriInterface;
 
 use function array_change_key_case;
 use function array_key_exists;
+use function assert;
+use function count;
 use function explode;
 use function gettype;
 use function implode;
@@ -76,7 +78,9 @@ class UriFactory implements UriFactoryInterface
 
         $fragment = '';
         if (str_contains($path, '#')) {
-            [$path, $fragment] = explode('#', $path, 2);
+            $parts = explode('#', $path, 2);
+            assert(count($parts) >= 2);
+            [$path, $fragment] = $parts;
         }
 
         return $uri

diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php
index 124cdff4ad17cef228765539ce1bd56c03c8f0e7..186d6d9af11188825672935da67fa8bbaaf7857c 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php
@@ -6,6 +6,8 @@ namespace Laminas\Diactoros;
 
 use function array_change_key_case;
 use function array_key_exists;
+use function assert;
+use function count;
 use function explode;
 use function gettype;
 use function implode;
@@ -219,7 +221,9 @@ function marshalUriFromSapi(array $server, array $headers): Uri
     // URI fragment
     $fragment = '';
     if (str_contains($path, '#')) {
-        [$path, $fragment] = explode('#', $path, 2);
+        $parts = explode('#', $path, 2);
+        assert(count($parts) >= 2);
+        [$path, $fragment] = $parts;
     }
 
     return $uri