diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-12-07 21:33:59 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-12-07 21:33:59 +0100 |
| commit | 1dba763e095d003b1f5391b32c33f8edf61530b0 (patch) | |
| tree | 8f53c32ec185521f5a0bbf3a7e6f6a2b9f51ee5a | |
| parent | 434a04344e415feda6e19671afc456f99f73b9cd (diff) | |
| parent | e8247faacc64dd5938a07e5aacf9e9d031933af5 (diff) | |
| download | forums-1dba763e095d003b1f5391b32c33f8edf61530b0.tar forums-1dba763e095d003b1f5391b32c33f8edf61530b0.tar.gz forums-1dba763e095d003b1f5391b32c33f8edf61530b0.tar.bz2 forums-1dba763e095d003b1f5391b32c33f8edf61530b0.tar.xz forums-1dba763e095d003b1f5391b32c33f8edf61530b0.zip | |
Merge branch 'ticket/14339' into ticket/14339-master
Conflicts:
phpBB/composer.json
phpBB/docs/INSTALL.html
phpBB/docs/README.html
| -rw-r--r-- | phpBB/composer.json | 2 | ||||
| -rw-r--r-- | phpBB/docs/INSTALL.html | 2 | ||||
| -rw-r--r-- | phpBB/docs/README.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index 9d52712655..8db3cb1348 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -25,7 +25,7 @@ "phpbb/phpbb-core": "self.version" }, "require": { - "php": ">=5.4", + "php": ">=5.4,<7.1", "bantu/ini-get-wrapper": "1.0.*", "google/recaptcha": "~1.1", "lusitanian/oauth": "0.2.*", diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index a5b1778848..86b320d197 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -147,7 +147,7 @@ <li>Oracle</li> </ul> </li> - <li><strong>PHP 5.4.0+</strong> with support for the database you intend to use.</li> + <li><strong>PHP 5.4.0+</strong> and <strong>PHP < 7.1</strong> with support for the database you intend to use.</li> <li>The following PHP modules are required: <ul> <li>json</li> diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index da3e2fa066..0a85b52dfa 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -323,7 +323,7 @@ <div class="content"> - <p>phpBB 3.2.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.4.0.</p> + <p>phpBB 3.2.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 5.4.0 and the maximum supported version is any version prior to PHP 7.1.</p> <p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p> |