diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-12 17:08:46 +0300 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-25 17:04:57 +0300 |
| commit | d4e828f39e302a7c69de28c5f2d9b77969f50230 (patch) | |
| tree | 52a8ac6277803f93b8562648b7c03e909a02084a | |
| parent | 3f5e76162d74701c35a31b5a611466dba93d9a04 (diff) | |
Move wizard
| -rw-r--r-- | apps/user_ldap/ajax/wizard.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Wizard.php (renamed from apps/user_ldap/lib/wizard.php) | 7 | ||||
| -rw-r--r-- | apps/user_ldap/lib/WizardResult.php (renamed from apps/user_ldap/lib/wizardresult.php) | 2 | ||||
| -rw-r--r-- | apps/user_ldap/tests/WizardTest.php (renamed from apps/user_ldap/tests/wizard.php) | 8 |
4 files changed, 12 insertions, 7 deletions
diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php index 99e0c37d1cf..a1e2b0e8fb6 100644 --- a/apps/user_ldap/ajax/wizard.php +++ b/apps/user_ldap/ajax/wizard.php @@ -60,7 +60,7 @@ $userManager = new \OCA\User_LDAP\User\Manager( $access = new \OCA\user_ldap\lib\Access($con, $ldapWrapper, $userManager); -$wizard = new \OCA\user_ldap\lib\Wizard($configuration, $ldapWrapper, $access); +$wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access); switch($action) { case 'guessPortAndTLS': diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/Wizard.php index 0b475ee7143..d9bb0c41727 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/Wizard.php @@ -29,9 +29,14 @@ * */ -namespace OCA\user_ldap\lib; +namespace OCA\User_LDAP; use OC\ServerNotAvailableException; +use OCA\user_ldap\lib\Access; +use OCA\user_ldap\lib\Configuration; +use OCA\user_ldap\lib\Helper; +use OCA\user_ldap\lib\ILDAPWrapper; +use OCA\user_ldap\lib\LDAPUtility; class Wizard extends LDAPUtility { static protected $l; diff --git a/apps/user_ldap/lib/wizardresult.php b/apps/user_ldap/lib/WizardResult.php index 54f01cf59b8..1adce9a1389 100644 --- a/apps/user_ldap/lib/wizardresult.php +++ b/apps/user_ldap/lib/WizardResult.php @@ -23,7 +23,7 @@ * */ -namespace OCA\user_ldap\lib; +namespace OCA\User_LDAP; class WizardResult { protected $changes = array(); diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/WizardTest.php index a73292db354..83cd58d2231 100644 --- a/apps/user_ldap/tests/wizard.php +++ b/apps/user_ldap/tests/WizardTest.php @@ -23,9 +23,9 @@ * */ -namespace OCA\user_ldap\tests; +namespace OCA\User_LDAP\tests; -use \OCA\user_ldap\lib\Wizard; +use \OCA\User_LDAP\Wizard; // use \OCA\user_ldap\User_LDAP as UserLDAP; // use \OCA\user_ldap\lib\Access; @@ -37,9 +37,9 @@ use \OCA\user_ldap\lib\Wizard; * * @group DB * - * @package OCA\user_ldap\tests + * @package OCA\User_LDAP\tests */ -class Test_Wizard extends \Test\TestCase { +class WizardTest extends \Test\TestCase { protected function setUp() { parent::setUp(); //we need to make sure the consts are defined, otherwise tests will fail |