diff options
author | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-11 13:35:35 +0200 |
---|---|---|
committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-25 11:45:55 +0200 |
commit | 452efa5fababa7c64ad450fda781c5d0c099c02e (patch) | |
tree | d4e91051dccc19d84ed791d768fbe385340c2b78 /apps/user_ldap/tests | |
parent | c6bcb07f8373b3a1515fc2f26872a0256ee3666d (diff) | |
download | nextcloud-server-452efa5fababa7c64ad450fda781c5d0c099c02e.tar.gz nextcloud-server-452efa5fababa7c64ad450fda781c5d0c099c02e.zip |
Port of LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups #9002
fix PHPdoc
Conflicts:
apps/user_ldap/lib/connection.php
add method to count groups on LDAP
Conflicts:
apps/user_ldap/lib/access.php
LDAP Wizard: count users and groups with the power of paged search
Conflicts:
apps/user_ldap/lib/wizard.php
consolidate requirement check
fix PHPdoc
Conflicts:
apps/user_ldap/lib/access.php
Wizard: get really all groups from LDAP by power of Paged Search
Conflicts:
apps/user_ldap/lib/wizard.php
make all this work in an early configuration state in the wizard by marking the config active and ignoring the validation state.
Conflicts:
apps/user_ldap/lib/connection.php
simplify two methods a bit, because they are not used for group search anymore
Conflicts:
apps/user_ldap/lib/wizard.php
remove unused vars; increase scrutinizer happiness
Diffstat (limited to 'apps/user_ldap/tests')
-rw-r--r-- | apps/user_ldap/tests/wizard.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php index 2b5cabc705d..ff5ee010b71 100644 --- a/apps/user_ldap/tests/wizard.php +++ b/apps/user_ldap/tests/wizard.php @@ -127,7 +127,7 @@ class Test_Wizard extends \PHPUnit_Framework_TestCase { # The following expectations are the real test # $filters = array('f1', 'f2', '*'); - $wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 5); + $wizard->cumulativeSearchOnAttribute($filters, 'cn', 5); unset($uidnumber); } @@ -203,8 +203,8 @@ class Test_Wizard extends \PHPUnit_Framework_TestCase { # The following expectations are the real test # $filters = array('f1', 'f2', '*'); - $wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 0); + $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0); unset($uidnumber); } -}
\ No newline at end of file +} |