* 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
By David King
via David King (1) and Nils Adermann (1)
* develop-olympus:
[task/functional] Use proper format for @var doc blocks.
[task/functional] Fix $lang_path variable
[task/functional] Change property visibility, remove globals, reword comment
[task/functional] Make sure missing language values are handled properly
[task/functional] Increase code coverage for functional tests
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
* imkingdavid/ticket/10535:
[ticket/10535] Delete no longer needed email confirm language entries.
[ticket/10535] Delete email confirm from installer
[ticket/10535] Removed email confirm field from acp_users module
[ticket/10535] Forgot a subsilver2 change. *doh*
[ticket/10535] Removed email confirm from UCP, removed unused language entries
[ticket/10535] Remove email confirm check on registration form
* github-igorw/feature/functional-tests:
[feature/functional-tests] Introduce bootstrap method
[feature/functional-tests] Make sure functional tests only install once