[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673

phpBB/config/services.yml

@@ -8,6 +8,12 @@ imports:
     - { resource: auth_providers.yml }
 
 services:
+    acl.permissions:
+        class: phpbb_permissions
+        arguments:
+            - @dispatcher
+            - @user
+
     auth:
         class: phpbb_auth
 
@@ -84,6 +90,7 @@ services:
         arguments:
             - @template
             - @user
+            - @request
             - %core.root_path%
             - %core.php_ext%
 
@@ -92,7 +99,7 @@ services:
         arguments:
             - @user
             - @service_container
-            - @style
+            - @template
 
     cron.task_collection:
         class: phpbb_di_service_collection
@@ -239,33 +246,12 @@ services:
             - %tables.notifications%
             - %tables.user_notifications%
 
+    php_ini:
+        class: phpbb_php_ini
+
     request:
         class: phpbb_request
 
-    style:
-        class: phpbb_style
-        arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @config
-            - @user
-            - @style.resource_locator
-            - @style.path_provider_ext
-            - @template
-
-    style.resource_locator:
-        class: phpbb_style_resource_locator
-
-    style.path_provider_ext:
-        class: phpbb_style_extension_path_provider
-        arguments:
-            - @ext.manager
-            - @style.path_provider
-            - %core.root_path%
-
-    style.path_provider:
-        class: phpbb_style_path_provider
-
     template:
         class: phpbb_template_twig
         arguments: