From 9e52ed9af1268b2230ff2fb4868c0b026f7ac464 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Sep 2016 12:54:01 +0200
Subject: [PATCH] [ticket/14797] Support PHP 7.1 and clearly state support for
 latest versions

PHPBB3-14797
---
 .travis.yml             | 1 -
 phpBB/composer.json     | 2 +-
 phpBB/composer.lock     | 6 +++---
 phpBB/docs/INSTALL.html | 2 +-
 phpBB/docs/README.html  | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1f95fc4a5..2d88c25b34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,6 @@ matrix:
     - php: hhvm
       env: DB=mysqli
   allow_failures:
-    - php: 7.1
     - php: hhvm
     - php: nightly
   fast_finish: true
diff --git a/phpBB/composer.json b/phpBB/composer.json
index 90978c2ea5..e6de5eab2e 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -25,7 +25,7 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
-		"php": ">=5.4,<7.1",
+		"php": ">=5.4",
 		"bantu/ini-get-wrapper": "1.0.*",
 		"google/recaptcha": "~1.1",
 		"guzzlehttp/guzzle": "~5.3",
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 1dfd7b5b5c..f5d025a04b 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "63b20e6f5099b514286ff23fa070e7f1",
-    "content-hash": "1369fbe6bfe057da9b7c8bfb4cacfe73",
+    "hash": "5426763a1b0cea586211be11218ec457",
+    "content-hash": "b6de2d81609b99acc0d3aaf0ee4cc886",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -3315,7 +3315,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.4,<7.1"
+        "php": ">=5.4"
     },
     "platform-dev": [],
     "platform-overrides": {
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 69e4e4e202..11b1f70a1d 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -148,7 +148,7 @@
 			<li>Oracle</li>
 		</ul>
 		</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><strong>PHP 5.4.0+</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 3a4ca02d20..4ab682e084 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 PHP to run phpBB. The minimum version required is PHP 5.4.0 and the maximum supported version is PHP 7.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 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>