From 728b200cd90563c2128ea0b6ceebe3a340e751ce Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sun, 30 Sep 2018 03:50:49 +0200
Subject: [PATCH] [ticket/9687] Add service definitions

PHPBB3-9687
---
 phpBB/config/default/container/services.yml   |  1 +
 .../config/default/container/services_ban.yml | 41 +++++++++++++++++++
 phpBB/config/default/container/tables.yml     |  2 +-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/config/default/container/services_ban.yml

diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml
index 59d52073f9..9b01005852 100644
--- a/phpBB/config/default/container/services.yml
+++ b/phpBB/config/default/container/services.yml
@@ -2,6 +2,7 @@ imports:
     - { resource: services_attachment.yml }
     - { resource: services_auth.yml }
     - { resource: services_avatar.yml }
+    - { resource: services_ban.yml }
     - { resource: services_captcha.yml }
     - { resource: services_console.yml }
     - { resource: services_content.yml }
diff --git a/phpBB/config/default/container/services_ban.yml b/phpBB/config/default/container/services_ban.yml
new file mode 100644
index 0000000000..689bb37ab9
--- /dev/null
+++ b/phpBB/config/default/container/services_ban.yml
@@ -0,0 +1,41 @@
+services:
+# ----- Ban management -----
+    ban.manager:
+        class: \phpbb\ban\manager
+        arguments:
+            - '@ban.type_collection'
+            - '@cache'
+            - '@dbal.conn'
+            - '@log'
+            - '@user'
+            - '%tables.bans%'
+            - '%tables.users%'
+            - '%tables.sessions%'
+            - '%tables.sessions_keys%'
+
+# ----- Ban types -----
+    ban.type_collection:
+        class: \phpbb\di\service_collection
+        arguments:
+            - '@service_container'
+        tags:
+            - { name: service_collection, tag: ban.type }
+
+    ban.type.email:
+        class: \phpbb\ban\type\email
+        arguments:
+            - '@dbal.conn'
+            - '@user'
+            - '%tables.users%'
+        tags:
+            - { name: ban.type }
+
+    ban.type.user:
+        class: \phpbb\ban\type\user
+        arguments:
+            - '@dbal.conn'
+            - '@log'
+            - '@user'
+            - '%tables.users'
+        tags:
+            - { name: ban.type }
diff --git a/phpBB/config/default/container/tables.yml b/phpBB/config/default/container/tables.yml
index 2117794b43..005f3ba927 100644
--- a/phpBB/config/default/container/tables.yml
+++ b/phpBB/config/default/container/tables.yml
@@ -9,7 +9,7 @@ parameters:
     tables.auth_provider_oauth_states: '%core.table_prefix%oauth_states'
     tables.auth_provider_oauth_account_assoc: '%core.table_prefix%oauth_accounts'
     tables.backups: '%core.table_prefix%backups'
-    tables.banlist: '%core.table_prefix%banlist'
+    tables.bans: '%core.table_prefix%bans'
     tables.bbcodes: '%core.table_prefix%bbcodes'
     tables.bookmarks: '%core.table_prefix%bookmarks'
     tables.bots: '%core.table_prefix%bots'