Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 314f27173d40fe3de45223245d5d81444fe125a4 https://github.com/phpmyadmin/phpmyadmin/commit/314f27173d40fe3de45223245d5d... Author: William Desportes williamdes@wdes.fr Date: 2020-05-04 (Mon, 05 May 2020) +02:00

Changed paths: M phpstan.neon.dist

Log Message: ----------- Ignore twig-templates from phpstan config

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

Commit: 13651548aef7c496c6556d12dded481e981c18ea https://github.com/phpmyadmin/phpmyadmin/commit/13651548aef7c496c6556d12dded... Author: William Desportes williamdes@wdes.fr Date: 2020-05-04 (Mon, 05 May 2020) +02:00

Changed paths: M libraries/classes/Import.php M test/classes/ImportTest.php

Log Message: ----------- #16093 - Move BOM stripping to a function and add tests

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

Commit: 972180a8629de15cc2a064780e559a21545bd781 https://github.com/phpmyadmin/phpmyadmin/commit/972180a8629de15cc2a064780e55... Author: William Desportes williamdes@wdes.fr Date: 2020-05-04 (Mon, 05 May 2020) +02:00

Changed paths: M libraries/classes/Import.php M test/classes/ImportTest.php

Log Message: ----------- Merge branch 'QA_5_0'

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

Commit: f215a035b5b21d2831228d8e82d99a3414a38c07 https://github.com/phpmyadmin/phpmyadmin/commit/f215a035b5b21d2831228d8e82d9... Author: William Desportes williamdes@wdes.fr Date: 2020-05-04 (Mon, 05 May 2020) +02:00

Changed paths: M .travis.yml

Log Message: ----------- Upload coverage to Scrutinizer

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