Skip to content

Silverstripe 4 compatibility #27

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

Merged
merged 12 commits into from
Oct 26, 2023

Conversation

edwilde
Copy link
Collaborator

@edwilde edwilde commented Mar 22, 2023

Update the module to be compatible with Silverstripe 4.

This branch has been used on numerous production sites already, so seems reliable.

@edwilde edwilde changed the base branch from pulls/TMP-ss4-upgrade to master March 22, 2023 19:28
@thats4shaw
Copy link

@madmatt any chance we could look at getting this merged?

Copy link
Collaborator

@Firesphere Firesphere left a comment

Choose a reason for hiding this comment

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

Files are marked as "deleted/created", which makes the PR harder to review than necessary.

README.md Outdated

## Requirements
* SilverStripe CMS 4
* Requires a version of silverstripe-framework that includes [this pull request](https://github.com/silverstripe/silverstripe-framework/pull/10047), or for this PR to be manually patched into your version of framework.
Copy link
Collaborator

Choose a reason for hiding this comment

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

PR reference not necessary anymore

Copy link
Owner

Choose a reason for hiding this comment

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

Good spot, thanks @Firesphere. Agree, the PR is merged so we should just target this at ^4.9 (new extension point was added in 4.9.0).

@ssmarco
Copy link

ssmarco commented Oct 19, 2023

I would love this project to continue forward, let us know if there is anything we can help

composer.json Outdated
"require": {
"silverstripe/framework": "^3.7",
"defuse/php-encryption": "v2.2.1"
"silverstripe/framework": "^4.1",
Copy link
Owner

Choose a reason for hiding this comment

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

This needs to be ^4.9.0 now as that's when the framework PR was merged.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Cheers @madmatt, have updated

@madmatt
Copy link
Owner

madmatt commented Oct 24, 2023

@ssmarco @edwilde I've reviewed this one last time and there's just one super minor tweak to make:

  1. Please fix up the composer.json min-version for silverstripe/framework to be ^4.9.0

I've manually diffed the following files that didn't get marked as a rename and confirmed I'm happy enough with the changes that it doesn't block merging:

  1. code/AtRestCryptoService.php -> src/AtRestCryptoService.php
  2. code/extensions/EncryptDataObjectsFieldExtension.php -> src/Extension/DecryptDataObjectFieldsExtension.php
  3. code/fieldtypes/EncryptedDatetime.php -> src/FieldType/EncryptedDatetime.php
  4. Removal of tests/unit/EncryptedDataObjectTest.php in favour of individual tests for the AtRestCryptoService, the extension and field types.

@madmatt
Copy link
Owner

madmatt commented Oct 24, 2023

Files are marked as "deleted/created", which makes the PR harder to review than necessary.

Per my comment above, this one is okay now, I've manually reviewed the files that weren't correctly marked and can confirm there's nothing bad in there, just updates to method signatures and minor tweaks to how the code works primarily.

@madmatt madmatt dismissed Firesphere’s stale review October 26, 2023 11:16

I've manually reviewed the requested changes, and all are satisfactory.

@madmatt
Copy link
Owner

madmatt commented Oct 26, 2023

Thanks @edwilde, @Firesphere and everyone else who has contributed to this! Merging this now, and I'll comment again when a new major version is released.

@madmatt madmatt merged commit 0c1240a into madmatt:master Oct 26, 2023
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.

5 participants