mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9617 from nextcloud/users-sort-case-fix 

Ignore case when sorting users
This commit is contained in:
Morris Jobke 2018-05-28 15:52:37 +02:00 committed by GitHub
parent b76f806857 ad6e548411
commit 9ddff6ff35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/User/Manager.php
View File

@ -239,7 +239,7 @@ class Manager extends PublicEmitter implements IUserManager {
* @var \OC\User\User $a * @var \OC\User\User $a
* @var \OC\User\User $b * @var \OC\User\User $b
*/ */
return strcmp($a->getUID(), $b->getUID()); return strcasecmp($a->getUID(), $b->getUID());
}); });
return $users; return $users;
} }
@ -268,7 +268,7 @@ class Manager extends PublicEmitter implements IUserManager {
* @var \OC\User\User $a * @var \OC\User\User $a
* @var \OC\User\User $b * @var \OC\User\User $b
*/ */
return strcmp(strtolower($a->getDisplayName()), strtolower($b->getDisplayName())); return strcasecmp($a->getDisplayName(), $b->getDisplayName());
}); });
return $users; return $users;
} }

6
tests/lib/User/ManagerTest.php
View File

@ -236,7 +236,7 @@ class ManagerTest extends TestCase {
$backend->expects($this->once()) $backend->expects($this->once())
->method('getUsers') ->method('getUsers')
->with($this->equalTo('fo')) ->with($this->equalTo('fo'))
->will($this->returnValue(array('foo', 'afoo'))); ->will($this->returnValue(array('foo', 'afoo', 'Afoo1', 'Bfoo')));
$backend->expects($this->never()) $backend->expects($this->never())
->method('loginName2UserName'); ->method('loginName2UserName');
@ -244,8 +244,10 @@ class ManagerTest extends TestCase {
$manager->registerBackend($backend); $manager->registerBackend($backend);
$result = $manager->search('fo'); $result = $manager->search('fo');
$this->assertEquals(2, count($result)); $this->assertEquals(4, count($result));
$this->assertEquals('afoo', array_shift($result)->getUID()); $this->assertEquals('afoo', array_shift($result)->getUID());
$this->assertEquals('Afoo1', array_shift($result)->getUID());
$this->assertEquals('Bfoo', array_shift($result)->getUID());
$this->assertEquals('foo', array_shift($result)->getUID()); $this->assertEquals('foo', array_shift($result)->getUID());
} }