projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ba598f 05322f9)
Merge branch '5.5'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 17 Apr 2023 20:03:47 +0000 (22:03 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 17 Apr 2023 20:03:47 +0000 (22:03 +0200)
1  2 
wcfsetup/install/files/lib/system/api/composer.lock patch | diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/api/composer/installed.json patch | diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/api/composer/installed.php patch | diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/CHANGELOG.md patch | diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/composer.json patch | diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/HeaderSecurity.php patch | diff1 | diff2 | blob | history

diff --cc wcfsetup/install/files/lib/system/api/composer.lock
index 0ba66344d084d07d410b1ade9c7ae60adb256252,acdb4f6f75a036582dcbfc473e957c2d6b1bd2a3..5e0e0e90c001727adebc2e4f93a0e36679eb56bc
--- 1/wcfsetup/install/files/lib/system/api/composer.lock
--- 2/wcfsetup/install/files/lib/system/api/composer.lock
+++ b/wcfsetup/install/files/lib/system/api/composer.lock
@@@ -465,22 -378,22 +465,22 @@@
          },
          {
              "name": "guzzlehttp/psr7",
-             "version": "2.4.4",
 -            "version": "2.4.5",
++            "version": "2.5.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/guzzle/psr7.git",
-                 "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf"
 -                "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66"
++                "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
              },
              "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",
++                "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
++                "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
                  "shasum": ""
              },
              "require": {
                  "php": "^7.2.5 || ^8.0",
                  "psr/http-factory": "^1.0",
--                "psr/http-message": "^1.0",
++                "psr/http-message": "^1.1 || ^2.0",
                  "ralouphie/getallheaders": "^3.0"
              },
              "provide": {
@@@ -564,7 -474,7 +561,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"
++                "source": "https://github.com/guzzle/psr7/tree/2.5.0"
              },
              "funding": [
                  {
@@@ -580,20 -490,20 +577,20 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2023-03-09T13:19:02+00:00"
 -            "time": "2023-04-17T16:00:45+00:00"
++            "time": "2023-04-17T16:11:26+00:00"
          },
          {
              "name": "laminas/laminas-diactoros",
-             "version": "2.25.1",
 -            "version": "dev-woltlab-2.4",
++            "version": "2.25.2",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/laminas-diactoros",
 -                "reference": "f74e310c766cf2bcab685a14353aacf2185e9384"
 +                "url": "https://github.com/laminas/laminas-diactoros.git",
-                 "reference": "13f45e5ba09c9b27752247d3be186fc49c2ca3a5"
++                "reference": "9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/13f45e5ba09c9b27752247d3be186fc49c2ca3a5",
-                 "reference": "13f45e5ba09c9b27752247d3be186fc49c2ca3a5",
 -                "url": "https://api.github.com/repos/WoltLab/laminas-diactoros/zipball/f74e310c766cf2bcab685a14353aacf2185e9384",
 -                "reference": "f74e310c766cf2bcab685a14353aacf2185e9384",
++                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e",
++                "reference": "9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e",
                  "shasum": ""
              },
              "require": {
@@@ -664,20 -598,14 +661,20 @@@
                  "psr-7"
              ],
              "support": {
 +                "chat": "https://laminas.dev/chat",
                  "docs": "https://docs.laminas.dev/laminas-diactoros/",
 +                "forum": "https://discourse.laminas.dev",
                  "issues": "https://github.com/laminas/laminas-diactoros/issues",
 -                "source": "https://github.com/laminas/laminas-diactoros",
                  "rss": "https://github.com/laminas/laminas-diactoros/releases.atom",
 -                "chat": "https://laminas.dev/chat",
 -                "forum": "https://discourse.laminas.dev"
 +                "source": "https://github.com/laminas/laminas-diactoros"
              },
 -            "time": "2023-04-13T15:12:36+00:00"
 +            "funding": [
 +                {
 +                    "url": "https://funding.communitybridge.org/projects/laminas-project",
 +                    "type": "community_bridge"
 +                }
 +            ],
-             "time": "2023-04-08T00:31:34+00:00"
++            "time": "2023-04-17T15:44:17+00:00"
          },
          {
              "name": "laminas/laminas-httphandlerrunner",
diff --cc wcfsetup/install/files/lib/system/api/composer/installed.json
index b693a8491290cc8f4d71e3c2b36ef64bebe2642b,dbd40bbe96e27f5d877f44c68ef15bf72ad68b40..3b513b65c595300f4c2053a5951f71ee05ba4108
--- 1/wcfsetup/install/files/lib/system/api/composer/installed.json
--- 2/wcfsetup/install/files/lib/system/api/composer/installed.json
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.json
@@@ -477,23 -379,23 +477,23 @@@
          },
          {
              "name": "guzzlehttp/psr7",
-             "version": "2.4.4",
-             "version_normalized": "2.4.4.0",
 -            "version": "2.4.5",
 -            "version_normalized": "2.4.5.0",
++            "version": "2.5.0",
++            "version_normalized": "2.5.0.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/guzzle/psr7.git",
-                 "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf"
 -                "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66"
++                "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
              },
              "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",
++                "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
++                "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
                  "shasum": ""
              },
              "require": {
                  "php": "^7.2.5 || ^8.0",
                  "psr/http-factory": "^1.0",
--                "psr/http-message": "^1.0",
++                "psr/http-message": "^1.1 || ^2.0",
                  "ralouphie/getallheaders": "^3.0"
              },
              "provide": {
@@@ -508,7 -410,7 +508,7 @@@
              "suggest": {
                  "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
              },
-             "time": "2023-03-09T13:19:02+00:00",
 -            "time": "2023-04-17T16:00:45+00:00",
++            "time": "2023-04-17T16:11:26+00:00",
              "type": "library",
              "extra": {
                  "bamarni-bin": {
@@@ -579,7 -478,7 +576,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"
++                "source": "https://github.com/guzzle/psr7/tree/2.5.0"
              },
              "funding": [
                  {
@@@ -599,17 -498,17 +596,17 @@@
          },
          {
              "name": "laminas/laminas-diactoros",
-             "version": "2.25.1",
-             "version_normalized": "2.25.1.0",
 -            "version": "dev-woltlab-2.4",
 -            "version_normalized": "dev-woltlab-2.4",
++            "version": "2.25.2",
++            "version_normalized": "2.25.2.0",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/laminas-diactoros",
 -                "reference": "f74e310c766cf2bcab685a14353aacf2185e9384"
 +                "url": "https://github.com/laminas/laminas-diactoros.git",
-                 "reference": "13f45e5ba09c9b27752247d3be186fc49c2ca3a5"
++                "reference": "9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/13f45e5ba09c9b27752247d3be186fc49c2ca3a5",
-                 "reference": "13f45e5ba09c9b27752247d3be186fc49c2ca3a5",
 -                "url": "https://api.github.com/repos/WoltLab/laminas-diactoros/zipball/f74e310c766cf2bcab685a14353aacf2185e9384",
 -                "reference": "f74e310c766cf2bcab685a14353aacf2185e9384",
++                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e",
++                "reference": "9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e",
                  "shasum": ""
              },
              "require": {
@@@ -629,14 -532,12 +626,14 @@@
                  "ext-dom": "*",
                  "ext-gd": "*",
                  "ext-libxml": "*",
 -                "http-interop/http-factory-tests": "^0.5.0",
 -                "laminas/laminas-coding-standard": "~1.0.0",
 -                "php-http/psr7-integration-tests": "^1.0",
 -                "phpunit/phpunit": "^7.5.18"
 -            },
 -            "time": "2023-04-13T15:12:36+00:00",
 +                "http-interop/http-factory-tests": "^0.9.0",
 +                "laminas/laminas-coding-standard": "^2.5",
 +                "php-http/psr7-integration-tests": "^1.2",
 +                "phpunit/phpunit": "^9.5.28",
 +                "psalm/plugin-phpunit": "^0.18.4",
 +                "vimeo/psalm": "^5.6"
 +            },
-             "time": "2023-04-08T00:31:34+00:00",
++            "time": "2023-04-17T15:44:17+00:00",
              "type": "library",
              "extra": {
                  "laminas": {
diff --cc wcfsetup/install/files/lib/system/api/composer/installed.php
index 2212741d3b14c3233c736758498624879c5fbbec,5fc64588090b66bccf21f59d3978c2d3c835e7cc..314a8678e089a0dfa247f4c35fa05172f8fb4024
--- 1/wcfsetup/install/files/lib/system/api/composer/installed.php
--- 2/wcfsetup/install/files/lib/system/api/composer/installed.php
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.php
@@@ -74,18 -65,18 +74,18 @@@
              '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',
++            'pretty_version' => '2.5.0',
++            'version' => '2.5.0.0',
++            'reference' => 'b635f279edd83fc275f822a1188157ffea568ff6',
              'type' => 'library',
              'install_path' => __DIR__ . '/../guzzlehttp/psr7',
              'aliases' => array(),
              'dev_requirement' => false,
          ),
          'laminas/laminas-diactoros' => array(
-             'pretty_version' => '2.25.1',
-             'version' => '2.25.1.0',
-             'reference' => '13f45e5ba09c9b27752247d3be186fc49c2ca3a5',
 -            'pretty_version' => 'dev-woltlab-2.4',
 -            'version' => 'dev-woltlab-2.4',
 -            'reference' => 'f74e310c766cf2bcab685a14353aacf2185e9384',
++            'pretty_version' => '2.25.2',
++            'version' => '2.25.2.0',
++            'reference' => '9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e',
              'type' => 'library',
              'install_path' => __DIR__ . '/../laminas/laminas-diactoros',
              'aliases' => array(),
diff --cc wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/CHANGELOG.md
index 0eabd3048fbca114a9a00f02e34ce381339ced5e,49e0c12a47846b150d4fa39a031d209ccf91ac73..fa716c094b87ebf024de25ff3f1ced38488cb3e8
--- 1/wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/CHANGELOG.md
--- 2/wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/CHANGELOG.md
+++ b/wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/CHANGELOG.md
@@@ -7,6 -7,14 +7,20 @@@ and this project adheres to [Semantic V
  
  ## Unreleased
  
++## 2.5.0 - 2023-04-17
++
++### Changed
++
++- Adjusted `psr/http-message` version constraint to `^1.1 || ^2.0`
++
+ ## 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 --cc wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/composer.json
index cd91040cf8ecf3a639614b1d8f9265a9899251cc,c0e7236c3eb2fd3c200b9ed0974bc7796695414e..d51dd622ef81c436fcadb3ae944d91254e397eb9
--- 1/wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/composer.json
--- 2/wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/composer.json
+++ b/wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/composer.json
@@@ -52,7 -52,7 +52,7 @@@
      "require": {
          "php": "^7.2.5 || ^8.0",
          "psr/http-factory": "^1.0",
--        "psr/http-message": "^1.0",
++        "psr/http-message": "^1.1 || ^2.0",
          "ralouphie/getallheaders": "^3.0"
      },
      "provide": {
diff --cc wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/HeaderSecurity.php
index 08a5e3c3e0f5d2ef92e8e7cdfdc98c219c286f1b,c9130e0c5b333c48ecb508ab66a676938df7c2c0..d12486aebe5f4b59d3e3cab537eae34c8baeb149
--- 1/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/HeaderSecurity.php
--- 2/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/HeaderSecurity.php
+++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/HeaderSecurity.php
@@@ -151,10 -162,10 +151,10 @@@ final class HeaderSecurit
          if (! is_string($name)) {
              throw new Exception\InvalidArgumentException(sprintf(
                  'Invalid header name type; expected string; received %s',
 -                (is_object($name) ? get_class($name) : gettype($name))
 +                is_object($name) ? $name::class : gettype($name)
              ));
          }
-         if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/', $name)) {
+         if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/D', $name)) {
              throw new Exception\InvalidArgumentException(sprintf(
                  '"%s" is not valid header name',
                  $name
WoltLab Suite Core (previously WoltLab Community Framework)