From b887fcc3d180860e3b7fdcb2a70e2cd8a519bea2 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 8 Sep 2012 10:49:58 -0500 Subject: [ticket/11103] The start of an all-encompassing notifications system This system will take input from various systems to store notifications and send notifications to users all in one nice extendable system. This system should act something like the notifications system on other social networking sites (in that, there is a single location where a user can see all of their notifications for various events). PHPBB3-11103 --- phpBB/config/services.yml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 133a43b77e..b9c697b481 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -89,6 +89,11 @@ services: - .%core.php_ext% - @cache.driver + notifications: + class: phpbb_notifications_service + arguments: + - @container + processor.config: class: phpbb_di_processor_ext arguments: -- cgit v1.2.1 From 37e24736058f4e41c67023ce48edeb75e44bbe75 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 4 Oct 2012 13:39:54 -0500 Subject: [ticket/11103] Rename classes phpbb_notifications_service -> phpbb_notification_manager phpbb_notifications_ -> phpbb_notification_ PHPBB3-11103 --- phpBB/config/services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index d427820f89..598c152fce 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -90,7 +90,7 @@ services: - @cache.driver notifications: - class: phpbb_notifications_service + class: phpbb_notification_manager arguments: - @container -- cgit v1.2.1 From cea94d89848a806f449610ddb2a7df7b7eec1328 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 4 Oct 2012 14:27:43 -0500 Subject: [ticket/11103] Use dependency injection instead of phpbb_container PHPBB3-11103 --- phpBB/config/services.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 598c152fce..f9ae35ba57 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -92,7 +92,15 @@ services: notifications: class: phpbb_notification_manager arguments: - - @container + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% processor.ext: class: phpbb_di_processor_ext -- cgit v1.2.1 From b9bc65eed88bbd2dff12102909903cbf4dc9b368 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 4 Oct 2012 14:47:13 -0500 Subject: [ticket/11103] Make $phpbb_notifications a global and use it everywhere Do not use phpbb_container everywhere (makes testing difficult) PHPBB3-11103 --- phpBB/config/services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index f9ae35ba57..4ae519091b 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -89,7 +89,7 @@ services: - .%core.php_ext% - @cache.driver - notifications: + notification_manager: class: phpbb_notification_manager arguments: - @dbal.conn -- cgit v1.2.1 From f09ee162528d931aabc3f216410d02d3a072c21d Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Fri, 9 Nov 2012 07:40:08 -0600 Subject: [ticket/11103] Use phpBB Container to load types/methods PHPBB3-11103 --- phpBB/config/notifications.yml | 272 +++++++++++++++++++++++++++++++++++++++++ phpBB/config/services.yml | 2 + 2 files changed, 274 insertions(+) create mode 100644 phpBB/config/notifications.yml (limited to 'phpBB/config') diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml new file mode 100644 index 0000000000..78fcd7c2d9 --- /dev/null +++ b/phpBB/config/notifications.yml @@ -0,0 +1,272 @@ +services: + notification.type.approve_post: + class: phpbb_notification_type_approve_post + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.approve_topic: + class: phpbb_notification_type_approve_topic + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.bookmark: + class: phpbb_notification_type_bookmark + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.disapprove_post: + class: phpbb_notification_type_disapprove_post + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.disapprove_topic: + class: phpbb_notification_type_disapprove_topic + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.pm: + class: phpbb_notification_type_pm + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.post: + class: phpbb_notification_type_post + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.post_in_queue: + class: phpbb_notification_type_post_in_queue + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.quote: + class: phpbb_notification_type_quote + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.report_pm: + class: phpbb_notification_type_report_pm + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.report_pm_closed: + class: phpbb_notification_type_report_pm_closed + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.report_post: + class: phpbb_notification_type_report_post + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.report_post_closed: + class: phpbb_notification_type_report_post + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.topic: + class: phpbb_notification_type_topic + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.type.topic_in_queue: + class: phpbb_notification_type_topic_in_queue + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.type } + + notification.method.email: + class: phpbb_notification_method_email + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.method } + + notification.method.jabber: + class: phpbb_notification_method_jabber + arguments: + - @notification_manager + - @dbal.conn + - @cache.driver + - @template + - @ext.manager + - @user + - @auth + - @config + - %core.root_path% + - %core.php_ext% + tags: + - { name: notification.method } \ No newline at end of file diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 4ae519091b..e780dc986f 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -1,6 +1,7 @@ imports: - { resource: tables.yml } - { resource: cron_tasks.yml } + - { resource: notifications.yml } services: auth: @@ -92,6 +93,7 @@ services: notification_manager: class: phpbb_notification_manager arguments: + - @container - @dbal.conn - @cache.driver - @template -- cgit v1.2.1 From 6c8c54d4d2575cd40fe873cd2108b031ae5830a6 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Fri, 9 Nov 2012 08:48:41 -0600 Subject: [ticket/11103] Inject table prefix to notifications system instead of constants PHPBB3-11103 --- phpBB/config/notifications.yml | 30 ++++++++++++++++++++++++++++++ phpBB/config/services.yml | 2 ++ phpBB/config/tables.yml | 2 ++ 3 files changed, 34 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml index 78fcd7c2d9..7c8e05494c 100644 --- a/phpBB/config/notifications.yml +++ b/phpBB/config/notifications.yml @@ -12,6 +12,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -28,6 +30,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -44,6 +48,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -60,6 +66,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -76,6 +84,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -92,6 +102,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -108,6 +120,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -124,6 +138,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -140,6 +156,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -156,6 +174,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -172,6 +192,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -188,6 +210,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -204,6 +228,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -220,6 +246,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } @@ -236,6 +264,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% tags: - { name: notification.type } diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index e780dc986f..cbae3d49dd 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -103,6 +103,8 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notifications% + - %tables.user_notifications% processor.ext: class: phpbb_di_processor_ext diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml index cfc6dbcfed..8791c5e89b 100644 --- a/phpBB/config/tables.yml +++ b/phpBB/config/tables.yml @@ -1,3 +1,5 @@ parameters: tables.config: %core.table_prefix%config tables.ext: %core.table_prefix%ext + tables.notifications: %core.table_prefix%notifications + tables.user_notifications: %core.table_prefix%user_notifications -- cgit v1.2.1 From 2afb8b9df873c3f9572a32ab7a62ea8ba8d8a45b Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 20 Nov 2012 18:14:48 -0600 Subject: [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 --- phpBB/config/notifications.yml | 82 ++++++++++++++++-------------------------- phpBB/config/services.yml | 18 ++++++---- phpBB/config/tables.yml | 1 + 3 files changed, 44 insertions(+), 57 deletions(-) (limited to 'phpBB/config') 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 -- cgit v1.2.1 From b91ba8d5f1c05bc285e3f3b24fc5ffd50f6ee3ed Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 8 Dec 2012 13:18:11 -0600 Subject: [ticket/11103] Newlines at end of files PHPBB3-11103 --- phpBB/config/notifications.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml index f8a5b5f9fa..5a593c44d6 100644 --- a/phpBB/config/notifications.yml +++ b/phpBB/config/notifications.yml @@ -279,4 +279,4 @@ services: - %core.root_path% - %core.php_ext% tags: - - { name: notification.method } \ No newline at end of file + - { name: notification.method } -- cgit v1.2.1 From 84284a9ccee7d5ccc658c3d1f751a5254b3b9175 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 9 Dec 2012 13:43:06 -0600 Subject: [ticket/11103] Use scope: prototype This lets us clean up the mess that was in load_object(), but requires scope: prototype to be added to the service definitions for all types or methods! PHPBB3-11103 --- phpBB/config/notifications.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml index 5a593c44d6..550fbdfd0c 100644 --- a/phpBB/config/notifications.yml +++ b/phpBB/config/notifications.yml @@ -15,6 +15,7 @@ services: 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 @@ -31,6 +32,7 @@ services: 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 @@ -47,6 +49,7 @@ services: notification.type.bookmark: class: phpbb_notification_type_bookmark + scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader - @dbal.conn @@ -63,6 +66,7 @@ services: 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 @@ -79,6 +83,7 @@ services: 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 @@ -95,6 +100,7 @@ services: notification.type.pm: class: phpbb_notification_type_pm + scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader - @dbal.conn @@ -111,6 +117,7 @@ services: notification.type.post: class: phpbb_notification_type_post + scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader - @dbal.conn @@ -127,6 +134,7 @@ services: 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 @@ -143,6 +151,7 @@ services: notification.type.quote: class: phpbb_notification_type_quote + scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader - @dbal.conn @@ -159,6 +168,7 @@ services: 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 @@ -175,6 +185,7 @@ services: 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 @@ -191,6 +202,7 @@ services: 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 @@ -207,6 +219,7 @@ services: notification.type.report_post_closed: class: phpbb_notification_type_report_post + scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader - @dbal.conn @@ -223,6 +236,7 @@ services: notification.type.topic: class: phpbb_notification_type_topic + scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader - @dbal.conn @@ -239,6 +253,7 @@ services: 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 @@ -255,6 +270,7 @@ services: notification.method.email: class: phpbb_notification_method_email + scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader - @dbal.conn @@ -269,6 +285,7 @@ services: notification.method.jabber: class: phpbb_notification_method_jabber + scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader - @dbal.conn -- cgit v1.2.1 From f47e51d6dea9d59a36a6babf1f4033104c93a53d Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 15 Dec 2012 19:18:26 -0600 Subject: [ticket/11103] Move is_enabled to a separate table for better performance PHPBB3-11103 --- phpBB/config/services.yml | 1 + phpBB/config/tables.yml | 1 + 2 files changed, 2 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index c3e4ee2128..8a8b26ab6b 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -157,6 +157,7 @@ services: - @user - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml index 528470d6ca..f5685a7cd9 100644 --- a/phpBB/config/tables.yml +++ b/phpBB/config/tables.yml @@ -1,6 +1,7 @@ parameters: tables.config: %core.table_prefix%config tables.ext: %core.table_prefix%ext + tables.notification_types: %core.table_prefix%notification_types tables.notifications: %core.table_prefix%notifications tables.user_notifications: %core.table_prefix%user_notifications tables.users: %core.table_prefix%users -- cgit v1.2.1 From 07282a30ae077825ea81a4e26839ac0473dc97b7 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 15 Jan 2013 12:10:07 -0600 Subject: [ticket/11103] Fix some various issues, better comments PHPBB3-11103 --- phpBB/config/notifications.yml | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml index 550fbdfd0c..c8414cb031 100644 --- a/phpBB/config/notifications.yml +++ b/phpBB/config/notifications.yml @@ -25,8 +25,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -42,8 +45,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -59,8 +65,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -76,8 +85,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -93,8 +105,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -110,8 +125,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -127,8 +145,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -144,8 +165,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -161,8 +185,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -178,8 +205,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -195,8 +225,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -212,8 +245,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -229,8 +265,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -246,8 +285,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -263,8 +305,11 @@ services: - @config - %core.root_path% - %core.php_ext% + - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -280,6 +325,8 @@ services: - @config - %core.root_path% - %core.php_ext% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.method } @@ -295,5 +342,7 @@ services: - @config - %core.root_path% - %core.php_ext% + calls: + - [set_notification_manager, [@notification_manager]] tags: - { name: notification.method } -- cgit v1.2.1 From f089e099fed38b1bdae5316fb09f0c8ed847d495 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 15 Jan 2013 12:29:20 -0600 Subject: [ticket/11103] Including the set call in the declaration throws errors Call the set_notification_manager from the load_object function instead. PHPBB3-11103 --- phpBB/config/notifications.yml | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'phpBB/config') diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml index c8414cb031..60aa63a854 100644 --- a/phpBB/config/notifications.yml +++ b/phpBB/config/notifications.yml @@ -28,8 +28,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -48,8 +46,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -68,8 +64,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -88,8 +82,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -108,8 +100,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -128,8 +118,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -148,8 +136,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -168,8 +154,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -188,8 +172,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -208,8 +190,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -228,8 +208,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -248,8 +226,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -268,8 +244,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -288,8 +262,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -308,8 +280,6 @@ services: - %tables.notification_types% - %tables.notifications% - %tables.user_notifications% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.type } @@ -325,8 +295,6 @@ services: - @config - %core.root_path% - %core.php_ext% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.method } @@ -342,7 +310,5 @@ services: - @config - %core.root_path% - %core.php_ext% - calls: - - [set_notification_manager, [@notification_manager]] tags: - { name: notification.method } -- cgit v1.2.1 From 8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 10 Jan 2013 19:32:39 -0600 Subject: [feature/migrations] Make the container available to extension installers This allows extensions to load and install migrations easily as per their needs. PHPBB3-11318 --- phpBB/config/services.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index ee52ca2800..028ab88229 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -112,6 +112,7 @@ services: ext.manager: class: phpbb_extension_manager arguments: + - @service_container - @dbal.conn - @config - %tables.ext% -- cgit v1.2.1 From a8da6b89e9da1d3b4e16317c21fc88fa1173d0f1 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Sat, 9 Feb 2013 20:01:40 -0600 Subject: [feature/migrations] Inject Migrator instead of using the container to fetch PHPBB3-11318 --- phpBB/config/services.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 028ab88229..ef5359129f 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -115,6 +115,7 @@ services: - @service_container - @dbal.conn - @config + - @migrator - %tables.ext% - %core.root_path% - .%core.php_ext% -- cgit v1.2.1 From 39ca212e17e80d14dbbd20cf5542ab37f27bd217 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Sat, 2 Mar 2013 11:02:53 -0600 Subject: [ticket/11386] Use finder to find migration files PHPBB3-11386 --- phpBB/config/migrator.yml | 1 + phpBB/config/services.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml index 999a2d41a3..fc534227f5 100644 --- a/phpBB/config/migrator.yml +++ b/phpBB/config/migrator.yml @@ -5,6 +5,7 @@ services: - @config - @dbal.conn - @dbal.tools + - @ext.manager - %tables.migrations% - %core.root_path% - %core.php_ext% diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 3e4ae8d129..250e4a782b 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -116,11 +116,12 @@ services: - @service_container - @dbal.conn - @config - - @migrator - %tables.ext% - %core.root_path% - .%core.php_ext% - @cache.driver + calls: + - [set_migrator, [@migrator]] ext.finder: class: phpbb_extension_finder -- cgit v1.2.1 From a6f877c0d84ff102d3812246eae7469e191983e2 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Sat, 2 Mar 2013 14:15:59 -0600 Subject: [ticket/11386] Fix circular reference error & serialize error PHPBB3-11386 --- phpBB/config/migrator.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml index fc534227f5..42445ef9bf 100644 --- a/phpBB/config/migrator.yml +++ b/phpBB/config/migrator.yml @@ -5,12 +5,13 @@ services: - @config - @dbal.conn - @dbal.tools - - @ext.manager - %tables.migrations% - %core.root_path% - %core.php_ext% - %core.table_prefix% - @migrator.tool_collection + calls: + - [set_extension_manager, [@ext.manager]] migrator.tool_collection: class: phpbb_di_service_collection -- cgit v1.2.1