* github-phpbb/develop-olympus:
[ticket/11159] static public is the currently approved order.
Conflicts:
tests/dbal/select_test.php
tests/dbal/write_test.php
tests/request/request_var_test.php
tests/security/extract_current_page_test.php
tests/security/redirect_test.php
tests/template/template_test.php
tests/text_processing/make_clickable_test.php
tests/utf/utf8_clean_string_test.php
* develop-olympus:
[task/functional] Fixed DEBUG_TEST related issues
[task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
[task/functional] Added posting tests (reply and new topic)
* 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
* develop-olympus:
[ticket/10678] Typo and formatting
[ticket/10678] Add port handling for MSSQL tests
[ticket/10678] Move config changes to new location
[ticket/10678] Rename helper class file
[ticket/10678] Lowercase class name, adjust comment width
[ticket/10678] More formatting and docblocks
[ticket/10678] More formatting requests
[ticket/10678] Fix formatting
[ticket/10678] Add better support for Firebird, Oracle, and MSSQL
* github-noxwizard/ticket/10678:
[ticket/10678] Typo and formatting
[ticket/10678] Add port handling for MSSQL tests
[ticket/10678] Move config changes to new location
[ticket/10678] Rename helper class file
[ticket/10678] Lowercase class name, adjust comment width
[ticket/10678] More formatting and docblocks
[ticket/10678] More formatting requests
[ticket/10678] Fix formatting
[ticket/10678] Add better support for Firebird, Oracle, and MSSQL
Conflicts:
tests/RUNNING_TESTS.txt
* develop-olympus:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
* prep-release-3.0.11:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
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
By David King
via David King
* github-imkingdavid/task/functional:
[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
Allow ODBC connections for Firebird
Capitalize fixture tables and columns for Firebird
On database drop failure, drop all tables
Provide cleanup utilities for databases that cannot be dropped
PHPBB3-10678
