From a6f5c0e908655752aeace8701f3b2c83efc06703 Mon Sep 17 00:00:00 2001
From: Cyperghost <olaf_schmitz_1@t-online.de>
Date: Wed, 13 Nov 2024 09:37:48 +0100
Subject: [PATCH] Remove composer require package `web-token/jwt-library` which
 is already delivered by `minishlink/web-push` in the correct version

---
 .../install/files/lib/system/api/composer.json |  1 -
 .../install/files/lib/system/api/composer.lock | 18 +++++-------------
 .../lib/system/api/composer/installed.json     |  6 +++---
 .../lib/system/api/composer/installed.php      | 12 +++++-------
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json
index 2a7106b3fe..b14ad97c27 100644
--- a/wcfsetup/install/files/lib/system/api/composer.json
+++ b/wcfsetup/install/files/lib/system/api/composer.json
@@ -33,7 +33,6 @@
     "sebastian/diff": "^5.1.1",
     "symfony/polyfill-php82": "^1.30.0",
     "symfony/polyfill-php83": "^1.30",
-    "web-token/jwt-library": "3.4.x-dev as 3.3.50",
     "willdurand/negotiation": "^3.1"
   },
   "replace": {
diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock
index 8efd16f28c..6c64d1baa2 100644
--- 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": "df8d36acac2bd2ee12183174cb4558ec",
+    "content-hash": "19f380ad9f8c022a19aee861df399da6",
     "packages": [
         {
             "name": "brick/math",
@@ -2511,7 +2511,7 @@
         },
         {
             "name": "web-token/jwt-library",
-            "version": "3.4.x-dev",
+            "version": "3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-library.git",
@@ -2593,7 +2593,7 @@
             ],
             "support": {
                 "issues": "https://github.com/web-token/jwt-library/issues",
-                "source": "https://github.com/web-token/jwt-library/tree/3.4.x"
+                "source": "https://github.com/web-token/jwt-library/tree/3.4.6"
             },
             "funding": [
                 {
@@ -2723,18 +2723,10 @@
         }
     ],
     "packages-dev": [],
-    "aliases": [
-        {
-            "package": "web-token/jwt-library",
-            "version": "3.4.9999999.9999999-dev",
-            "alias": "3.3.50",
-            "alias_normalized": "3.3.50.0"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "nikic/fast-route": 10,
-        "web-token/jwt-library": 20
+        "nikic/fast-route": 10
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json
index fac9390a2f..1ffd302720 100644
--- a/wcfsetup/install/files/lib/system/api/composer/installed.json
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.json
@@ -2616,8 +2616,8 @@
         },
         {
             "name": "web-token/jwt-library",
-            "version": "3.4.x-dev",
-            "version_normalized": "3.4.9999999.9999999-dev",
+            "version": "3.4.6",
+            "version_normalized": "3.4.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-library.git",
@@ -2701,7 +2701,7 @@
             ],
             "support": {
                 "issues": "https://github.com/web-token/jwt-library/issues",
-                "source": "https://github.com/web-token/jwt-library/tree/3.4.x"
+                "source": "https://github.com/web-token/jwt-library/tree/3.4.6"
             },
             "funding": [
                 {
diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php
index 1ef045f7f0..1723a6de09 100644
--- a/wcfsetup/install/files/lib/system/api/composer/installed.php
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => '6.1.x-dev',
         'version' => '6.1.9999999.9999999-dev',
-        'reference' => 'a3e52ecf7029e45ad8f926f9c62c92d691d4dd74',
+        'reference' => '3959efa223892cb168c1f1a89bff4ae0d9b53d9b',
         'type' => 'project',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => '6.1.x-dev',
             'version' => '6.1.9999999.9999999-dev',
-            'reference' => 'a3e52ecf7029e45ad8f926f9c62c92d691d4dd74',
+            'reference' => '3959efa223892cb168c1f1a89bff4ae0d9b53d9b',
             'type' => 'project',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
@@ -415,14 +415,12 @@
             ),
         ),
         'web-token/jwt-library' => array(
-            'pretty_version' => '3.4.x-dev',
-            'version' => '3.4.9999999.9999999-dev',
+            'pretty_version' => '3.4.6',
+            'version' => '3.4.6.0',
             'reference' => '1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28',
             'type' => 'library',
             'install_path' => __DIR__ . '/../web-token/jwt-library',
-            'aliases' => array(
-                0 => '3.3.50',
-            ),
+            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'web-token/jwt-signature' => array(
-- 
2.20.1