@@ -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(), |
@@ -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(), |
@@ -21,7 +21,7 @@ | |||
* | |||
*/ | |||
namespace OCA\user_ldap\lib; | |||
namespace OCA\User_LDAP; | |||
/** | |||
* @brief wraps around static ownCloud core methods |
@@ -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; | |||
@@ -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 |
@@ -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; |
@@ -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; |
@@ -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'); |
@@ -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'); |
@@ -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'), |
@@ -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'), |
@@ -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(), |
@@ -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(), |