-
Notifications
You must be signed in to change notification settings - Fork 11
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
Silverstripe 4 compatibility #27
Conversation
… encrypting and decrypting files
…yption/decryption
* master: Update README.md Update README.md Cast the value to decrypt to a string to prevent type-errors # Conflicts: # README.md
@madmatt any chance we could look at getting this merged? |
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.
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. |
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.
PR reference not necessary anymore
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.
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).
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", |
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.
This needs to be ^4.9.0
now as that's when the framework
PR was merged.
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.
Cheers @madmatt, have updated
@ssmarco @edwilde I've reviewed this one last time and there's just one super minor tweak to make:
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:
|
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. |
I've manually reviewed the requested changes, and all are satisfactory.
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. |
Update the module to be compatible with Silverstripe 4.
This branch has been used on numerous production sites already, so seems reliable.