Skip to content

Commit 9f310d2

Browse files
committed
[TASK] Update firebase/php-jwt ^6.10.2 and remove composer patch
TYPO3 monorepo used a composer patch based on [1] for the `firebase/php-jwt` package to resolve the one or other PHP 8.4 issue to allow testing TYPO3 against PHP 8.4. The pull-request has been merged already months ago and a release has been finally made [2]. This change removes the composer patch introduced with #104578 and updates the package version to ensure having required fixes on board even for classic mode installations. Used command(s): > composer remove --dev "cweagans/composer-patches" > composer config --no-plugins --no-interaction \ --unset allow-plugins.cweagans/composer-patches > composer config --no-plugins --no-interaction \ --unset extra.composer-exit-on-patch-failure > composer config --no-plugins --no-interaction \ --unset extra.patches-file > composer require -d typo3/sysext/core --no-update \ "firebase/php-jwt":"^6.10.2" > composer require "firebase/php-jwt":"^6.10.2" > rm -rf Build/patches [1] firebase/php-jwt#572 [2] https://github.com/firebase/php-jwt/releases/tag/v6.10.2 Resolves: #105689 Related: #104578 Releases: main, 13.4 Change-Id: I6af68aaacabae9e64f2eecef75a5169943d738d8 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/87219 Tested-by: core-ci <[email protected]> Tested-by: Stefan Bürk <[email protected]> Reviewed-by: Stefan Bürk <[email protected]>
1 parent 65f01b7 commit 9f310d2

File tree

5 files changed

+13
-134
lines changed

5 files changed

+13
-134
lines changed

Build/patches/firebase-php-jwt-572-php-8.4.diff

Lines changed: 0 additions & 62 deletions
This file was deleted.

Build/patches/patches.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

composer.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
"sort-packages": true,
3737
"allow-plugins": {
3838
"typo3/class-alias-loader": true,
39-
"typo3/cms-composer-installers": true,
40-
"cweagans/composer-patches": true
39+
"typo3/cms-composer-installers": true
4140
}
4241
},
4342
"require": {
@@ -63,7 +62,7 @@
6362
"doctrine/lexer": "^3.0.1",
6463
"egulias/email-validator": "^4.0",
6564
"enshrined/svg-sanitize": "^0.20.0",
66-
"firebase/php-jwt": "^6.10.1",
65+
"firebase/php-jwt": "^6.10.2",
6766
"guzzlehttp/guzzle": "^7.9.2",
6867
"guzzlehttp/promises": "^2.0.3",
6968
"guzzlehttp/psr7": "^2.7.0",
@@ -116,7 +115,6 @@
116115
"codeception/module-filesystem": "^3.0.1",
117116
"codeception/module-webdriver": "^4.0.2",
118117
"composer/composer": "^2.7.8",
119-
"cweagans/composer-patches": "^1.7.3",
120118
"friendsofphp/php-cs-fixer": "^3.64.0",
121119
"php-webdriver/webdriver": "^1.15.1",
122120
"phpstan/phpdoc-parser": "^1.30.0",
@@ -154,9 +152,7 @@
154152
},
155153
"branch-alias": {
156154
"dev-main": "13.4.x-dev"
157-
},
158-
"composer-exit-on-patch-failure": "true",
159-
"patches-file": "Build/patches/patches.json"
155+
}
160156
},
161157
"scripts": {
162158
"gerrit:setup": [

composer.lock

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

typo3/sysext/core/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"doctrine/lexer": "^3.0.1",
4040
"egulias/email-validator": "^4.0",
4141
"enshrined/svg-sanitize": "^0.20.0",
42-
"firebase/php-jwt": "^6.10.1",
42+
"firebase/php-jwt": "^6.10.2",
4343
"guzzlehttp/guzzle": "^7.9.2",
4444
"guzzlehttp/psr7": "^2.7.0",
4545
"lolli42/finediff": "^1.1.1",

0 commit comments

Comments
 (0)