Branch: refs/heads/QA_5_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: c309b96edd98bdce18506b6dfee1f3209bf6748f https://github.com/phpmyadmin/phpmyadmin/commit/c309b96edd98bdce18506b6dfee1... Author: Utkarsh Gupta utkarsh@debian.org Date: 2021-05-24 (Mon, 05 May 2021) +05:30

Changed paths: M test/classes/Plugins/Import/ImportShpTest.php

Log Message: ----------- Skip testImportOsm and testDoImport on 32-bit/s390x arch

These two tests fail on s390x machines, looks like some 32-bit issues we already have. Probably worth skipping these on 32-bit/s390x arch.

Signed-off-by: Utkarsh Gupta utkarsh@debian.org

Commit: 577e52a37fc39d6de8672bdb23acd91f73a3141a https://github.com/phpmyadmin/phpmyadmin/commit/577e52a37fc39d6de8672bdb23ac... Author: William Desportes williamdes@wdes.fr Date: 2021-05-24 (Mon, 05 May 2021) +02:00

Changed paths: M psalm-baseline.xml

Log Message: ----------- Update Psalm baseline

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

Commit: 68c113b5594fef3cbb90f91fe9fbbfb383b4ac25 https://github.com/phpmyadmin/phpmyadmin/commit/68c113b5594fef3cbb90f91fe9fb... Author: William Desportes williamdes@wdes.fr Date: 2021-05-24 (Mon, 05 May 2021) +02:00

Changed paths: M test/classes/Plugins/Import/ImportShpTest.php

Log Message: ----------- Merge #16913 - Skip testImportOsm and testDoImport on 32-bit/s390x arch

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