From ed9ebde84e6ccb1bc54c3bdca571a7aa59aa0dcb Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Mon, 13 May 2024 17:20:56 +0200
Subject: [PATCH] [TASK] Upgrade bacon/bacon-qr-code to v3
This new version drops support for PHP 8.0 and below
https://github.com/Bacon/BaconQrCode/releases/tag/v3.0.0
Resolves: #103832
Releases: main
Change-Id: I80f032e44c3ca8c712166a10f7115e1a38ad7a84
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84233
Tested-by: core-ci <typo3@b13.com>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Torben Hansen <derhansen@gmail.com>
Reviewed-by: Andreas Kienast <a.fernandez@scripting-base.de>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Torben Hansen <derhansen@gmail.com>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Tested-by: Andreas Kienast <a.fernandez@scripting-base.de>
---
composer.json | 2 +-
composer.lock | 36 ++++++++++++++++-----------------
typo3/sysext/core/composer.json | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/composer.json b/composer.json
index ae8b0fd58769..dc82d590e8f7 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"composer-runtime-api": "^2.1",
- "bacon/bacon-qr-code": "^2.0.7",
+ "bacon/bacon-qr-code": "^3.0",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.13.3 || ^2.0",
"doctrine/dbal": "^4.0.2",
diff --git a/composer.lock b/composer.lock
index 4aa5d2a1f998..39a987dc8967 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,32 +4,32 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "6dfcba6d6d0e69822307a60fb4c8a43b",
+ "content-hash": "1a782f264b739fadbca2bb941180861d",
"packages": [
{
"name": "bacon/bacon-qr-code",
- "version": "2.0.8",
+ "version": "v3.0.0",
"source": {
"type": "git",
"url": "https://github.com/Bacon/BaconQrCode.git",
- "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22"
+ "reference": "510de6eca6248d77d31b339d62437cc995e2fb41"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22",
- "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22",
+ "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/510de6eca6248d77d31b339d62437cc995e2fb41",
+ "reference": "510de6eca6248d77d31b339d62437cc995e2fb41",
"shasum": ""
},
"require": {
"dasprid/enum": "^1.0.3",
"ext-iconv": "*",
- "php": "^7.1 || ^8.0"
+ "php": "^8.1"
},
"require-dev": {
- "phly/keep-a-changelog": "^2.1",
- "phpunit/phpunit": "^7 | ^8 | ^9",
- "spatie/phpunit-snapshot-assertions": "^4.2.9",
- "squizlabs/php_codesniffer": "^3.4"
+ "phly/keep-a-changelog": "^2.12",
+ "phpunit/phpunit": "^10.5.11 || 11.0.4",
+ "spatie/phpunit-snapshot-assertions": "^5.1.5",
+ "squizlabs/php_codesniffer": "^3.9"
},
"suggest": {
"ext-imagick": "to generate QR code images"
@@ -56,9 +56,9 @@
"homepage": "https://github.com/Bacon/BaconQrCode",
"support": {
"issues": "https://github.com/Bacon/BaconQrCode/issues",
- "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.8"
+ "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.0"
},
- "time": "2022-12-07T17:46:57+00:00"
+ "time": "2024-04-18T11:16:25+00:00"
},
{
"name": "christian-riesen/base32",
@@ -121,16 +121,16 @@
},
{
"name": "dasprid/enum",
- "version": "1.0.4",
+ "version": "1.0.5",
"source": {
"type": "git",
"url": "https://github.com/DASPRiD/Enum.git",
- "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f"
+ "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8e6b6ea76eabbf19ea2bf5b67b98e1860474012f",
- "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f",
+ "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016",
+ "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016",
"shasum": ""
},
"require": {
@@ -165,9 +165,9 @@
],
"support": {
"issues": "https://github.com/DASPRiD/Enum/issues",
- "source": "https://github.com/DASPRiD/Enum/tree/1.0.4"
+ "source": "https://github.com/DASPRiD/Enum/tree/1.0.5"
},
- "time": "2023-03-01T18:44:03+00:00"
+ "time": "2023-08-25T16:18:39+00:00"
},
{
"name": "doctrine/annotations",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 19991d389aaa..2b40fc76d1e9 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -31,7 +31,7 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"composer-runtime-api": "^2.1",
- "bacon/bacon-qr-code": "^2.0.7",
+ "bacon/bacon-qr-code": "^3.0",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.13.3 || ^2.0",
"doctrine/dbal": "^4.0.2",
--
GitLab