Skip to content

[stable13] Do not load calendar/addressbook plugins if not needed - #9655

Merged
rullzer merged 8 commits into
stable13from
backport/9268/stable13
May 31, 2018
Merged

[stable13] Do not load calendar/addressbook plugins if not needed#9655
rullzer merged 8 commits into
stable13from
backport/9268/stable13

Conversation

@rullzer

@rullzerrullzer commented May 29, 2018

Copy link
Copy Markdown
Member

Backport of #9268

@rullzerrullzer added this to the Nextcloud 13.0.3 milestone May 29, 2018
blizzz
blizzz approved these changes May 29, 2018
View reviewed changes

@blizzzblizzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🐘

skjnldsv
skjnldsv approved these changes May 30, 2018
View reviewed changes

@skjnldsvskjnldsv left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

elephant

rullzer added 6 commits May 30, 2018 13:27
@rullzer@skjnldsv
Do not load calendar/addressbook plugins if not needed
ed0069b
Fixes#6711
Based on owncloud/core@f0fb21c
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer@skjnldsv
When sharing calendars and addressbooks the principal has to be verif…
3a133b1
…ied to be valid
owncloud/core@d3fb8fc
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer@skjnldsv
CalDAV and CardDAV plugins need to be registered for the principals c…
0f88f3f
…ollection as well
owncloud/core@9f2e643
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer@skjnldsv
Adding repair step which cleans shares of invalid principals
1ea356c
owncloud/core@edacf22
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer@skjnldsv
Fix tests
29f1ea2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer@skjnldsv
Move repairstep to a custom command
4fae9be
People that have issues can run it manually
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@skjnldsv
skjnldsvforce-pushed the backport/9268/stable13 branch from 6b4f559 to 4fae9beCompareMay 30, 2018 11:28
@skjnldsv

skjnldsv commented May 30, 2018

Copy link
Copy Markdown
Member

Rebased

@codecov

codecovBot commented May 30, 2018•
edited
Loading

Copy link
Copy Markdown

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 FilesCoverage ΔComplexity Δ
apps/dav/lib/Connector/Sabre/Principal.php86.84% <0%> (-3.99%)48 <0> (+2)
apps/dav/composer/composer/autoload_classmap.php0% <0%> (ø)0 <0> (ø)⬇️
apps/dav/composer/composer/autoload_static.php0% <0%> (ø)1 <0> (ø)⬇️
apps/dav/composer/composer/ClassLoader.php0% <0%> (ø)64 <0> (-1)⬇️
apps/dav/lib/CardDAV/AddressBook.php57.5% <100%> (ø)28 <0> (ø)⬇️
apps/dav/lib/DAV/Sharing/Backend.php87.36% <100%> (+0.55%)26 <5> (+2)⬆️
apps/dav/lib/CalDAV/Calendar.php70.28% <100%> (ø)48 <0> (ø)⬇️
apps/dav/lib/Command/RemoveInvalidShares.php92% <92%> (ø)6 <6> (?)
apps/dav/lib/Server.php47.46% <95.83%> (+2.8%)22 <3> (+5)⬆️
... and 1 more

@MorrisJobkeMorrisJobke mentioned this pull request May 31, 2018
Merged
@MorrisJobke
Remove type hints for PHP 5.6
fa41a4c
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke

MorrisJobke commented May 31, 2018

Copy link
Copy Markdown
Member

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

@MorrisJobke
Remove not needed change
d62f5c1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobkeMorrisJobke 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 31, 2018
@MorrisJobkeMorrisJobke mentioned this pull request May 31, 2018
Merged
@rullzer
rullzer merged commit f7372be into stable13May 31, 2018
@rullzer
rullzer deleted the backport/9268/stable13 branch May 31, 2018 17:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blizzzblizzzblizzz approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@MorrisJobkeMorrisJobkeAwaiting requested review from MorrisJobke
@icewind1991icewind1991Awaiting requested review from icewind1991
@schiessleschiessleAwaiting requested review from schiessle

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugenhancement

Projects

None yet

Milestone

Nextcloud 13.0.3

Development

Successfully merging this pull request may close these issues.

4 participants

@rullzer@skjnldsv@MorrisJobke@blizzz