Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2d79fdcbaaa5439717ded3e2f07b08073ec789d7 https://github.com/phpmyadmin/phpmyadmin/commit/2d79fdcbaaa5439717ded3e2f07b... Author: Domen mitenem@outlook.com Date: 2020-12-09 (Wed, 12 December 2020) +01:00

Changed paths: M po/sl.po

Log Message: ----------- Translated using Weblate (Slovenian)

Currently translated at 100.0% (3334 of 3334 strings)

[CI skip]

Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/sl/ Signed-off-by: Domen mitenem@outlook.com

Commit: c1552aef433ef3598c92ba5fc74b4c8928943625 https://github.com/phpmyadmin/phpmyadmin/commit/c1552aef433ef3598c92ba5fc74b... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M .travis.yml

Log Message: ----------- Backport some TravisCI fixes and changes

- Fix Windows build (d3efa9b5b5d15cdac2a538cd0a0f317415895529, dd0efd4435d2798fcd2349581f1bc37a3e1692a2, f8736b7c3e9bda49001409df6d749807d3be40df) - Fix Doctum build (e77adf994409da2ff03ae50e6a849ee303667bca) - phpstan memoy limit (e6d84af4e944962f5787e00774281d1d4b377380)

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

Commit: bdc8760bc350b8422cf7ac722ccfa5b9ef268ac4 https://github.com/phpmyadmin/phpmyadmin/commit/bdc8760bc350b8422cf7ac722ccf... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M libraries/classes/Gis/GisMultiPoint.php M libraries/classes/Gis/GisPoint.php

Log Message: ----------- Fix #16525 - PHP 8.0 failing tests when comparing 0 to ''

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

Commit: 00b419afe147624238d44dc5fe62a7cf07b14134 https://github.com/phpmyadmin/phpmyadmin/commit/00b419afe147624238d44dc5fe62... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M libraries/classes/Controllers/Setup/HomeController.php M libraries/classes/Setup/ConfigGenerator.php M libraries/classes/Table.php

Log Message: ----------- Ref #16429 - Fix PHP 8.0 "TypeError: preg_replace():" errors

Cherry-pick: e4bd8b51aa5c0fbb54da7c82847784d278e06c4b Cherry-pick: b826234ebb5da52afd940fa0a5d552a1b9a3b0dd

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

Commit: ff52752bc0c457154dfb9cdcb56d77a9a603fb18 https://github.com/phpmyadmin/phpmyadmin/commit/ff52752bc0c457154dfb9cdcb56d... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M libraries/classes/Util.php

Log Message: ----------- Ref #16429 - PHP 8 error TypeError: Unsupported operand types: string / int

Cherry-pick: d402c0fd6be75cae35c1480938fc2391aaee634f

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

Commit: b8e4d932b7bebcd1e4371c608117b1336fff8d99 https://github.com/phpmyadmin/phpmyadmin/commit/b8e4d932b7bebcd1e4371c608117... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M libraries/classes/Setup/ConfigGenerator.php

Log Message: ----------- Ref #16429 - PHP 8 error on preg_replace

47) PhpMyAdmin\Tests\Setup\ConfigGeneratorTest::testGetConfigFile TypeError: preg_replace(): Argument #3 ($subject) must be of type array|string, int given

libraries/classes/Setup/ConfigGenerator.php:61 test/classes/Setup/ConfigGeneratorTest.php:55 vendor/phpunit/phpunit/phpunit:61 Cherry-pick: cd3a0e46cea930e760581b5cd742dbd328dd9629 Signed-off-by: William Desportes williamdes@wdes.fr

Commit: cabe45f5a44bec8b91f7cee463db4899555ac771 https://github.com/phpmyadmin/phpmyadmin/commit/cabe45f5a44bec8b91f7cee463db... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M libraries/classes/Plugins/Import/ImportOds.php M libraries/classes/Plugins/Import/ImportXml.php

Log Message: ----------- Fix #16490 - [PHP 8.0] Function libxml_disable_entity_loader() is deprecated

Cherry-pick: 723c0095b9393588c93fd96aaa8d5c0c6fad1b17

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

Commit: 0e728a67c5fd30fb15085b80e22d2b4fc48dee4a https://github.com/phpmyadmin/phpmyadmin/commit/0e728a67c5fd30fb15085b80e22d... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M test/classes/HeaderTest.php

Log Message: ----------- Ref #16429 - Fix undefined array keys

Cherry-pick: 2df5ce00448091302791488b7fa914ac15268c37

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

Commit: 96f1a24a6fe8d5dcfc6d4a1c38fce568c035b760 https://github.com/phpmyadmin/phpmyadmin/commit/96f1a24a6fe8d5dcfc6d4a1c38fc... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entries for #16525, #16429 and #16490

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

Commit: 860f0351007767338def118eec05cc40568db9b8 https://github.com/phpmyadmin/phpmyadmin/commit/860f0351007767338def118eec05... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M po/af.po M po/am.po M po/ar.po M po/ar_LY.po M po/az.po M po/be.po M po/be@latin.po M po/ber.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ku.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/my.po M po/nb.po M po/ne.po M po/nl.po M po/nn.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/rcf.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/tzm.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po

Log Message: ----------- Update po files

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

Commit: 005b400090d764e004db5f1da49e8dddf3563f5a https://github.com/phpmyadmin/phpmyadmin/commit/005b400090d764e004db5f1da49e... Author: William Desportes williamdes@wdes.fr Date: 2020-12-12 (Sat, 12 December 2020) +01:00

Changed paths: M ChangeLog

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