Skip to content

Conversation

@liviuconcioiu
Copy link
Contributor

Description

Before:

before1.mp4

After:

after1.mp4

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

Thank you.

Copy link
Member

@williamdes williamdes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, I can confirm that on the Debian side v3 is the one packaged but sadly we still lack php-pragmarx-google2fa-qrcode to make it work

This change is still good, and it confirms that v3 will work when the missing library lands out

@williamdes
Copy link
Member

You may have to adjust our release script, it may lack quotes maybe
https://github.com/phpmyadmin/phpmyadmin/actions/runs/17361010383/job/49281102489?pr=19837#step:11:615

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

For some reason locally the command composer require --dev bacon/bacon-qr-code:"^2.0 || ^3.0" pragmarx/google2fa-qrcode:^2.1 works fine

a9bc83c was maybe a good idea

@codecov
Copy link

codecov bot commented Aug 31, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 50.68%. Comparing base (b96856d) to head (238d18b).
⚠️ Report is 9 commits behind head on QA_5_2.

Additional details and impacted files
@@             Coverage Diff              @@
##             QA_5_2   #19837      +/-   ##
============================================
+ Coverage     49.44%   50.68%   +1.23%     
- Complexity    16778    16779       +1     
============================================
  Files           607      607              
  Lines         69485    69488       +3     
============================================
+ Hits          34357    35219     +862     
+ Misses        35128    34269     -859     
Flag Coverage Δ
unit-8.0-ubuntu-latest 50.68% <ø> (+1.28%) ⬆️
unit-8.1-ubuntu-latest ?
unit-8.4-ubuntu-latest ?

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

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

MoonE commented Aug 31, 2025

This seems to work. Setting the input separator to a newline character and separating each package by a new line

for PACKAGE in $PACKAGE_LIST
do
    PKG_VERSION="$(get_composer_package_version "$PACKAGE")"
    PACKAGES_VERSIONS="$PACKAGES_VERSIONS\n$PACKAGE:$PKG_VERSION"
done

echo "* Installing composer packages '$(echo "$PACKAGES_VERSIONS" | tr $'\n' ' ')'"
IFS=$'\n' composer require --no-interaction --update-no-dev $PACKAGES_VERSION

@liviuconcioiu
Copy link
Contributor Author

@williamdes all versions worked locally, but I must admit that I have the latest version of composer.

Test seems to pass https://github.com/phpmyadmin/phpmyadmin/actions/runs/17363513269/job/49286783009. Let me know which version you prefer the one that is right now or @MoonE approach.

@williamdes
Copy link
Member

@williamdes all versions worked locally, but I must admit that I have the latest version of composer.

Test seems to pass https://github.com/phpmyadmin/phpmyadmin/actions/runs/17363513269/job/49286783009. Let me know which version you prefer the one that is right now or @MoonE approach.

I think the IFS option by @MoonE is more standard bash than yours
Maybe take it in your PR with a Co-Author line

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

@williamdes williamdes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your work !

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

Something is not working as expected, I am confused

@liviuconcioiu
Copy link
Contributor Author

Only 238d18b worked.

@MoonE
Copy link
Contributor

MoonE commented Sep 1, 2025

Maybe this will work?

NEWLINE=$'\n'
for PACKAGE in $PACKAGE_LIST
do
    PKG_VERSION="$(get_composer_package_version "$PACKAGE")"
    PACKAGES_VERSIONS="${PACKAGES_VERSIONS}${NEWLINE}${PACKAGE}:${PKG_VERSION}"
done

echo "* Installing composer packages '$(echo "$PACKAGES_VERSIONS" | tr $NEWLINE ' ')'"
IFS=$NEWLINE composer require --no-interaction --update-no-dev $PACKAGES_VERSIONS

@MoonE
Copy link
Contributor

MoonE commented Sep 1, 2025

238d18b is the way to go with the dash shell, the default shell for #!/bin/sh on Ubuntu.
But maybe change this:

-echo "* Installing composer packages '$@'"
+echo "* Installing composer packages '$*'"

https://www.shellcheck.net/wiki/SC2145

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
@liviuconcioiu
Copy link
Contributor Author

But maybe change this:

Done. Output looks OK. https://github.com/phpmyadmin/phpmyadmin/actions/runs/17388649338/job/49358987203?pr=19837

Copy link
Member

@williamdes williamdes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, let's go for that

@williamdes williamdes requested a review from ibennetch September 2, 2025 00:42
@MauricioFauth MauricioFauth merged commit 5060169 into phpmyadmin:QA_5_2 Sep 9, 2025
28 of 31 checks passed
@MauricioFauth MauricioFauth self-assigned this Sep 9, 2025
@MauricioFauth MauricioFauth added this to the 5.2.3 milestone Sep 9, 2025
@liviuconcioiu liviuconcioiu deleted the baconqrcode branch September 9, 2025 23:08
@williamdes williamdes removed the request for review from ibennetch September 10, 2025 06:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants