diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-20 18:14:48 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-20 22:54:16 -0600 |
| commit | 2afb8b9df873c3f9572a32ab7a62ea8ba8d8a45b (patch) | |
| tree | ab584092e7e54f50a15dd9a22ed5b31200ea03f1 /phpBB/config | |
| parent | d2187424da6ff2e0d4a69a6e21bac7e92f68335a (diff) | |
| download | forums-2afb8b9df873c3f9572a32ab7a62ea8ba8d8a45b.tar forums-2afb8b9df873c3f9572a32ab7a62ea8ba8d8a45b.tar.gz forums-2afb8b9df873c3f9572a32ab7a62ea8ba8d8a45b.tar.bz2 forums-2afb8b9df873c3f9572a32ab7a62ea8ba8d8a45b.tar.xz forums-2afb8b9df873c3f9572a32ab7a62ea8ba8d8a45b.zip | |
[ticket/11103] Create user loader class, update for DIC
Create a very basic user loader class to handle querying/storing
user data in a centralized location.
Use DIC collection service for notification types/methods.
Cleanup unused dependencies.
Fix some other issues.
PHPBB3-11103
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/notifications.yml | 82 | ||||
| -rw-r--r-- | phpBB/config/services.yml | 18 | ||||
| -rw-r--r-- | phpBB/config/tables.yml | 1 |
3 files changed, 44 insertions, 57 deletions
diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml index 7c8e05494c..f8a5b5f9fa 100644 --- a/phpBB/config/notifications.yml +++ b/phpBB/config/notifications.yml @@ -1,12 +1,24 @@ 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 arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -20,11 +32,9 @@ services: notification.type.approve_topic: class: phpbb_notification_type_approve_topic arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -38,11 +48,9 @@ services: notification.type.bookmark: class: phpbb_notification_type_bookmark arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -56,11 +64,9 @@ services: notification.type.disapprove_post: class: phpbb_notification_type_disapprove_post arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -74,11 +80,9 @@ services: notification.type.disapprove_topic: class: phpbb_notification_type_disapprove_topic arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -92,11 +96,9 @@ services: notification.type.pm: class: phpbb_notification_type_pm arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -110,11 +112,9 @@ services: notification.type.post: class: phpbb_notification_type_post arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -128,11 +128,9 @@ services: notification.type.post_in_queue: class: phpbb_notification_type_post_in_queue arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -146,11 +144,9 @@ services: notification.type.quote: class: phpbb_notification_type_quote arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -164,11 +160,9 @@ services: notification.type.report_pm: class: phpbb_notification_type_report_pm arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -182,11 +176,9 @@ services: notification.type.report_pm_closed: class: phpbb_notification_type_report_pm_closed arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -200,11 +192,9 @@ services: notification.type.report_post: class: phpbb_notification_type_report_post arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -218,11 +208,9 @@ services: notification.type.report_post_closed: class: phpbb_notification_type_report_post arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -236,11 +224,9 @@ services: notification.type.topic: class: phpbb_notification_type_topic arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -254,11 +240,9 @@ services: notification.type.topic_in_queue: class: phpbb_notification_type_topic_in_queue arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -272,11 +256,9 @@ services: notification.method.email: class: phpbb_notification_method_email arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config @@ -288,11 +270,9 @@ services: notification.method.jabber: class: phpbb_notification_method_jabber arguments: - - @notification_manager + - @user_loader - @dbal.conn - @cache.driver - - @template - - @ext.manager - @user - @auth - @config diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index af80d28b15..bbc28e903f 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -97,14 +97,12 @@ services: notification_manager: class: phpbb_notification_manager arguments: - - @container + - @notification.type_collection + - @notification.method_collection + - @service_container + - @user_loader - @dbal.conn - - @cache.driver - - @template - - @ext.manager - @user - - @auth - - @config - %core.root_path% - %core.php_ext% - %tables.notifications% @@ -151,3 +149,11 @@ services: user: class: phpbb_user + + user_loader: + class: phpbb_user_loader + arguments: + - @dbal.conn + - %core.root_path% + - %core.php_ext% + - %tables.users% diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml index 8791c5e89b..528470d6ca 100644 --- a/phpBB/config/tables.yml +++ b/phpBB/config/tables.yml @@ -3,3 +3,4 @@ parameters: tables.ext: %core.table_prefix%ext tables.notifications: %core.table_prefix%notifications tables.user_notifications: %core.table_prefix%user_notifications + tables.users: %core.table_prefix%users |