* develop-olympus:
[ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
[ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
[ticket/11513] Use PHPUnit from composer in .travis.yml.
[ticket/11513] Update (all) composer dependencies.
[ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.
Conflicts:
.travis.yml
phpBB/composer.lock
* develop-olympus:
[ticket/11337] Abort setup-webserver.sh script when an error occurs.
[ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
[ticket/11337] Silence nginx config file writing.
[ticket/11337] php-fpm.conf is no longer owned by root.
[ticket/11337] Run functional tests on travis using nginx and php-fpm.
Conflicts:
.travis.yml
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
[ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
* develop-olympus:
[ticket/10981] Added check for PHP version before running composer
[ticket/10981] Modified travis to use composer with --dev
[ticket/10981] Removed setupBeforeClass
[ticket/10981] Modified functional framework to account for goutte changes
[ticket/10981] Added goutte via composer
Conflicts:
.travis.yml
composer.phar
phpBB/composer.json
phpBB/composer.lock
tests/bootstrap.php
* Fyorl/ticket/10981:
[ticket/10981] Added check for PHP version before running composer
[ticket/10981] Modified travis to use composer with --dev
[ticket/10981] Removed setupBeforeClass
[ticket/10981] Modified functional framework to account for goutte changes
[ticket/10981] Added goutte via composer
The travis configuration file contains a statement that checks whether
the test is ran against PHP 5.2 but as that version isn't tested at
all the check can be removed.
PHPBB3-10869
