From 5060169e1938e4bfc188afd02cd76c9eba77a352 Mon Sep 17 00:00:00 2001
From: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Date: Wed, 10 Sep 2025 01:04:47 +0200
Subject: [PATCH] Add support for bacon-qr-code v3 (#19837)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add support for bacon-qr-code v3

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix #2

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Quote packages

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Co-authored-by: Maximilian Krög <maxi_kroeg@web.de>

* Fix

Co-authored-by: William Desportes <williamdes@wdes.fr>

* Add quotes to the package version

* Fix again

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Co-authored-by: Maximilian Krög <maxi_kroeg@web.de>
Co-authored-by: William Desportes <williamdes@wdes.fr>
---
 composer.json             | 2 +-
 scripts/create-release.sh | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 857cdaa492..44cd690d30 100644
--- a/composer.json
+++ b/composer.json
@@ -105,7 +105,7 @@
         "web-auth/webauthn-lib": "For better WebAuthn/FIDO2 authentication support"
     },
     "require-dev": {
-        "bacon/bacon-qr-code": "^2.0",
+        "bacon/bacon-qr-code": "^2.0 || ^3.0",
         "code-lts/u2f-php-server": "^1.2",
         "php-webdriver/webdriver": "^1.13",
         "phpmyadmin/coding-standard": "^3.0.0",
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 2b06ec9161..1b1d8a358d 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -562,18 +562,19 @@ composer config platform.php "$PHP_REQ"
 composer update --no-interaction --no-dev
 
 # Parse the required versions from composer.json
-PACKAGES_VERSIONS=''
 PACKAGE_LIST='tecnickcom/tcpdf pragmarx/google2fa-qrcode bacon/bacon-qr-code code-lts/u2f-php-server web-auth/webauthn-lib thecodingmachine/safe'
 
+set --
+
 for PACKAGES in $PACKAGE_LIST
 do
     PKG_VERSION="$(get_composer_package_version "$PACKAGES")"
-    PACKAGES_VERSIONS="$PACKAGES_VERSIONS $PACKAGES:$PKG_VERSION"
+    set -- "$@" "$PACKAGES:$PKG_VERSION"
 done
 
-echo "* Installing composer packages '$PACKAGES_VERSIONS'"
+echo "* Installing composer packages '$*'"
 
-composer require --no-interaction --update-no-dev $PACKAGES_VERSIONS
+composer require --no-interaction --update-no-dev "$@"
 
 echo "* Running a security checkup"
 security_checkup