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.

Sign up for GitHub

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

Jump to bottom

Bump icewind/streams from 0.7.1 to 0.7.2 #24533

Merged
merged 1 commit into from
Dec 29, 2020
Merged

Bump icewind/streams from 0.7.1 to 0.7.2 #24533

merged 1 commit into from
Dec 29, 2020

Conversation

ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Dec 3, 2020 •
edited
Loading

@ChristophWurst ChristophWurst added this to the Nextcloud 21 milestone Dec 3, 2020
@ChristophWurst ChristophWurst self-assigned this Dec 3, 2020
@ChristophWurst ChristophWurst force-pushed the dependabot/composer/icewind/streams-0.7.2 branch from d36da7e to 17fa2a3 Compare December 3, 2020 10:06
@MorrisJobke
Copy link
Member

Psalm is not happy :(

@ChristophWurst
Copy link
Member Author

Over method overwrites like \OC\Files\Stream\Encryption::wrapSource have to be adjusted. In this specific example we use a $mode param that got dropped.

@icewind1991 could you take care? I think you understand the changes best ✌️

@rullzer rullzer force-pushed the dependabot/composer/icewind/streams-0.7.2 branch from 2135f8b to 76c17a4 Compare December 4, 2020 08:13
@rullzer
Copy link
Member

rullzer commented Dec 4, 2020

I think a lot of the psalm warnings here come because there are also a lot of fixes. So I think we actually had most in there already they are just slighyly modified.

The changes in streams itself are minimal. @MorrisJobke can you rerun psalm? Then I vote to just get it in.

@ChristophWurst
Copy link
Member Author

Then I vote to just get it in.

/home/runner/work/server/server/lib/private/Files/Stream/Encryption.php:201:69:error - MoreSpecificImplementedParamType: Argument 4 of OC\Files\Stream\Encryption::wrapSource has the more specific type 'string', expecting 'null|string' as defined by Icewind\Streams\WrapperHandler::wrapSource

we should fix those

@MorrisJobke
Copy link
Member

we should fix those

Yep - Ping me again once they are in.

@nickvergessen
Copy link
Member

Can we move this forward? It's currently blocking #24486 which needs a bump of 3rdparty to get the phonenumber lib in.

Or we can also unmerge the stream update until tests are ready, but we should get master unblocked soon!

@nickvergessen
Copy link
Member

Revert is in nextcloud/3rdparty#546

This was referenced Dec 14, 2020
Merged
Merged
@ChristophWurst
Copy link
Member Author

oudated

@ChristophWurst ChristophWurst deleted the dependabot/composer/icewind/streams-0.7.2 branch December 18, 2020 12:30
@ChristophWurst
Copy link
Member Author

let's keep it open for 22. but we need to redo the bump in 3rdparty

@ChristophWurst ChristophWurst force-pushed the dependabot/composer/icewind/streams-0.7.2 branch 2 times, most recently from 0d87b00 to 8e77dc2 Compare December 23, 2020 16:51
rullzer
rullzer approved these changes Dec 23, 2020
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

sure

@ChristophWurst
Copy link
Member Author

Neat, CI passes.

@rullzer rullzer mentioned this pull request Dec 28, 2020
Merged
39 tasks
@ChristophWurst ChristophWurst force-pushed the dependabot/composer/icewind/streams-0.7.2 branch from 14b7f51 to 6a0d175 Compare December 28, 2020 11:59
@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 28, 2020
@ChristophWurst ChristophWurst force-pushed the dependabot/composer/icewind/streams-0.7.2 branch from 6a0d175 to 4747205 Compare December 29, 2020 07:27
@ChristophWurst ChristophWurst mentioned this pull request Dec 29, 2020
Merged
3 tasks
@ChristophWurst ChristophWurst force-pushed the dependabot/composer/icewind/streams-0.7.2 branch 2 times, most recently from f33edbe to b9f8622 Compare December 29, 2020 07:53
rullzer
rullzer requested changes Dec 29, 2020
View reviewed changes
apps/workflowengine/lib/Check/FileMimeType.php Outdated Show resolved Hide resolved
lib/private/Files/Storage/Wrapper/Encryption.php Outdated Show resolved Hide resolved
lib/private/Files/Stream/Encryption.php Show resolved Hide resolved
@ChristophWurst ChristophWurst force-pushed the dependabot/composer/icewind/streams-0.7.2 branch from b9f8622 to aa41b9a Compare December 29, 2020 07:59
@ChristophWurst
Bump icewind/streams from 0.7.1 to 0.7.2
73c7d0d 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst ChristophWurst force-pushed the dependabot/composer/icewind/streams-0.7.2 branch from aa41b9a to 73c7d0d Compare December 29, 2020 08:08
@ChristophWurst ChristophWurst merged commit 35aa34a into master Dec 29, 2020
@ChristophWurst ChristophWurst deleted the dependabot/composer/icewind/streams-0.7.2 branch December 29, 2020 10:24
@kesselb kesselb mentioned this pull request Oct 22, 2021
Closed
@PVince81 PVince81 mentioned this pull request Oct 25, 2021
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliusknorr juliusknorr juliusknorr approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@rullzer rullzer rullzer approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@kesselb kesselb Awaiting requested review from kesselb

Assignees

@ChristophWurst ChristophWurst

Labels
4. to release Ready to be released and/or waiting for tests to finish feature: dependencies
Projects
None yet
Milestone
Nextcloud 21
Development

Successfully merging this pull request may close these issues.
5 participants
@ChristophWurst @MorrisJobke @rullzer @nickvergessen @juliusknorr