Merge pull request #9654 from nextcloud/backport/9360/stable13

[stable13] Fix "Invalid argument supplied for foreach()"
nextcloud · May 30, 2018 · 4c1f88e · 4c1f88e
2 parents 3acfcc4 + 0b25317
commit 4c1f88e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
@@ -614,7 +614,7 @@ public function handlePasswordExpiry($params) {
 		$uid = $params['uid'];
 		if(isset($uid) && $uid === $this->getUsername()) {
 			//retrieve relevant user attributes
-			$result = $this->access->search('objectclass=*', $this->dn, ['pwdpolicysubentry', 'pwdgraceusetime', 'pwdreset', 'pwdchangedtime']);
+			$result = $this->access->search('objectclass=*', array($this->dn), ['pwdpolicysubentry', 'pwdgraceusetime', 'pwdreset', 'pwdchangedtime']);
 
 			if(array_key_exists('pwdpolicysubentry', $result[0])) {
 				$pwdPolicySubentry = $result[0]['pwdpolicysubentry'];
@@ -631,7 +631,7 @@ public function handlePasswordExpiry($params) {
 			$cacheKey = 'ppolicyAttributes' . $ppolicyDN;
 			$result = $this->connection->getFromCache($cacheKey);
 			if(is_null($result)) {
-				$result = $this->access->search('objectclass=*', $ppolicyDN, ['pwdgraceauthnlimit', 'pwdmaxage', 'pwdexpirewarning']);
+				$result = $this->access->search('objectclass=*', array($ppolicyDN), ['pwdgraceauthnlimit', 'pwdmaxage', 'pwdexpirewarning']);
 				$this->connection->writeToCache($cacheKey, $result);
 			}
 

diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php
@@ -1132,15 +1132,15 @@ public function testHandlePasswordExpiryWarningDefaultPolicy() {
 		$this->access->expects($this->any())
 			->method('search')
 			->will($this->returnCallback(function($filter, $base) {
-				if($base === 'uid=alice') {
+				if($base === array('uid=alice')) {
 					return array(
 						array(
 							'pwdchangedtime' => array((new \DateTime())->sub(new \DateInterval('P28D'))->format('Ymdhis').'Z'),
 							'pwdgraceusetime' => [],
 						),
 					);
 				}
-				if($base === 'cn=default,ou=policies,dc=foo,dc=bar') {
+				if($base === array('cn=default,ou=policies,dc=foo,dc=bar')) {
 					return array(
 						array(
 							'pwdmaxage' => array('2592000'),
@@ -1202,7 +1202,7 @@ public function testHandlePasswordExpiryWarningCustomPolicy() {
 		$this->access->expects($this->any())
 			->method('search')
 			->will($this->returnCallback(function($filter, $base) {
-				if($base === 'uid=alice') {
+				if($base === array('uid=alice')) {
 					return array(
 						array(
 							'pwdpolicysubentry' => array('cn=custom,ou=policies,dc=foo,dc=bar'),
@@ -1211,7 +1211,7 @@ public function testHandlePasswordExpiryWarningCustomPolicy() {
 						)
 					);
 				}
-				if($base === 'cn=custom,ou=policies,dc=foo,dc=bar') {
+				if($base === array('cn=custom,ou=policies,dc=foo,dc=bar')) {
 					return array(
 						array(
 							'pwdmaxage' => array('2592000'),