From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 24 Jun 2024 10:19:30 +0000 (+0200)
Subject: Merge branch '6.0'
X-Git-Tag: 6.1.0_Alpha_1~50
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=45a6706503b512494d1b99e1a319d4fc337c73ce;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '6.0'
---

45a6706503b512494d1b99e1a319d4fc337c73ce
diff --cc wcfsetup/install/files/lib/system/api/composer/installed.json
index c11532a526,e12181b6a6..c66233fd6e
--- a/wcfsetup/install/files/lib/system/api/composer/installed.json
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.json
@@@ -875,76 -875,10 +875,76 @@@
              ],
              "install-path": "../laminas/laminas-stdlib"
          },
 +        {
 +            "name": "nikic/fast-route",
 +            "version": "2.0.0-beta1",
 +            "version_normalized": "2.0.0.0-beta1",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/nikic/FastRoute.git",
 +                "reference": "d3ada013d0f683ad2a8d0614fc97917a6ab72ce9"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/nikic/FastRoute/zipball/d3ada013d0f683ad2a8d0614fc97917a6ab72ce9",
 +                "reference": "d3ada013d0f683ad2a8d0614fc97917a6ab72ce9",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": ">=8.1.0",
 +                "psr/simple-cache": "^2.0 || ^3.0"
 +            },
 +            "require-dev": {
 +                "lcobucci/coding-standard": "^11.0",
 +                "phpbench/phpbench": "^1.2",
 +                "phpstan/extension-installer": "^1.1",
 +                "phpstan/phpstan": "^1.10",
 +                "phpstan/phpstan-deprecation-rules": "^1.1",
 +                "phpstan/phpstan-phpunit": "^1.3",
 +                "phpstan/phpstan-strict-rules": "^1.5",
 +                "phpunit/phpunit": "^10.3"
 +            },
 +            "time": "2024-03-04T23:46:43+00:00",
 +            "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "2.0-dev"
 +                }
 +            },
 +            "installation-source": "dist",
 +            "autoload": {
 +                "files": [
 +                    "src/functions.php"
 +                ],
 +                "psr-4": {
 +                    "FastRoute\\": "src/"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "BSD-3-Clause"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Nikita Popov",
 +                    "email": "nikic@php.net"
 +                }
 +            ],
 +            "description": "Fast request router for PHP",
 +            "keywords": [
 +                "router",
 +                "routing"
 +            ],
 +            "support": {
 +                "issues": "https://github.com/nikic/FastRoute/issues",
 +                "source": "https://github.com/nikic/FastRoute/tree/2.0.0-beta1"
 +            },
 +            "install-path": "../nikic/fast-route"
 +        },
          {
              "name": "paragonie/constant_time_encoding",
-             "version": "v2.6.3",
-             "version_normalized": "2.6.3.0",
+             "version": "v2.7.0",
+             "version_normalized": "2.7.0.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/paragonie/constant_time_encoding.git",