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] Do not load calendar/addressbook plugins if not needed #9655

Merged
merged 8 commits into from May 31, 2018

Conversation

Projects
None yet
4 participants
@rullzer
Member

rullzer commented May 29, 2018

Backport of #9268

@blizzz

blizzz approved these changes May 29, 2018

🐘

@skjnldsv

skjnldsv approved these changes May 30, 2018 edited

elephant

rullzer added some commits Apr 23, 2018

Do not load calendar/addressbook plugins if not needed
Fixes #6711
Based on owncloud/core@f0fb21c

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
When sharing calendars and addressbooks the principal has to be verif…
…ied to be valid

owncloud/core@d3fb8fc

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
CalDAV and CardDAV plugins need to be registered for the principals c…
…ollection as well

owncloud/core@9f2e643

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Adding repair step which cleans shares of invalid principals
owncloud/core@edacf22

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Move repairstep to a custom command
People that have issues can run it manually

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

This comment has been minimized.

Member

skjnldsv commented May 30, 2018

Rebased

@codecov

This comment has been minimized.

codecov bot commented May 30, 2018

Codecov Report

Merging #9655 into stable13 will increase coverage by 0.01%.
The diff coverage is 76.38%.

@@              Coverage Diff               @@
##             stable13    #9655      +/-   ##
==============================================
+ Coverage       51.43%   51.44%   +0.01%     
- Complexity      25106    25120      +14     
==============================================
  Files            1612     1613       +1     
  Lines           95544    95589      +45     
  Branches         1376     1376              
==============================================
+ Hits            49143    49179      +36     
- Misses          46401    46410       +9
Impacted Files Coverage Δ Complexity Δ
apps/dav/lib/Connector/Sabre/Principal.php 86.84% <0%> (-3.99%) 48 <0> (+2)
apps/dav/composer/composer/autoload_classmap.php 0% <0%> (ø) 0 <0> (ø) ⬇️
apps/dav/composer/composer/autoload_static.php 0% <0%> (ø) 1 <0> (ø) ⬇️
apps/dav/composer/composer/ClassLoader.php 0% <0%> (ø) 64 <0> (-1) ⬇️
apps/dav/lib/CardDAV/AddressBook.php 57.5% <100%> (ø) 28 <0> (ø) ⬇️
apps/dav/lib/DAV/Sharing/Backend.php 87.36% <100%> (+0.55%) 26 <5> (+2) ⬆️
apps/dav/lib/CalDAV/Calendar.php 70.28% <100%> (ø) 48 <0> (ø) ⬇️
apps/dav/lib/Command/RemoveInvalidShares.php 92% <92%> (ø) 6 <6> (?)
apps/dav/lib/Server.php 47.46% <95.83%> (+2.8%) 22 <3> (+5) ⬆️
... and 1 more

@MorrisJobke MorrisJobke referenced this pull request May 31, 2018

Merged

13.0.3 RC 1 #9700

Remove type hints for PHP 5.6
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke

This comment has been minimized.

Member

MorrisJobke commented May 31, 2018

cough cough I removed the type hints for PHP 5.6 compatibility. 😉

Remove not needed change
Signed-off-by: Morris Jobke <hey@morrisjobke.de>

@rullzer rullzer merged commit f7372be into stable13 May 31, 2018

3 checks passed

codecov/patch 76.38% of diff hit (target 51.43%)
Details
codecov/project 51.44% (+0.01%) compared to 4c1f88e
Details
continuous-integration/drone/pr the build was successful
Details

@rullzer rullzer deleted the backport/9268/stable13 branch May 31, 2018

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