Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[backport #13740] backport #13740 to stable7 #13742

Merged
merged 3 commits into from May 26, 2015
Merged

[backport #13740] backport #13740 to stable7 #13742

merged 3 commits into from May 26, 2015

Conversation

blizzz
Copy link
Contributor

@blizzz blizzz commented Jan 28, 2015

Same as #13740 but for stable7

Also incorporates a backport of #15606

This was referenced Jan 28, 2015
Closed
Merged
@blizzz
Copy link
Contributor Author

blizzz commented Jan 28, 2015

One bug was detected by scrutinizer, will fix it

@DeepDiver1975
Copy link
Member

@blizzz

00:25:58.982 PHP Fatal error:  Call to undefined method Mock_Access_b3b5cb35::getFilterForUserCount() in /var/jenkins/workspace/pull-request-analyser-ng-simple@2/label/SLAVE/apps/user_ldap/group_ldap.php on line 266
00:25:58.982 PHP Stack trace:
00:25:58.982 PHP   1. {main}() /usr/local/bin/phpunit:0
00:25:58.982 PHP   2. PHPUnit_TextUI_Command::main() /usr/local/bin/phpunit:605
00:25:58.982 PHP   3. PHPUnit_TextUI_Command->run() phar:///usr/local/bin/phpunit/phpunit/TextUI/Command.php:138
00:25:58.982 PHP   4. PHPUnit_TextUI_TestRunner->doRun() phar:///usr/local/bin/phpunit/phpunit/TextUI/Command.php:186
00:25:58.983 PHP   5. PHPUnit_Framework_TestSuite->run() phar:///usr/local/bin/phpunit/phpunit/TextUI/TestRunner.php:423
00:25:58.983 PHP   6. PHPUnit_Framework_TestSuite->run() phar:///usr/local/bin/phpunit/phpunit/Framework/TestSuite.php:751
00:25:58.983 PHP   7. PHPUnit_Framework_TestCase->run() phar:///usr/local/bin/phpunit/phpunit/Framework/TestSuite.php:751
00:25:58.983 PHP   8. PHPUnit_Framework_TestResult->run() phar:///usr/local/bin/phpunit/phpunit/Framework/TestCase.php:711
00:25:58.983 PHP   9. PHP_Invoker->invoke() phar:///usr/local/bin/phpunit/phpunit/Framework/TestResult.php:641
00:25:58.984 PHP  10. call_user_func_array:{phar:///usr/local/bin/phpunit/php-invoker/Invoker.php:93}() phar:///usr/local/bin/phpunit/php-invoker/Invoker.php:93
00:25:58.984 PHP  11. PHPUnit_Framework_TestCase->runBare() phar:///usr/local/bin/phpunit/php-invoker/Invoker.php:93
00:25:58.984 PHP  12. PHPUnit_Framework_TestCase->runTest() phar:///usr/local/bin/phpunit/phpunit/Framework/TestCase.php:775
00:25:58.984 PHP  13. ReflectionMethod->invokeArgs() phar:///usr/local/bin/phpunit/phpunit/Framework/TestCase.php:905
00:25:58.984 PHP  14. OCA\user_ldap\tests\Test_Group_Ldap->testCountEmptySearchString() phar:///usr/local/bin/phpunit/phpunit/Framework/TestCase.php:905
00:25:58.984 PHP  15. OCA\user_ldap\GROUP_LDAP->countUsersInGroup() /var/jenkins/workspace/pull-request-analyser-ng-simple@2/label/SLAVE/apps/user_ldap/tests/group_ldap.php:86
00:25:58.984 PHP  16. OCA\user_ldap\GROUP_LDAP->countUsersInPrimaryGroup() /var/jenkins/workspace/pull-request-analyser-ng-simple@2/label/SLAVE/apps/user_ldap/group_ldap.php:554
00:25:58.984 PHP  17. OCA\user_ldap\GROUP_LDAP->prepareFilterForUsersInPrimaryGroup() /var/jenkins/workspace/pull-request-analyser-ng-simple@2/label/SLAVE/apps/user_ldap/group_ldap.php:311
00:25:59.066 PHP Warning:  Unknown: Cannot destroy the zip context in Unknown on line 0
00:25:59.066 PHP Stack trace:
00:25:59.066 PHP   1. {main}() /usr/local/bin/phpunit:0
00:25:59.066 PHP   2. PHPUnit_TextUI_Command::main() /usr/local/bin/phpunit:605
00:25:59.067 PHP   3. PHPUnit_TextUI_Command->run() phar:///usr/local/bin/phpunit/phpunit/TextUI/Command.php:138
00:25:59.067 PHP   4. PHPUnit_TextUI_TestRunner->doRun() phar:///usr/local/bin/phpunit/phpunit/TextUI/Command.php:186
00:25:59.067 PHP   5. PHPUnit_Framework_TestSuite->run() phar:///usr/local/bin/phpunit/phpunit/TextUI/TestRunner.php:423
00:25:59.067 PHP   6. PHPUnit_Framework_TestSuite->run() phar:///usr/local/bin/phpunit/phpunit/Framework/TestSuite.php:751
00:25:59.067 PHP   7. PHPUnit_Framework_TestCase->run() phar:///usr/local/bin/phpunit/phpunit/Framework/TestSuite.php:751
00:25:59.068 PHP   8. PHPUnit_Framework_TestResult->run() phar:///usr/local/bin/phpunit/phpunit/Framework/TestCase.php:711
00:25:59.068 PHP   9. PHP_Invoker->invoke() phar:///usr/local/bin/phpunit/phpunit/Framework/TestResult.php:641
00:25:59.068 PHP  10. call_user_func_array:{phar:///usr/local/bin/phpunit/php-invoker/Invoker.php:93}() phar:///usr/local/bin/phpunit/php-invoker/Invoker.php:93
00:25:59.068 PHP  11. PHPUnit_Framework_TestCase->runBare() phar:///usr/local/bin/phpunit/php-invoker/Invoker.php:93
00:25:59.068 PHP  12. PHPUnit_Framework_TestCase->runTest() phar:///usr/local/bin/phpunit/phpunit/Framework/TestCase.php:775
00:25:59.068 PHP  13. ReflectionMethod->invokeArgs() phar:///usr/local/bin/phpunit/phpunit/Framework/TestCase.php:905
00:25:59.068 PHP  14. OCA\user_ldap\tests\Test_Group_Ldap->testCountEmptySearchString() phar:///usr/local/bin/phpunit/phpunit/Framework/TestCase.php:905
00:25:59.068 PHP  15. OCA\user_ldap\GROUP_LDAP->countUsersInGroup() /var/jenkins/workspace/pull-request-analyser-ng-simple@2/label/SLAVE/apps/user_ldap/tests/group_ldap.php:86
00:25:59.068 PHP  16. OCA\user_ldap\GROUP_LDAP->countUsersInPrimaryGroup() /var/jenkins/workspace/pull-request-analyser-ng-simple@2/label/SLAVE/apps/user_ldap/group_ldap.php:554
00:25:59.068 PHP  17. OCA\user_ldap\GROUP_LDAP->prepareFilterForUsersInPrimaryGroup() /var/jenkins/workspace/pull-request-analyser-ng-simple@2/label/SLAVE/apps/user_ldap/group_ldap.php:311
00:25:59.068 PHP Warning:  Unknown: Cannot destroy the zip context in Unknown on line 0

@blizzz
Copy link
Contributor Author

blizzz commented Jan 28, 2015

@DeepDiver1975 that's what i mentioned earlier. fixed now.

@DeepDiver1975 DeepDiver1975 changed the title Stable7 backport of #13740 [backport #13740] backport #13740 to stable7 Jan 30, 2015
@MorrisJobke MorrisJobke added this to the 7.0.5-next-maintenance milestone Feb 3, 2015
@DeepDiver1975 DeepDiver1975 removed this from the 7.0.5-next-maintenance milestone Feb 5, 2015
@DeepDiver1975
Copy link
Member

has to be scheduled for 7.0.6 - THX

@LukasReschke LukasReschke added this to the 7.0.6 milestone Feb 24, 2015
@blizzz
Copy link
Contributor Author

blizzz commented Mar 24, 2015

This one also needs testers/reviewers @jnfrmarks @MorrisJobke @LukasReschke

@blizzz
Copy link
Contributor Author

blizzz commented Apr 14, 2015

Oh my, this has a beard.

I will rebase and add the backport of #15606 which is necessary for #13533 as well.

@blizzz
Backport of #13740
f3bd266 
inlcude AD primary group in user filter, if a group is selected. fixes #12190

fix counting of users in primary group

:lipstick:

adept to OC 7

and escape the search term

Conflicts:
	apps/user_ldap/lib/connection.php
@blizzz
Fixes returns of group memberships and counting if all members have t…
07988cf 
…he specific groups as primary set.
@blizzz blizzz mentioned this pull request Apr 14, 2015
Merged
@scrutinizer-notifier
Copy link

The inspection completed: 2 new issues, 5 updated code elements

@ghost
Copy link

ghost commented May 18, 2015

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/12373/
🚀 Test PASSed.🚀
chuck

@MorrisJobke
Copy link
Contributor

@cmonteroluque @craigpg This is the same as #16456 for stable7

@MorrisJobke
Copy link
Contributor

@sbelov1 @bboule @jnfrmarks @plastilincheg @rjaeckel @gig13 Please test. I tested this with an LDAP instance and all works like before and no errors are logged.

👍

@DeepDiver1975
Copy link
Member

we need testing power here @rperezb THX

@bboule
Copy link

bboule commented May 21, 2015

Will ask team to test here as well!!

@sbelov1
Copy link

sbelov1 commented May 21, 2015

I've tested this in my internal lab and it did fix the issue. Correct number of Domain Users was shown in the app and Users page.

@DeepDiver1975
Copy link
Member

I've tested this in my internal lab and it did fix the issue.

treating this as 👍

DeepDiver1975 added a commit that referenced this pull request May 26, 2015
@DeepDiver1975
Merge pull request #13742 from owncloud/fix-12190-2-stable7
55a122a 
[backport #13740] backport #13740 to stable7
@DeepDiver1975 DeepDiver1975 merged commit 55a122a into stable7 May 26, 2015
@DeepDiver1975 DeepDiver1975 deleted the fix-12190-2-stable7 branch May 26, 2015 14:06
@rperezb
Copy link

rperezb commented May 27, 2015

@DeepDiver1975 hey @jvillafanez will check it, he has been working on checking 7.0.6 bug fixing

@LukasReschke LukasReschke mentioned this pull request Jun 1, 2015
Closed
@lock lock bot locked as resolved and limited conversation to collaborators Aug 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
3 - To Review blue-ticket purple-ticket
Projects
None yet
Milestone
7.0.6
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@blizzz @DeepDiver1975 @scrutinizer-notifier @MorrisJobke @bboule @sbelov1 @rperezb @LukasReschke