diff options
Diffstat (limited to 'tests/template/template_includecss_test.php')
| -rw-r--r-- | tests/template/template_includecss_test.php | 17 | 
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php index 96980e17c6..ac62e820ae 100644 --- a/tests/template/template_includecss_test.php +++ b/tests/template/template_includecss_test.php @@ -28,11 +28,13 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te  		$defaults = $this->config_defaults();  		$config = new \phpbb\config\config(array_merge($defaults, $new_config)); +		$filesystem = new \phpbb\filesystem\filesystem(); +  		$this->phpbb_path_helper = new \phpbb\path_helper(  			new \phpbb\symfony_request(  				new phpbb_mock_request()  			), -			new \phpbb\filesystem(), +			$filesystem,  			$this->getMock('\phpbb\request\request'),  			$phpbb_root_path,  			$phpEx @@ -43,9 +45,10 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te  		$container = new phpbb_mock_container_builder();  		$cache_path = $phpbb_root_path . 'cache/twig';  		$context = new \phpbb\template\context(); -		$loader = new \phpbb\template\twig\loader(''); +		$loader = new \phpbb\template\twig\loader(new \phpbb\filesystem\filesystem(), '');  		$twig = new \phpbb\template\twig\environment(  			$config, +			$filesystem,  			$this->phpbb_path_helper,  			$container,  			$cache_path, @@ -61,10 +64,10 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te  		$this->template = new phpbb\template\twig\twig(  			$this->phpbb_path_helper,  			$config, -			$user,  			$context,  			$twig,  			$cache_path, +			$this->user,  			array(new \phpbb\template\twig\extension($context, $this->user)),  			new phpbb_mock_extension_manager(  				dirname(__FILE__) . '/', @@ -92,19 +95,19 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te  			*/  			array(  				array('TEST' => 1), -				'<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', +				'<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',  			),  			array(  				array('TEST' => 2), -				'<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', +				'<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',  			),  			array(  				array('TEST' => 3), -				'<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', +				'<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',  			),  			array(  				array('TEST' => 4), -				'<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', +				'<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',  			),  		);  	}  | 
