Merge branch 'develop-olympus' into develop

* develop-olympus:
Merge remote-tracking branch 'remotes/nickv/ticket/11481' into develop

# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11481:
  [ticket/11481] Move prepended slash from calls into function
  [ticket/11481] Remove globals and use dependency injection instead
  [ticket/11481] Use container for all classes and inject dependencies
  [ticket/11481] Move functions from feed into helper class
  [ticket/11481] Move active topics feed to own file
  [ticket/11481] Move topics feed to own file
  [ticket/11481] Move news feed to own file
  [ticket/11481] Move forums feed to own file
  [ticket/11481] Move topic feed to own file
  [ticket/11481] Move forum feed to own file
  [ticket/11481] Move overall feed to own file
  [ticket/11481] Move feed topic base to own file
  [ticket/11481] Move feed post base to own file
  [ticket/11481] Move feed base to own file
  [ticket/11481] Move feed factory to own file
[ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php

PHPBB3-11550
[ticket/11550] Move functionality for copying/restoring to test case helpers

PHPBB3-11550
[ticket/11550] Use new functionality from the test case helpers

Instead of duplicating the extension copy code, it is now in the helpers.
So we remove the code from existing tests.

PHPBB3-11550
[ticket/11550] Fixtures should only be directories not files

PHPBB3-11550
[ticket/10820] Fix function docblock

PHPBB3-10820
Merge branch 'ticket/10820' into ticket/10820-develop

* ticket/10820:
  [ticket/10820] Fix function docblock

Conflicts:
	phpBB/download/file.php
[ticket/11550] We use a different fixture set for extension_acp_test.php

PHPBB3-11550
[feature/twig] Adding Twig dependency to composer.json

PHPBB3-11598
[feature/twig] WIP extension/lexer/some tokenparsers/nodes

PHPBB3-11598
[feature/twig] Support our old INCLUDE statements (no quotes)

Better code for handling IF .blah

PHPBB3-11598
[feature/twig] Working on DEFINE

PHPBB3-11598
[ticket/11600] Increase code test coverage of avatar manager

Currently, not all methods and their possible behaviors are tested with unit tests.
Add them for better code coverage.

PHPBB3-11600
[feature/twig] More work on the lexer

Committing what I have now to save it as I'm trying another method next

PHPBB3-11598
[feature/twig] Replace phpBB template code with Twig syntax, then parse w/Twig

Fixing begin token/node, adding includejs token/node

PHPBB3-11598
[feature/twig] BEGIN loops now work

PHPBB3-11598
[feature/twig] Replace phpBB template with Twig

Move phpbb_template class to phpbb_template_phpbb
Changed phpbb_template class to an interface
Switch services.yml to load phpbb_template_twig instead of phpbb_template

PHPBB3-11598
[ticket/11550] Move comments to correct function

PHPBB3-11550
[ticket/11550] Specify a valid path so it's clearer that it must be a path

PHPBB3-11550