Skip to content

Avoid calling image* methods on boolean - #30040

Merged
come-nc merged 3 commits into
masterfrom
fix/images-php-8.0-2
Dec 6, 2021
Merged

Avoid calling image* methods on boolean#30040
come-nc merged 3 commits into
masterfrom
fix/images-php-8.0-2

Conversation

@come-nc

Copy link
Copy Markdown
Contributor

This avoids fatal errors on PHP>=8, and warnings on older versions.
Log should also be clearer.

Signed-off-by: Côme Chilliet come.chilliet@nextcloud.com

Fixes#29990

@come-nccome-nc self-assigned this Dec 2, 2021
@come-nc

Copy link
Copy Markdown
ContributorAuthor

/backport to stable23

@come-nc

Copy link
Copy Markdown
ContributorAuthor

/backport to stable22

@come-nc

Copy link
Copy Markdown
ContributorAuthor

/backport to stable21

@come-nc
come-nc requested review from a team, ArtificialOwl, juliusknorr, nickvergessen and solracsf and removed request for a teamDecember 2, 2021 11:03
@come-nccome-nc added the 3. to review Waiting for reviews label Dec 2, 2021
Comment threadlib/private/legacy/OC_Image.php Outdated
@come-nc
come-ncforce-pushed the fix/images-php-8.0-2 branch from e7dde95 to e5d69d4CompareDecember 2, 2021 14:39

@solracsfsolracsf left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

No more errors on my side. 👍

@come-nc
come-ncforce-pushed the fix/images-php-8.0-2 branch 2 times, most recently from d74f4aa to 1d76114CompareDecember 6, 2021 09:26
This avoids fatal errors on PHP>=8, and warnings on older versions.
Log should also be clearer.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

imagedestroy(): Argument #1 ($image) must be of type GdImage, bool given

3 participants

@come-nc@nickvergessen@solracsf