Branch: refs/heads/QA_5_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 25999c6bd01068122754cc12d8bb690cf3c456cf https://github.com/phpmyadmin/phpmyadmin/commit/25999c6bd01068122754cc12d8b… Author: William Desportes <williamdes(a)wdes.fr> Date: 2021-05-28 (Fri, 05 May 2021) +02:00 Changed paths: M .editorconfig Log Message: ----------- Adjust editor config for test data folder Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: a0b36073feb3a52eee0b2cb77e4d063a5fb84f03 https://github.com/phpmyadmin/phpmyadmin/commit/a0b36073feb3a52eee0b2cb77e4… Author: William Desportes <williamdes(a)wdes.fr> Date: 2021-05-28 (Fri, 05 May 2021) +02:00 Changed paths: M libraries/classes/Import.php Log Message: ----------- Fix #16920 - Uncaught TypeError: PhpMyAdmin\Import::detectType(): Argument #2 ($cell) must be of type ?string, float given Fixes: #16920 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: a8e56bf3a90fa5906651f2fcb2e7aaef7fe8329d https://github.com/phpmyadmin/phpmyadmin/commit/a8e56bf3a90fa5906651f2fcb2e… Author: William Desportes <williamdes(a)wdes.fr> Date: 2021-05-28 (Fri, 05 May 2021) +02:00 Changed paths: M libraries/classes/Plugins/Import/ImportOds.php Log Message: ----------- Fix #16926 - Warning in ./libraries/classes/Plugins/Import/ImportOds.php#377 Undefined array key "ods_empty_rows" Fixes: #16926 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 790c09084c1a87bdfbe056942c7ad1b302ee7991 https://github.com/phpmyadmin/phpmyadmin/commit/790c09084c1a87bdfbe056942c7… Author: William Desportes <williamdes(a)wdes.fr> Date: 2021-05-28 (Fri, 05 May 2021) +02:00 Changed paths: A test/test_data/import-slim.ods.xml M test/classes/Plugins/Import/ImportOdsTest.php M test/classes/Stubs/DbiDummy.php Log Message: ----------- Add tests for #16920 - Uncaught TypeError: PhpMyAdmin\Import::detectType(): Argument #2 ($cell) must be of type ?string, float given Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: e2528fe44068ac92296ce9932376a6ef8b0b058f https://github.com/phpmyadmin/phpmyadmin/commit/e2528fe44068ac92296ce993237… Author: William Desportes <williamdes(a)wdes.fr> Date: 2021-05-28 (Fri, 05 May 2021) +02:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entries for #14130, #16920 and #16926 Signed-off-by: William Desportes <williamdes(a)wdes.fr>