Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3b3fbaefdbc2163f81116296ab30ace9abe8bda6 https://github.com/phpmyadmin/phpmyadmin/commit/3b3fbaefdbc2163f81116296ab30... Author: William Desportes williamdes@wdes.fr Date: 2020-03-05 (Thu, 03 March 2020) +01:00

Changed paths: M phpunit.xml.dist

Log Message: ----------- Remove json logging removed in phpunit 6.0 (version that we no longer support)

Ref: https://github.com/sebastianbergmann/phpunit/blob/6.0.0/ChangeLog-6.0.md#rem... "Removed the --log-json commandline option (deprecated in PHPUnit 5.7)"

This commit is done for phpunit 9.0 to not complain about it

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 40945551f0d1bf7eb581a4bc5abfe0eeac61b45e https://github.com/phpmyadmin/phpmyadmin/commit/40945551f0d1bf7eb581a4bc5abf... Author: William Desportes williamdes@wdes.fr Date: 2020-03-05 (Thu, 03 March 2020) +01:00

Changed paths: M composer.json

Log Message: ----------- Support phpunit 9.0

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 0f0b10cba6371cf8d915269500fbd18a0d71a998 https://github.com/phpmyadmin/phpmyadmin/commit/0f0b10cba6371cf8d915269500fb... Author: William Desportes williamdes@wdes.fr Date: 2020-03-05 (Thu, 03 March 2020) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for 40945551f0

Signed-off-by: William Desportes williamdes@wdes.fr