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

Update PHP to 8.1, plus some enhancements #108

Merged

Conversation

GuySartorelli
Copy link
Member

@GuySartorelli GuySartorelli commented May 2, 2023

Changes in this PR

Each of these changes has its own commit. You can review the commits individually if that makes peer review easier.

The commits should all remain distinct - DO NOT SQUASH

@GuySartorelli GuySartorelli marked this pull request as draft May 2, 2023 03:31
Copy link
Member Author

Choose a reason for hiding this comment

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

This file is easiest to read by just viewing the actual raw file directly, rather than seeing the diff, since I have copied the class.twig file from doctum itself, and then re-applied any changes as appropriate.

Copy link
Member Author

Choose a reason for hiding this comment

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

This file is easiest to read by just viewing the actual raw file directly, rather than seeing the diff - it's ultimately just adding in the google analytics snippet, the rest of the JS template has changed so completely in doctum that any other customisations no longer apply.

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 to this file were necessary to match changes in symfony/console

@@ -12,9 +13,19 @@ class ApiJsonStore extends JsonStore
{
public function removeClass(Project $project, $name)
{
$path = $this->getFilename($project, $name);
Copy link
Member Author

Choose a reason for hiding this comment

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

The signature for getFilename() changed - it was easier to just refactor this method to call the parent method and ignore the exception.

Copy link
Member Author

Choose a reason for hiding this comment

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

Required to match changes in symfony/finder

Required also updating various dependencies.
There was code there to do this already, but it seems like it just never
got finished.
@GuySartorelli GuySartorelli marked this pull request as ready for review October 11, 2023 00:06
composer.json Show resolved Hide resolved
composer.json Show resolved Hide resolved
@emteknetnz emteknetnz merged commit d273eee into silverstripe:master Oct 11, 2023
8 checks passed
@emteknetnz emteknetnz deleted the pulls/master/php-81 branch October 11, 2023 04:31
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.

3 participants