-
Notifications
You must be signed in to change notification settings - Fork 10
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
Usagov 2122 update custom code #2126
Conversation
…. update to circleCI config to use php83
… into USAGOV-2122-update-custom-code
…p83 compatibility, minor README cleanup
… into USAGOV-2122-update-custom-code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems good to me! I flagged Gene on one benefits-finder file, so I'm not merging just yet.
web/modules/custom/usagov_benefit_finder/src/Form/BenefitFinderSettingsForm.php
Show resolved
Hide resolved
Heads up, there's a merge conflict now. |
@whitealbum Gene and I are both happy with this, but now it has merge conflicts. Could you please update? |
… into USAGOV-2122-update-custom-code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Taking your note about the composer merge to heart, I tore down my site and tried to do a full rebuild via bin/init
. I'm hitting a couple of issues with composer install
:
- a warning that my composer.lock file is out of date. Usually when we've merged this just means that the content-hash value needs to be updated, and running
composer update --lock
will take care of it - a full-blown error:
Warning: The lock file is not up to date with the latest changes in composer.json. You may be getting outdated dependencies. It is recommended that you run `composer update` or `composer update <package name>`.
- Required (in require-dev) package "rector/rector" is not present in the lock file.
This usually happens when composer files are incorrectly merged or the composer.json file is manually edited.
Read more about correctly resolving merge conflicts https://getcomposer.org/doc/articles/resolving-merge-conflicts.md
and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require-r
That says "warning" but my build failed at that point.
…motes/origin/USAGOV-2122-update-custom-code' into USAGOV-2122-update-custom-code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Confirming that the current version of this branch builds successfully for me. (Unfortunately another merge round is needed.)
… into USAGOV-2122-update-custom-code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All working now.
Jira Task
https://cm-jira.usa.gov/browse/USAGOV-2122
Description
Added to ability to check for PHP8.3 issues
Type of Changes
Testing Instructions
run
bin/composer php-compatibility
Change Requirements
Validation Steps
Security Review
Reviewer Reminders
Post PR Approval Instructions
Follow these steps as soon as you merge the new changes.
Review in Test
and add a comment. State whether the change is already visible on cms-dev.usa.gov and beta-dev.usa.gov, or if the deployment is still in process.