4 files changed, 64 insertions, 4 deletions
diff --git a/phpBB/config/auth_providers.yml b/phpBB/config/auth_providers.yml
new file mode 100644
index 0000000000..bcc448e4d7
--- /dev/null
+++ b/phpBB/config/auth_providers.yml
@@ -0,0 +1,37 @@
+services:
+    auth.provider_collection:
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: auth.provider }
+    auth.provider.db:
+        class: phpbb_auth_provider_db
+        arguments:
+            - @dbal.conn
+            - @config
+            - @request
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: auth.provider }
+    auth.provider.apache:
+        class: phpbb_auth_provider_apache
+        arguments:
+            - @dbal.conn
+            - @config
+            - @request
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: auth.provider }
+    auth.provider.ldap:
+        class: phpbb_auth_provider_ldap
+        arguments:
+            - @dbal.conn
+            - @config
+            - @user
+        tags:
+            - { name: auth.provider }
diff --git a/phpBB/config/feed.yml b/phpBB/config/feed.yml
index 59eeafd458..5a4cdae815 100644
--- a/phpBB/config/feed.yml
+++ b/phpBB/config/feed.yml
@@ -23,6 +23,7 @@ services:
             - @cache.driver
             - @user
             - @auth
+            - @content.visibility
             - %core.php_ext%
 
     feed.forums:
@@ -35,6 +36,7 @@ services:
             - @cache.driver
             - @user
             - @auth
+            - @content.visibility
             - %core.php_ext%
 
     feed.news:
@@ -47,6 +49,7 @@ services:
             - @cache.driver
             - @user
             - @auth
+            - @content.visibility
             - %core.php_ext%
 
     feed.overall:
@@ -59,6 +62,7 @@ services:
             - @cache.driver
             - @user
             - @auth
+            - @content.visibility
             - %core.php_ext%
 
     feed.topic:
@@ -71,6 +75,7 @@ services:
             - @cache.driver
             - @user
             - @auth
+            - @content.visibility
             - %core.php_ext%
 
     feed.topics:
@@ -83,6 +88,7 @@ services:
             - @cache.driver
             - @user
             - @auth
+            - @content.visibility
             - %core.php_ext%
 
     feed.topics_active:
@@ -95,4 +101,5 @@ services:
             - @cache.driver
             - @user
             - @auth
+            - @content.visibility
             - %core.php_ext%
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index bb96953bcf..c1579cfb57 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -5,6 +5,7 @@ imports:
     - { resource: migrator.yml }
     - { resource: avatars.yml }
     - { resource: feed.yml }
+    - { resource: auth_providers.yml }
 
 services:
     auth:
@@ -65,6 +66,19 @@ services:
             - @dbal.conn
             - %tables.config_text%
 
+    content.visibility:
+        class: phpbb_content_visibility
+        arguments:
+            - @auth
+            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.forums%
+            - %tables.posts%
+            - %tables.topics%
+            - %tables.users%
+
     controller.helper:
         class: phpbb_controller_helper
         arguments:
@@ -78,7 +92,7 @@ services:
         arguments:
             - @user
             - @service_container
-            - @ext.finder
+            - @style
 
     cron.task_collection:
         class: phpbb_di_service_collection
@@ -112,7 +126,6 @@ services:
             - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
 
     dbal.tools:
-        file: %core.root_path%includes/db/db_tools.%core.php_ext%
         class: phpbb_db_tools
         arguments:
             - @dbal.conn
@@ -254,15 +267,15 @@ services:
         class: phpbb_style_path_provider
 
     template:
-        class: phpbb_template
+        class: phpbb_template_twig
         arguments:
             - %core.root_path%
             - %core.php_ext%
             - @config
             - @user
-            - @style.resource_locator
             - @template_context
             - @ext.manager
+            - %core.adm_relative_path%
 
     template_context:
         class: phpbb_template_context
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index ec5fec23ad..fdb448f4e0 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -2,10 +2,13 @@ parameters:
     tables.config: %core.table_prefix%config
     tables.config_text: %core.table_prefix%config_text
     tables.ext: %core.table_prefix%ext
+    tables.forums: %core.table_prefix%forums
     tables.log: %core.table_prefix%log
     tables.migrations: %core.table_prefix%migrations
     tables.modules: %core.table_prefix%modules
     tables.notification_types: %core.table_prefix%notification_types
     tables.notifications: %core.table_prefix%notifications
+    tables.posts: %core.table_prefix%posts
+    tables.topics: %core.table_prefix%topics
     tables.user_notifications: %core.table_prefix%user_notifications
     tables.users: %core.table_prefix%users