3 files changed, 87 insertions, 0 deletions
diff --git a/phpBB/config/profilefields.yml b/phpBB/config/profilefields.yml
new file mode 100644
index 0000000000..5a861a4b56
--- /dev/null
+++ b/phpBB/config/profilefields.yml
@@ -0,0 +1,82 @@
+services:
+    profilefields.manager:
+        class: phpbb\profilefields\manager
+        arguments:
+            - @auth
+            - @dbal.conn
+            - @request
+            - @template
+            - @profilefields.type_collection
+            - @user
+            - %tables.profile_fields%
+            - %tables.profile_fields_language%
+            - %tables.profile_fields_data%
+
+    profilefields.lang_helper:
+        class: phpbb\profilefields\lang_helper
+        arguments:
+            - @dbal.conn
+            - %tables.profile_fields_options_language%
+
+    profilefields.type_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: profilefield.type }
+
+    profilefields.type.bool:
+        class: phpbb\profilefields\type\type_bool
+        arguments:
+            - @profilefields.lang_helper
+            - @request
+            - @template
+            - @user
+        tags:
+            - { name: profilefield.type }
+
+    profilefields.type.date:
+        class: phpbb\profilefields\type\type_date
+        arguments:
+            - @request
+            - @template
+            - @user
+        tags:
+            - { name: profilefield.type }
+
+    profilefields.type.dropdown:
+        class: phpbb\profilefields\type\type_dropdown
+        arguments:
+            - @profilefields.lang_helper
+            - @request
+            - @template
+            - @user
+        tags:
+            - { name: profilefield.type }
+
+    profilefields.type.int:
+        class: phpbb\profilefields\type\type_int
+        arguments:
+            - @request
+            - @template
+            - @user
+        tags:
+            - { name: profilefield.type }
+
+    profilefields.type.string:
+        class: phpbb\profilefields\type\type_string
+        arguments:
+            - @request
+            - @template
+            - @user
+        tags:
+            - { name: profilefield.type }
+
+    profilefields.type.text:
+        class: phpbb\profilefields\type\type_text
+        arguments:
+            - @request
+            - @template
+            - @user
+        tags:
+            - { name: profilefield.type }
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 8f7a7676ad..735626810f 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -9,6 +9,7 @@ imports:
     - { resource: console.yml }
     - { resource: mimetype_guessers.yml }
     - { resource: passwords.yml }
+    - { resource: profilefields.yml }
 
 services:
     acl.permissions:
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index 0d364eb6b0..e4f7bda89b 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -10,6 +10,10 @@ parameters:
     tables.modules: %core.table_prefix%modules
     tables.notification_types: %core.table_prefix%notification_types
     tables.notifications: %core.table_prefix%notifications
+    tables.profile_fields: %core.table_prefix%profile_fields
+    tables.profile_fields_data: %core.table_prefix%profile_fields_data
+    tables.profile_fields_options_language: %core.table_prefix%profile_fields_lang
+    tables.profile_fields_language: %core.table_prefix%profile_lang
     tables.posts: %core.table_prefix%posts
     tables.topics: %core.table_prefix%topics
     tables.user_notifications: %core.table_prefix%user_notifications