Page MenuHomePhorge

Update phpqrcode from version 1.1.4 to 1.9.9
ClosedPublic

Authored by aklapper on Jul 8 2024, 01:55.
Tags
None
Referenced Files
F2904845: D25725.1737334830.diff
Sun, Jan 19, 01:00
F2895097: D25725.1737233771.diff
Fri, Jan 17, 20:56
F2867652: D25725.1736648511.diff
Sat, Jan 11, 02:21
F2863353: D25725.1736496052.diff
Thu, Jan 9, 08:00
F2863352: D25725.1736496050.diff
Thu, Jan 9, 08:00
F2863351: D25725.1736496049.diff
Thu, Jan 9, 08:00
F2863350: D25725.1736496046.diff
Thu, Jan 9, 08:00
F2863349: D25725.1736496043.diff
Thu, Jan 9, 08:00
Time Spent
kiborg12332182 w, 3 d, 23 h

Details

Summary

Update the internal copy of phpqrcode from version 1.1.4 (2010100721) to version 1.9.9 (20130526).
Single reason is that it adds a lot of documentation which may come handy one day.
This more recent code is taken from https://sourceforge.net/p/phpqrcode/code/19/ which equals https://github.com/Darkflib/php-qrcode/blob/master/lib/merged/phpqrcode.php, with our two custom one-line patches still on top.

Closes T15878

Test Plan
  • Manually diff between old downstream and slightly newer upstream version in a visual diff tool to review the changes.
  • Go to http://phorge.localhost/settings/panel/multifactor/ and select "Add Auth Factor", select TOTP, click "Continue", still see a QR code properly rendered which works.

Diff Detail

Repository
rP Phorge
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

aklapper requested review of this revision.Jul 8 2024, 01:55

sgtm

I was still able to generate QR codes, and I verified with alternative application "Barcode Scanner" that the desired URL is read.


Unrelated:

I had difficulties in following the test plan, also before this change, but only because I had 4 minutes of delay between my phone and my laptop. I just installed chrony on my Debian and its again in sync with the rest of the planet, and it works.

This revision is now accepted and ready to land.Jul 12 2024, 09:46