* upstream/develop: (22 commits)
[ticket/11206] Remove includes to non-existent files from download/file.php
[ticket/11205] Fix merge conflict in readme.html.
[ticket/11202] Check response success before content assertions.
[ticket/11204] Reindent.
[ticket/11198] Remove additional asterix as /** is doc-block only
[ticket/11200] Add a reminder comment.
[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.
[ticket/11200] Make cache available during container construction
[ticket/11199] Match cache purge container files against container_*
[ticket/11199] Purge dumped container correctly on cache purge.
[ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
[ticket/11199] Cache purge does not remove dumped container
[ticket/11198] Store the swapping partners in vars and simplify the logic
[ticket/11198] Correctly set links after an item is moved up/down with AJAX
[ticket/11197] Prefix the css classes for the small arrow with "arrow"
[ticket/10879] Remove arrow icon from attachment link in editor
[ticket/11195] Condense logic, remove improperly formatted if()
[ticket/11190-develop] Functional tests purge cache before running.
...
Conflicts:
tests/test_framework/phpbb_database_test_connection_manager.php
This patch changes the dumped container suffix to a prefix instead which
makes the existing code for purging 'cache/container_*' files work
as intended.
PHPBB3-11199
This reverts commit 303fc646adf9104d7c82cf8bcebbc8fc0d328624, reversing
changes made to 9c28470ad7b45c10ce3a32065650e4b17f9f27ea.
The correct fix should be to alter the container file name to start with
container_ prefix.
PHPBB3-11199
* upstream/develop: (31 commits)
[ticket/11194] Service tag data is stored in an array so access it correctly
[ticket/11193] Instantiate a single collection_pass for all collections
[ticket/11152] Basic tests for the container functions
[ticket/11152] Compile the install container
[ticket/11152] Throw error if services.yml is missing
[ticket/11152] Remove old container processor calls
[ticket/11152] Use realpath in container extensions consistently
[ticket/11152] Rename collection to collection_pass
[ticket/11152] Remove @api docblocks
[ticket/11152] Create separate function for debug-dependent container
[ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
[ticket/11152] Convert cron_task_collection to generic di_service_collection
[ticket/11152] Use relative root path in container, one dumped container per path
[ticket/11152] Move container functions to a separate function file
[feature/compiled-dic] Rename $phpEx to $php_ext in new code
[feature/compiled-dic] Use an absolute path for core.root_path parameter
[feature/compiled-dic] Update the composer.lock file
[feature/compiled-dic] Purge cache to make ext services available right away
[feature/compiled-dic] Fix root path when container is created after install
[feature/compiled-dic] Remove old test
...
* upstream/develop: (666 commits)
[ticket/11077] Remove code from old global announcements system
[ticket/11189] Replace DEBUG_EXTRA with DEBUG
[ticket/11189] Always log critical errors when in cron or in image output
[ticket/11187] Added a blank array to fix errors in functional tests
[ticket/10780] Make L_COLON available in the installer.
[ticket/11183] Remove $load_extensions and weird dl() calls
[ticket/10970] Added extra documentation to parse_dynamic_path.
[ticket/10939] Added documentation for phpbb_request::file
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10780] Use L_COLON on LDAP page.
[ticket/10780] Use L_COLON on search backend ACP pages.
[ticket/10780] Use L_COLON for "download all attachments".
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
[ticket/10780] Replace colon usage in template output with {L_COLON}
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
[ticket/10172] Show prosilver birthday list even if there are no birthdays.
...
Conflicts:
phpBB/common.php
phpBB/download/file.php
phpBB/includes/db/dbal.php
phpBB/includes/db/firebird.php
phpBB/includes/db/mssql.php
phpBB/includes/db/mssql_odbc.php
phpBB/includes/db/mssqlnative.php
phpBB/includes/db/mysql.php
phpBB/includes/db/mysqli.php
phpBB/includes/db/oracle.php
phpBB/includes/db/postgres.php
phpBB/includes/db/sqlite.php
phpBB/includes/extension/manager.php
phpBB/install/database_update.php
* 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
We cannot use container tags at run time if we are using a cached, compiled
container object (i.e. phpbb_cache_container) so we have to load them
beforehand.
PHPBB3-11152
