aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-02 10:20:53 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-02 10:20:53 +0100
commit46b70ded94ca5a0b9ce05d757fa8e7feb1d1056f (patch)
tree8110cbf67f7fe0ec9528d3835983cbd33955828e
parent20fb9385f5776633a2bd2f3d8778bbd33d04da31 (diff)
parentc7dd7d42c68fc039467c55577f1a60ee1be3a744 (diff)
downloadforums-46b70ded94ca5a0b9ce05d757fa8e7feb1d1056f.tar
forums-46b70ded94ca5a0b9ce05d757fa8e7feb1d1056f.tar.gz
forums-46b70ded94ca5a0b9ce05d757fa8e7feb1d1056f.tar.bz2
forums-46b70ded94ca5a0b9ce05d757fa8e7feb1d1056f.tar.xz
forums-46b70ded94ca5a0b9ce05d757fa8e7feb1d1056f.zip
Merge pull request #5805 from 3D-I/ticket/16283
[ticket/16283] Update requirements for 3.3.0
-rw-r--r--phpBB/common.php2
-rw-r--r--phpBB/docs/README.html6
-rw-r--r--phpBB/includes/startup.php6
-rw-r--r--phpBB/install/app.php4
-rw-r--r--phpBB/language/en/install.php2
-rw-r--r--phpBB/phpbb/install/module/requirements/task/check_server_environment.php4
6 files changed, 11 insertions, 13 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index fc009dd8c4..e25274d3f4 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -12,7 +12,7 @@
*/
/**
-* Minimum Requirement: PHP 7.1.0
+* Minimum Requirement: PHP 7.1.3
*/
if (!defined('IN_PHPBB'))
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index ca50fe95be..32b2d98ab4 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -265,7 +265,7 @@
<ul>
<li>Your server type/version, e.g. Apache 2.2.3, IIS 7, Sambar, etc.</li>
- <li>PHP version and mode of operation, e.g. PHP 7.1.0 as a module, PHP 7.1.0 running as CGI, etc.</li>
+ <li>PHP version and mode of operation, e.g. PHP 7.1.3 as a module, PHP 7.1.3 running as CGI, etc.</li>
<li>DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 (via ODBC), etc.</li>
</ul>
@@ -323,11 +323,11 @@
<div class="content">
- <p>phpBB 3.3.x takes advantage of new features added in PHP 7.1.0. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 7.1.0 and the maximum supported version is the latest stable version of PHP.</p>
+ <p>phpBB 3.3.x takes advantage of new features added in PHP 7.1. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 7.1.3 and the maximum supported version is the latest stable version of PHP.</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>
- <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 7.1.0 to 7.2.x and 7.3.x without issues.</p>
+ <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 7.1.3 to 7.2.x and 7.3.x without issues.</p>
<a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3>
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index d42ae58c42..5ead3b7fbb 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -23,11 +23,11 @@ $level = E_ALL & ~E_NOTICE & ~E_DEPRECATED;
error_reporting($level);
/**
-* Minimum Requirement: PHP 7.1.0
+* Minimum Requirement: PHP 7.1.3
*/
-if (version_compare(PHP_VERSION, '7.1') < 0)
+if (version_compare(PHP_VERSION, '7.1.3', '<'))
{
- die('You are running an unsupported PHP version. Please upgrade to PHP 7.1.0 or higher before trying to install or update to phpBB 3.3');
+ die('You are running an unsupported PHP version. Please upgrade to PHP 7.1.3 or higher before trying to install or update to phpBB 3.3');
}
// Register globals and magic quotes have been dropped in PHP 5.4 so no need for extra checks
diff --git a/phpBB/install/app.php b/phpBB/install/app.php
index 9d04ec2156..0e6212e37a 100644
--- a/phpBB/install/app.php
+++ b/phpBB/install/app.php
@@ -20,9 +20,9 @@ define('PHPBB_ENVIRONMENT', 'production');
$phpbb_root_path = '../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
-if (version_compare(PHP_VERSION, '7.1') < 0)
+if (version_compare(PHP_VERSION, '7.1.3', '<'))
{
- die('You are running an unsupported PHP version. Please upgrade to PHP 7.1.0 or higher before trying to install or update to phpBB 3.3');
+ die('You are running an unsupported PHP version. Please upgrade to PHP 7.1.3 or higher before trying to install or update to phpBB 3.3');
}
$startup_new_path = $phpbb_root_path . 'install/update/update/new/install/startup.' . $phpEx;
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 53d9940560..61a7b72791 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -105,7 +105,7 @@ $lang = array_merge($lang, array(
// Server requirements
'PHP_VERSION_REQD' => 'PHP version',
- 'PHP_VERSION_REQD_EXPLAIN' => 'phpBB requires PHP version 7.1.0 or higher.',
+ 'PHP_VERSION_REQD_EXPLAIN' => 'phpBB requires PHP version 7.1.3 or higher.',
'PHP_GETIMAGESIZE_SUPPORT' => 'PHP getimagesize() function is required',
'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the getimagesize function needs to be available.',
'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support',
diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
index 4607ce9ec2..41aa82623b 100644
--- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
+++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
@@ -96,9 +96,7 @@ class check_server_environment extends \phpbb\install\task_base
*/
protected function check_php_version()
{
- $php_version = PHP_VERSION;
-
- if (version_compare($php_version, '7.1') < 0)
+ if (version_compare(PHP_VERSION, '7.1.3', '<'))
{
$this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN');