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

[stable12] CardDAV convertor check should not be to wide #7456

Merged
merged 1 commit into from Dec 12, 2017

Conversation

Projects
None yet
3 participants
@rullzer
Member

rullzer commented Dec 11, 2017

Backport of #7342

CardDAV convertor check should not be to wide
Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@codecov

This comment has been minimized.

codecov bot commented Dec 11, 2017

Codecov Report

Merging #7456 into stable12 will increase coverage by <.01%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable12    #7456      +/-   ##
==============================================
+ Coverage       53.92%   53.93%   +<.01%     
- Complexity      22701    22702       +1     
==============================================
  Files            1384     1384              
  Lines           86955    86956       +1     
  Branches         1330     1330              
==============================================
+ Hits            46889    46896       +7     
+ Misses          40066    40060       -6
Impacted Files Coverage Δ Complexity Δ
apps/dav/lib/CardDAV/Converter.php 73.52% <100%> (+0.39%) 24 <0> (+1) ⬆️
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)
core/js/js.js 61.83% <0%> (+0.55%) 0% <0%> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 91.93% <0%> (+1.61%) 29% <0%> (ø) ⬇️
@blizzz

blizzz approved these changes Dec 12, 2017

@blizzz blizzz added 4. to release and removed 3. to review labels Dec 12, 2017

@MorrisJobke MorrisJobke merged commit f44d5bd into stable12 Dec 12, 2017

3 checks passed

codecov/patch 100% of diff hit (target 53.92%)
Details
codecov/project 53.93% (+<.01%) compared to 2bd2835
Details
continuous-integration/drone/pr the build was successful
Details

@MorrisJobke MorrisJobke deleted the 12_7342 branch Dec 12, 2017

@MorrisJobke MorrisJobke referenced this pull request Jan 8, 2018

Merged

12.0.5 RC1 #7740

13 of 13 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment