Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3

Conflicts:
	phpBB/includes/db/migrator.php

phpBB/config/avatars.yml

@@ -0,0 +1,55 @@
+services:
+    avatar.driver.gravatar:
+        class: phpbb_avatar_driver_gravatar
+        arguments:
+            - @config
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+        calls:
+            - [set_name, [avatar.driver.gravatar]]
+        tags:
+            - { name: avatar.driver }
+
+    avatar.driver.local:
+        class: phpbb_avatar_driver_local
+        arguments:
+            - @config
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+        calls:
+            - [set_name, [avatar.driver.local]]
+        tags:
+            - { name: avatar.driver }
+
+    avatar.driver.remote:
+        class: phpbb_avatar_driver_remote
+        arguments:
+            - @config
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+        calls:
+            - [set_name, [avatar.driver.remote]]
+        tags:
+            - { name: avatar.driver }
+
+    avatar.driver.upload:
+        class: phpbb_avatar_driver_upload
+        arguments:
+            - @config
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+        calls:
+            - [set_name, [avatar.driver.upload]]
+        tags:
+            - { name: avatar.driver }
+
+    avatar.driver_collection:
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: avatar.driver }

phpBB/config/services.yml

@@ -3,11 +3,19 @@ imports:
     - { resource: cron_tasks.yml }
     - { resource: notifications.yml }
     - { resource: migrator.yml }
+    - { resource: avatars.yml }
 
 services:
     auth:
         class: phpbb_auth
 
+    avatar.manager:
+        class: phpbb_avatar_manager
+        arguments:
+            - @config
+            - @avatar.driver_collection
+            - @service_container
+
     cache:
         class: phpbb_cache_service
         arguments:
@@ -131,6 +139,19 @@ services:
             - .%core.php_ext%
             - _ext_finder
 
+    groupposition.legend:
+        class: phpbb_groupposition_legend
+        arguments:
+            - @dbal.conn
+            - @user
+
+    groupposition.teampage:
+        class: phpbb_groupposition_teampage
+        arguments:
+            - @dbal.conn
+            - @user
+            - @cache.driver
+
     http_kernel:
         class: Symfony\Component\HttpKernel\HttpKernel
         arguments: