diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | phpBB/common.php | 2 | ||||
| -rw-r--r-- | phpBB/composer.json | 2 | ||||
| -rw-r--r-- | phpBB/config/default/container/services.yml | 6 | ||||
| -rw-r--r-- | phpBB/docs/INSTALL.html | 2 | ||||
| -rw-r--r-- | phpBB/docs/README.html | 4 | ||||
| -rw-r--r-- | phpBB/install/index.php | 4 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/install.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/composer.json | 2 | ||||
| -rwxr-xr-x | travis/check-executable-files.sh | 2 | ||||
| -rwxr-xr-x | travis/check-image-icc-profiles.sh | 2 | ||||
| -rwxr-xr-x | travis/check-sami-parse-errors.sh | 2 | ||||
| -rwxr-xr-x | travis/setup-phpbb.sh | 2 |
14 files changed, 19 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index b7b17f2f19..08bbfab2b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/phpBB/common.php b/phpBB/common.php index e6c2352113..e819c75efc 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -12,7 +12,7 @@ */ /** -* Minimum Requirement: PHP 5.3.3 +* Minimum Requirement: PHP 5.3.9 */ if (!defined('IN_PHPBB')) diff --git a/phpBB/composer.json b/phpBB/composer.json index 228258a741..dcb4000d34 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -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", diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index aa9e7abddf..c376726b3b 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -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 diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 273df92cb5..15d45dd1db 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -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> diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index b66f47178e..7def70c2f5 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -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> diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 495f49ee49..63145002df 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -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) diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 536b7142d5..c2d3f1c6d7 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -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>'; } diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index dd22e84fcb..75e5d50225 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -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', diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json index 513d7e4559..175be4b0ab 100644 --- a/phpBB/phpbb/composer.json +++ b/phpBB/phpbb/composer.json @@ -22,6 +22,6 @@ "classmap": [""] }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" } } diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh index 4d420add1c..e1a1625d18 100755 --- a/travis/check-executable-files.sh +++ b/travis/check-executable-files.sh @@ -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 diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh index bb070ccc27..d10c4cac40 100755 --- a/travis/check-image-icc-profiles.sh +++ b/travis/check-image-icc-profiles.sh @@ -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 {}' diff --git a/travis/check-sami-parse-errors.sh b/travis/check-sami-parse-errors.sh index c3338e34db..84976a7666 100755 --- a/travis/check-sami-parse-errors.sh +++ b/travis/check-sami-parse-errors.sh @@ -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 diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index 205f23b876..369c477860 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -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 |