mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

[ticket/17135] Refactor messenger code to services

Browse Source 
PHPBB3-17135
This commit is contained in:
rxu
2023-06-08 21:17:01 +07:00
parent f95816cbe3
commit a7b5369138
22 changed files with 191 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/console/user/activate_test.php
View File

@@ -41,7 +41,8 @@ class phpbb_console_user_activate_test extends phpbb_console_user_base
$this->notifications,
$this->user_loader,
$this->phpbb_root_path,
$this->php_ext
$this->php_ext,
$this->messenger_method_collection
));
$command = $application->find('user:activate');

3
tests/console/user/add_test.php
View File

@@ -32,7 +32,8 @@ class phpbb_console_user_add_test extends phpbb_console_user_base
$this->language,
$this->passwords_manager,
$this->phpbb_root_path,
$this->php_ext
$this->php_ext,
$this->messenger_method_collection
));
$command = $application->find('user:add');

5
tests/console/user/base.php
View File

@@ -105,6 +105,11 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
$this->messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
$this->messenger_method_collection->add('messenger.method.email');
$this->messenger_method_collection->add('messenger.method.jabber');
$phpbb_container->set('messenger.method_collection', $this->messenger_method_collection);
parent::setUp();
}

15
tests/email/email_parsing_test.php
View File

@@ -95,7 +95,8 @@ class phpbb_email_parsing_test extends phpbb_test_case
$phpbb_container->set('template.twig.extensions.collection', $twig_extensions_collection);
$twig->addExtension($twig_extension);
$phpbb_container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
$twig_lexer = new \phpbb\template\twig\lexer($twig);
$phpbb_container->set('template.twig.lexer', $twig_lexer);
$phpbb_container->set('dispatcher', $dispatcher);
$phpbb_container->set('language', $lang);
$phpbb_container->set('request', $request);
@@ -111,13 +112,23 @@ class phpbb_email_parsing_test extends phpbb_test_case
$core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';
$phpbb_container->setParameter('core.cache_dir', $core_cache_dir);
$core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx;
$phpbb_container->setParameter('core.messenger_queue_file', $core_messenger_queue_file);
$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
$messenger_method_collection->add('messenger.method.email');
$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
$messenger_queue = new \phpbb\messenger\queue($config, $dispatcher, $messenger_method_collection, $core_messenger_queue_file);
$phpbb_container->set('messenger.queue', $messenger_queue);
$this->email = new \phpbb\messenger\email($config, $dispatcher, $lang, $log, $request, $user, $messenger_queue);
$this->email = new \phpbb\messenger\method\phpbb_email(
$config, $dispatcher, $lang, $log, $request, $user, $messenger_queue,
$phpbb_path_helper, $extension_manager, $twig_extensions_collection, $twig_lexer,
$cache_path
);
$phpbb_container->set('messenger.method.email', $this->email);
$reflection = new ReflectionObject($this->email);
$this->reflection_template_property = $reflection->getProperty('template');

5
tests/notification/base.php
View File

@@ -146,6 +146,11 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
$phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
$messenger_method_collection->add('messenger.method.email');
$messenger_method_collection->add('messenger.method.jabber');
$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
$phpbb_container->compile();
$this->notifications->setDependencies($this->auth, $this->config);

8
tests/notification/notification_method_email_test.php
View File

@@ -105,6 +105,11 @@ class notification_method_email_test extends phpbb_tests_notification_base
)
);
$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
$messenger_method_collection->add('messenger.method.email');
$messenger_method_collection->add('messenger.method.jabber');
$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
$this->notification_method_email = $this->getMockBuilder('\phpbb\notification\method\email')
->setConstructorArgs([
$phpbb_container->get('user_loader'),
@@ -113,7 +118,8 @@ class notification_method_email_test extends phpbb_tests_notification_base
$phpbb_container->get('dbal.conn'),
$phpbb_root_path,
$phpEx,
$phpbb_container->getParameter('tables.notification_emails')
$phpbb_container->getParameter('tables.notification_emails'),
$phpbb_container->get('messenger.method_collection')
])
->setMethods(['notify_using_messenger'])
->getMock();

6
tests/notification/submit_post_base.php
View File

@@ -158,6 +158,12 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
$phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push');
$phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions');
$phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $config, $phpbb_dispatcher, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE));
$messenger_method_collection = new \phpbb\di\service_collection($phpbb_container);
$messenger_method_collection->add('messenger.method.email');
$messenger_method_collection->add('messenger.method.jabber');
$phpbb_container->set('messenger.method_collection', $messenger_method_collection);
$phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
$phpbb_container->compile();