[ticket/17135] Fix code flaws

PHPBB-17135
2025-08-09 02:06:32 +02:00 · 2024-06-23 14:55:01 +07:00
parent 3fddff240c
commit 0c720eaf7c
13 changed files with 249 additions and 107 deletions
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -34,7 +34,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 	{
 		global $auth, $db, $cache, $config, $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpEx;

-		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$phpbb_dispatcher = new \phpbb\event\dispatcher();
 		$phpbb_container = new phpbb_mock_container_builder();
 		$phpbb_container->set('cache.driver', new phpbb_mock_cache());
 		$phpbb_container->set('notification_manager', new phpbb_mock_notification_manager());
@@ -108,8 +108,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		$assets_bag = new \phpbb\template\assets_bag();
 		$phpbb_container->set('assets.bag', $assets_bag);

-		$dispatcher = new \phpbb\event\dispatcher();
-		$phpbb_container->set('dispatcher', $dispatcher);
+		$phpbb_container->set('dispatcher', $phpbb_dispatcher);

 		$core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';
 		$phpbb_container->setParameter('core.cache_dir', $core_cache_dir);
@@ -121,7 +120,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		$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);
+		$messenger_queue = new \phpbb\messenger\queue($config, $phpbb_dispatcher, $messenger_method_collection, $core_messenger_queue_file);
 		$phpbb_container->set('messenger.queue', $messenger_queue);

 		$request = new phpbb_mock_request;
@@ -139,9 +138,33 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		);
 		$phpbb_container->set('path_helper', $phpbb_path_helper);

-		$extension_manager = new phpbb_mock_extension_manager(
+		$factory = new \phpbb\db\tools\factory();
+		$db_doctrine = $this->new_doctrine_dbal();
+		$db_tools = $factory->get($db_doctrine);
+		$migrator = new \phpbb\db\migrator(
+			$phpbb_container,
+			$config,
+			$db,
+			$db_tools,
+			'phpbb_migrations',
+			$phpbb_root_path,
+			$this->php_ext,
+			'phpbb_',
+			self::get_core_tables(),
+			[],
+			new \phpbb\db\migration\helper()
+		);
+		$phpbb_container->set('migrator', $migrator);
+
+		$finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $this->php_ext);
+		$extension_manager = new \phpbb\extension\manager(
+			$phpbb_container,
+			$db,
+			$config,
+			$finder_factory,
+			'phpbb_ext',
 			__DIR__ . '/',
-			[]
+			new \phpbb\cache\service(new phpbb_mock_cache(), $config, $db, $phpbb_dispatcher, $phpbb_root_path, $this->php_ext)
 		);
 		$phpbb_container->set('ext.manager', $extension_manager);

@@ -159,7 +182,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 			$cache_path,
 			null,
 			new \phpbb\template\twig\loader(''),
-			$dispatcher,
+			$phpbb_dispatcher,
 			[
 				'cache'			=> false,
 				'debug'			=> false,
@@ -167,7 +190,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 				'autoescape'	=> false,
 			]
 		);
-		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang);
+		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $this->language);
 		$phpbb_container->set('template.twig.extensions.phpbb', $twig_extension);

 		$twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container);
@@ -178,10 +201,21 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		$twig_lexer = new \phpbb\template\twig\lexer($twig);
 		$phpbb_container->set('template.twig.lexer', $twig_lexer);

-		$this->email = new \phpbb\messenger\method\phpbb_email(
-			$assets_bag, $this->config, $dispatcher, $this->language, $log, $request, $user, $messenger_queue,
-			$phpbb_path_helper, $extension_manager, $twig_extensions_collection, $twig_lexer,
-			$cache_path, $phpbb_root_path
+		$this->email = new \phpbb\messenger\method\email(
+			$assets_bag,
+			$this->config,
+			$phpbb_dispatcher,
+			$this->language,
+			$messenger_queue,
+			$phpbb_path_helper,
+			$request,
+			$twig_extensions_collection,
+			$twig_lexer,
+			$user,
+			$phpbb_root_path,
+			$cache_path,
+			$extension_manager,
+			$this->log
 		);
 		$phpbb_container->set('messenger.method.email', $this->email);

--- a/tests/email/email_parsing_test.php
+++ b/tests/email/email_parsing_test.php
@@ -123,10 +123,21 @@ class phpbb_email_parsing_test extends phpbb_test_case
 		$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\method\phpbb_email(
-			$assets_bag, $config, $dispatcher, $lang, $log, $request, $user, $messenger_queue,
-			$phpbb_path_helper, $extension_manager, $twig_extensions_collection, $twig_lexer,
-			$cache_path, $phpbb_root_path
+		$this->email = new \phpbb\messenger\method\email(
+			$assets_bag,
+			$config,
+			$dispatcher,
+			$lang,
+			$messenger_queue,
+			$phpbb_path_helper,
+			$request,
+			$twig_extensions_collection,
+			$twig_lexer,
+			$user,
+			$phpbb_root_path,
+			$cache_path,
+			$extension_manager,
+			$log
 		);
 		$phpbb_container->set('messenger.method.email', $this->email);

--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -324,6 +324,123 @@ class phpbb_functional_test_case extends phpbb_test_case
 		return $extension_manager;
 	}

+	protected static function get_messenger_method_email($container)
+	{
+		global $phpbb_root_path, $phpEx;
+
+		$config = new \phpbb\config\config(
+			[
+				'version' => PHPBB_VERSION,
+				'email_enable' => false,
+				'email_package_size' => 0,
+				'smtp_delivery' => 0,
+				'default_lang' => 'en',
+			]
+		);
+
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
+		$container->set('user', $user);
+		$container->set('language', $lang);
+
+		$assets_bag = new \phpbb\template\assets_bag();
+		$container->set('assets.bag', $assets_bag);
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$container->set('dispatcher', $phpbb_dispatcher);
+
+		$core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';
+		$container->setParameter('core.cache_dir', $core_cache_dir);
+
+		$core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx;
+		$container->setParameter('core.messenger_queue_file', $core_messenger_queue_file);
+
+		$messenger_method_collection = new \phpbb\di\service_collection($container);
+		$messenger_method_collection->add('messenger.method.email');
+		$container->set('messenger.method_collection', $messenger_method_collection);
+
+		$messenger_queue = new \phpbb\messenger\queue($config, $phpbb_dispatcher, $messenger_method_collection, $core_messenger_queue_file);
+		$container->set('messenger.queue', $messenger_queue);
+
+		$request = new phpbb_mock_request;
+		$container->set('request', $request);
+
+		$symfony_request = new \phpbb\symfony_request(
+			$request
+		);
+
+		$phpbb_path_helper = new \phpbb\path_helper(
+			$symfony_request,
+			$request,
+			$phpbb_root_path,
+			$phpEx
+		);
+		$container->set('path_helper', $phpbb_path_helper);
+
+		$dbms = self::$config['dbms'];
+		$db = new $dbms();
+		$db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']);
+
+		$extension_manager = new phpbb_mock_extension_manager($phpbb_root_path, [], $container);
+		$container->set('ext.manager', $extension_manager);
+
+		$context = new \phpbb\template\context();
+		$cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig';
+		$container->setParameter('core.template.cache_path', $cache_path);
+		$filesystem = new \phpbb\filesystem\filesystem();
+		$container->set('filesystem', $filesystem);
+
+		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
+			$config,
+			$filesystem,
+			$phpbb_path_helper,
+			$cache_path,
+			null,
+			new \phpbb\template\twig\loader(''),
+			$phpbb_dispatcher,
+			[
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			]
+		);
+		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang);
+		$container->set('template.twig.extensions.phpbb', $twig_extension);
+
+		$twig_extensions_collection = new \phpbb\di\service_collection($container);
+		$twig_extensions_collection->add('template.twig.extensions.phpbb');
+		$container->set('template.twig.extensions.collection', $twig_extensions_collection);
+
+		$twig->addExtension($twig_extension);
+		$twig_lexer = new \phpbb\template\twig\lexer($twig);
+		$container->set('template.twig.lexer', $twig_lexer);
+
+		$auth = new \phpbb\auth\auth();
+		$log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
+		$container->set('log', $log);
+
+		$email_method = new \phpbb\messenger\method\email(
+			$assets_bag,
+			$config,
+			$phpbb_dispatcher,
+			$lang,
+			$messenger_queue,
+			$phpbb_path_helper,
+			$request,
+			$twig_extensions_collection,
+			$twig_lexer,
+			$user,
+			$phpbb_root_path,
+			$cache_path,
+			$extension_manager,
+			$log
+		);
+		$container->set('messenger.method.email', $email_method);
+	}
+
 	protected static function install_board()
 	{
 		global $phpbb_root_path, $phpEx;
@@ -374,6 +491,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task());
 		$container->register('installer.install_finish.install_extensions')->setSynthetic(true);
 		$container->set('installer.install_finish.install_extensions', new phpbb_mock_null_installer_task());
+		self::get_messenger_method_email($container);
 		$container->compile();

 		$language = $container->get('language');