Merge branch '5.3' into 5.4
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 21 Jun 2022 08:47:11 +0000 (10:47 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 21 Jun 2022 08:47:11 +0000 (10:47 +0200)
1  2 
wcfsetup/install/files/lib/system/api/composer.json
wcfsetup/install/files/lib/system/api/composer.lock
wcfsetup/install/files/lib/system/api/composer/installed.json
wcfsetup/install/files/lib/system/api/composer/installed.php
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/CHANGELOG.md
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/README.md
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/composer.json

index ca43ec4489e17ddc9c8aa570002815658e872733,f84c253c1892350632f1f615be16579e871204fb..73264f39f82bcdab991c05382d8dc0b6a6eb57ba
          "chrisjean/php-ico": "1.0.*",
          "true/punycode": "~2.0",
          "pear/net_idna2": "^0.2.0",
 -        "scssphp/scssphp": "^1.3",
 -        "guzzlehttp/guzzle": "dev-6.5-woltlab",
 -        "guzzlehttp/psr7": "dev-woltlab-1.6.1 as 1.6.1"
 +        "scssphp/scssphp": "dev-woltlab-1.4",
 +        "guzzlehttp/guzzle": "dev-7.3.0-woltlab as 7.3.0",
 +        "paragonie/constant_time_encoding": "^2.3",
-         "guzzlehttp/psr7": "1.8.*"
++        "guzzlehttp/psr7": "1.9.*"
      },
      "repositories": [
          {
index 81aa0488424c33c49f5f8fffceb9cd042b65550c,d69cbc8c1f27f3ff0cee00f151d514703d0a0ff3..24486a94d43fbc2d1b2adeab9af7efa41ca4d912
@@@ -4,7 -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": "1a6b4a2f6ca794c5f28b6434753e00e4",
 -    "content-hash": "1c5d2894e134ffd3d6d48cde54301194",
++    "content-hash": "f5fe9f8a33abba6955c7e0e58e52e8b6",
      "packages": [
          {
              "name": "chrisjean/php-ico",
          },
          {
              "name": "guzzlehttp/psr7",
-             "version": "1.8.5",
 -            "version": "dev-woltlab-1.6.1",
++            "version": "1.9.0",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/guzzle-psr7",
 -                "reference": "3dffed9d5f5a762bcc843155a2f85c36614a299e"
 +                "url": "https://github.com/guzzle/psr7.git",
-                 "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
++                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
-                 "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
 -                "url": "https://api.github.com/repos/WoltLab/guzzle-psr7/zipball/3dffed9d5f5a762bcc843155a2f85c36614a299e",
 -                "reference": "3dffed9d5f5a762bcc843155a2f85c36614a299e",
++                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
++                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
                  "shasum": ""
              },
              "require": {
              "type": "library",
              "extra": {
                  "branch-alias": {
-                     "dev-master": "1.7-dev"
 -                    "dev-master": "1.6-dev"
++                    "dev-master": "1.9-dev"
                  }
              },
              "autoload": {
                  "uri",
                  "url"
              ],
-                 "source": "https://github.com/guzzle/psr7/tree/1.8.5"
 +            "support": {
 +                "issues": "https://github.com/guzzle/psr7/issues",
-             "time": "2022-03-20T21:51:18+00:00"
++                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
 +            },
 +            "funding": [
 +                {
 +                    "url": "https://github.com/GrahamCampbell",
 +                    "type": "github"
 +                },
 +                {
 +                    "url": "https://github.com/Nyholm",
 +                    "type": "github"
 +                },
 +                {
 +                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
 +                    "type": "tidelift"
 +                }
 +            ],
+             "time": "2022-06-20T21:43:03+00:00"
          },
 +        {
 +            "name": "paragonie/constant_time_encoding",
 +            "version": "v2.4.0",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/paragonie/constant_time_encoding.git",
 +                "reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c",
 +                "reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": "^7|^8"
 +            },
 +            "require-dev": {
 +                "phpunit/phpunit": "^6|^7|^8|^9",
 +                "vimeo/psalm": "^1|^2|^3|^4"
 +            },
 +            "type": "library",
 +            "autoload": {
 +                "psr-4": {
 +                    "ParagonIE\\ConstantTime\\": "src/"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Paragon Initiative Enterprises",
 +                    "email": "security@paragonie.com",
 +                    "homepage": "https://paragonie.com",
 +                    "role": "Maintainer"
 +                },
 +                {
 +                    "name": "Steve 'Sc00bz' Thomas",
 +                    "email": "steve@tobtu.com",
 +                    "homepage": "https://www.tobtu.com",
 +                    "role": "Original Developer"
 +                }
 +            ],
 +            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
 +            "keywords": [
 +                "base16",
 +                "base32",
 +                "base32_decode",
 +                "base32_encode",
 +                "base64",
 +                "base64_decode",
 +                "base64_encode",
 +                "bin2hex",
 +                "encoding",
 +                "hex",
 +                "hex2bin",
 +                "rfc4648"
 +            ],
 +            "support": {
 +                "email": "info@paragonie.com",
 +                "issues": "https://github.com/paragonie/constant_time_encoding/issues",
 +                "source": "https://github.com/paragonie/constant_time_encoding"
 +            },
 +            "time": "2020-12-06T15:14:20+00:00"
 +        },
          {
              "name": "pear/net_idna2",
              "version": "v0.2.0",
index 4ffa06bac5e7aca88bbaf372c49b5e9be0d8ca15,0b7f5c8f25f863b29d4a04522f268520bb5d7ab8..1130d99378ac00d52f61b99972af63c5651deb0b
          },
          {
              "name": "guzzlehttp/psr7",
-             "version": "1.8.5",
-             "version_normalized": "1.8.5.0",
 -            "version": "dev-woltlab-1.6.1",
 -            "version_normalized": "dev-woltlab-1.6.1",
++            "version": "1.9.0",
++            "version_normalized": "1.9.0.0",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/guzzle-psr7",
 -                "reference": "3dffed9d5f5a762bcc843155a2f85c36614a299e"
 +                "url": "https://github.com/guzzle/psr7.git",
-                 "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
++                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
-                 "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
 -                "url": "https://api.github.com/repos/WoltLab/guzzle-psr7/zipball/3dffed9d5f5a762bcc843155a2f85c36614a299e",
 -                "reference": "3dffed9d5f5a762bcc843155a2f85c36614a299e",
++                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
++                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
                  "shasum": ""
              },
              "require": {
              },
              "require-dev": {
                  "ext-zlib": "*",
 -                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
 +                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
              },
              "suggest": {
 -                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
 +                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
              },
-             "time": "2022-03-20T21:51:18+00:00",
+             "time": "2022-06-20T21:43:03+00:00",
              "type": "library",
              "extra": {
                  "branch-alias": {
-                     "dev-master": "1.7-dev"
 -                    "dev-master": "1.6-dev"
++                    "dev-master": "1.9-dev"
                  }
              },
              "installation-source": "dist",
                  "uri",
                  "url"
              ],
-                 "source": "https://github.com/guzzle/psr7/tree/1.8.5"
 +            "support": {
 +                "issues": "https://github.com/guzzle/psr7/issues",
++                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
 +            },
 +            "funding": [
 +                {
 +                    "url": "https://github.com/GrahamCampbell",
 +                    "type": "github"
 +                },
 +                {
 +                    "url": "https://github.com/Nyholm",
 +                    "type": "github"
 +                },
 +                {
 +                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
 +                    "type": "tidelift"
 +                }
 +            ],
              "install-path": "../guzzlehttp/psr7"
          },
 +        {
 +            "name": "paragonie/constant_time_encoding",
 +            "version": "v2.4.0",
 +            "version_normalized": "2.4.0.0",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/paragonie/constant_time_encoding.git",
 +                "reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c",
 +                "reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": "^7|^8"
 +            },
 +            "require-dev": {
 +                "phpunit/phpunit": "^6|^7|^8|^9",
 +                "vimeo/psalm": "^1|^2|^3|^4"
 +            },
 +            "time": "2020-12-06T15:14:20+00:00",
 +            "type": "library",
 +            "installation-source": "dist",
 +            "autoload": {
 +                "psr-4": {
 +                    "ParagonIE\\ConstantTime\\": "src/"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Paragon Initiative Enterprises",
 +                    "email": "security@paragonie.com",
 +                    "homepage": "https://paragonie.com",
 +                    "role": "Maintainer"
 +                },
 +                {
 +                    "name": "Steve 'Sc00bz' Thomas",
 +                    "email": "steve@tobtu.com",
 +                    "homepage": "https://www.tobtu.com",
 +                    "role": "Original Developer"
 +                }
 +            ],
 +            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
 +            "keywords": [
 +                "base16",
 +                "base32",
 +                "base32_decode",
 +                "base32_encode",
 +                "base64",
 +                "base64_decode",
 +                "base64_encode",
 +                "bin2hex",
 +                "encoding",
 +                "hex",
 +                "hex2bin",
 +                "rfc4648"
 +            ],
 +            "support": {
 +                "email": "info@paragonie.com",
 +                "issues": "https://github.com/paragonie/constant_time_encoding/issues",
 +                "source": "https://github.com/paragonie/constant_time_encoding"
 +            },
 +            "install-path": "../paragonie/constant_time_encoding"
 +        },
          {
              "name": "pear/net_idna2",
              "version": "v0.2.0",
index 7c4a72fc460af52dd99716492304dfd08fdab750,9bc004cf763f3f6ec4598622763c33f69095c6f1..45bb09748c544352c390b2087d7390636969ff94
              'dev_requirement' => false,
          ),
          'guzzlehttp/psr7' => array(
-             'pretty_version' => '1.8.5',
-             'version' => '1.8.5.0',
-             'reference' => '337e3ad8e5716c15f9657bd214d16cc5e69df268',
 -            'pretty_version' => 'dev-woltlab-1.6.1',
 -            'version' => 'dev-woltlab-1.6.1',
 -            'reference' => '3dffed9d5f5a762bcc843155a2f85c36614a299e',
++            'pretty_version' => '1.9.0',
++            'version' => '1.9.0.0',
++            'reference' => 'e98e3e6d4f86621a9b75f623996e6bbdeb4b9318',
              'type' => 'library',
              'install_path' => __DIR__ . '/../guzzlehttp/psr7',
 -            'aliases' => array(
 -                0 => '1.6.1',
 -            ),
 +            'aliases' => array(),
 +            'dev_requirement' => false,
 +        ),
 +        'paragonie/constant_time_encoding' => array(
 +            'pretty_version' => 'v2.4.0',
 +            'version' => '2.4.0.0',
 +            'reference' => 'f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c',
 +            'type' => 'library',
 +            'install_path' => __DIR__ . '/../paragonie/constant_time_encoding',
 +            'aliases' => array(),
              'dev_requirement' => false,
          ),
          'pear/net_idna2' => array(
index f177f583fb65410cefe105749096f04eb3402e8a,4ebe3a865f1e681c3cb68b390c4e0940ba4488da..b4fdf3c68aaff73b9086745816c621a4bdb1196e
@@@ -3,81 -3,14 +3,87 @@@
  
  All notable changes to this project will be documented in this file.
  
- The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
- and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
  
  
 -## [Unreleased]
 +## Unreleased
  
 -## [1.6.0]
++## 1.9.0 - 2022-06-20
++### Added
++
++- Added `UriComparator::isCrossOrigin` method
++
 +## 1.8.5 - 2022-03-20
 +
 +### Fixed
 +
 +- Correct header value validation
 +
 +## 1.8.4 - 2022-03-20
 +
 +### Fixed
 +
 +- Validate header values properly
 +
 +## 1.8.3 - 2021-10-05
 +
 +### Fixed
 +
 +- Return `null` in caching stream size if remote size is `null`
 +
 +## 1.8.2 - 2021-04-26
 +
 +### Fixed
 +
 +- Handle possibly unset `url` in `stream_get_meta_data`
 +
 +## 1.8.1 - 2021-03-21
 +
 +### Fixed
 +
 +- Issue parsing IPv6 URLs
 +- Issue modifying ServerRequest lost all its attributes
 +
 +## 1.8.0 - 2021-03-21
 +
 +### Added
 +
 +- Locale independent URL parsing
 +- Most classes got a `@final` annotation to prepare for 2.0
 +
 +### Fixed
 +
 +- Issue when creating stream from `php://input` and curl-ext is not installed
 +- Broken `Utils::tryFopen()` on PHP 8
 +
 +## 1.7.0 - 2020-09-30
 +
 +### Added
 +
 +- Replaced functions by static methods
 +
 +### Fixed
 +
 +- Converting a non-seekable stream to a string
 +- Handle multiple Set-Cookie correctly
 +- Ignore array keys in header values when merging
 +- Allow multibyte characters to be parsed in `Message:bodySummary()`
 +
 +### Changed
 +
 +- Restored partial HHVM 3 support
 +
 +
 +## [1.6.1] - 2019-07-02
 +
 +### Fixed
 +
 +- Accept null and bool header values again
 +
 +
 +## [1.6.0] - 2019-06-30
  
  ### Added
  
index 464cae4f22e52403a680d63f039f08c816e6c9cb,a94d857d06a2a3f415d98bdcf4e6aea2c1d6a2e2..64776cb665581e9955a3ce57299c5a543a2f2968
@@@ -807,18 -753,3 +817,28 @@@ Whether two URIs can be considered equi
  `$normalizations` bitmask. The method also accepts relative URI references and returns true when they are equivalent.
  This of course assumes they will be resolved against the same base URI. If this is not the case, determination of
  equivalence or difference of relative references does not mean anything.
 +
 +
++## Version Guidance
++
++| Version | Status         | PHP Version      |
++|---------|----------------|------------------|
++| 1.x     | Security fixes | >=5.4,<8.1       |
++| 2.x     | Latest         | ^7.2.5 \|\| ^8.0 |
++
++
 +## Security
 +
 +If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/psr7/security/policy) for more information.
 +
++
 +## License
 +
 +Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information.
 +
++
 +## For Enterprise
 +
 +Available as part of the Tidelift Subscription
 +
 +The maintainers of Guzzle and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-guzzlehttp-psr7?utm_source=packagist-guzzlehttp-psr7&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
index 7ecdc8ba3e5ff2cb45fd90ccef39a9c990977ebc,168a055b06bb295153fdeb876c51d1c66e2d7366..0e36920dbc519a51dcc67bf0cae01bcf3c03e232
      },
      "extra": {
          "branch-alias": {
-             "dev-master": "1.7-dev"
 -            "dev-master": "1.6-dev"
++            "dev-master": "1.9-dev"
 +        }
 +    },
 +    "config": {
 +        "preferred-install": "dist",
 +        "sort-packages": true,
 +        "allow-plugins": {
 +            "bamarni/composer-bin-plugin": true
          }
      }
  }