* 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
...
* 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)
* github-imkingdavid/task/functional:
[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)
* Fyorl/feature/attach-dl: (75 commits)
[feature/attach-dl] Removed the use of some abbreviations
[feature/attach-dl] Changed $files_added checks
[feature/attach-dl] Renamed $post_id to $post_msg_id
[feature/attach-dl] Fixed a comment
[feature/attach-dl] Optimised an sql query
[feature/attach-dl] Fixed the logic in an sql statement
[feature/attch-dl] $forum_id cast to int
[feature/attach-dl] Fixed $file_added to $files_added
[feature/attach-dl] Moved definition of $archive_name
[feature/attach-dl] Swapped the order of an if statement
[feature/attach-dl] Cast variables to int
[feature/attach-dl] Added $archive_path
[feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
[feature/attach-dl] Renamed $count to $files_added
[feature/attach-dl] Removed sprintf() use
[feature/attach-dl] Removed need for array_keys()
[feature/attach-dl] Added multiple attachment downloads to PMs
[feature/attach-dl] Removed reliance on current($row)
[feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
[feature/attach-dl] Moved PM authentication handling into own function
...
* upstream/develop: (259 commits)
[prep-release-3.0.11] Bumping version number for 3.0.11 final.
[feature/php-events] Fix doc of core.viewonline_overwrite_location
[feature/php-events] Fix doc of core.user_set_default_group
[feature/php-events] Fix doc of core.generate_smilies_after
[feature/php-events] Fix doc of core.delete_user_after
[feature/php-events] Fix doc of core.delete_user_before
[feature/php-events] Fix doc of core.update_username
[feature/php-events] Fix doc of core.memberlist_prepare_profile_data
[feature/php-events] Fix doc and position of viewonline_overwrite_location
[feature/php-events] Fix doc of core.viewtopic_get_post_data
[feature/php-events] Fix doc of core.viewtopic_cache_guest_data
[ticket/11061] Add the --dev flag to the composer instructions in README
[ticket/11060] Make sure pyrus can install everything on travis
[ticket/11059] Use https for the README logo
[feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum
[feature/php-events] Fix core.acp_manage_forums_update_data_after vars
[ticket/11032] fix language of error displayed
[ticket/11052] update search backend constructor everywhere
[ticket/11052] pass parametes to search construct while posting
[ticket/11054] Fixed $config var description
...
Conflicts:
phpBB/includes/cron/task/core/tidy_cache.php
phpBB/includes/cron/task/core/tidy_search.php
For some reason, all errors are just flipped on before connecting to the
database, despite the system as a whole having a different setting for
displayable errors. Had to add & ~E_STRICT in PHP 5.4.5 to suppress Strict
Standards messages, but I would assume that the db piece shouldn't be involved
with setting error_reporting at all.
PHPBB3-11066
* prep-release-3.0.11:
[prep-release-3.0.11] Bumping version number for 3.0.11 final.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
