* develop-olympus:
[ticket/11202] Custom message does not make sense here, delete it.
[ticket/11202] Check response success before content assertions.
[ticket/11202] Add a heuristic function to check for response success.
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
* p/ticket/11202-olympus:
[ticket/11202] Custom message does not make sense here, delete it.
[ticket/11202] Check response success before content assertions.
[ticket/11202] Add a heuristic function to check for response success.
* Fyorl/ticket/10939:
[ticket/10939] Added documentation for phpbb_request::file
[ticket/10939] Added tests for phpbb_request::file
[ticket/10939] Modified the default return for $request->file
[ticket/10939] Modified fileupload tests to deal with new behaviour
[ticket/10939] Modified mock request class to handle deactivated $_FILES
[ticket/10939] Modified acp_groups.php to not use $_FILES
[ticket/10939] Modified ucp_groups.php to not use $_FILES
[ticket/10939] Modified functions_user.php to not use $_FILES
[ticket/10939] Modified message_parser.php to not use $_FILES
[ticket/10939] Modified functions_upload to not use $_FILES
[ticket/10939] Modified request test slightly to include $_FILES
[ticket/10939] Added $_FILES handling to phpbb_request
The problem is, that we try to recreate the db and reconnect to it, while the
old connection is still hold. To resolve this, we just drop all tables and
recreate the tables instead of the hole db.
PHPBB3-11186
* github-p/ticket/11174:
[ticket/11174] Check common words, fix array equality assertion.
[ticket/11174] Test for common words.
[ticket/11174] More tests.
[ticket/11174] Clarify why that is the way it is.
[ticket/11174] Started on search tests - keyword splitting.
* 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
This was probably necessary all along, and the test happened to work
because state was not correctly reset between test runs and
a previous test set an empty template path.
PHPBB3-10933
* bantu/ticket/8713:
[ticket/8713] Update untrimmed_variable() doc block.
[ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
[ticket/8713] Trim password in auth_db to keep compatibility.
[ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
[ticket/8713] Rename untrimed_variable() to untrimmed_variable().
[ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
[ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
[ticket/8713] Always trim array keys.
[ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
[ticket/8713] Use \t in double quotes instead of tabs.
[ticket/8713] Use correct parameter for nested data.
[ticket/8713] Adjust test method name to other recursive_set_var() tests.
[ticket/8713] Do not trim login inputs
* develop-olympus:
[ticket/11045] Removed file conflict tests for compress class
[ticket/11045] Replaced __DIR__ with dirname(__FILE__)
[ticket/11045] Opening brace on its own line
[ticket/11045] Explicitely check for zlib and bz2
[ticket/11045] Added tests for file conflicts
[ticket/11045] Added unit tests for the compress class
* Fyorl/ticket/11045:
[ticket/11045] Removed file conflict tests for compress class
[ticket/11045] Replaced __DIR__ with dirname(__FILE__)
[ticket/11045] Opening brace on its own line
[ticket/11045] Explicitely check for zlib and bz2
[ticket/11045] Added tests for file conflicts
[ticket/11045] Added unit tests for the compress class
Create a function to request variables which are not trimmed.
All requests for passwords (except forum passwords) now use the
untrimmed request function.
PHPBB3-8713
* github-igorw/feature/dic: (35 commits)
[feature/dic] Spaces to tabs, add useless docblocks
[feature/dic] Remove unneeded newline
[feature/dic] Add a doc block for the prune_forum cron task forum_data
[feature/dic] Update composer.lock to symfony/* RC1
[feature/dic] Fix re-ordering of services
[feature/dic] Fix parse errors
[feature/dic] Add docblock for cron_manager::wrap_task()
[feature/dic] Make cron task attributes protected, one per line
[feature/dic] Coding style: Braces
[feature/dic] Re-order services alphabetically
[feature/dic] Remove duplicate event-dispatcher dependency
[feature/dic] Adjust installer script to work with partially configured container
[feature/dic] Generate full cache driver class name on fresh install
[feature/dic] Adjust cache driver class name for BC
[feature/dic] Rename {phpEx => php_ext} for consistency
[feature/dic] Add trailing newline to htaccess
[feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock file
[feature/dic] Load services from extensions
[feature/dic] Introduce DI processors instead of abusing compiler passes
[feature/dic] Add dbal_ class prefix to dbal.driver.class
...
