Skip to content

Commit 5060169

Browse files
liviuconcioiuMoonEwilliamdes
authored
Add support for bacon-qr-code v3 (phpmyadmin#19837)
* 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>
1 parent d2fdad0 commit 5060169

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"web-auth/webauthn-lib": "For better WebAuthn/FIDO2 authentication support"
106106
},
107107
"require-dev": {
108-
"bacon/bacon-qr-code": "^2.0",
108+
"bacon/bacon-qr-code": "^2.0 || ^3.0",
109109
"code-lts/u2f-php-server": "^1.2",
110110
"php-webdriver/webdriver": "^1.13",
111111
"phpmyadmin/coding-standard": "^3.0.0",

scripts/create-release.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -562,18 +562,19 @@ composer config platform.php "$PHP_REQ"
562562
composer update --no-interaction --no-dev
563563

564564
# Parse the required versions from composer.json
565-
PACKAGES_VERSIONS=''
566565
PACKAGE_LIST='tecnickcom/tcpdf pragmarx/google2fa-qrcode bacon/bacon-qr-code code-lts/u2f-php-server web-auth/webauthn-lib thecodingmachine/safe'
567566

567+
set --
568+
568569
for PACKAGES in $PACKAGE_LIST
569570
do
570571
PKG_VERSION="$(get_composer_package_version "$PACKAGES")"
571-
PACKAGES_VERSIONS="$PACKAGES_VERSIONS $PACKAGES:$PKG_VERSION"
572+
set -- "$@" "$PACKAGES:$PKG_VERSION"
572573
done
573574

574-
echo "* Installing composer packages '$PACKAGES_VERSIONS'"
575+
echo "* Installing composer packages '$*'"
575576

576-
composer require --no-interaction --update-no-dev $PACKAGES_VERSIONS
577+
composer require --no-interaction --update-no-dev "$@"
577578

578579
echo "* Running a security checkup"
579580
security_checkup

0 commit comments

Comments
 (0)