fix: Adapt return type for Nextcloud 26

[juliusknorr]

Changed in nextcloud/server#36120

Should still be compatible with 25 as adding the return type on the child class is ok if none is there on the parent.

[cypress]

10 failed and 1 flaky tests on run #263 ↗︎

10

40

0

0

1

Details:

fix: Adapt return type for Nextcloud 26
Project: Collectives	Commit: a40379b4df
Status: Failed	Duration: 12:49 💡
Started: Feb 10, 2023 6:09 PM	Ended: Feb 10, 2023 6:22 PM

  pages.spec.js • 2 failed tests

View Output Video

Test
Page > Editing a page > Supports page content editing and switching to read mode		Screenshot
Page > Display table of contents > Allows to display/close TOC and switch page modes in between		Screenshot

  pages-links.spec.js • 8 failed tests

View Output Video

Test
Page > Link handling internal > Opens link to image in Nextcloud in viewer		Screenshot
Page > Link handling internal > Opens link to text file in Nextcloud in viewer		Screenshot
Page > Link handling internal > Opens link to page in this collective in same/new tab depending on view/edit mode		Screenshot
Page > Link handling internal > Opens link to page in other collective in same/new tab depending on view/edit mode		Screenshot
Page > Link handling internal > Opens link to another Nextcloud app in new tab		Screenshot
Page > Link handling internal > Opens link to external page in new tab		Screenshot
Page > Link handling public share > Public share: opens link to page in this collective in same/new tab depending on view/edit mode		Screenshot
Page > Link handling public share > Public share: opens link to external page in new tab		Screenshot

  cypress/e2e/pages.spec.js • 1 flaky test

View Output Video

Test
Page > Creating a page from template > New page has template content		Screenshot

_{This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.}

[max-nextcloud]

Good catch! But it turns out this is possible in stable25 - but not in php 7.4 which stable25 still supports. So i don't know what to do here.

[juliusknorr]

cc @come-nc as you added the return type on the storage wrapper. Any idea how we could stay compatible with 7.4 still? Otherwise apps implementing a wrapper would be forced to release separate versions for 25/26.

[juliusknorr]

Found a way by having two separate classes and let psalm ignore the error for php 7.4. Not really nice but at least save us from needing to branch off for Nextcloud 26. @mejo- What do you think?

[max-nextcloud]

@juliushaertl sounds great! I was wondering if something like this would be possible.
I think the Lint / php-cs failure and the PHPUnit failures are still related to this though.

update: I addressed those two.

[come-nc]

Way too many applications got hit by this change in OC.
It seems some of files classes should move to OCP, if so many applications depend on them anyway…