diff options
| author | javiexin <javiexin@gmail.com> | 2017-03-09 16:12:25 +0100 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-09 16:12:25 +0100 | 
| commit | bd12504f6cf03b36821a5cea2bf77a419496dcdb (patch) | |
| tree | d30cc3506e1bbdc284dc7cca910c5dac6b927ae0 /tests/functions_user/group_user_attributes_test.php | |
| parent | 96a90d3f81c1fcce3834ee72b7d1b9f76aa9354c (diff) | |
| parent | 3e9f12d12d7dbdd2cee39425e81b5fdf66fcfbc8 (diff) | |
| download | forums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.tar forums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.tar.gz forums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.tar.bz2 forums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.tar.xz forums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.zip  | |
Merge branch '3.2.x' into ticket/15068
Diffstat (limited to 'tests/functions_user/group_user_attributes_test.php')
| -rw-r--r-- | tests/functions_user/group_user_attributes_test.php | 4 | 
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php index 99a15b32bf..3124d57ba0 100644 --- a/tests/functions_user/group_user_attributes_test.php +++ b/tests/functions_user/group_user_attributes_test.php @@ -11,9 +11,7 @@  *  */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';  require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';  class phpbb_functions_user_group_user_attributes_test extends phpbb_database_test_case  { @@ -139,7 +137,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes  		$auth = $this->getMock('\phpbb\auth\auth');  		$auth->expects($this->any())  			->method('acl_clear_prefetch'); -		$cache_driver = new \phpbb\cache\driver\null(); +		$cache_driver = new \phpbb\cache\driver\dummy();  		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');  		$phpbb_container  			->expects($this->any())  | 
