aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-11-07 14:27:00 +0100
committerTristan Darricau <github@nicofuma.fr>2014-11-20 21:00:01 +0100
commitc98efc53a80150b6f9189c9b194855c748e9b03d (patch)
treec82af6d71d9893b3a60fca428fd507b1dbf0afeb
parent0b61e3540de353f2bf0a6904a87727e4efe9c5fa (diff)
downloadforums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar
forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar.gz
forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar.bz2
forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar.xz
forums-c98efc53a80150b6f9189c9b194855c748e9b03d.zip
[ticket/12620] Fix rebase (move config file to the right directory)
PHPBB3-12620
-rw-r--r--phpBB/config/default/container/services_auth.yml (renamed from phpBB/config/default/services_auth.yml)0
-rw-r--r--phpBB/config/default/container/services_auth_providers.yml86
-rw-r--r--phpBB/config/default/container/services_avatar.yml (renamed from phpBB/config/default/services_avatar.yml)0
-rw-r--r--phpBB/config/default/container/services_avatars.yml60
-rw-r--r--phpBB/config/default/container/services_content.yml (renamed from phpBB/config/default/services_content.yml)0
-rw-r--r--phpBB/config/default/container/services_cron.yml (renamed from phpBB/config/default/services_cron.yml)0
-rw-r--r--phpBB/config/default/container/services_cron_tasks.yml125
-rw-r--r--phpBB/config/default/container/services_db.yml (renamed from phpBB/config/default/services_db.yml)0
-rw-r--r--phpBB/config/default/container/services_event.yml (renamed from phpBB/config/default/services_event.yml)0
-rw-r--r--phpBB/config/default/container/services_mimetype_guesser.yml (renamed from phpBB/config/default/services_mimetype_guesser.yml)0
-rw-r--r--phpBB/config/default/container/services_mimetype_guessers.yml43
-rw-r--r--phpBB/config/default/container/services_notification.yml (renamed from phpBB/config/default/services_notification.yml)0
-rw-r--r--phpBB/config/default/container/services_notifications.yml368
-rw-r--r--phpBB/config/default/container/services_password.yml (renamed from phpBB/config/default/services_password.yml)0
-rw-r--r--phpBB/config/default/container/services_passwords.yml128
-rw-r--r--phpBB/config/default/container/services_profilefield.yml (renamed from phpBB/config/default/services_profilefield.yml)0
-rw-r--r--phpBB/config/default/container/services_profilefields.yml101
-rw-r--r--phpBB/config/default/container/services_user.yml (renamed from phpBB/config/default/services_user.yml)0
18 files changed, 0 insertions, 911 deletions
diff --git a/phpBB/config/default/services_auth.yml b/phpBB/config/default/container/services_auth.yml
index 88a90ca2d6..88a90ca2d6 100644
--- a/phpBB/config/default/services_auth.yml
+++ b/phpBB/config/default/container/services_auth.yml
diff --git a/phpBB/config/default/container/services_auth_providers.yml b/phpBB/config/default/container/services_auth_providers.yml
deleted file mode 100644
index 89303a684a..0000000000
--- a/phpBB/config/default/container/services_auth_providers.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-services:
- auth.provider_collection:
- class: phpbb\auth\provider_collection
- arguments:
- - @service_container
- - @config
- tags:
- - { name: service_collection, tag: auth.provider }
- auth.provider.db:
- class: phpbb\auth\provider\db
- arguments:
- - @dbal.conn
- - @config
- - @passwords.manager
- - @request
- - @user
- - @service_container
- - %core.root_path%
- - %core.php_ext%
- tags:
- - { name: auth.provider }
- auth.provider.apache:
- class: phpbb\auth\provider\apache
- arguments:
- - @dbal.conn
- - @config
- - @passwords.manager
- - @request
- - @user
- - %core.root_path%
- - %core.php_ext%
- tags:
- - { name: auth.provider }
- auth.provider.ldap:
- class: phpbb\auth\provider\ldap
- arguments:
- - @dbal.conn
- - @config
- - @passwords.manager
- - @user
- tags:
- - { name: auth.provider }
- auth.provider.oauth:
- class: phpbb\auth\provider\oauth\oauth
- arguments:
- - @dbal.conn
- - @config
- - @passwords.manager
- - @request
- - @user
- - %tables.auth_provider_oauth_token_storage%
- - %tables.auth_provider_oauth_account_assoc%
- - @auth.provider.oauth.service_collection
- - %tables.users%
- - @service_container
- - %core.root_path%
- - %core.php_ext%
- tags:
- - { name: auth.provider }
- auth.provider.oauth.service_collection:
- class: phpbb\di\service_collection
- arguments:
- - @service_container
- tags:
- - { name: service_collection, tag: auth.provider.oauth.service }
- auth.provider.oauth.service.bitly:
- class: phpbb\auth\provider\oauth\service\bitly
- arguments:
- - @config
- - @request
- tags:
- - { name: auth.provider.oauth.service }
- auth.provider.oauth.service.facebook:
- class: phpbb\auth\provider\oauth\service\facebook
- arguments:
- - @config
- - @request
- tags:
- - { name: auth.provider.oauth.service }
- auth.provider.oauth.service.google:
- class: phpbb\auth\provider\oauth\service\google
- arguments:
- - @config
- - @request
- tags:
- - { name: auth.provider.oauth.service }
diff --git a/phpBB/config/default/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml
index 5292489715..5292489715 100644
--- a/phpBB/config/default/services_avatar.yml
+++ b/phpBB/config/default/container/services_avatar.yml
diff --git a/phpBB/config/default/container/services_avatars.yml b/phpBB/config/default/container/services_avatars.yml
deleted file mode 100644
index 8e5b1fdbfe..0000000000
--- a/phpBB/config/default/container/services_avatars.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-services:
- avatar.driver.gravatar:
- class: phpbb\avatar\driver\gravatar
- arguments:
- - @config
- - %core.root_path%
- - %core.php_ext%
- - @path_helper
- - @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%
- - @path_helper
- - @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%
- - @path_helper
- - @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%
- - @path_helper
- - @mimetype.guesser
- - @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 }
diff --git a/phpBB/config/default/services_content.yml b/phpBB/config/default/container/services_content.yml
index f0985f0292..f0985f0292 100644
--- a/phpBB/config/default/services_content.yml
+++ b/phpBB/config/default/container/services_content.yml
diff --git a/phpBB/config/default/services_cron.yml b/phpBB/config/default/container/services_cron.yml
index 7a90c39733..7a90c39733 100644
--- a/phpBB/config/default/services_cron.yml
+++ b/phpBB/config/default/container/services_cron.yml
diff --git a/phpBB/config/default/container/services_cron_tasks.yml b/phpBB/config/default/container/services_cron_tasks.yml
deleted file mode 100644
index acf9a48bf9..0000000000
--- a/phpBB/config/default/container/services_cron_tasks.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-services:
- cron.task.core.prune_all_forums:
- class: phpbb\cron\task\core\prune_all_forums
- arguments:
- - %core.root_path%
- - %core.php_ext%
- - @config
- - @dbal.conn
- calls:
- - [set_name, [cron.task.core.prune_all_forums]]
- tags:
- - { name: cron.task }
-
- cron.task.core.prune_forum:
- class: phpbb\cron\task\core\prune_forum
- arguments:
- - %core.root_path%
- - %core.php_ext%
- - @config
- - @dbal.conn
- calls:
- - [set_name, [cron.task.core.prune_forum]]
- tags:
- - { name: cron.task }
-
- cron.task.core.prune_shadow_topics:
- class: phpbb\cron\task\core\prune_shadow_topics
- arguments:
- - %core.root_path%
- - %core.php_ext%
- - @config
- - @dbal.conn
- - @log
- - @user
- calls:
- - [set_name, [cron.task.core.prune_shadow_topics]]
- tags:
- - { name: cron.task }
-
- cron.task.core.prune_notifications:
- class: phpbb\cron\task\core\prune_notifications
- arguments:
- - @config
- - @notification_manager
- calls:
- - [set_name, [cron.task.core.prune_notifications]]
- tags:
- - { name: cron.task }
-
- cron.task.core.queue:
- class: phpbb\cron\task\core\queue
- arguments:
- - %core.root_path%
- - %core.php_ext%
- - @config
- calls:
- - [set_name, [cron.task.core.queue]]
- tags:
- - { name: cron.task }
-
- cron.task.core.tidy_cache:
- class: phpbb\cron\task\core\tidy_cache
- arguments:
- - @config
- - @cache.driver
- calls:
- - [set_name, [cron.task.core.tidy_cache]]
- tags:
- - { name: cron.task }
-
- cron.task.core.tidy_database:
- class: phpbb\cron\task\core\tidy_database
- arguments:
- - %core.root_path%
- - %core.php_ext%
- - @config
- calls:
- - [set_name, [cron.task.core.tidy_database]]
- tags:
- - { name: cron.task }
-
- cron.task.core.tidy_plupload:
- class: phpbb\cron\task\core\tidy_plupload
- arguments:
- - %core.root_path%
- - @config
- calls:
- - [set_name, [cron.task.core.tidy_plupload]]
- tags:
- - { name: cron.task }
-
- cron.task.core.tidy_search:
- class: phpbb\cron\task\core\tidy_search
- arguments:
- - %core.root_path%
- - %core.php_ext%
- - @auth
- - @config
- - @dbal.conn
- - @user
- calls:
- - [set_name, [cron.task.core.tidy_search]]
- tags:
- - { name: cron.task }
-
- cron.task.core.tidy_sessions:
- class: phpbb\cron\task\core\tidy_sessions
- arguments:
- - @config
- - @user
- calls:
- - [set_name, [cron.task.core.tidy_sessions]]
- tags:
- - { name: cron.task }
-
- cron.task.core.tidy_warnings:
- class: phpbb\cron\task\core\tidy_warnings
- arguments:
- - %core.root_path%
- - %core.php_ext%
- - @config
- calls:
- - [set_name, [cron.task.core.tidy_warnings]]
- tags:
- - { name: cron.task }
diff --git a/phpBB/config/default/services_db.yml b/phpBB/config/default/container/services_db.yml
index b3f1b485ea..b3f1b485ea 100644
--- a/phpBB/config/default/services_db.yml
+++ b/phpBB/config/default/container/services_db.yml
diff --git a/phpBB/config/default/services_event.yml b/phpBB/config/default/container/services_event.yml
index 1ccef78f9b..1ccef78f9b 100644
--- a/phpBB/config/default/services_event.yml
+++ b/phpBB/config/default/container/services_event.yml
diff --git a/phpBB/config/default/services_mimetype_guesser.yml b/phpBB/config/default/container/services_mimetype_guesser.yml
index 2e89ed3c1f..2e89ed3c1f 100644
--- a/phpBB/config/default/services_mimetype_guesser.yml
+++ b/phpBB/config/default/container/services_mimetype_guesser.yml
diff --git a/phpBB/config/default/container/services_mimetype_guessers.yml b/phpBB/config/default/container/services_mimetype_guessers.yml
deleted file mode 100644
index 0115146deb..0000000000
--- a/phpBB/config/default/container/services_mimetype_guessers.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-parameters:
- mimetype.guesser.priority.lowest: -2
- mimetype.guesser.priority.low: -1
- mimetype.guesser.priority.default: 0
- mimetype.guesser.priority.high: 1
- mimetype.guesser.priority.highest: 2
-
-services:
- mimetype.fileinfo_mimetype_guesser:
- class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser
- tags:
- - { name: mimetype.guessers }
-
- mimetype.filebinary_mimetype_guesser:
- class: Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser
- tags:
- - { name: mimetype.guessers }
-
- mimetype.content_guesser:
- class: phpbb\mimetype\content_guesser
- calls:
- - [set_priority, [%mimetype.guesser.priority.low%]]
- tags:
- - { name: mimetype.guessers }
-
- mimetype.extension_guesser:
- class: phpbb\mimetype\extension_guesser
- calls:
- - [set_priority, [%mimetype.guesser.priority.lowest%]]
- tags:
- - { name: mimetype.guessers }
-
- mimetype.guesser_collection:
- class: phpbb\di\service_collection
- arguments:
- - @service_container
- tags:
- - { name: service_collection, tag: mimetype.guessers }
-
- mimetype.guesser:
- class: phpbb\mimetype\guesser
- arguments:
- - @mimetype.guesser_collection
diff --git a/phpBB/config/default/services_notification.yml b/phpBB/config/default/container/services_notification.yml
index add577be2c..add577be2c 100644
--- a/phpBB/config/default/services_notification.yml
+++ b/phpBB/config/default/container/services_notification.yml
diff --git a/phpBB/config/default/container/services_notifications.yml b/phpBB/config/default/container/services_notifications.yml
deleted file mode 100644
index 5675e76a99..0000000000
--- a/phpBB/config/default/container/services_notifications.yml
+++ /dev/null
@@ -1,368 +0,0 @@
-services:
- notification.type_collection:
- class: phpbb\di\service_collection
- arguments:
- - @service_container
- tags:
- - { name: service_collection, tag: notification.type }
-
- notification.method_collection:
- class: phpbb\di\service_collection
- arguments:
- - @service_container
- tags:
- - { name: service_collection, tag: notification.method }
-
- notification.type.approve_post:
- class: phpbb\notification\type\approve_post
- scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.approve_topic:
- class: phpbb\notification\type\approve_topic
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.bookmark:
- class: phpbb\notification\type\bookmark
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.disapprove_post:
- class: phpbb\notification\type\disapprove_post
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.disapprove_topic:
- class: phpbb\notification\type\disapprove_topic
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.group_request:
- class: phpbb\notification\type\group_request
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.group_request_approved:
- class: phpbb\notification\type\group_request_approved
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.pm:
- class: phpbb\notification\type\pm
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.post:
- class: phpbb\notification\type\post
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.post_in_queue:
- class: phpbb\notification\type\post_in_queue
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.quote:
- class: phpbb\notification\type\quote
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.report_pm:
- class: phpbb\notification\type\report_pm
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.report_pm_closed:
- class: phpbb\notification\type\report_pm_closed
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.report_post:
- class: phpbb\notification\type\report_post
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.report_post_closed:
- class: phpbb\notification\type\report_post_closed
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.topic:
- class: phpbb\notification\type\topic
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.topic_in_queue:
- class: phpbb\notification\type\topic_in_queue
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.type.admin_activate_user:
- class: phpbb\notification\type\admin_activate_user
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- - %tables.notification_types%
- - %tables.notifications%
- - %tables.user_notifications%
- tags:
- - { name: notification.type }
-
- notification.method.email:
- class: phpbb\notification\method\email
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- tags:
- - { name: notification.method }
-
- notification.method.jabber:
- class: phpbb\notification\method\jabber
- scope: prototype # scope MUST be prototype for this to work!
- arguments:
- - @user_loader
- - @dbal.conn
- - @cache.driver
- - @user
- - @auth
- - @config
- - %core.root_path%
- - %core.php_ext%
- tags:
- - { name: notification.method }
diff --git a/phpBB/config/default/services_password.yml b/phpBB/config/default/container/services_password.yml
index cb45ec3d42..cb45ec3d42 100644
--- a/phpBB/config/default/services_password.yml
+++ b/phpBB/config/default/container/services_password.yml
diff --git a/phpBB/config/default/container/services_passwords.yml b/phpBB/config/default/container/services_passwords.yml
deleted file mode 100644
index 3dc217286f..0000000000
--- a/phpBB/config/default/container/services_passwords.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-parameters:
- passwords.algorithms:
- - passwords.driver.bcrypt_2y
- - passwords.driver.bcrypt
- - passwords.driver.salted_md5
- - passwords.driver.phpass
-
-services:
- passwords.driver.bcrypt:
- class: phpbb\passwords\driver\bcrypt
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.bcrypt_2y:
- class: phpbb\passwords\driver\bcrypt_2y
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.bcrypt_wcf2:
- class: phpbb\passwords\driver\bcrypt_wcf2
- arguments:
- - @passwords.driver.bcrypt
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.salted_md5:
- class: phpbb\passwords\driver\salted_md5
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.phpass:
- class: phpbb\passwords\driver\phpass
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.convert_password:
- class: phpbb\passwords\driver\convert_password
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.sha1_smf:
- class: phpbb\passwords\driver\sha1_smf
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.sha1_wcf1:
- class: phpbb\passwords\driver\sha1_wcf1
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.sha1:
- class: phpbb\passwords\driver\sha1
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.md5_phpbb2:
- class: phpbb\passwords\driver\md5_phpbb2
- arguments:
- - @request
- - @passwords.driver.salted_md5
- - %core.root_path%
- - %core.php_ext%
- tags:
- - { name: passwords.driver }
-
- passwords.driver.md5_mybb:
- class: phpbb\passwords\driver\md5_mybb
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver.md5_vb:
- class: phpbb\passwords\driver\md5_vb
- arguments:
- - @config
- - @passwords.driver_helper
- tags:
- - { name: passwords.driver }
-
- passwords.driver_collection:
- class: phpbb\di\service_collection
- arguments:
- - @service_container
- tags:
- - { name: service_collection, tag: passwords.driver }
-
- passwords.driver_helper:
- class: phpbb\passwords\driver\helper
- arguments:
- - @config
-
- passwords.manager:
- class: phpbb\passwords\manager
- arguments:
- - @config
- - @passwords.driver_collection
- - @passwords.helper
- - %passwords.algorithms%
-
- passwords.helper:
- class: phpbb\passwords\helper
diff --git a/phpBB/config/default/services_profilefield.yml b/phpBB/config/default/container/services_profilefield.yml
index 5ccfef9148..5ccfef9148 100644
--- a/phpBB/config/default/services_profilefield.yml
+++ b/phpBB/config/default/container/services_profilefield.yml
diff --git a/phpBB/config/default/container/services_profilefields.yml b/phpBB/config/default/container/services_profilefields.yml
deleted file mode 100644
index ce2a84b12b..0000000000
--- a/phpBB/config/default/container/services_profilefields.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-services:
- profilefields.manager:
- class: phpbb\profilefields\manager
- arguments:
- - @auth
- - @dbal.conn
- - @dispatcher
- - @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.googleplus:
- class: phpbb\profilefields\type\type_googleplus
- arguments:
- - @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 }
-
- profilefields.type.url:
- class: phpbb\profilefields\type\type_url
- arguments:
- - @request
- - @template
- - @user
- tags:
- - { name: profilefield.type }
diff --git a/phpBB/config/default/services_user.yml b/phpBB/config/default/container/services_user.yml
index 1ca853ea45..1ca853ea45 100644
--- a/phpBB/config/default/services_user.yml
+++ b/phpBB/config/default/container/services_user.yml