Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5271b960bc12845f37ea333d58fac3e73487d8ca https://github.com/phpmyadmin/phpmyadmin/commit/5271b960bc12845f37ea333d58fa... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-10 (Tue, 08 August 2021) +02:00 Changed paths: M libraries/classes/DatabaseInterface.php Log Message: ----------- Fix #17039 - Unable to have 2FA working with a pmadb value != phpmyadmin Fixes #17039 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: d8c604f836fca122c981825421a11363eb3e4444 https://github.com/phpmyadmin/phpmyadmin/commit/d8c604f836fca122c981825421a1... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-11 (Wed, 08 August 2021) +02:00 Changed paths: M test/classes/DatabaseInterfaceTest.php Log Message: ----------- Add tests for #17039 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 98d692c7e8df08649fcdbbf04d4459ad15018ebd https://github.com/phpmyadmin/phpmyadmin/commit/98d692c7e8df08649fcdbbf04d44... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-11 (Wed, 08 August 2021) +02:00 Changed paths: M ChangeLog Log Message: ----------- Add a ChangeLog entry for #17039 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: c28014d24bfceba430b43e7b74bf7ff25b9a613c https://github.com/phpmyadmin/phpmyadmin/commit/c28014d24bfceba430b43e7b74bf... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-11 (Wed, 08 August 2021) +02:00 Changed paths: M test/classes/TwoFactorTest.php Log Message: ----------- Un-mock TwoFactorTest - Add tests for #15724 Two years ago I made the fix 6c35ea3be7b201a1ed189ba667160e8f51ce9599 but no tests seem to back up this behavior Now that I removed the mocks, it is safe Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: b98a3a75896c7bc3bd32ea52d6c58694de12c828 https://github.com/phpmyadmin/phpmyadmin/commit/b98a3a75896c7bc3bd32ea52d6c5... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-11 (Wed, 08 August 2021) +02:00 Changed paths: M test/classes/DatabaseInterfaceTest.php Log Message: ----------- Ref #17039 - Fix testPostConnectControl test Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 880043961e61a747b2f029d829569c5f542f5298 https://github.com/phpmyadmin/phpmyadmin/commit/880043961e61a747b2f029d82956... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-11 (Wed, 08 August 2021) +02:00 Changed paths: M ChangeLog M libraries/classes/DatabaseInterface.php M test/classes/DatabaseInterfaceTest.php M test/classes/TwoFactorTest.php Log Message: ----------- Merge branch 'QA_5_1' Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 81e1749cabe40bc429f8d55ff21501bba4c70ed0 https://github.com/phpmyadmin/phpmyadmin/commit/81e1749cabe40bc429f8d55ff215... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-11 (Wed, 08 August 2021) +02:00 Changed paths: M psalm-baseline.xml Log Message: ----------- Update psalm baseline Signed-off-by: William Desportes <williamdes@wdes.fr>