* 'develop' of https://github.com/phpbb/phpbb3: (204 commits)
[ticket/11219] Coding guidelines and naming consistency changes
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
[ticket/11247] Fix wrong property reference in flock class.
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
[ticket/10716] Collect standard error from executed php process.
[ticket/10716] Skip test if php is not in PATH.
[ticket/10716] Exclude our dependencies from linting.
[ticket/10103] New and improved wording.
[ticket/10716] Only lint on php 5.3+.
[ticket/10103] Assert with messages.
[ticket/10103] assertLessThan/assertGreaterThan.
[ticket/10103] Inline assignment is bad?
[ticket/10103] $rv had too few characters.
[ticket/10103] Correct flock class documentation.
...
Conflicts:
phpBB/config/services.yml
phpBB/includes/groupposition/legend.php
* brunoais/ticket/10601:
[ticket/10601] The ORDER BY is only taking space there
[ticket/10601] New approach in the update algorithm
[ticket/10601] Comment to help understanding the code
[ticket/10601] Requested code changes
[ticket/10601] Cosmetic code changes
[ticket/10601] Database updating code v2
[ticket/10601] Database updating code
[ticket/10601] Comment explaning the basename applied to categories
[ticket/10601] Correctly access class property
[ticket/10601]Move Inbox the default in private messages module
- Removed the double line before the addition
- Moved the condition of the WHERE so that both are in the same line
- Removed TABs from the black lines
- Used double quotes instead of escaped single quotes.
PHPBB3-10601
Explain in the code where
if (isset($this->module_categories_basenames[$cat_name]))
and
if (isset($this->module_categories_basenames[$level2_name]))
exists, what does it do.
PHPBB3-10601
* imkingdavid/feature/controller-new: (67 commits)
[feature/controller] Fix misnamed route for functional test
[feature/controller] Fix comments, check against more general HttpException
[feature/controller] Check for proper status codes from controllers
[feature/controller] Correctly create Symfony object from globals
[feature/controller] Add documentation about input being HTML-escaped
[feature/controller] Create Symfony Request in new function
[feature/controller] Remove unused language strings
[feature/controller] Don't use $user->lang() before container compilation
[feature/controller] Update routing documentation for using query string
[feature/controller] Remove now-unused code
[feature/controller] Remove url rewriting until we use pathinfo in controllers
[feature/controller] Fix functional tests to use query string for controllers
[feature/controller] Allow injecting Symfony Request into controllers
[feature/controller] Use query string, not path info, for controller access
[feature/controller] Fix line endings and permissions, and check responses
[feature/controller] Remove URL rewriting by default
[feature/controller] Add controller functional test with template
[feature/controller] Use warning instead of echo for copy() and unlink()
[feature/controller] Flip method parameters, require $message
[feature/controller] Rename $root_path class property to $phpbb_root_path
...
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11198] Remove additional asterix as /** is doc-block only
[ticket/11200] Add a reminder comment.
[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/11194] Service tag data is stored in an array so access it correctly
[ticket/11193] Instantiate a single collection_pass for all collections
[ticket/11190-develop] Functional tests purge cache before running.
[ticket/11190] Functional tests purge cache before running.
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
* develop-olympus:
[ticket/10897] Combine bot updates and bot delete.
[ticket/10897] Use same code/query for deleting.
[ticket/10897] Make sure the user we're fetching is a bot.
[ticket/10897] Do not handle IP address. There is no need.
[ticket/10897] Update by user_id instead of bot_name.
[ticket/10897] Move bot delete data to the relevant foreach loop.
[ticket/10897] Add comment about what's going on.
[ticket/10897] Remove unnecessary string casting.
[ticket/10897] Add space after foreach.
[ticket/10897] Update bots during phpBB update
[ticket/10897] Bot list updated
