Move LogWrapper to PSR-4

6 files changed, 9 insertions, 8 deletions

diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php
index 03a1dfbeb47..6dee5bd5c91 100644
--- a/apps/user_ldap/tests/User/ManagerTest.php
+++ b/apps/user_ldap/tests/User/ManagerTest.php
@@ -40,7 +40,7 @@ class ManagerTest extends \Test\TestCase {
 		$access = $this->getMock('\OCA\User_LDAP\User\IUserTools');
 		$config = $this->getMock('\OCP\IConfig');
 		$filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper');
-		$log = $this->getMock('\OCA\user_ldap\lib\LogWrapper');
+		$log = $this->getMock('\OCA\User_LDAP\LogWrapper');
 		$avaMgr = $this->getMock('\OCP\IAvatarManager');
 		$image = $this->getMock('\OCP\Image');
 		$dbc = $this->getMock('\OCP\IDBConnection');
diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php
index 81497b4bcb8..2a5a7cc6a77 100644
--- a/apps/user_ldap/tests/User/UserTest.php
+++ b/apps/user_ldap/tests/User/UserTest.php
@@ -40,7 +40,7 @@ class UserTest extends \Test\TestCase {
 		$access  = $this->getMock('\OCA\User_LDAP\User\IUserTools');
 		$config  = $this->getMock('\OCP\IConfig');
 		$filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper');
-		$log     = $this->getMock('\OCA\user_ldap\lib\LogWrapper');
+		$log     = $this->getMock('\OCA\User_LDAP\LogWrapper');
 		$avaMgr  = $this->getMock('\OCP\IAvatarManager');
 		$image   = $this->getMock('\OCP\Image');
 		$dbc     = $this->getMock('\OCP\IDBConnection');
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index fb36ee94e27..d67dafb90eb 100644
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -81,7 +81,7 @@ class User_LDAPTest extends \Test\TestCase {
 			->setConstructorArgs([
 				$this->configMock,
 				$this->getMock('\OCA\user_ldap\lib\FilesystemHelper'),
-				$this->getMock('\OCA\user_ldap\lib\LogWrapper'),
+				$this->getMock('\OCA\User_LDAP\LogWrapper'),
 				$this->getMock('\OCP\IAvatarManager'),
 				$this->getMock('\OCP\Image'),
 				$this->getMock('\OCP\IDBConnection'),
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index e9789219177..3f74551eaec 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -55,7 +55,7 @@ class Test_Access extends \Test\TestCase {
 			$umMethods, array(
 				$this->getMock('\OCP\IConfig'),
 				$this->getMock('\OCA\user_ldap\lib\FilesystemHelper'),
-				$this->getMock('\OCA\user_ldap\lib\LogWrapper'),
+				$this->getMock('\OCA\User_LDAP\LogWrapper'),
 				$this->getMock('\OCP\IAvatarManager'),
 				$this->getMock('\OCP\Image'),
 				$this->getMock('\OCP\IDBConnection'),
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
index 95a3f850a63..189fbf4154b 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
@@ -67,10 +67,11 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 		$this->userManager = new LDAPUserManager(
 			\OC::$server->getConfig(),
 			new \OCA\user_ldap\lib\FilesystemHelper(),
-			new \OCA\user_ldap\lib\LogWrapper(),
+			new \OCA\User_LDAP\LogWrapper(),
 			\OC::$server->getAvatarManager(),
 			new \OCP\Image(),
-			\OC::$server->getDatabaseConnection()
+			\OC::$server->getDatabaseConnection(),
+			\OC::$server->getUserManager()
 		);
 	}
 
@@ -82,7 +83,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 	 */
 	protected function case1() {
 		\OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', false);
-		$userManager = \oc::$server->getUserManager();
+		$userManager = \OC::$server->getUserManager();
 		$userManager->clearBackends();
 		$userManager->registerBackend($this->backend);
 		$users = $userManager->search('', 5, 0);
diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
index 65e026d6980..598d8720f56 100644
--- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
+++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
@@ -122,7 +122,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
 		$this->userManager = new \OCA\User_LDAP\User\Manager(
 			\OC::$server->getConfig(),
 			new \OCA\user_ldap\lib\FilesystemHelper(),
-			new \OCA\user_ldap\lib\LogWrapper(),
+			new \OCA\User_LDAP\LogWrapper(),
 			\OC::$server->getAvatarManager(),
 			new \OCP\Image(),
 			\OC::$server->getDatabaseConnection(),