Upgrade to PHP 7.1

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
Maurício Meneghini Fauth 2018-04-11 18:27:29 -03:00
parent 86adefd460
commit 1a107ac92e
7 changed files with 12 additions and 16 deletions

View File

@ -13,11 +13,6 @@ services:
php:
- "7.2"
- "7.1"
- "7.0"
- "5.6"
- "5.5"
- "hhvm-3.12"
- "hhvm-3.18"
- "nightly"
sudo: required
@ -63,7 +58,7 @@ matrix:
include:
- php: "7.1"
env: CI_MODE=selenium
- php: "7.0"
- php: "7.1"
env: CI_MODE=release
- php: "7.1"
env: CI_MODE=docs

View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
5.0.0 (not yet released)
- issue #13896 Drop support for PHP 5.5, PHP 5.6, PHP 7.0 and HHVM
4.8.1 (not yet released)

View File

@ -39,7 +39,7 @@
}
],
"require": {
"php": ">=5.5.0",
"php": "^7.1",
"ext-mysqli": "*",
"ext-xml": "*",
"ext-pcre": "*",
@ -54,7 +54,7 @@
"psr/container": "^1.0",
"twig/twig": "^1.34",
"twig/extensions": "~1.5.1",
"symfony/expression-language": "^3.2 || ^2.8",
"symfony/expression-language": "^3.2",
"symfony/polyfill-mbstring": "^1.3"
},
"conflict": {
@ -79,9 +79,9 @@
"samyoul/u2f-php-server": "For FIDO U2F authentication"
},
"require-dev": {
"phpunit/phpunit": "^4.8.36 || ^5.7",
"phpunit/phpunit": "^5.7",
"codacy/coverage": "^1.3.0",
"phpunit/phpunit-selenium": "~1.2 || ^3.0",
"phpunit/phpunit-selenium": "^3.0",
"squizlabs/php_codesniffer": "^3.0",
"tecnickcom/tcpdf": "^6.2",
"pragmarx/google2fa": "^3.0",

View File

@ -12,7 +12,7 @@ web server (such as Apache, nginx, :term:`IIS`) to install phpMyAdmin's files in
PHP
---
* You need PHP 5.5.0 or newer, with ``session`` support, the Standard PHP Library
* You need PHP 7.1.0 or newer, with ``session`` support, the Standard PHP Library
(SPL) extension, hash, ctype, and JSON support.
* The ``mbstring`` extension (see :term:`mbstring`) is strongly recommended

View File

@ -55,9 +55,9 @@ if (getcwd() == dirname(__FILE__)) {
* Minimum PHP version; can't call Core::fatalError() which uses a
* PHP 5 function, so cannot easily localize this message.
*/
if (version_compare(PHP_VERSION, '5.5.0', 'lt')) {
if (version_compare(PHP_VERSION, '7.1.0', 'lt')) {
die(
'PHP 5.5+ is required. <br /> Currently installed version is: '
'PHP 7.1+ is required. <br /> Currently installed version is: '
. phpversion()
);
}

View File

@ -222,7 +222,7 @@ rm -f .travis.yml .coveralls.yml .scrutinizer.yml .jshintrc .weblate codecov.yml
rm -f README.rst
if [ ! -d libraries/tcpdf ] ; then
PHP_REQ=`sed -n '/"php"/ s/.*">=\([0-9]\.[0-9]\).*/\1/p' composer.json`
PHP_REQ=`sed -n '/"php"/ s/.*"\^\([0-9]\.[0-9]\).*/\1/p' composer.json`
if [ -z "$PHP_REQ" ] ; then
echo "Failed to figure out required PHP version from composer.json"
exit 2

View File

@ -28,8 +28,8 @@ class Environment_Test extends TestCase
public function testPhpVersion()
{
$this->assertTrue(
version_compare('5.5', phpversion(), '<='),
'phpMyAdmin requires PHP 5.5 or above'
version_compare('7.1.0', phpversion(), '<='),
'phpMyAdmin requires PHP 7.1 or above'
);
}