* develop-ascraeus:
[ticket/12932] Remove set_datetime_class method from user class
[ticket/12932] Fix tests and calls to create_datetime
[ticket/12932] Add method for getting the datetime class and allow overriding
Conflicts:
phpBB/config/services.yml
[ticket/12787] Allow the route to say that the referer has to be used.
* Nicofuma/ticket/12787:
[ticket/12787] Updates phpbb_mock_controller_helper
[ticket/12787] Add controller_helper::get_current_url()
[ticket/12787] Remove one app.php when it's both in $path and $web_root_path
[ticket/12787] Fix the absolute board url
[ticket/12787] Use a parameter (_referer) instead of the Referer header
[ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer()
[ticket/12099] Remove config again
[ticket/12099] Correctly fix the path when performing AJAX requests
[ticket/12099] Add request argument to path_helper service
* github-phpbb/develop:
[ticket/11832] Correct paths in tests
[ticket/11832] Correct ROOT_PATH variable
[ticket/11832] get_url() from phpbb_template_asset should return web path
[ticket/11832] Fix INCLUDE(JS/CSS)
[ticket/11832] Fix constructions of phpbb_filesystem
[ticket/11832] Fix smiley paths
[ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
[ticket/11832] Fix build_url and the S_LOGIN_ACTION
[ticket/11832] Changing comments to say app.php rather than index.php
[ticket/11832] We must instantiate the $phpbb_filesystem in common
[ticket/11832] Fix the web path corrections
[ticket/11832] More extensive testing
[ticket/11832] Use dirname(__FILE__)
[ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
[ticket/11832] Make $phpbb_container a global initiated by the framework
[ticket/11832] Fix log tests
[ticket/11832] update_web_root_path helper and tests
[ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
Conflicts:
phpBB/common.php
phpBB/config/services.yml
phpBB/includes/bbcode.php
phpBB/includes/functions.php
phpBB/includes/functions_messenger.php
phpBB/install/index.php
phpBB/phpbb/filesystem.php
phpBB/phpbb/template/twig/environment.php
phpBB/phpbb/template/twig/node/includeasset.php
phpBB/phpbb/template/twig/twig.php
tests/controller/helper_url_test.php
tests/dbal/migrator_test.php
tests/extension/manager_test.php
tests/extension/metadata_manager_test.php
tests/filesystem/clean_path_test.php
tests/mock/extension_manager.php
tests/template/template_events_test.php
tests/template/template_test_case.php
tests/template/template_test_case_with_tree.php
tests/test_framework/phpbb_functional_test_case.php
* EXreaction/ticket/11415:
[ticket/11415] Add test for find_from_extension()
[ticket/11415] Send the extension base the finder rather than the manager
[ticket/11415] Create function in finder find_from_extension
[ticket/11415] Fix ext.manager constructor in tests
[ticket/11415] Make migrator/ext.manager dependencies of the base ext class
[ticket/11415] Remove migrator dependency from extension manager
[ticket/11415] Move migrator to base extension class from ext.manager
[ticket/11415] Move while loop from ext manager to acp_extensions.php
