Move FilesystemHelper to PSR-4

13 files changed, 16 insertions, 13 deletions

diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index 55a681a007b..fa42706fac9 100644
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -51,7 +51,7 @@ $con->setIgnoreValidation(true);
 
 $userManager = new \OCA\User_LDAP\User\Manager(
 	\OC::$server->getConfig(),
-	new \OCA\user_ldap\lib\FilesystemHelper(),
+	new \OCA\User_LDAP\FilesystemHelper(),
 	new \OCA\User_LDAP\LogWrapper(),
 	\OC::$server->getAvatarManager(),
 	new \OCP\Image(),
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 28b38594494..e9777b0f985 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -34,7 +34,7 @@ $ocConfig = \OC::$server->getConfig();
 if(count($configPrefixes) === 1) {
 	$dbc = \OC::$server->getDatabaseConnection();
 	$userManager = new OCA\User_LDAP\User\Manager($ocConfig,
-		new OCA\user_ldap\lib\FilesystemHelper(),
+		new OCA\User_LDAP\FilesystemHelper(),
 		new OCA\User_LDAP\LogWrapper(),
 		\OC::$server->getAvatarManager(),
 		new \OCP\Image(),
diff --git a/apps/user_ldap/lib/filesystemhelper.php b/apps/user_ldap/lib/FilesystemHelper.php
index 03f4c4274f4..439e7fb1d0b 100644
--- a/apps/user_ldap/lib/filesystemhelper.php
+++ b/apps/user_ldap/lib/FilesystemHelper.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\user_ldap\lib;
+namespace OCA\User_LDAP;
 
 /**
  * @brief wraps around static ownCloud core methods
diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php
index bf4083fdb18..c51d6473482 100644
--- a/apps/user_ldap/lib/Proxy.php
+++ b/apps/user_ldap/lib/Proxy.php
@@ -30,7 +30,6 @@ namespace OCA\User_LDAP;
 
 use OCA\user_ldap\lib\Access;
 use OCA\user_ldap\lib\Connection;
-use OCA\user_ldap\lib\FilesystemHelper;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\Mapping\GroupMapping;
 
diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php
index 211f5d519c3..d97112e43c7 100644
--- a/apps/user_ldap/lib/User/Manager.php
+++ b/apps/user_ldap/lib/User/Manager.php
@@ -26,7 +26,7 @@
 namespace OCA\User_LDAP\User;
 
 use OCA\User_LDAP\LogWrapper;
-use OCA\user_ldap\lib\FilesystemHelper;
+use OCA\User_LDAP\FilesystemHelper;
 use OCP\IAvatarManager;
 use OCP\IConfig;
 use OCP\IDBConnection;
@@ -73,7 +73,7 @@ class Manager {
 
 	/**
 	 * @param IConfig $ocConfig
-	 * @param \OCA\user_ldap\lib\FilesystemHelper $ocFilesystem object that
+	 * @param \OCA\User_LDAP\FilesystemHelper $ocFilesystem object that
 	 * gives access to necessary functions from the OC filesystem
 	 * @param  \OCA\User_LDAP\LogWrapper $ocLog
 	 * @param IAvatarManager $avatarManager
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index 53159d66f67..aee644a2b6c 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -25,7 +25,7 @@
 namespace OCA\User_LDAP\User;
 
 use OCA\user_ldap\lib\Connection;
-use OCA\user_ldap\lib\FilesystemHelper;
+use OCA\User_LDAP\FilesystemHelper;
 use OCA\User_LDAP\LogWrapper;
 use OCP\IAvatarManager;
 use OCP\IConfig;
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index b855b12fe91..9b0398c068d 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -28,6 +28,10 @@
 
 namespace OCA\user_ldap\lib;
 
+use OCA\User_LDAP\FilesystemHelper;
+use OCA\User_LDAP\Helper;
+use OCA\User_LDAP\LDAP;
+use OCA\User_LDAP\LogWrapper;
 use OCA\User_LDAP\Mapping\GroupMapping;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User\Manager;
diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php
index 633cd0c876a..478cd2aca8c 100644
--- a/apps/user_ldap/tests/User/ManagerTest.php
+++ b/apps/user_ldap/tests/User/ManagerTest.php
@@ -39,7 +39,7 @@ class ManagerTest extends \Test\TestCase {
 	private function getTestInstances() {
 		$access = $this->getMock('\OCA\User_LDAP\User\IUserTools');
 		$config = $this->getMock('\OCP\IConfig');
-		$filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper');
+		$filesys = $this->getMock('\OCA\User_LDAP\FilesystemHelper');
 		$log = $this->getMock('\OCA\User_LDAP\LogWrapper');
 		$avaMgr = $this->getMock('\OCP\IAvatarManager');
 		$image = $this->getMock('\OCP\Image');
diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php
index 9afdb7c8645..63854685023 100644
--- a/apps/user_ldap/tests/User/UserTest.php
+++ b/apps/user_ldap/tests/User/UserTest.php
@@ -39,7 +39,7 @@ class UserTest extends \Test\TestCase {
 	private function getTestInstances() {
 		$access  = $this->getMock('\OCA\User_LDAP\User\IUserTools');
 		$config  = $this->getMock('\OCP\IConfig');
-		$filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper');
+		$filesys = $this->getMock('\OCA\User_LDAP\FilesystemHelper');
 		$log     = $this->getMock('\OCA\User_LDAP\LogWrapper');
 		$avaMgr  = $this->getMock('\OCP\IAvatarManager');
 		$image   = $this->getMock('\OCP\Image');
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index f13240aa248..de634f21315 100644
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -79,7 +79,7 @@ class User_LDAPTest extends \Test\TestCase {
 			->setMethods(['getDeletedUser'])
 			->setConstructorArgs([
 				$this->configMock,
-				$this->getMock('\OCA\user_ldap\lib\FilesystemHelper'),
+				$this->getMock('\OCA\User_LDAP\FilesystemHelper'),
 				$this->getMock('\OCA\User_LDAP\LogWrapper'),
 				$this->getMock('\OCP\IAvatarManager'),
 				$this->getMock('\OCP\Image'),
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index 75bf4b7524d..bf80ac6af91 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -53,7 +53,7 @@ class Test_Access extends \Test\TestCase {
 		$um = $this->getMock('\OCA\User_LDAP\User\Manager',
 			$umMethods, array(
 				$this->getMock('\OCP\IConfig'),
-				$this->getMock('\OCA\user_ldap\lib\FilesystemHelper'),
+				$this->getMock('\OCA\User_LDAP\FilesystemHelper'),
 				$this->getMock('\OCA\User_LDAP\LogWrapper'),
 				$this->getMock('\OCP\IAvatarManager'),
 				$this->getMock('\OCP\Image'),
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
index 189fbf4154b..751cb99600c 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
@@ -66,7 +66,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 	protected function initUserManager() {
 		$this->userManager = new LDAPUserManager(
 			\OC::$server->getConfig(),
-			new \OCA\user_ldap\lib\FilesystemHelper(),
+			new \OCA\User_LDAP\FilesystemHelper(),
 			new \OCA\User_LDAP\LogWrapper(),
 			\OC::$server->getAvatarManager(),
 			new \OCP\Image(),
diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
index 598d8720f56..195862226b7 100644
--- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
+++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
@@ -121,7 +121,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
 	protected function initUserManager() {
 		$this->userManager = new \OCA\User_LDAP\User\Manager(
 			\OC::$server->getConfig(),
-			new \OCA\user_ldap\lib\FilesystemHelper(),
+			new \OCA\User_LDAP\FilesystemHelper(),
 			new \OCA\User_LDAP\LogWrapper(),
 			\OC::$server->getAvatarManager(),
 			new \OCP\Image(),