From c7d16febefd3eae6de188885fdca0c6d8f11a938 Mon Sep 17 00:00:00 2001
From: toxyy <thrashtek@gmail.com>
Date: Sun, 3 Dec 2023 17:30:29 -0500
Subject: [PATCH] [ticket/15214] Add fixes for various other tests

Add new dispatch parameter to the template\twig\extension calls

PHPBB3-15214
---
 tests/extension/metadata_manager_test.php       | 2 +-
 tests/template/extension_test.php               | 5 +++--
 tests/template/template_allfolder_test.php      | 5 +++--
 tests/template/template_events_test.php         | 5 +++--
 tests/template/template_includecss_test.php     | 5 +++--
 tests/template/template_test_case.php           | 5 +++--
 tests/template/template_test_case_with_tree.php | 5 +++--
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 2357d593b5..535512e9ed 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -112,7 +112,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$lang = new \phpbb\language\language($lang_loader);
 		$this->user = new \phpbb\user($lang, '\phpbb\datetime');
 
-		$this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)));
+		$this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $phpbb_dispatcher)));
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 	}
 
diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php
index 6308928325..759fd6e27d 100644
--- a/tests/template/extension_test.php
+++ b/tests/template/extension_test.php
@@ -74,6 +74,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader($filesystem);
+		$dispatcher = new \phpbb\event\dispatcher($phpbb_container);
 		$twig = new \phpbb\template\twig\environment(
 			$config,
 			$filesystem,
@@ -81,7 +82,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 			$cache_path,
 			null,
 			$loader,
-			new \phpbb\event\dispatcher($phpbb_container),
+			$dispatcher,
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -97,7 +98,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 			$cache_path,
 			$this->user,
 			[
-				new \phpbb\template\twig\extension($context, $twig, $this->lang),
+				new \phpbb\template\twig\extension($context, $twig, $this->lang, $dispatcher),
 				new \phpbb\template\twig\extension\avatar(),
 				new \phpbb\template\twig\extension\config($config),
 				new \phpbb\template\twig\extension\username(),
diff --git a/tests/template/template_allfolder_test.php b/tests/template/template_allfolder_test.php
index 9765b32845..534c0a84ea 100644
--- a/tests/template/template_allfolder_test.php
+++ b/tests/template/template_allfolder_test.php
@@ -60,6 +60,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader(new \phpbb\filesystem\filesystem(), '');
+		$dispatcher = new \phpbb\event\dispatcher($container);
 		$twig = new \phpbb\template\twig\environment(
 			$config,
 			$filesystem,
@@ -67,7 +68,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
 			$cache_path,
 			$this->extension_manager,
 			$loader,
-			new \phpbb\event\dispatcher($container),
+			$dispatcher,
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -75,7 +76,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
 				'autoescape'	=> false,
 			)
 		);
-		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager);
+		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)), $this->extension_manager);
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 
 		$this->template_path = $this->test_path . '/templates';
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index aa3f772111..d41a70b372 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -154,6 +154,7 @@ Zeta test event in all',
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader(new \phpbb\filesystem\filesystem(), '');
+		$dispatcher = new \phpbb\event\dispatcher($container);
 		$twig = new \phpbb\template\twig\environment(
 			$config,
 			$filesystem,
@@ -161,7 +162,7 @@ Zeta test event in all',
 			$cache_path,
 			$this->extension_manager,
 			$loader,
-			new \phpbb\event\dispatcher($container),
+			$dispatcher,
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -169,7 +170,7 @@ Zeta test event in all',
 				'autoescape'	=> false,
 			)
 		);
-		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager);
+		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)), $this->extension_manager);
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 
 		$this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path));
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php
index c767986f85..8d2d21a220 100644
--- a/tests/template/template_includecss_test.php
+++ b/tests/template/template_includecss_test.php
@@ -46,6 +46,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader(new \phpbb\filesystem\filesystem(), '');
+		$dispatcher = new \phpbb\event\dispatcher($container);
 		$twig = new \phpbb\template\twig\environment(
 			$config,
 			$filesystem,
@@ -53,7 +54,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 			$cache_path,
 			null,
 			$loader,
-			new \phpbb\event\dispatcher($container),
+			$dispatcher,
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -68,7 +69,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 			$twig,
 			$cache_path,
 			$this->user,
-			array(new \phpbb\template\twig\extension($context, $twig, $this->user)),
+			array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)),
 			new phpbb_mock_extension_manager(
 				__DIR__ . '/',
 				array(
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 1cb6cbe799..6d819e8842 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -98,6 +98,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader(new \phpbb\filesystem\filesystem(), '');
+		$dispatcher = new \phpbb\event\dispatcher($container);
 		$twig = new \phpbb\template\twig\environment(
 			$config,
 			$filesystem,
@@ -105,7 +106,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 			$cache_path,
 			null,
 			$loader,
-			new \phpbb\event\dispatcher($container),
+			$dispatcher,
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -113,7 +114,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 				'autoescape'	=> false,
 			)
 		);
-		$this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)));
+		$this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)));
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 		$this->template->set_custom_style('tests', $this->template_path);
 	}
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index 4a1764053b..339b5d2feb 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -41,6 +41,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader(new \phpbb\filesystem\filesystem(), '');
+		$dispatcher = new \phpbb\event\dispatcher($container);
 		$twig = new \phpbb\template\twig\environment(
 			$config,
 			$filesystem,
@@ -48,7 +49,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 			$cache_path,
 			null,
 			$loader,
-			new \phpbb\event\dispatcher($container),
+			$dispatcher,
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -56,7 +57,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 				'autoescape'	=> false,
 			)
 		);
-		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)));
+		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)));
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 		$this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
 	}