[ticket/16944] Update tests for adjusted environment constructor

PHPBB3-16944

phpBB/includes/bbcode.php

@@ -162,6 +162,7 @@ class bbcode
 				$phpbb_container->get('config'),
 				new \phpbb\template\context(),
 				new \phpbb\template\twig\environment(
+					$phpbb_container->get('assets.bag'),
 					$phpbb_container->get('config'),
 					$phpbb_container->get('filesystem'),
 					$phpbb_container->get('path_helper'),

phpBB/includes/functions_messenger.php

@@ -737,6 +737,7 @@ class messenger
 		}
 
 		$template_environment = new \phpbb\template\twig\environment(
+			$phpbb_container->get('assets.bag'),
 			$phpbb_container->get('config'),
 			$phpbb_container->get('filesystem'),
 			$phpbb_container->get('path_helper'),

tests/controller/common_helper_route.php

@@ -116,9 +116,13 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
 		$container = new phpbb_mock_container_builder();
 		$container->setParameter('core.environment', PHPBB_ENVIRONMENT);
 		$cache_path = $phpbb_root_path . 'cache/twig';
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader('');
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$this->config,
 			$this->filesystem,
 			$this->phpbb_path_helper,

tests/email/email_parsing_test.php

@@ -66,8 +66,13 @@ class phpbb_email_parsing_test extends phpbb_test_case
 		);
 		$phpbb_container->set('ext.manager', $extension_manager);
 
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
+
 		$context = new \phpbb\template\context();
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$config,
 			$filesystem,
 			$phpbb_path_helper,

tests/extension/metadata_manager_test.php

@@ -66,7 +66,11 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 			$this->phpbb_root_path,
 			$this->phpEx
 		);
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$this->config,
 			$filesystem,
 			$phpbb_path_helper,

tests/template/extension_test.php

@@ -95,7 +95,11 @@ 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([]);
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$config,
 			$filesystem,
 			$phpbb_path_helper,

tests/template/template_allfolder_test.php

@@ -58,7 +58,11 @@ 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('');
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$config,
 			$filesystem,
 			$path_helper,

tests/template/template_events_test.php

@@ -152,7 +152,11 @@ Zeta test event in all',
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader('');
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$config,
 			$filesystem,
 			$path_helper,

tests/template/template_includecss_test.php

@@ -44,7 +44,11 @@ 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('');
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$config,
 			$filesystem,
 			$this->phpbb_path_helper,

tests/template/template_test_case.php

@@ -95,7 +95,11 @@ 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('');
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$config,
 			$filesystem,
 			$path_helper,

tests/template/template_test_case_with_tree.php

@@ -45,7 +45,11 @@ 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('');
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$config,
 			$filesystem,
 			$this->phpbb_path_helper,

tests/template/twig_test.php

@@ -63,7 +63,11 @@ class twig_test extends \phpbb_test_case
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader('');
+		$log = new \phpbb\log\dummy();
+		$iconify_bundler = new \phpbb\assets\iconify_bundler($log);
+		$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
 		$twig = new \phpbb\template\twig\environment(
+			$assets_bag,
 			$config,
 			$filesystem,
 			$path_helper,