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

Minor phpstan-fixes for php8.1 #3237

Merged
merged 1 commit into from
May 16, 2023
Merged

Minor phpstan-fixes for php8.1 #3237

merged 1 commit into from
May 16, 2023

Conversation

sreichel
Copy link
Contributor

@sreichel sreichel commented May 4, 2023 •
edited
Loading

Description (*)

Some fixes for php8.1 (bc)

Related Pull Requests

  1. See Github workflows now run on PHP 8.1 #3163

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)
  • Add yourself to contributors list

@github-actions github-actions bot added Component: Catalog Relates to Mage_Catalog Component: Uploader Relates to Mage_Uploader Component: Core Relates to Mage_Core Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: Payment Relates to Mage_Payment phpstan labels May 4, 2023
@sreichel sreichel changed the title Minor phpstan-fix for php8.1 Minor phpstan-fixes for php8.1 May 5, 2023
kiatng
kiatng previously approved these changes May 5, 2023
View reviewed changes
elidrissidev
elidrissidev previously approved these changes May 5, 2023
View reviewed changes
@elidrissidev
Copy link
Member

I just noticed now that this is targeting v19, probably should've targeted main and then got backported.

@sreichel sreichel mentioned this pull request May 10, 2023
Merged
ADDISON74
ADDISON74 previously approved these changes May 10, 2023
View reviewed changes
@ADDISON74
Copy link
Contributor

I leave this PR up to you to decide merging it in v19 then cherry picking in main.

@fballiano
Copy link
Contributor

if this gets rebased to main I'll merge it right away

@sreichel
Copy link
Contributor Author

It does not get rebased on its own.

@fballiano
Copy link
Contributor

this guide by Colin fixes it OpenMage/rfcs#10 (comment)

@fballiano fballiano dismissed stale reviews from ADDISON74, elidrissidev, and kiatng via 756a6af May 16, 2023 15:05
@fballiano fballiano changed the base branch from v19 to main May 16, 2023 15:06
@fballiano
Copy link
Contributor

I did the rebase. I'll merge since it was already approved.

@fballiano fballiano merged commit ce8622c into OpenMage:main May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kiatng kiatng kiatng left review comments

@ADDISON74 ADDISON74 ADDISON74 left review comments

@elidrissidev elidrissidev elidrissidev left review comments

Assignees
No one assigned
Labels
Component: Catalog Relates to Mage_Catalog Component: Core Relates to Mage_Core Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: Payment Relates to Mage_Payment Component: Uploader Relates to Mage_Uploader phpstan
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sreichel @elidrissidev @ADDISON74 @fballiano @kiatng