Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1308ecccd0cd2289aa91a5f766aa0286d17c3500 https://github.com/phpmyadmin/phpmyadmin/commit/1308ecccd0cd2289aa91a5f766aa... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M .travis.yml Log Message: ----------- Enable testing in PHP 7.1 I hoped there will be phpMyAdmin 4.7.0 by time PHP 7.1 is out, but obviously that's not the case, so we should fix 4.6 branch as well. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 034047a21908d1a547682862b9589191d036c9d2 https://github.com/phpmyadmin/phpmyadmin/commit/034047a21908d1a547682862b958... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M test/install-runkit Log Message: ----------- There is no runkit for 7.1 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 48144987d810a2b2ec113f1d94375387f3782e84 https://github.com/phpmyadmin/phpmyadmin/commit/48144987d810a2b2ec113f1d9437... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M libraries/plugins/schema/svg/Svg.php M libraries/plugins/schema/svg/SvgRelationSchema.php Log Message: ----------- Ensure font size is integer, we do further calculations with it Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 9f5789dff85302cc78d23ded2e67dd59d57f6870 https://github.com/phpmyadmin/phpmyadmin/commit/9f5789dff85302cc78d23ded2e67... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M test/libraries/PMA_server_status_monitor_test.php Log Message: ----------- Set reasonable mock value for tests Set integer where we do a COUNT() SQL. See also #12539 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ffaf589a26432a9d12b329c7c102ce032568e4e7 https://github.com/phpmyadmin/phpmyadmin/commit/ffaf589a26432a9d12b329c7c102... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M libraries/SysInfoLinux.php Log Message: ----------- Fix numeric errors Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: cb6d733e5ac2a9e3720ae69918041ae95b27d4c4 https://github.com/phpmyadmin/phpmyadmin/commit/cb6d733e5ac2a9e3720ae6991804... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M test/libraries/PMA_server_status_monitor_test.php Log Message: ----------- Fix other places of wrong value for # in tests Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 1fd24b650d005782ac9f9edc73fb4f46d4ad0410 https://github.com/phpmyadmin/phpmyadmin/commit/1fd24b650d005782ac9f9edc73fb... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M ChangeLog M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php Log Message: ----------- Update phpSecLib to 2.0.4 * fix E_DEPRECATED errors on PHP 7.1 * Random: fix issues with serialize() Issue #12800 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 28968fe919964d32ed30a84dcb92ff0ef53df5ed https://github.com/phpmyadmin/phpmyadmin/commit/28968fe919964d32ed30a84dcb92... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php Log Message: ----------- Set correct Uptime value for tests MySQL returns this as integer, so we should do the same for tests. See also #12539 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 569a4d280c34fe463bff894583114d65a3b6835b https://github.com/phpmyadmin/phpmyadmin/commit/569a4d280c34fe463bff89458311... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M test/libraries/PMA_server_status_test.php Log Message: ----------- Fix test expectations Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 2086bb61c17fc104074867c3df6b01d0e1a3ea70 https://github.com/phpmyadmin/phpmyadmin/commit/2086bb61c17fc104074867c3df6b... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M ChangeLog Log Message: ----------- Add changelog entry for PHP 7.1 compatibility Fixes #12800 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 583f5ff533d3623f590f2179e1757a32ee417559 https://github.com/phpmyadmin/phpmyadmin/commit/583f5ff533d3623f590f2179e175... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/06d76588c234...583f5ff533d3