Skip to content

Commit

Permalink
[TASK] Update firebase/php-jwt ^6.10.2 and remove composer patch
Browse files Browse the repository at this point in the history
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/+/87218
Tested-by: core-ci <[email protected]>
Tested-by: Markus Hofmann <[email protected]>
Reviewed-by: Stefan Bürk <[email protected]>
Tested-by: Garvin Hicking <[email protected]>
Tested-by: Stefan Bürk <[email protected]>
Tested-by: Christian Kuhn <[email protected]>
Reviewed-by: Christian Kuhn <[email protected]>
Reviewed-by: Garvin Hicking <[email protected]>
Reviewed-by: Markus Hofmann <[email protected]>
  • Loading branch information
sbuerk committed Nov 24, 2024
1 parent 4d7d2ba commit a37cf11
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 133 deletions.
62 changes: 0 additions & 62 deletions Build/patches/firebase-php-jwt-572-php-8.4.diff

This file was deleted.

7 changes: 0 additions & 7 deletions Build/patches/patches.json

This file was deleted.

10 changes: 3 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
"sort-packages": true,
"allow-plugins": {
"typo3/class-alias-loader": true,
"typo3/cms-composer-installers": true,
"cweagans/composer-patches": true
"typo3/cms-composer-installers": true
}
},
"require": {
Expand All @@ -63,7 +62,7 @@
"doctrine/lexer": "^3.0.1",
"egulias/email-validator": "^4.0",
"enshrined/svg-sanitize": "^0.20.0",
"firebase/php-jwt": "^6.10.1",
"firebase/php-jwt": "^6.10.2",
"guzzlehttp/guzzle": "^7.9.2",
"guzzlehttp/promises": "^2.0.3",
"guzzlehttp/psr7": "^2.7.0",
Expand Down Expand Up @@ -116,7 +115,6 @@
"codeception/module-filesystem": "^3.0.1",
"codeception/module-webdriver": "^4.0.2",
"composer/composer": "^2.7.8",
"cweagans/composer-patches": "^1.7.3",
"friendsofphp/php-cs-fixer": "^3.64.0",
"php-webdriver/webdriver": "^1.15.1",
"phpstan/phpdoc-parser": "^1.30.0",
Expand Down Expand Up @@ -148,9 +146,7 @@
},
"branch-alias": {
"dev-main": "14.0.x-dev"
},
"composer-exit-on-patch-failure": "true",
"patches-file": "Build/patches/patches.json"
}
},
"scripts": {
"gerrit:setup": [
Expand Down
64 changes: 8 additions & 56 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion typo3/sysext/core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"doctrine/lexer": "^3.0.1",
"egulias/email-validator": "^4.0",
"enshrined/svg-sanitize": "^0.20.0",
"firebase/php-jwt": "^6.10.1",
"firebase/php-jwt": "^6.10.2",
"guzzlehttp/guzzle": "^7.9.2",
"guzzlehttp/psr7": "^2.7.0",
"lolli42/finediff": "^1.1.1",
Expand Down

0 comments on commit a37cf11

Please sign in to comment.