# By Oleg Pudeyev (36) and others
# Via Oleg Pudeyev
* p/feature/template-events: (47 commits)
[feature/template-events] Pass arguments in correct order.
[feature/template-events] Order extensions in mock extension manager.
[feature/template-events] Changes per imkingdavid's review.
[feature/template-events] Make style names private on template.
[feature/template-events] Test for event that is defined in parent style only.
[feature/template-events] Specify style names, add inheritance tests.
[feature/template-events] Normalize expected directory trees.
[feature/template-events] Allow dataset to be correctly selectable.
[feature/template-events] Dataset for template event testing with inheritance.
[feature/template-events] Use style names array in template filter.
[feature/template-events] Generate style names array in set_style.
[feature/template-events] Convert a single style name to array of them.
[feature/template-events] Chase dependency injection for template context.
[feature/template-events] Adjust template events test to use the dataset.
[feature/template-events] Create a dataset for template event tests.
[feature/template-events] Indentation fix.
[feature/template-events] Cosmetic changes.
[feature/template-events] Wording: wrongly -> improperly.
[feature/template-events] Indentation fix.
[feature/template-events] Rename template_name to style_name.
...
* p/ticket/11095-develop:
[ticket/11095] Restore brace on previous line.
[ticket/11095] Docs and tests for phpbb_build_hidden_fields_for_query_params.
[ticket/11095] Forward GET parameters into hidden fields for jumpbox.
[ticket/11095] Python quoteattr port.
[ticket/11095] Use get method in jumpboxes.
* develop-olympus:
[ticket/10205] Reduce nesting in mysql drivers.
[ticket/10205] Rewrite _sql_error implementations to have a single return.
[ticket/10205] Cosmetic changes.
[ticket/10205] Add some columns to the empty fixture file for mssqlnative.
[ticket/10205] Delete stray return.
[ticket/10205] Test failed connection attempts.
[ticket/10205] Check for function existence in mssql connect method.
[ticket/10205] Convert mssqlnative driver to the same logic.
[ticket/10205] Fix a parse error in oracle driver.
[ticket/10205] Fix remaining db drivers.
[ticket/10205] Avoid calling mysqli functions when mysqli is missing.
[ticket/10205] Account for potentially missing extensions in dbal.
Conflicts:
tests/fixtures/empty.xml
* p/ticket/10205:
[ticket/10205] Reduce nesting in mysql drivers.
[ticket/10205] Rewrite _sql_error implementations to have a single return.
[ticket/10205] Cosmetic changes.
[ticket/10205] Add some columns to the empty fixture file for mssqlnative.
[ticket/10205] Delete stray return.
[ticket/10205] Test failed connection attempts.
[ticket/10205] Check for function existence in mssql connect method.
[ticket/10205] Convert mssqlnative driver to the same logic.
[ticket/10205] Fix a parse error in oracle driver.
[ticket/10205] Fix remaining db drivers.
[ticket/10205] Avoid calling mysqli functions when mysqli is missing.
[ticket/10205] Account for potentially missing extensions in dbal.
* develop-olympus:
[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
Conflicts:
phpBB/includes/ucp/ucp_prefs.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
* develop-olympus:
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
Conflicts:
phpBB/includes/functions_messenger.php
We keep the last queue run time around, therefore for determining
whether enough time has passed since the last run we can simply
use this config variable.
When there is no queue file we consider a queue run successful.
Previously queue.php ("cache file") modification time would be used
for determining whether enough time has passed since last queue run.
The problem was that modification time would be updated whenever
anything was added to the queue, creating a situation where if
queue is processed less frequently than it is added to that email
would not be sent.
PHPBB3-10602
* p/ticket/10103:
[ticket/10103] New and improved wording.
[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.
[ticket/10103] Try a longer sleep for travis.
[ticket/10103] Convert the rest of the tree to flock class.
[ticket/10103] Test for flock lock class, with concurrency no less.
[ticket/10103] Use flock lock class in messenger.
[ticket/10103] Factor out flock lock class.
* p/ticket/9983:
[ticket/9983] Also check generic APC enable/disable.
[ticket/9983] Use APC instead of apc in error messages.
[ticket/9983] Skip tests if APC is not enabled for CLI.
[ticket/9983] Test for apc cache driver.
[ticket/9983] Add phpbb prefix to global variables.
[ticket/9983] Empty line by request.
[ticket/9983] Indeed, it is <?php.
[ticket/9983] Add a test for destroy.
[ticket/9983] Exercise exists also.
[ticket/9983] Add a purge test.
[ticket/9983] Rename test methods.
[ticket/9983] get/put cache test moved to a base class.
[ticket/9983] Create driver in setup in null driver test.
[ticket/9983] Split cache test into per-driver files.
[ticket/9983] Add redis cache driver tests.
* 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
In order to not overwrite data in default redis store, at least
one of redis host or post must be explicitly specified.
Redis cache driver constructor has been modified to accept
host and port as parameters. This was not added to public API
as there are more parameters being passed via global constants.
PHPBB3-9983
* bantu/ticket/10875:
[ticket/10875] tests/cache/cache_test.php: Use single quotes where possible.
[ticket/10875] Test for null cache driver and sql cache.
[ticket/10875] Revise sql cache test.
[ticket/10875] Must return query result on failure.
[ticket/10875] More documentation.
[ticket/10875] Spelling fix.
[ticket/10875] Add docblocks for phpbb_cache_driver_interface
[ticket/10875] Add comment about cache's sql_load() method.
[ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save().
[ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result.
[ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save().
[ticket/10875] Remove useless assignment from phpbb_cache_driver_memory.
