Merge branch '3.3.x'

tests/pagination/pagination_test.php

@@ -41,7 +41,6 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 
 		$manager = new phpbb_mock_extension_manager(dirname(__FILE__) . '/', array());
 
-
 		$loader = new \Symfony\Component\Routing\Loader\YamlFileLoader(
 			new \phpbb\routing\file_locator(dirname(__FILE__) . '/')
 		);
@@ -57,8 +56,28 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 			$request
 		);
 
+		$db = $this->getMockBuilder('\phpbb\db\driver\mysqli')
+			->disableOriginalConstructor()
+			->getMock();
+
 		$this->routing_helper = new \phpbb\routing\helper($this->config, $router, $symfony_request, $request, '', 'php');
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $symfony_request, $request, $this->routing_helper);
+		$this->helper = new phpbb_mock_controller_helper(
+			new \phpbb\auth\auth(),
+			new \phpbb\cache\driver\dummy(),
+			$this->config,
+			new \phpbb\cron\manager([], $this->routing_helper, '', 'php'),
+			$db,
+			new phpbb_mock_event_dispatcher(),
+			new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
+			$request,
+			$this->routing_helper,
+			$symfony_request,
+			$this->template,
+			$this->user,
+			$phpbb_root_path,
+			'adm/',
+			'php'
+		);
 		$this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper, $phpbb_dispatcher);
 	}