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 @@
  • Oracle
  • -
  • PHP 5.3.3+ with support for the database you intend to use.
  • +
  • PHP 5.3.9+ with support for the database you intend to use.
  • The following PHP modules are required: