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

ENH Fallback to reading PHP version from composer.json #115

Merged

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Dec 9, 2024

Issue silverstripe/.github#350

Multiple commits, do not squash merge

@emteknetnz emteknetnz changed the title MNT Unit test for doorman ENH Support asyncphp/doorman Dec 9, 2024
@emteknetnz emteknetnz marked this pull request as ready for review December 9, 2024 02:16
@emteknetnz
Copy link
Member Author

emteknetnz commented Dec 9, 2024

I've created this PR which should resolve #115

@GuySartorelli
Copy link
Member

This is #115 - and CI is failing on it.

consts.php Outdated Show resolved Hide resolved
@emteknetnz emteknetnz changed the title ENH Support asyncphp/doorman ENH Fallback to reading PHP version from composer.json Dec 9, 2024
['myaccount/silverstripe-admin', 'mybranch', ['silverstripe/framework' => '^6'], 'silverstripe-theme', '6.x-dev'],
['myaccount/silverstripe-somemodule', 'mybranch', ['silverstripe/cms' => '^6'], 'silverstripe-recipe', '6.x-dev'],
['myaccount/silverstripe-somemodule', 'mybranch', ['silverstripe/admin' => '^3'], 'silverstripe-vendormodule', '6.x-dev'],
['myaccount/silverstripe-admin', 'mybranch', ['silverstripe/framework' => '^6'], 'silverstripe-theme', '6.0.x-dev'],
Copy link
Member Author

Choose a reason for hiding this comment

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

Changes here are in a separate commit to fix unrelated broken unit test

job_creator.php Outdated Show resolved Hide resolved
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for being patient with me on this one

@GuySartorelli GuySartorelli merged commit 00933af into silverstripe:1.17 Dec 9, 2024
2 checks passed
@GuySartorelli GuySartorelli deleted the pulls/1.17/doorman branch December 9, 2024 21:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants