From e76c673e2e6a379ae7c4beccabfaaf8a5eb18371 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 30 Dec 2018 12:31:26 +0100
Subject: [ticket/14948] Update requirements and travis build matrix

PHPBB3-14948
---
 .travis.yml                                          | 20 ++++++++++----------
 phpBB/common.php                                     |  2 +-
 phpBB/docs/INSTALL.html                              |  2 +-
 phpBB/docs/README.html                               |  6 +++---
 phpBB/includes/startup.php                           |  6 +++---
 phpBB/install/app.php                                |  4 ++--
 phpBB/language/en/install.php                        |  2 +-
 .../requirements/task/check_server_environment.php   |  2 +-
 phpBB/phpbb/template/asset.php                       |  7 -------
 9 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd5e4da59e..b2ae91bd70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,26 +3,26 @@ sudo: required
 
 matrix:
   include:
-    - php: 5.6
+    - php: 7.1
       env: DB=none;NOTESTS=1
-    - php: 5.6
+    - php: 7.1
       env: DB=mariadb
-    - php: 5.6
+    - php: 7.1
       env: DB=postgres
-    - php: 5.6
+    - php: 7.1
       env: DB=sqlite3
-    - php: 5.6
+    - php: 7.1
       env: DB=mysqli;SLOWTESTS=1
-    - php: 5.6
+    - php: 7.1
       env: DB=mysqli # MyISAM
-    - php: 5.6
-      env: DB=mysql
-    - php: 7.0
-      env: DB=mysqli
     - php: 7.1
+      env: DB=mysql
+    - php: 7.2
       env: DB=mysqli
     - php: 7.2
       env: DB=mysqli
+    - php: 7.3
+      env: DB=mysqli
     - php: nightly
       env: DB=mysqli
   allow_failures:
diff --git a/phpBB/common.php b/phpBB/common.php
index 230afd44e0..fc009dd8c4 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -12,7 +12,7 @@
 */
 
 /**
-* Minimum Requirement: PHP 5.4.0
+* Minimum Requirement: PHP 7.1.0
 */
 
 if (!defined('IN_PHPBB'))
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 4f7f07d3dc..7edfa8b43d 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.7+</strong> but less than <strong>PHP 7.3</strong> with support for the database you intend to use.</li>
+		<li><strong>PHP 7.1.0+</strong> but less than <strong>PHP 7.4</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 8fb9036ad8..85a00ef24b 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 5.4.0 as a module, PHP 5.4.0 running as CGI, 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>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.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.7 and the maximum supported version is the latest stable version of PHP.</p>
+	<p>phpBB 3.2.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>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 MySQL 3.23, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 5.4.7 above 5.6.x to 7.1.x and 7.2.x without problem.</p>
+	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 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>
 
 <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 66f85657a5..d42ae58c42 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 5.4.0
+* Minimum Requirement: PHP 7.1.0
 */
-if (version_compare(PHP_VERSION, '5.4') < 0)
+if (version_compare(PHP_VERSION, '7.1') < 0)
 {
-	die('You are running an unsupported PHP version. Please upgrade to PHP 5.4.0 or higher before trying to install or update to phpBB 3.2');
+	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');
 }
 // 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 710f49570b..9d04ec2156 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, '5.4.7', '<') || version_compare(PHP_VERSION, '7.3-dev', '>='))
+if (version_compare(PHP_VERSION, '7.1') < 0)
 {
-	die('You are running an unsupported PHP version. Please upgrade to PHP equal to or greater than 5.4.7 but less than 7.3-dev in order to install or update to phpBB 3.2');
+	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');
 }
 
 $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 370ab00988..7591eb16ec 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 5.4.0 or higher.',
+	'PHP_VERSION_REQD_EXPLAIN'			=> 'phpBB requires PHP version 7.1.0 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 29f9777747..4607ce9ec2 100644
--- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
+++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
@@ -98,7 +98,7 @@ class check_server_environment extends \phpbb\install\task_base
 	{
 		$php_version = PHP_VERSION;
 
-		if (version_compare($php_version, '5.4') < 0)
+		if (version_compare($php_version, '7.1') < 0)
 		{
 			$this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN');
 
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php
index cb00f16549..d6b46234f0 100644
--- a/phpBB/phpbb/template/asset.php
+++ b/phpBB/phpbb/template/asset.php
@@ -45,13 +45,6 @@ class asset
 	*/
 	public function set_url($url)
 	{
-		if (version_compare(PHP_VERSION, '5.4.7') < 0 && substr($url, 0, 2) === '//')
-		{
-			// Workaround for PHP 5.4.6 and older bug #62844 - add fake scheme and then remove it
-			$this->components = parse_url('http:' . $url);
-			$this->components['scheme'] = '';
-			return;
-		}
 		$this->components = parse_url($url);
 	}
 
-- 
cgit v1.2.1