mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 02:29:21 +02:00
Code Issues Releases Wiki Activity

[ticket/13407] Bump minimal version to php 5.3.9

Browse Source 
PHPBB3-13407
This commit is contained in:
Nicofuma 2015-02-03 17:23:11 +01:00
parent 73d3d02af1
commit b8939da242
14 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -2,8 +2,6 @@ language: php
matrix:
include:
- php: 5.3.3
env: DB=mysqli
- php: 5.3
env: DB=mysqli # MyISAM
- php: 5.4
@ -45,5 +43,5 @@ script:
- travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./
- sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
- sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"

2
phpBB/common.php
View File

@ -12,7 +12,7 @@
*/
/**
* Minimum Requirement: PHP 5.3.3
* Minimum Requirement: PHP 5.3.9
*/
if (!defined('IN_PHPBB'))

2
phpBB/composer.json
View File

@ -25,7 +25,7 @@
"phpbb/phpbb-core": "self.version"
},
"require": {
"php": ">=5.3.3",
"php": ">=5.3.9",
"lusitanian/oauth": "0.2.*",
"patchwork/utf8": "1.1.*",
"symfony/config": "2.7.*@dev",

6
phpBB/config/default/container/services.yml
View File

@ -167,6 +167,9 @@ services:
class: Symfony\Component\HttpKernel\EventListener\RouterListener
arguments:
- @router
- null
- null
- @request_stack
tags:
- { name: kernel.event_subscriber }
@ -176,9 +179,6 @@ services:
class: phpbb\symfony_request
arguments:
- @request
- null
- null
- @request_stack
request_stack:
class: Symfony\Component\HttpFoundation\RequestStack

2
phpBB/docs/INSTALL.html
View File

@ -141,7 +141,7 @@
<li>Oracle</li>
</ul>
</li>
<li><strong>PHP 5.3.3+</strong> with support for the database you intend to use.</li>
<li><strong>PHP 5.3.9+</strong> with support for the database you intend to use.</li>
<li>The following PHP modules are required:
<ul>
<li>json</li>

4
phpBB/docs/README.html
View File

@ -261,7 +261,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.3.3 as a module, PHP 5.4.0 running as CGI, etc.</li>
<li>PHP version and mode of operation, e.g. PHP 5.3.9 as a module, PHP 5.4.0 running as CGI, etc.</li>
<li>DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 SP1, etc.</li>
</ul>
@ -319,7 +319,7 @@
<div class="content">
<p>phpBB 3.1.x takes advantage of new features added in PHP 5.3. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.3.3.</p>
<p>phpBB 3.1.x takes advantage of new features added in PHP 5.3. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.3.9.</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>

4
phpBB/install/index.php
View File

@ -22,9 +22,9 @@ define('PHPBB_ENVIRONMENT', 'production');
$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
if (version_compare(PHP_VERSION, '5.3.3') < 0)
if (version_compare(PHP_VERSION, '5.3.9') < 0)
{
die('You are running an unsupported PHP version. Please upgrade to PHP 5.3.3 or higher before trying to install phpBB 3.1');
die('You are running an unsupported PHP version. Please upgrade to PHP 5.3.9 or higher before trying to install phpBB 3.1');
}
function phpbb_require_updated($path, $optional = false)

2
phpBB/install/install_install.php
View File

@ -157,7 +157,7 @@ class install_install extends module
// Test the minimum PHP version
$php_version = PHP_VERSION;
if (version_compare($php_version, '5.3.3') < 0)
if (version_compare($php_version, '5.3.9') < 0)
{
$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
}

4
phpBB/language/en/install.php
View File

@ -301,10 +301,10 @@ $lang = array_merge($lang, array(
'PHP_REGISTER_GLOBALS_EXPLAIN' => 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
'PHP_SAFE_MODE' => 'Safe mode',
'PHP_SETTINGS' => 'PHP version and settings',
'PHP_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 5.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
'PHP_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 5.3.9 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
'PHP_URL_FOPEN_SUPPORT' => 'PHP setting <var>allow_url_fopen</var> is enabled',
'PHP_URL_FOPEN_SUPPORT_EXPLAIN' => '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.',
'PHP_VERSION_REQD' => 'PHP version >= 5.3.3',
'PHP_VERSION_REQD' => 'PHP version >= 5.3.9',
'POST_ID' => 'Post ID',
'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
'PREPROCESS_STEP' => 'Executing pre-processing functions/queries',

2
phpBB/phpbb/composer.json
View File

@ -22,6 +22,6 @@
"classmap": [""]
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
}
}

2
travis/check-executable-files.sh
View File

@ -15,7 +15,7 @@ TRAVIS_PHP_VERSION=$2
root="$3"
path="${root}phpBB/"
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
then
# Check the permissions of the files

2
travis/check-image-icc-profiles.sh
View File

@ -13,7 +13,7 @@ set -e
DB=$1
TRAVIS_PHP_VERSION=$2
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
then
find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | \
parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}'

2
travis/check-sami-parse-errors.sh
View File

@ -13,7 +13,7 @@ set -e
DB=$1
TRAVIS_PHP_VERSION=$2
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
then
# Workarounds for
# https://github.com/fabpot/Sami/issues/116

2
travis/setup-phpbb.sh
View File

@ -14,7 +14,7 @@ set -x
DB=$1
TRAVIS_PHP_VERSION=$2
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
then
travis/setup-exiftool.sh
travis/setup-unbuffer.sh