Move Configuration to PSR-4

10 files changed, 14 insertions, 15 deletions

diff --git a/apps/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php
index 3820c05d9d6..18407126fbf 100644
--- a/apps/user_ldap/ajax/getNewServerConfigPrefix.php
+++ b/apps/user_ldap/ajax/getNewServerConfigPrefix.php
@@ -34,12 +34,12 @@ $nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT);
 
 $resultData = array('configPrefix' => $nk);
 
-$newConfig = new \OCA\user_ldap\lib\Configuration($nk, false);
+$newConfig = new \OCA\User_LDAP\Configuration($nk, false);
 if(isset($_POST['copyConfig'])) {
-	$originalConfig = new \OCA\user_ldap\lib\Configuration($_POST['copyConfig']);
+	$originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']);
 	$newConfig->setConfiguration($originalConfig->getConfiguration());
 } else {
-	$configuration = new \OCA\user_ldap\lib\Configuration($nk, false);
+	$configuration = new \OCA\User_LDAP\Configuration($nk, false);
 	$newConfig->setConfiguration($configuration->getDefaults());
 	$resultData['defaults'] = $configuration->getDefaults();
 }
diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index 1d0f6000666..6a67e2a1fd0 100644
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -42,7 +42,7 @@ if(!isset($_POST['ldap_serverconfig_chooser'])) {
 $prefix = (string)$_POST['ldap_serverconfig_chooser'];
 
 $ldapWrapper = new \OCA\User_LDAP\LDAP();
-$configuration = new \OCA\user_ldap\lib\Configuration($prefix);
+$configuration = new \OCA\User_LDAP\Configuration($prefix);
 
 $con = new \OCA\User_LDAP\Connection($ldapWrapper, '', null);
 $con->setConfiguration($configuration->getConfiguration());
diff --git a/apps/user_ldap/lib/Command/CreateEmptyConfig.php b/apps/user_ldap/lib/Command/CreateEmptyConfig.php
index 779dbbc6fd5..c735e51f491 100644
--- a/apps/user_ldap/lib/Command/CreateEmptyConfig.php
+++ b/apps/user_ldap/lib/Command/CreateEmptyConfig.php
@@ -27,7 +27,7 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use \OCA\User_LDAP\Helper;
-use \OCA\user_ldap\lib\Configuration;
+use \OCA\User_LDAP\Configuration;
 
 class CreateEmptyConfig extends Command {
 	/** @var \OCA\User_LDAP\Helper */
diff --git a/apps/user_ldap/lib/Command/SetConfig.php b/apps/user_ldap/lib/Command/SetConfig.php
index d9308c0afd4..d466e1eb769 100644
--- a/apps/user_ldap/lib/Command/SetConfig.php
+++ b/apps/user_ldap/lib/Command/SetConfig.php
@@ -28,7 +28,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use OCA\User_LDAP\Helper;
-use \OCA\user_ldap\lib\Configuration;
+use OCA\User_LDAP\Configuration;
 
 class SetConfig extends Command {
 
diff --git a/apps/user_ldap/lib/Command/ShowConfig.php b/apps/user_ldap/lib/Command/ShowConfig.php
index 91904ca8380..dbd18216f81 100644
--- a/apps/user_ldap/lib/Command/ShowConfig.php
+++ b/apps/user_ldap/lib/Command/ShowConfig.php
@@ -28,8 +28,8 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use \OCA\User_LDAP\Helper;
-use \OCA\user_ldap\lib\Configuration;
+use OCA\User_LDAP\Helper;
+use OCA\User_LDAP\Configuration;
 
 class ShowConfig extends Command {
 	/** @var \OCA\User_LDAP\Helper */
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/Configuration.php
index 418a2bfc015..476483ecc2f 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/Configuration.php
@@ -26,7 +26,7 @@
  *
  */
 
-namespace OCA\user_ldap\lib;
+namespace OCA\User_LDAP;
 
 /**
  * @property int ldapPagingSize holds an integer
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index c565b5bdc43..c63bf903d82 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -33,7 +33,6 @@ namespace OCA\User_LDAP;
 
 use OC\ServerNotAvailableException;
 use OCA\user_ldap\lib\Access;
-use OCA\user_ldap\lib\Configuration;
 
 class Wizard extends LDAPUtility {
 	static protected $l;
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 3bb9689d290..40d02dfaa14 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -67,7 +67,7 @@ $tmpl->assign('toc', $toc);
 $tmpl->assign('settingControls', $sControls);
 
 // assign default values
-$config = new \OCA\user_ldap\lib\Configuration('', false);
+$config = new \OCA\User_LDAP\Configuration('', false);
 $defaults = $config->getDefaults();
 foreach($defaults as $key => $default) {
 	$tmpl->assign($key.'_default', $default);
diff --git a/apps/user_ldap/tests/WizardTest.php b/apps/user_ldap/tests/WizardTest.php
index f0767ea635a..d962e057911 100644
--- a/apps/user_ldap/tests/WizardTest.php
+++ b/apps/user_ldap/tests/WizardTest.php
@@ -29,7 +29,7 @@ use \OCA\User_LDAP\Wizard;
 
 // use \OCA\User_LDAP\User_LDAP as UserLDAP;
 // use \OCA\user_ldap\lib\Access;
-// use \OCA\user_ldap\lib\Configuration;
+// use \OCA\User_LDAP\Configuration;
 // use \OCA\User_LDAP\ILDAPWrapper;
 
 /**
@@ -59,12 +59,12 @@ class WizardTest extends \Test\TestCase {
 		static $accMethods;
 
 		if(is_null($confMethods)) {
-			$confMethods = get_class_methods('\OCA\user_ldap\lib\Configuration');
+			$confMethods = get_class_methods('\OCA\User_LDAP\Configuration');
 			$connMethods = get_class_methods('\OCA\User_LDAP\Connection');
 			$accMethods  = get_class_methods('\OCA\user_ldap\lib\Access');
 		}
 		$lw   = $this->getMock('\OCA\User_LDAP\ILDAPWrapper');
-		$conf = $this->getMock('\OCA\user_ldap\lib\Configuration',
+		$conf = $this->getMock('\OCA\User_LDAP\Configuration',
 							   $confMethods,
 							   array($lw, null, null));
 
diff --git a/apps/user_ldap/tests/configuration.php b/apps/user_ldap/tests/configuration.php
index 3b87223b75b..d4f1ce142bd 100644
--- a/apps/user_ldap/tests/configuration.php
+++ b/apps/user_ldap/tests/configuration.php
@@ -89,7 +89,7 @@ class Test_Configuration extends \Test\TestCase {
 	 * @dataProvider configurationDataProvider
 	 */
 	public function testSetValue($key, $input, $expected) {
-		$configuration = new \OCA\user_ldap\lib\Configuration('t01', false);
+		$configuration = new \OCA\User_LDAP\Configuration('t01', false);
 
 		$settingsInput = array(
 			'ldapBaseUsers' => array(