Merge remote-tracking branch 'remotes/nickv/ticket/10714' into develop

# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10714: (56 commits)
  [ticket/10714] Get log from container in install, update and download/file
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [ticket/10714] Update add_log docs block with @param and @deprecated
  [ticket/10714] Remove fallback code from previous commits and move global
  [ticket/10714] Fix missing parameter and global phpbb_log in unit tests
  [ticket/10714] Add getter for is_in_admin and use it
  [ticket/10714] Fix more comments
  [ticket/10714] Cast values to integer before using them in the query
  [ticket/10714] Fix several doc blocks and comments
  [ticket/10714] Fix missing 8th argument in unit tests
  [ticket/10714] Use new core.adm_relative_path to create the object.
  [ticket/10714] Fix several comments and variable names
  [ticket/10714] Fix database driver class name
  [ticket/10714] Forgot most important, use container to create $phpbb_log
  [ticket/10714] Remove type hinting to allow the usage of mocks in tests
  [ticket/10714] Fix dependency injections in unit tests with mocks
  [ticket/10714] Use dependencies instead of globals
  [ticket/10714] Compare log_type to false, rather then null
  [ticket/10714] Add global variables for the unit tests
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php
index f13156c2cc..4336fd894e 100644
--- a/tests/functions_user/group_user_attributes_test.php
+++ b/tests/functions_user/group_user_attributes_test.php
@@ -125,7 +125,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
 	*/
 	public function test_group_user_attributes($description, $user_id, $group_id, $group_row, $expected)
 	{
-		global $auth, $cache, $db, $phpbb_dispatcher, $user, $phpbb_container;
+		global $auth, $cache, $db, $phpbb_dispatcher, $user, $phpbb_container, $phpbb_log, $phpbb_root_path, $phpEx;
 
 		$user->ip = '';
 		$cache = new phpbb_mock_cache;
@@ -141,6 +141,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
 			->method('get')
 			->with('cache.driver')
 			->will($this->returnValue($cache_driver));
+		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
 
 		group_user_attributes('default', $group_id, array($user_id), false, 'group_name', $group_row);