From a5703b47502cd76533795649be058e6d75b6a3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 20 Feb 2017 08:21:40 +0100 Subject: [PATCH 1/2] Update PHP versions FAQ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It could probably use more adjusting, but this way it is at least talking about current versions. Signed-off-by: Michal Čihař --- doc/faq.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/faq.rst b/doc/faq.rst index 2baba586c1..851bacdb09 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -426,12 +426,16 @@ MMCache but upgrading MMCache to version 2.3.21 solves the problem. .. _faq1_31: -1.31 Does phpMyAdmin support PHP 5? ------------------------------------ +1.31 Which PHP versions does phpMyAdmin support? +------------------------------------------------ -Yes. +Since release 4.5, phpMyAdmin supports only PHP 5.5 and newer. Since release +4.1 phpMyAdmin supports only PHP 5.3 and newer. For PHP 5.2 you can use 4.0.x +releases. -Since release 4.5, phpMyAdmin supports only PHP 5.5 and newer. Since release 4.1 phpMyAdmin supports only PHP 5.3 and newer. For PHP 5.2 you can use 4.0.x releases. +PHP 7 is supported since phpMyAdmin 4.6, PHP 7.1 is supported since 4.6.5. + +phpMyAdmin also works fine with HHVM. .. _faq1_32: From 454620dcf8ae1cadfa618a51251886cd5677bd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 20 Feb 2017 08:25:34 +0100 Subject: [PATCH 2/2] Require SQL parser > 4.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This brings additional fixes like for #12345 Signed-off-by: Michal Čihař --- ChangeLog | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a3b1633209..842e7a668c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ phpMyAdmin - ChangeLog - issue #12693 Improved support for TokuDB - issue #11231 Try harder to honor LoginCookieValidity setting - issue #13016 and #13017 Slight improvements to the table layout of Relation view +- issue #12345 Correctly show affected rows for LOAD DATA queries 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/composer.json b/composer.json index f96b60d8ad..362f08f802 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "ext-xml": "*", "ext-pcre": "*", "ext-json": "*", - "phpmyadmin/sql-parser": "^4.1", + "phpmyadmin/sql-parser": "^4.1.2", "phpmyadmin/motranslator": "^3.0", "phpmyadmin/shapefile": "^2.0", "tecnickcom/tcpdf": "^6.2",