Merge pull request #778 from owncloud/issue-777

[full-ci] Fixup code reported by phpstan 1.10.1

Author: phil-davis

lib/Access.php

@@ -665,7 +665,6 @@ public function shouldMapToGroupname($groupname) {
 		}
 		$groupBackend = $group->getBackend();
 		$groupBackendClass = \get_class($groupBackend);
-		/** @phpstan-ignore-next-line */
 		if (($groupBackendClass === \OCA\User_LDAP\Group_LDAP::class || $groupBackendClass === \OCA\User_LDAP\Group_Proxy::class)
 				&& \OC::$server->getConfig()->getAppValue('user_ldap', 'reuse_accounts', 'no') === 'yes') {
 			// Account with same groupname exists, and matching backend, we can use this - merge
@@ -2088,7 +2087,7 @@ private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
 					if (!$pagedSearchOK) {
 						return false;
 					}
-				} else {  /** @phpstan-ignore-line */
+				} else {
 					\OC::$server->getLogger()->debug(
 						"No paged search for us at $range",
 						['app' => 'user_ldap']

lib/User/Manager.php

@@ -160,7 +160,7 @@ public function getAttributes($minimal = false) {
 			$attributes[\substr($homeRule, \strlen('attr:'))] = true;
 		}
 		$searchAttributes = $ldapConfig->ldapAttributesForUserSearch;
-		if ($searchAttributes === '' || $searchAttributes === null) { /** @phpstan-ignore-line FIXME empty multiline initializes as '', make it [] */
+		if ($searchAttributes === '' || $searchAttributes === null) { /** FIXME empty multiline initializes as '', make it [] */
 			$searchAttributes = [];
 		}
 		foreach ($searchAttributes as $attr) {

lib/Wizard.php

@@ -719,24 +719,6 @@ private function applyFind($key, $value) {
 		$this->configuration->setConfiguration([$key => $value]);
 	}
 
-	/**
-	 * Checks, whether a port was entered in the Host configuration
-	 * field. In this case the port will be stripped off, but also stored as
-	 * setting.
-	 */
-	private function checkHost() {
-		$host = $this->configuration->ldapHost;
-		$hostInfo = \parse_url($host);
-
-		//removes Port from Host
-		if (\is_array($hostInfo) && isset($hostInfo['port'])) {
-			$port = $hostInfo['port'];
-			$host = \str_replace(':'.$port, '', $host);
-			$this->applyFind('ldap_host', $host);
-			$this->applyFind('ldap_port', (string)$port);
-		}
-	}
-
 	/**
 	 * tries to detect the group member association attribute which is
 	 * one of 'uniqueMember', 'memberUid', 'member'

phpstan.neon

@@ -17,5 +17,5 @@ parameters:
       message: '#^Dead catch [^"]* is never thrown in the try block.$#'
       path: lib/Access.php
     -
-      message: "#Strict comparison using === between non-falsy-string and '' will always evaluate to false.#"
+      message: "#Strict comparison using === between mixed and '' will always evaluate to false.#"
       path: lib/Wizard.php