diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-12 16:16:06 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-25 16:04:57 +0200 |
| commit | 6feccccbd5d16fee3ffc94ba73f1baeae4956655 (patch) | |
| tree | d88ee2eb010b7022ca1a95ff8f45233fdba60720 /apps/user_ldap/lib | |
| parent | e73d811425d35977d5c6c1fcf1be8ab3f512ad89 (diff) | |
| download | nextcloud-server-6feccccbd5d16fee3ffc94ba73f1baeae4956655.tar.gz nextcloud-server-6feccccbd5d16fee3ffc94ba73f1baeae4956655.zip | |
Move LogWrapper to PSR-4
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/LogWrapper.php (renamed from apps/user_ldap/lib/logwrapper.php) | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Proxy.php | 1 | ||||
| -rw-r--r-- | apps/user_ldap/lib/User/Manager.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/lib/User/User.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/jobs.php | 3 |
5 files changed, 6 insertions, 6 deletions
diff --git a/apps/user_ldap/lib/logwrapper.php b/apps/user_ldap/lib/LogWrapper.php index 41ae4fc3426..5368e82417b 100644 --- a/apps/user_ldap/lib/logwrapper.php +++ b/apps/user_ldap/lib/LogWrapper.php @@ -20,7 +20,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 dd7cd97b6f9..783d8f9373c 100644 --- a/apps/user_ldap/lib/Proxy.php +++ b/apps/user_ldap/lib/Proxy.php @@ -32,7 +32,6 @@ use OCA\user_ldap\lib\Access; use OCA\user_ldap\lib\Connection; use OCA\user_ldap\lib\FilesystemHelper; use OCA\user_ldap\lib\ILDAPWrapper; -use OCA\user_ldap\lib\LogWrapper; 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 ca86970d477..211f5d519c3 100644 --- a/apps/user_ldap/lib/User/Manager.php +++ b/apps/user_ldap/lib/User/Manager.php @@ -25,7 +25,7 @@ namespace OCA\User_LDAP\User; -use OCA\user_ldap\lib\LogWrapper; +use OCA\User_LDAP\LogWrapper; use OCA\user_ldap\lib\FilesystemHelper; use OCP\IAvatarManager; use OCP\IConfig; @@ -75,7 +75,7 @@ class Manager { * @param IConfig $ocConfig * @param \OCA\user_ldap\lib\FilesystemHelper $ocFilesystem object that * gives access to necessary functions from the OC filesystem - * @param \OCA\user_ldap\lib\LogWrapper $ocLog + * @param \OCA\User_LDAP\LogWrapper $ocLog * @param IAvatarManager $avatarManager * @param Image $image an empty image instance * @param IDBConnection $db diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php index 4b9e3a3c9fc..53159d66f67 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -26,7 +26,7 @@ namespace OCA\User_LDAP\User; use OCA\user_ldap\lib\Connection; use OCA\user_ldap\lib\FilesystemHelper; -use OCA\user_ldap\lib\LogWrapper; +use OCA\User_LDAP\LogWrapper; use OCP\IAvatarManager; use OCP\IConfig; use OCP\Image; diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php index 842f96e07ce..b855b12fe91 100644 --- a/apps/user_ldap/lib/jobs.php +++ b/apps/user_ldap/lib/jobs.php @@ -30,6 +30,7 @@ namespace OCA\user_ldap\lib; use OCA\User_LDAP\Mapping\GroupMapping; use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\User\Manager; class Jobs extends \OC\BackgroundJob\TimedJob { static private $groupsFromDB; @@ -170,7 +171,7 @@ class Jobs extends \OC\BackgroundJob\TimedJob { if(count($configPrefixes) === 1) { //avoid the proxy when there is only one LDAP server configured $dbc = \OC::$server->getDatabaseConnection(); - $userManager = new user\Manager( + $userManager = new Manager( \OC::$server->getConfig(), new FilesystemHelper(), new LogWrapper(), |