Skip to content
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

Add mode parameter to wrapSource #15

Merged
merged 1 commit into from
Jun 14, 2021

Conversation

juliusknorr
Copy link
Contributor

Allow passing the mode in the wrapSource signature to avoid declaration errors when extending from the class in the Nextcloud encryption code:

https://github.com/nextcloud/server/blob/73c7d0dc8156703341733b9c39c69d05263173da/lib/private/Files/Stream/Encryption.php#L203

Should resole nextcloud/server#26464

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr
Copy link
Contributor Author

@icewind1991 Request for review 😉

@AndyXheli
Copy link

AndyXheli commented May 25, 2021

@juliushaertl Thank you so much for looking into this what dir should i makes these changes too seems like there are two of the WrapperHandler.php

/var/www/nextcloud/3rdparty/icewind/streams/src/WrapperHandler.php
/var/www/nextcloud/apps/files_external/3rdparty/icewind/streams/src/WrapperHandler.php

So on Nextcloud 20.0.10 i only see
/var/www/nextcloud/apps/files_external/3rdparty/icewind/streams/src/WrapperHandler.php

& on NC 21.0.2 i see both
/var/www/nextcloud/3rdparty/icewind/streams/src/WrapperHandler.php
/var/www/nextcloud/apps/files_external/3rdparty/icewind/streams/src/WrapperHandler.php

@AndyXheli
Copy link

AndyXheli commented May 28, 2021

I can confirm this dose fix the issue on NC 21.0.2 but not on NC 20.0.10 maybe because NC20.0.10 dose not have both folder structures like NC 21

@AndyXheli
Copy link

@icewind1991 are you able to review this :)

@icewind1991 icewind1991 merged commit 0c6aae1 into icewind1991:master Jun 14, 2021
@juliusknorr juliusknorr deleted the enh/wrapsource-mode branch June 14, 2021 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants