Skip to content

Commit 198578c

Browse files
CyperghostCyperghost
committed
Merge branch 'upgrade-jwt' into 6.1
2 parents 565ef09 + 747052b commit 198578c

File tree

140 files changed

+3983
-19518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+3983
-19518
lines changed

‎com.woltlab.wcf/fileDelete.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,6 +2165,39 @@
21652165
<file>lib/system/api/paragonie/random_compat/other/build_phar.php</file>
21662166
<file>lib/system/api/paragonie/random_compat/psalm-autoload.php</file>
21672167
<file>lib/system/api/paragonie/random_compat/psalm.xml</file>
2168+
<file>lib/system/api/paragonie/sodium_compat/autoload-php7.php</file>
2169+
<file>lib/system/api/paragonie/sodium_compat/composer-php52.json</file>
2170+
<file>lib/system/api/paragonie/sodium_compat/lib/constants.php</file>
2171+
<file>lib/system/api/paragonie/sodium_compat/lib/sodium_compat.php</file>
2172+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/BLAKE2b.php</file>
2173+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20.php</file>
2174+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php</file>
2175+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php</file>
2176+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519.php</file>
2177+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php</file>
2178+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php</file>
2179+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php</file>
2180+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php</file>
2181+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php</file>
2182+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php</file>
2183+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/H.php</file>
2184+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/README.md</file>
2185+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Ed25519.php</file>
2186+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/HChaCha20.php</file>
2187+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/HSalsa20.php</file>
2188+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Int32.php</file>
2189+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Int64.php</file>
2190+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305.php</file>
2191+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305/State.php</file>
2192+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Salsa20.php</file>
2193+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/SecretStream/State.php</file>
2194+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/SipHash.php</file>
2195+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Util.php</file>
2196+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/X25519.php</file>
2197+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/XChaCha20.php</file>
2198+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/XSalsa20.php</file>
2199+
<file>lib/system/api/paragonie/sodium_compat/src/Crypto32.php</file>
2200+
<file>lib/system/api/paragonie/sodium_compat/src/PHP52/SplFixedArray.php</file>
21682201
<file>lib/system/api/parsedown/LICENSE.txt</file>
21692202
<file>lib/system/api/parsedown/Parsedown.php</file>
21702203
<file>lib/system/api/parsedown/README.md</file>

‎com.woltlab.wcf/package.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,8 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
9999
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_serviceWorker.php</instruction>
100100
</instructions>
101101

102-
<instructions type="update" fromversion="6.1.0 RC 1">
103-
<instruction type="acpTemplate">acptemplates_update.tar</instruction>
104-
<instruction type="file">files_update.tar</instruction>
105-
<instruction type="template">templates_update.tar</instruction>
102+
<instructions type="update" fromversion="6.1.0">
103+
<!-- https://github.com/WoltLab/WCF/commit/3434ac976c35ac20a16b717b2fe8d457841c6220 -->
104+
<instruction type="fileDelete"/>
106105
</instructions>
107106
</package>

‎wcfsetup/install/files/lib/system/api/composer.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"sebastian/diff": "^5.1.1",
3434
"symfony/polyfill-php82": "^1.30.0",
3535
"symfony/polyfill-php83": "^1.30",
36-
"web-token/jwt-library": "3.3.50 as dev-3.3.x",
36+
"web-token/jwt-library": "3.4.x-dev as 3.3.50",
3737
"willdurand/negotiation": "^3.1"
3838
},
3939
"replace": {
@@ -47,11 +47,5 @@
4747
"web-token/jwt-signature-algorithm-ecdsa": "*",
4848
"web-token/jwt-util-ecc": "*"
4949
},
50-
"repositories": [
51-
{
52-
"type": "vcs",
53-
"url": "https://github.com/WoltLab/jwt-library.git"
54-
}
55-
],
5650
"type": "project"
5751
}

‎wcfsetup/install/files/lib/system/api/composer.lock

Lines changed: 103 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,7 @@
795795
'Jose\\Component\\Core\\JWK' => $vendorDir . '/web-token/jwt-library/Core/JWK.php',
796796
'Jose\\Component\\Core\\JWKSet' => $vendorDir . '/web-token/jwt-library/Core/JWKSet.php',
797797
'Jose\\Component\\Core\\JWT' => $vendorDir . '/web-token/jwt-library/Core/JWT.php',
798+
'Jose\\Component\\Core\\Util\\Base64UrlSafe' => $vendorDir . '/web-token/jwt-library/Core/Util/Base64UrlSafe.php',
798799
'Jose\\Component\\Core\\Util\\BigInteger' => $vendorDir . '/web-token/jwt-library/Core/Util/BigInteger.php',
799800
'Jose\\Component\\Core\\Util\\ECKey' => $vendorDir . '/web-token/jwt-library/Core/Util/ECKey.php',
800801
'Jose\\Component\\Core\\Util\\ECSignature' => $vendorDir . '/web-token/jwt-library/Core/Util/ECSignature.php',
@@ -1121,6 +1122,10 @@
11211122
'Pelago\\Emogrifier\\HtmlProcessor\\HtmlPruner' => $vendorDir . '/pelago/emogrifier/src/HtmlProcessor/HtmlPruner.php',
11221123
'Pelago\\Emogrifier\\Utilities\\ArrayIntersector' => $vendorDir . '/pelago/emogrifier/src/Utilities/ArrayIntersector.php',
11231124
'Pelago\\Emogrifier\\Utilities\\CssConcatenator' => $vendorDir . '/pelago/emogrifier/src/Utilities/CssConcatenator.php',
1125+
'Psr\\Cache\\CacheException' => $vendorDir . '/psr/cache/src/CacheException.php',
1126+
'Psr\\Cache\\CacheItemInterface' => $vendorDir . '/psr/cache/src/CacheItemInterface.php',
1127+
'Psr\\Cache\\CacheItemPoolInterface' => $vendorDir . '/psr/cache/src/CacheItemPoolInterface.php',
1128+
'Psr\\Cache\\InvalidArgumentException' => $vendorDir . '/psr/cache/src/InvalidArgumentException.php',
11241129
'Psr\\Clock\\ClockInterface' => $vendorDir . '/psr/clock/src/ClockInterface.php',
11251130
'Psr\\EventDispatcher\\EventDispatcherInterface' => $vendorDir . '/psr/event-dispatcher/src/EventDispatcherInterface.php',
11261131
'Psr\\EventDispatcher\\ListenerProviderInterface' => $vendorDir . '/psr/event-dispatcher/src/ListenerProviderInterface.php',

‎wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
2121
'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'),
2222
'Psr\\Clock\\' => array($vendorDir . '/psr/clock/src'),
23+
'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
2324
'Pelago\\Emogrifier\\' => array($vendorDir . '/pelago/emogrifier/src'),
2425
'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
2526
'Negotiation\\' => array($vendorDir . '/willdurand/negotiation/src/Negotiation'),

‎wcfsetup/install/files/lib/system/api/composer/autoload_static.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d
4747
'Psr\\Http\\Client\\' => 16,
4848
'Psr\\EventDispatcher\\' => 20,
4949
'Psr\\Clock\\' => 10,
50+
'Psr\\Cache\\' => 10,
5051
'Pelago\\Emogrifier\\' => 18,
5152
'ParagonIE\\ConstantTime\\' => 23,
5253
),
@@ -150,6 +151,10 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d
150151
array (
151152
0 => __DIR__ . '/..' . '/psr/clock/src',
152153
),
154+
'Psr\\Cache\\' =>
155+
array (
156+
0 => __DIR__ . '/..' . '/psr/cache/src',
157+
),
153158
'Pelago\\Emogrifier\\' =>
154159
array (
155160
0 => __DIR__ . '/..' . '/pelago/emogrifier/src',
@@ -1027,6 +1032,7 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d
10271032
'Jose\\Component\\Core\\JWK' => __DIR__ . '/..' . '/web-token/jwt-library/Core/JWK.php',
10281033
'Jose\\Component\\Core\\JWKSet' => __DIR__ . '/..' . '/web-token/jwt-library/Core/JWKSet.php',
10291034
'Jose\\Component\\Core\\JWT' => __DIR__ . '/..' . '/web-token/jwt-library/Core/JWT.php',
1035+
'Jose\\Component\\Core\\Util\\Base64UrlSafe' => __DIR__ . '/..' . '/web-token/jwt-library/Core/Util/Base64UrlSafe.php',
10301036
'Jose\\Component\\Core\\Util\\BigInteger' => __DIR__ . '/..' . '/web-token/jwt-library/Core/Util/BigInteger.php',
10311037
'Jose\\Component\\Core\\Util\\ECKey' => __DIR__ . '/..' . '/web-token/jwt-library/Core/Util/ECKey.php',
10321038
'Jose\\Component\\Core\\Util\\ECSignature' => __DIR__ . '/..' . '/web-token/jwt-library/Core/Util/ECSignature.php',
@@ -1353,6 +1359,10 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d
13531359
'Pelago\\Emogrifier\\HtmlProcessor\\HtmlPruner' => __DIR__ . '/..' . '/pelago/emogrifier/src/HtmlProcessor/HtmlPruner.php',
13541360
'Pelago\\Emogrifier\\Utilities\\ArrayIntersector' => __DIR__ . '/..' . '/pelago/emogrifier/src/Utilities/ArrayIntersector.php',
13551361
'Pelago\\Emogrifier\\Utilities\\CssConcatenator' => __DIR__ . '/..' . '/pelago/emogrifier/src/Utilities/CssConcatenator.php',
1362+
'Psr\\Cache\\CacheException' => __DIR__ . '/..' . '/psr/cache/src/CacheException.php',
1363+
'Psr\\Cache\\CacheItemInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemInterface.php',
1364+
'Psr\\Cache\\CacheItemPoolInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemPoolInterface.php',
1365+
'Psr\\Cache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/cache/src/InvalidArgumentException.php',
13561366
'Psr\\Clock\\ClockInterface' => __DIR__ . '/..' . '/psr/clock/src/ClockInterface.php',
13571367
'Psr\\EventDispatcher\\EventDispatcherInterface' => __DIR__ . '/..' . '/psr/event-dispatcher/src/EventDispatcherInterface.php',
13581368
'Psr\\EventDispatcher\\ListenerProviderInterface' => __DIR__ . '/..' . '/psr/event-dispatcher/src/ListenerProviderInterface.php',

0 commit comments

Comments
 (0)