Merge pull request #1143 from nextcloud/ldap-smells-for-fun-and-profit

fix a few minor code smells

apps/user_ldap/js/wizard/wizard.js

@@ -70,7 +70,7 @@ OCA = OCA || {};
 		controller.setView(view);
 		controller.setModel(model);
 		controller.run();
-	}
+	};
 
 	OCA.LDAP.Wizard.Wizard = Wizard;
 })();

apps/user_ldap/lib/Access.php

@@ -869,7 +869,7 @@ class Access extends LDAPUtility implements IUserTools {
 
 			//browsing through prior pages to get the cookie for the new one
 			if($skipHandling) {
-				return;
+				return false;
 			}
 			// if count is bigger, then the server does not support
 			// paged search. Instead, he did a normal search. We set a
@@ -983,7 +983,6 @@ class Access extends LDAPUtility implements IUserTools {
 		$findings = array();
 		$savedoffset = $offset;
 		do {
-			$continue = false;
 			$search = $this->executeSearch($filter, $base, $attr, $limit, $offset);
 			if($search === false) {
 				return array();

apps/user_ldap/lib/Configuration.php

@@ -106,12 +106,13 @@ class Configuration {
 
 	/**
 	 * @param string $name
-	 * @return mixed|void
+	 * @return mixed|null
 	 */
 	public function __get($name) {
 		if(isset($this->config[$name])) {
 			return $this->config[$name];
 		}
+		return null;
 	}
 
 	/**
@@ -182,7 +183,7 @@ class Configuration {
 				$applied[] = $inputKey;
 			}
 		}
-
+		return null;
 	}
 
 	public function readConfiguration() {

apps/user_ldap/lib/Connection.php

@@ -558,12 +558,13 @@ class Connection extends LDAPUtility {
 			}
 			return $bindStatus;
 		}
+		return null;
 	}
 
 	/**
 	 * @param string $host
 	 * @param string $port
-	 * @return false|void
+	 * @return bool
 	 * @throws \OC\ServerNotAvailableException
 	 */
 	private function doConnect($host, $port) {
@@ -580,6 +581,7 @@ class Connection extends LDAPUtility {
 		} else {
 			throw new \OC\ServerNotAvailableException('Could not set required LDAP Protocol version.');
 		}
+		return true;
 	}
 
 	/**

apps/user_ldap/lib/Jobs/UpdateGroups.php

@@ -44,7 +44,6 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob {
 	static private $groupsFromDB;
 
 	static private $groupBE;
-	static private $connector;
 
 	public function __construct(){
 		$this->interval = self::getRefreshInterval();

apps/user_ldap/lib/LDAP.php

@@ -259,6 +259,7 @@ class LDAP implements ILDAPWrapper {
 			}
 			return $result;
 		}
+		return null;
 	}
 
 	/**

apps/user_ldap/lib/User_LDAP.php

@@ -189,11 +189,6 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 			$this->access->connection->ldapUserDisplayName . '=*',
 			$this->access->getFilterPartForUserSearch($search)
 		));
-		$attrs = array($this->access->connection->ldapUserDisplayName, 'dn');
-		$additionalAttribute = $this->access->connection->ldapUserDisplayName2;
-		if(!empty($additionalAttribute)) {
-			$attrs[] = $additionalAttribute;
-		}
 
 		\OCP\Util::writeLog('user_ldap',
 			'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter,

apps/user_ldap/lib/Wizard.php

@@ -943,7 +943,6 @@ class Wizard extends LDAPUtility {
 				$cns = $this->configuration->ldapGroupFilterGroups;
 				if(is_array($cns) && count($cns) > 0) {
 					$filter .= '(|';
-					$base = $this->configuration->ldapBase[0];
 					foreach($cns as $cn) {
 						$filter .= '(cn=' . $cn . ')';
 					}

apps/user_ldap/tests/AccessTest.php

@@ -201,6 +201,7 @@ class AccessTest extends \Test\TestCase {
 						return $case['interResult'];
 					}
 				}
+				return null;
 			}));
 
 		foreach($cases as $case) {

apps/user_ldap/tests/ConfigurationTest.php

@@ -93,14 +93,6 @@ class ConfigurationTest extends \Test\TestCase {
 	public function testSetValue($key, $input, $expected) {
 		$configuration = new \OCA\User_LDAP\Configuration('t01', false);
 
-		$settingsInput = array(
-			'ldapBaseUsers' => array(
-				'cn=someUsers,dc=example,dc=org',
-				'  ',
-				' cn=moreUsers,dc=example,dc=org '
-			)
-		);
-
 		$configuration->setConfiguration([$key => $input]);
 		$this->assertSame($configuration->$key, $expected);
 	}

apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php

@@ -111,7 +111,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 	 */
 	protected function case2() {
 		\OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', true);
-		$userManager = \oc::$server->getUserManager();
+		$userManager = \OC::$server->getUserManager();
 		// clearing backends is critical, otherwise the userManager will have
 		// the user objects cached and the value from case1 returned
 		$userManager->clearBackends();
@@ -144,7 +144,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 		$this->connection->setConfiguration([
 			'homeFolderNamingRule' => 'attr:',
 		]);
-		$userManager = \oc::$server->getUserManager();
+		$userManager = \OC::$server->getUserManager();
 		$userManager->clearBackends();
 		$userManager->registerBackend($this->backend);
 		$users = $userManager->search('', 5, 0);

apps/user_ldap/tests/User/ManagerTest.php

@@ -208,7 +208,6 @@ class ManagerTest extends \Test\TestCase {
 		list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) =
 			$this->getTestInstances();
 
-		$dn = 'cn=foo,dc=foobar,dc=bar';
 		$uid = 'gone';
 
 		$access->expects($this->never())