Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9ed31d6fa13f8c0b218834f90a984572ebd60ff0 https://github.com/phpmyadmin/phpmyadmin/commit/9ed31d6fa13f8c0b218834f90a98... Author: William Desportes williamdes@wdes.fr Date: 2020-02-22 (Sat, 02 February 2020) +01:00

Changed paths: M libraries/classes/Util.php M test/classes/UtilTest.php

Log Message: ----------- Fix #15830 - strftime issue on windows for Japanese users

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

Commit: ace65393ede9a7bc49f71ec764b00fd7e24927b9 https://github.com/phpmyadmin/phpmyadmin/commit/ace65393ede9a7bc49f71ec764b0... Author: William Desportes williamdes@wdes.fr Date: 2020-02-22 (Sat, 02 February 2020) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for #15830

Commit: 6bf1309d12f93f27bdc132468bb13bc90b90b495 https://github.com/phpmyadmin/phpmyadmin/commit/6bf1309d12f93f27bdc132468bb1... Author: William Desportes williamdes@wdes.fr Date: 2020-02-22 (Sat, 02 February 2020) +01:00

Changed paths: M test/classes/Dbi/DbiDummyTest.php

Log Message: ----------- Add a test for escapeString

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

Commit: 0c209702facce23dfa6d17ab7094fbfdf7b3452f https://github.com/phpmyadmin/phpmyadmin/commit/0c209702facce23dfa6d17ab7094... Author: William Desportes williamdes@wdes.fr Date: 2020-02-22 (Sat, 02 February 2020) +01:00

Changed paths: M libraries/classes/Transformations.php

Log Message: ----------- Fix TransformationsTest::testGetMime on Windows

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

Commit: 818b9f76bf7d927e9ac6555f775e243dcf44092b https://github.com/phpmyadmin/phpmyadmin/commit/818b9f76bf7d927e9ac6555f775e... Author: William Desportes williamdes@wdes.fr Date: 2020-02-22 (Sat, 02 February 2020) +01:00

Changed paths: M libraries/classes/DatabaseInterface.php M libraries/classes/Table.php M test/classes/TableTest.php

Log Message: ----------- Fix more broken queries on Windows CI

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

Commit: cc0c975e78eafa26397d5f5c9928c3f8e859ec57 https://github.com/phpmyadmin/phpmyadmin/commit/cc0c975e78eafa26397d5f5c9928... Author: William Desportes williamdes@wdes.fr Date: 2020-02-22 (Sat, 02 February 2020) +01:00

Changed paths: M libraries/classes/DatabaseInterface.php

Log Message: ----------- Fix _getSqlForTablesFull and getColumnsFull for Windows CI

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

Commit: 72216b4965edd4d03def65eeecbbfad63247bdfd https://github.com/phpmyadmin/phpmyadmin/commit/72216b4965edd4d03def65eeecbb... Author: William Desportes williamdes@wdes.fr Date: 2020-02-22 (Sat, 02 February 2020) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for 6bf1309d12, 0c209702f, 818b9f76bf, cc0c975e78

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

Commit: 9a8e311a76da5566de0418d0d77a3e4a05ea36f4 https://github.com/phpmyadmin/phpmyadmin/commit/9a8e311a76da5566de0418d0d77a... Author: William Desportes williamdes@wdes.fr Date: 2020-02-22 (Sat, 02 February 2020) +01:00

Changed paths: M ChangeLog M libraries/classes/DatabaseInterface.php M libraries/classes/Table.php M libraries/classes/Transformations.php M libraries/classes/Util.php M test/classes/Dbal/DbiDummyTest.php M test/classes/TableTest.php M test/classes/UtilTest.php

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

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

Commit: 0448fd0323537008877244443f75ced26cf78027 https://github.com/phpmyadmin/phpmyadmin/commit/0448fd0323537008877244443f75... Author: William Desportes williamdes@wdes.fr Date: 2020-02-22 (Sat, 02 February 2020) +01:00

Changed paths: M phpstan-baseline.neon

Log Message: ----------- Add temporary strftime error to phpstan-baseline.neon

Ref: https://github.com/phpstan/phpstan/issues/3014

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