-
Notifications
You must be signed in to change notification settings - Fork 283
fix: do not show hidden calendars #6770
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
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6770 +/- ##
============================================
+ Coverage 22.88% 22.89% +0.01%
- Complexity 476 478 +2
============================================
Files 252 252
Lines 12307 12309 +2
Branches 2383 2382 -1
============================================
+ Hits 2816 2818 +2
Misses 9143 9143
Partials 348 348
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
The failed tests are due to the missing class on server the required PR needs to be merged |
|
This app works with Nextcloud 30. CI for 30 and 31 will still fail even when the server PR is in. Just FYI. |
Yes, the idea was to back port the server side to 30 and 31 |
4b0ba0a to
b12d8db
Compare
|
@st3iny Do you mid giving this a final review? |
77852f4 to
e1ff31e
Compare
1687935 to
1cb92f9
Compare
|
Pushed a commit to update the psalm-baseline:
Psalm has issues missing interfaces, does not handle interface_exists properly. Adding it to the baseline is therefore okay. The alternative is to safeguard the call with another method_exists check. |
1cb92f9 to
0ef6dbc
Compare
|
Appended the previous commit to add psalm-baseline.xml to REUSE.toml. It's apparently not ideal to have the copyright in the baseline itself because that file is generated. Weird anyway to have a "copyright" for that, I mean it's generated after all 😕 |
I can change it to method_exists. |
kesselb
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested and works.
I believe it's still okay for me to approve this, as I only made changes related to CI and did not modify any code.
Sure! Feel free to drop my commit, I can take care of updating the baseline/moving spdx to resuse.toml later. There is now more psalm errors, but in unrelated code 🤣 |
0ef6dbc to
7230873
Compare
That happend because I had nextcloud/ocp:dev-stable31 installed for updating the baseline and that dropped the entries for ServerVersion which is new in 31, but not available in 30. |
Okay, I'll take care of the other errors |
7230873 to
caac7c7
Compare
|
/backport to stable5.2 |
|
This PR seems a bit cursed 🧙♂️ 😆 Tests need an update. The baseline contains an entry that is no longer valid due to the method_exists check. Please drop my commit; I'll take care of updating the baseline and SPDX in a follow-up. |
caac7c7 to
a763904
Compare
Will do |
|
@st3iny when you get a min, remove your block please |
|
@kesselb I think the easiest would be to back port the server portion to 30, its a fix for a issue Test are failing on 30 because the interface is missing, unless they can be skipped for 30, but not sure that is possible since we need to create a dummy interface, for the inheritance issue |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As much as I dislike saying that, please remove the unit test again. Unfortunately, we can't mock the intersection of multiple interfaces until we upgrade to PHPUnit 10.
For now, test only with the old interface (ICalendar) and pretend that ICalendarIsEnabled does not exist.
Edit: See my next review.
st3iny
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hackity hack but should work ...
I agree, wacky hacky, the best option is just to back port the server code, its a fix for a bug and 30 is still supported. I'll back port it today, now that the freeze is over. |
Looks like back porting to 30 was my original idea, the PR was already created was just waiting for the freeze to be over. 😆 |
Signed-off-by: SebastianKrupinski <[email protected]>
f1c1287 to
82316d5
Compare
|
/backport to stable5.3 |
Resolves: #6767
Requires: nextcloud/server#51081