From f3dc2a801d7e077e5e10a143b8d450b0b4a3aa11 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 28 Sep 2015 17:40:24 +0200 Subject: [ticket/14205] Bump PHP requirement to PHP 5.4 PHPBB3-14205 --- .travis.yml | 23 +++++++++--------- phpBB/composer.json | 2 +- phpBB/composer.lock | 28 +++++++++++----------- phpBB/docs/INSTALL.html | 2 +- phpBB/docs/README.html | 6 ++--- phpBB/includes/acp/acp_main.php | 2 +- phpBB/install/index.php | 4 ++-- phpBB/install/install_install.php | 2 +- phpBB/language/en/install.php | 4 ++-- phpBB/language/en/install_new.php | 2 +- phpBB/phpbb/composer.json | 2 +- .../requirements/task/check_server_environment.php | 2 +- travis/check-executable-files.sh | 5 ++-- travis/check-image-icc-profiles.sh | 3 ++- travis/check-sami-parse-errors.sh | 3 ++- travis/ext-sniff.sh | 2 +- travis/phing-sniff.sh | 3 ++- travis/setup-database.sh | 8 ++++++- travis/setup-phpbb.sh | 7 +++--- 19 files changed, 60 insertions(+), 50 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae61235c72..4f9734a19a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ language: php matrix: include: - - php: 5.3 - env: DB=mysqli # MyISAM - php: 5.4 - env: DB=mysqli + env: DB=none;NOTESTS=1 + - php: 5.4 + env: DB=mysqli # MyISAM - php: 5.4 env: DB=mysql - php: 5.4 @@ -33,19 +33,18 @@ services: - redis-server install: - - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION + - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS before_script: - - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION + - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS - phantomjs --webdriver=8910 > /dev/null & script: - - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION - - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION - - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION - - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./ + - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION $NOTESTS + - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION $NOTESTS + - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS + - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./ - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi" - - sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" + - sh -c "if [ '$NOTESTS' != '1' -a '$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' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" - + - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" diff --git a/phpBB/composer.json b/phpBB/composer.json index bcf359a53b..b96e6cacf6 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -29,7 +29,7 @@ "lusitanian/oauth": "0.2.*", "marc1706/fast-image-size": "1.1.*", "patchwork/utf8": "1.1.*", - "php": ">=5.3.9", + "php": ">=5.4", "s9e/text-formatter": "dev-release/php5.3", "symfony/config": "2.8.*@dev", "symfony/console": "2.8.*@dev", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index accd4a55f6..bd08a36fdc 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "983770c26a0dcd7399ebd488846ade9a", + "hash": "3a1fb55478d50b5b7b5888f3a07e0b43", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -254,7 +254,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/fb39bdd38f6706b96422a7583b89c9283a58960f", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/c065d0e81e7e4666cd13ba4414f4dc7fe8d33dd9", "reference": "beee0e5693f7ca8ed16a94294acf53b6e6207e7c", "shasum": "" }, @@ -313,7 +313,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/a3aa17e2dcec2dc1c764bedd21e69fdf888b8b55", + "url": "https://api.github.com/repos/symfony/Config/zipball/546b5c41f8e0c3b18e55e4450ec51444adf3e61e", "reference": "a3aa17e2dcec2dc1c764bedd21e69fdf888b8b55", "shasum": "" }, @@ -363,7 +363,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/d31246d93cd99dc57858adb5da63841d56969928", + "url": "https://api.github.com/repos/symfony/Console/zipball/a0d4aa01cfe2e3646e50c13c721c04d044534535", "reference": "d31246d93cd99dc57858adb5da63841d56969928", "shasum": "" }, @@ -420,7 +420,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/3c14966b099b4ba807f146df4c6a7acffba2f793", + "url": "https://api.github.com/repos/symfony/Debug/zipball/7eac742c453af47ae561d6c41743dc7faefc9464", "reference": "3c14966b099b4ba807f146df4c6a7acffba2f793", "shasum": "" }, @@ -475,7 +475,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/99c05679526e9293783ce3a9059890b47da1d97e", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/0558c49dc0abbf4702b432fb9813bcd849d46ff9", "reference": "99c05679526e9293783ce3a9059890b47da1d97e", "shasum": "" }, @@ -535,7 +535,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/d7246885b7fe4cb5a2786bda34362d2f0e40b730", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e79162fa079bb559ddad17c58cf8b7ecbaffd9b6", "reference": "d7246885b7fe4cb5a2786bda34362d2f0e40b730", "shasum": "" }, @@ -593,7 +593,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/b9fa06f1822de287e660130955b546777994597b", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/287fc0b1dcb11ff729eeefc20441c08eaf628f29", "reference": "b9fa06f1822de287e660130955b546777994597b", "shasum": "" }, @@ -744,7 +744,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/330079921340f2d273dd24df16fc129948614e77", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/39aa7db7997031951ad4a4019153199287e1cc88", "reference": "330079921340f2d273dd24df16fc129948614e77", "shasum": "" }, @@ -824,7 +824,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/e9554bafc78c93b15ef56ce72c5aa2f3a511e683", + "url": "https://api.github.com/repos/symfony/Routing/zipball/7ee642267d616c9855c28387d30050e093f26c6b", "reference": "e9554bafc78c93b15ef56ce72c5aa2f3a511e683", "shasum": "" }, @@ -971,7 +971,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/f85dc88ede5943c63c8681c02d8ef6b4252be54c", + "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/2d1b0ac84ff35256d14c7dd5d949e50d138fa7f3", "reference": "f85dc88ede5943c63c8681c02d8ef6b4252be54c", "shasum": "" }, @@ -2443,7 +2443,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/4f297d7e00c375b6ab03732e076f65799a73937d", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/4dbd336331f5e7ba7a6f9e4f9f608b89093f49b3", "reference": "4f297d7e00c375b6ab03732e076f65799a73937d", "shasum": "" }, @@ -2551,7 +2551,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/be577b3a5d4a06d8ce03db57222bd06b5a6509de", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/1b459587235fb74b213269ec5ad8ac2f6e22f5f4", "reference": "be577b3a5d4a06d8ce03db57222bd06b5a6509de", "shasum": "" }, @@ -2670,7 +2670,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.3.9" + "php": ">=5.4" }, "platform-dev": [] } diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index a0e63092f0..c6a88def7f 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -147,7 +147,7 @@
  • Oracle
    • -
  • PHP 5.3.9+ with support for the database you intend to use.
    • +
  • PHP 5.4.0+ with support for the database you intend to use.
  • The following PHP modules are required: