Skip to content

Conversation

sreichel
Copy link
Contributor

Questions or comments

phpstan errors are fixed in #4889

@github-actions github-actions bot added documentation composer Relates to composer.json rector labels Jul 21, 2025
addison74
addison74 previously approved these changes Jul 21, 2025
Copy link

@sreichel sreichel marked this pull request as draft July 21, 2025 06:33
@github-actions github-actions bot added the ddev label Sep 30, 2025
@sreichel sreichel changed the title Allow PHP 8.5 Support PHP 8.5 Sep 30, 2025
@sreichel sreichel changed the title Support PHP 8.5 PHP 8.5 support Sep 30, 2025
@sreichel sreichel marked this pull request as ready for review September 30, 2025 21:48
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR adds support for PHP 8.5 in the OpenMage/magento-lts project by updating version constraints, dependencies, and configuration files to handle PHP 8.5 compatibility.

  • Updated PHP version constraint from <8.5 to <8.6 in composer.json to support PHP 8.5
  • Added PHP 8.5 polyfill dependency and updated Symfony polyfill versions to ^1.33
  • Migrated patch references from remote URLs to local .vendor-patches files for better maintainability

Reviewed Changes

Copilot reviewed 18 out of 19 changed files in this pull request and generated no comments.

Show a summary per file
File Description
docs/content/users/requirements.md Updated documentation to indicate PHP 8.4/8.5 support
composer.json Expanded PHP version constraint, updated polyfill dependencies, and migrated to local patch files
.phpstan.dist.neon Updated PHPStan max PHP version to 80599 (PHP 8.5)
.rector.php Added PHP 8.5 Rector rules for code modernization
.github/workflows/syntax-php.yml Updated CI matrix to test PHP 8.5 instead of 8.4
.github/workflows/phpunit.yml Updated CI matrix to test PHP 8.5 instead of 8.4
.ddev/commands/web/vendor-patches Added patches folder parameter to vendor-patches command
Multiple .vendor-patches/*.patch files Local patch files for various dependencies and bug fixes

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

addison74
addison74 previously approved these changes Oct 1, 2025
Hanmac
Hanmac previously approved these changes Oct 2, 2025
@sreichel sreichel requested review from addison74 and kiatng October 3, 2025 22:36
# Conflicts:
#	composer.lock
Copy link

sonarqubecloud bot commented Oct 9, 2025

@sreichel
Copy link
Contributor Author

sreichel commented Oct 9, 2025

We already had two green flags ... merge.

@sreichel sreichel merged commit 11031e2 into OpenMage:main Oct 9, 2025
25 checks passed
@sreichel sreichel deleted the php85 branch October 9, 2025 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants