Skip to content

Commit

Permalink
Merge branch '3.2.x'
Browse files Browse the repository at this point in the history
* 3.2.x:
  [ticket/14797] Support PHP 7.1 and clearly state support for latest versions
  • Loading branch information
Nicofuma committed Sep 25, 2016
2 parents a713f51 + ef755ff commit c4812a2
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -27,7 +27,6 @@ matrix:
- php: hhvm
env: DB=mysqli
allow_failures:
- php: 7.1
- php: hhvm
- php: nightly
fast_finish: true
Expand Down
3 changes: 1 addition & 2 deletions phpBB/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion phpBB/docs/INSTALL.html
Expand Up @@ -148,7 +148,7 @@ <h1>Install</h1>
<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>
Expand Down
2 changes: 1 addition & 1 deletion phpBB/docs/README.html
Expand Up @@ -323,7 +323,7 @@ <h1>Readme</h1>

<div class="content">

<p>phpBB 3.3.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.5.9. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 5.5.9 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>

Expand Down

0 comments on commit c4812a2

Please sign in to comment.