Merge branch '5.3' into 5.4
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 17 Apr 2023 16:23:38 +0000 (18:23 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 17 Apr 2023 16:23:38 +0000 (18:23 +0200)
1  2 
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/.github/workflows/ci.yml
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/.github/workflows/integration.yml
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/.github/workflows/static.yml
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/CHANGELOG.md
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/composer.json
wcfsetup/install/files/lib/system/api/guzzlehttp/psr7/src/MessageTrait.php

index db4f59cfa25c7da82067c40a3c622449d825f2bb,010384c4c97956ef0a5278a0a26f4d0018896e96..3422fabf92624b15621e7955e50dab914bf54600
          },
          {
              "name": "guzzlehttp/psr7",
-             "version": "1.9.0",
 -            "version": "dev-woltlab-1.6.1",
++            "version": "1.9.1",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/guzzle-psr7",
 -                "reference": "ea8fce9b54724a3527a5cc630574d0ddaafd5acd"
 +                "url": "https://github.com/guzzle/psr7.git",
-                 "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
++                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
-                 "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
 -                "url": "https://api.github.com/repos/WoltLab/guzzle-psr7/zipball/ea8fce9b54724a3527a5cc630574d0ddaafd5acd",
 -                "reference": "ea8fce9b54724a3527a5cc630574d0ddaafd5acd",
++                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b",
++                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b",
                  "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"
              },
              "type": "library",
--            "extra": {
--                "branch-alias": {
-                     "dev-master": "1.9-dev"
 -                    "dev-master": "1.6-dev"
--                }
--            },
              "autoload": {
 -                "psr-4": {
 -                    "GuzzleHttp\\Psr7\\": "src/"
 -                },
                  "files": [
                      "src/functions_include.php"
 -                ]
 -            },
 -            "autoload-dev": {
 +                ],
                  "psr-4": {
 -                    "GuzzleHttp\\Tests\\Psr7\\": "tests/"
 +                    "GuzzleHttp\\Psr7\\": "src/"
                  }
              },
 +            "notification-url": "https://packagist.org/downloads/",
              "license": [
                  "MIT"
              ],
                  "uri",
                  "url"
              ],
 -            "time": "2023-04-17T15:33:27+00:00"
 +            "support": {
 +                "issues": "https://github.com/guzzle/psr7/issues",
-                 "source": "https://github.com/guzzle/psr7/tree/1.9.0"
++                "source": "https://github.com/guzzle/psr7/tree/1.9.1"
 +            },
 +            "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"
++            "time": "2023-04-17T16:00:37+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",
index 9807523ea80bd242465124bb19cb303abd74dd80,b8340af3481f54674c150a9582f3cac475dafd98..4c147f8c2a8755b37c1f70e5fc71987db842320b
          },
          {
              "name": "guzzlehttp/psr7",
-             "version": "1.9.0",
-             "version_normalized": "1.9.0.0",
 -            "version": "dev-woltlab-1.6.1",
 -            "version_normalized": "dev-woltlab-1.6.1",
++            "version": "1.9.1",
++            "version_normalized": "1.9.1.0",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/WoltLab/guzzle-psr7",
 -                "reference": "ea8fce9b54724a3527a5cc630574d0ddaafd5acd"
 +                "url": "https://github.com/guzzle/psr7.git",
-                 "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
++                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
-                 "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
 -                "url": "https://api.github.com/repos/WoltLab/guzzle-psr7/zipball/ea8fce9b54724a3527a5cc630574d0ddaafd5acd",
 -                "reference": "ea8fce9b54724a3527a5cc630574d0ddaafd5acd",
++                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b",
++                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b",
                  "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-06-20T21:43:03+00:00",
 -            "time": "2023-04-17T15:33:27+00:00",
++            "time": "2023-04-17T16:00:37+00:00",
              "type": "library",
--            "extra": {
--                "branch-alias": {
-                     "dev-master": "1.9-dev"
 -                    "dev-master": "1.6-dev"
--                }
--            },
              "installation-source": "dist",
              "autoload": {
 -                "psr-4": {
 -                    "GuzzleHttp\\Psr7\\": "src/"
 -                },
                  "files": [
                      "src/functions_include.php"
 -                ]
 -            },
 -            "autoload-dev": {
 +                ],
                  "psr-4": {
 -                    "GuzzleHttp\\Tests\\Psr7\\": "tests/"
 +                    "GuzzleHttp\\Psr7\\": "src/"
                  }
              },
 +            "notification-url": "https://packagist.org/downloads/",
              "license": [
                  "MIT"
              ],
                  "uri",
                  "url"
              ],
-                 "source": "https://github.com/guzzle/psr7/tree/1.9.0"
 +            "support": {
 +                "issues": "https://github.com/guzzle/psr7/issues",
++                "source": "https://github.com/guzzle/psr7/tree/1.9.1"
 +            },
 +            "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 fb0fa17d8213671293a56f09bf3e542581aeb68b,e72bdd135e4b32fedbd8cafeee8228602923fc68..63278036b2c9fad19b01c805f703aacd7d01413e
              'dev_requirement' => false,
          ),
          'guzzlehttp/psr7' => array(
-             'pretty_version' => '1.9.0',
-             'version' => '1.9.0.0',
-             'reference' => 'e98e3e6d4f86621a9b75f623996e6bbdeb4b9318',
 -            'pretty_version' => 'dev-woltlab-1.6.1',
 -            'version' => 'dev-woltlab-1.6.1',
 -            'reference' => 'ea8fce9b54724a3527a5cc630574d0ddaafd5acd',
++            'pretty_version' => '1.9.1',
++            'version' => '1.9.1.0',
++            'reference' => 'e4490cabc77465aaee90b20cfc9a770f8c04be6b',
              '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 eda7dceb56f5a879f9581d5d25cbc1579c949c9b,0000000000000000000000000000000000000000..0850470e02a3f27ddaa6b7de17fc526516d0f219
mode 100644,000000..100644
--- /dev/null
@@@ -1,34 -1,0 +1,30 @@@
-     runs-on: ubuntu-latest
 +name: CI
 +
 +on:
 +  pull_request:
 +
 +jobs:
 +  build:
 +    name: Build
-         uses: actions/checkout@v2
-       - name: Mimic PHP 8.0
-         run: composer config platform.php 8.0.999
-         if: matrix.php > 8
++    runs-on: ubuntu-22.04
 +    strategy:
 +      max-parallel: 10
 +      matrix:
 +        php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
 +
 +    steps:
 +      - name: Set up PHP
 +        uses: shivammathur/setup-php@v2
 +        with:
 +          php-version: ${{ matrix.php }}
 +          coverage: 'none'
 +          extensions: mbstring
 +
 +      - name: Checkout code
++        uses: actions/checkout@v3
 +
 +      - name: Install dependencies
 +        run: composer update --no-interaction --no-progress
 +
 +      - name: Run tests
 +        run: make test
index 3c31f9ef2a885f78a5570f0e38d46c362fec69b0,0000000000000000000000000000000000000000..a55a256edbd36cd748f7ffa213e6170d04615755
mode 100644,000000..100644
--- /dev/null
@@@ -1,37 -1,0 +1,36 @@@
 +name: Integration
 +
 +on:
 +  pull_request:
 +
 +jobs:
-     runs-on: ubuntu-latest
 +  build:
 +    name: Test
-         php: ['7.2', '7.3', '7.4', '8.0']
++    runs-on: ubuntu-22.04
 +    strategy:
 +      max-parallel: 10
 +      matrix:
-         uses: actions/checkout@v2
++        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
 +
 +    steps:
 +      - name: Set up PHP
 +        uses: shivammathur/setup-php@v2
 +        with:
 +          php-version: ${{ matrix.php }}
 +          coverage: none
 +
 +      - name: Checkout code
++        uses: actions/checkout@v3
 +
 +      - name: Download dependencies
 +        uses: ramsey/composer-install@v1
 +        with:
 +          composer-options: --no-interaction --optimize-autoloader
 +
 +      - name: Start server
 +        run: php -S 127.0.0.1:10002 tests/Integration/server.php &
 +
 +      - name: Run tests
 +        env:
 +          TEST_SERVER: 127.0.0.1:10002
 +        run: ./vendor/bin/phpunit --testsuite Integration
index ab4d68ba30b292972fcb397f102435c94b6cb5d1,0000000000000000000000000000000000000000..f00351b68b24074af6899848879ca45aea49d781
mode 100644,000000..100644
--- /dev/null
@@@ -1,29 -1,0 +1,29 @@@
-     runs-on: ubuntu-latest
 +name: Static analysis
 +
 +on:
 +  pull_request:
 +
 +jobs:
 +  php-cs-fixer:
 +    name: PHP-CS-Fixer
-         uses: actions/checkout@v2
++    runs-on: ubuntu-22.04
 +
 +    steps:
 +      - name: Checkout code
++        uses: actions/checkout@v3
 +
 +      - name: Setup PHP
 +        uses: shivammathur/setup-php@v2
 +        with:
 +          php-version: '7.4'
 +          coverage: none
 +          extensions: mbstring
 +
 +      - name: Download dependencies
 +        run: composer update --no-interaction --no-progress
 +
 +      - name: Download PHP CS Fixer
 +        run: composer require "friendsofphp/php-cs-fixer:2.18.4"
 +
 +      - name: Execute PHP CS Fixer
 +        run: vendor/bin/php-cs-fixer fix --diff-format udiff --dry-run
index b4fdf3c68aaff73b9086745816c621a4bdb1196e,4ebe3a865f1e681c3cb68b390c4e0940ba4488da..9b2b65cdb8abea2404bb253026663f5ea70091e9
@@@ -7,83 -7,10 +7,89 @@@ The format is based on [Keep a Changelo
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
  
  
 -## [Unreleased]
 +## Unreleased
  
 -## [1.6.0]
++## 1.9.1 - 2023-04-17
++### Fixed
++
++- Fixed header validation issue
++
 +## 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 0e36920dbc519a51dcc67bf0cae01bcf3c03e232,168a055b06bb295153fdeb876c51d1c66e2d7366..2607f22d48fc633ac5e57e657b6ae246acd03928
              "GuzzleHttp\\Tests\\Psr7\\": "tests/"
          }
      },
--    "extra": {
--        "branch-alias": {
-             "dev-master": "1.9-dev"
-         }
-     },
 -            "dev-master": "1.6-dev"
 +    "config": {
 +        "preferred-install": "dist",
 +        "sort-packages": true,
 +        "allow-plugins": {
 +            "bamarni/composer-bin-plugin": true
          }
      }
  }