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.

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

[stable13] check user state when fetching to avoid dealing with offline objects #9662

Merged
merged 1 commit into from
May 30, 2018

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented May 29, 2018

backport of #9640

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code makes sense 👍

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 29, 2018
@@ -52,7 +52,6 @@

use OC\ServerNotAvailableException;
use OCP\IConfig;
use OCP\Util;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes Phan to fail:

apps/user_ldap/lib/Access.php:588 PhanUndeclaredClassConstant Reference to constant WARN from undeclared class \OCA\User_LDAP\Util
apps/user_ldap/lib/Access.php:1978 PhanUndeclaredClassConstant Reference to constant DEBUG from undeclared class \OCA\User_LDAP\Util

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doh, thx

fixes #9502

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@MorrisJobke MorrisJobke force-pushed the backport/9640/stable13 branch from 8882d32 to d33ba08 Compare May 29, 2018 18:55
@codecov
Copy link

codecov bot commented May 29, 2018

Codecov Report

Merging #9662 into stable13 will increase coverage by 0.04%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable13    #9662      +/-   ##
==============================================
+ Coverage       51.39%   51.44%   +0.04%     
- Complexity      25104    25105       +1     
==============================================
  Files            1612     1612              
  Lines           95545    95562      +17     
  Branches         1376     1376              
==============================================
+ Hits            49107    49158      +51     
+ Misses          46438    46404      -34
Impacted Files Coverage Δ Complexity Δ
apps/user_ldap/lib/Access.php 40.02% <100%> (+3.83%) 320 <2> (+1) ⬆️
apps/user_ldap/templates/renewpassword.php 0% <0%> (ø) 0% <0%> (ø) ⬇️
apps/oauth2/lib/Controller/OauthApiController.php 82.71% <0%> (+0.36%) 12% <0%> (ø) ⬇️
core/js/js.js 66.48% <0%> (+0.66%) 0% <0%> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 91.93% <0%> (+1.61%) 29% <0%> (ø) ⬇️

@MorrisJobke MorrisJobke merged commit db59474 into stable13 May 30, 2018
@MorrisJobke MorrisJobke deleted the backport/9640/stable13 branch May 30, 2018 07:19
@MorrisJobke MorrisJobke mentioned this pull request May 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: ldap
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants