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.

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

fix(manager/composer): respect the PHP override in composer.json #13657

Merged
merged 8 commits into from Jan 20, 2022
Merged

fix(manager/composer): respect the PHP override in composer.json #13657

merged 8 commits into from Jan 20, 2022

Conversation

internalsystemerror
Copy link
Contributor

Changes:

This ensures that renovate respects the PHP override set in composer.json: https://getcomposer.org/doc/06-config.md#platform.

Given the following:

{
    "config": {
        "platform": {
            "php": "7.4.27"
        }
    },
    "require": {
        "php": "^7.4 || ~8.0.0"
    }
}

Then the detected PHP version used for composer should be 7.4.27. This PR adds that awareness to renovate.

Context:

There are several issues related which should be closed by this (for instance #4396). And mainly came about after this discussion #13637.

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM

lib/manager/composer/types.ts Show resolved Hide resolved
lib/manager/composer/types.ts Show resolved Hide resolved
Signed-off-by: Gary Lockett <gary@creativecow.uk>
lib/manager/composer/utils.ts Outdated Show resolved Hide resolved
lib/manager/composer/utils.ts Outdated Show resolved Hide resolved
lib/manager/composer/utils.ts Outdated Show resolved Hide resolved
viceice and others added 2 commits January 20, 2022 08:42
@internalsystemerror
Copy link
Contributor Author

I will be able to fix this and finish this off tonight

Gary Lockett added 2 commits January 20, 2022 12:00
@internalsystemerror
Copy link
Contributor Author

Never mind, that was a quick fix. Sorry I'd missed this on the initial upload so I was able to push it now.

@viceice viceice changed the title fix(composer): respect the PHP override in composer.json fix(manager/composer): respect the PHP override in composer.json Jan 20, 2022
@viceice viceice enabled auto-merge (squash) January 20, 2022 12:30
@viceice viceice merged commit 73e7492 into renovatebot:main Jan 20, 2022
@internalsystemerror
Copy link
Contributor Author

@rarkins @viceice Thank you both for your help with this!

@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 31.38.2 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 20, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants