gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for bacon-qr-code v3 (#19837)

Browse Source 
* 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>
This commit is contained in:
Liviu-Mihail Concioiu 2025-09-10 01:04:47 +02:00 committed by GitHub
parent d2fdad042c
commit 5060169e19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -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",

9
scripts/create-release.sh
View File

@ -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