Skip to content

[stable21] Fix/images php 8.0 #29520

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
Merged
merged 5 commits into from
Nov 8, 2021
Merged

[stable21] Fix/images php 8.0 #29520

merged 5 commits into from
Nov 8, 2021

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Nov 2, 2021 •
edited by come-nc
Loading

backport of #29479

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 21.0.6 milestone Nov 2, 2021
@come-nc
Fix resource usages in OC_Image
23aa60b 
This makes sure using resource or GdImage (PHP>=8) behaves the same.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Revert "Do not run image tests on php8"
efd689e 
This reverts commit d690f90.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Enable Avatar tests as well for PHP>=8
8bc3bed 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the backport/29479/stable21 branch from 3b50d3b to 8bc3bed Compare November 2, 2021 10:50
@come-nc
Fix psalm-ocp error about GdImage class
bd59877 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@skjnldsv
Copy link
Member

skjnldsv commented Nov 2, 2021

Please check this:
image

@blizzz blizzz mentioned this pull request Nov 3, 2021
Merged
10 tasks
@skjnldsv skjnldsv added the 2. developing Work in progress label Nov 4, 2021
@come-nc
Merge branch 'stable21' into backport/29479/stable21
dde1880 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Nov 4, 2021
blizzz
blizzz approved these changes Nov 8, 2021
View reviewed changes
Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

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

would be nice to import \GdImage with the use statement and save the backslash later on.

@come-nc come-nc merged commit 5041b72 into stable21 Nov 8, 2021
@come-nc come-nc deleted the backport/29479/stable21 branch November 8, 2021 10:57
@blizzz blizzz mentioned this pull request Nov 10, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blizzz blizzz blizzz approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@come-nc come-nc come-nc approved these changes

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl

@CarlSchwan CarlSchwan Awaiting requested review from CarlSchwan

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

Assignees

No one assigned

Labels

4. to release Ready to be released and/or waiting for tests to finish bug

Projects

None yet

Milestone

Nextcloud 21.0.6

Development

Successfully merging this pull request may close these issues.

4 participants

@skjnldsv @blizzz @come-nc