Skip to content

Updates for Silverstripe 5.x #30

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
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This module allows Silverstripe CMS ORM data to be encrypted before being stored


## Requirements
* SilverStripe CMS 4.9
* SilverStripe CMS 5.0

## Installation
Install via Composer:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"source": "https://github.com/madmatt/silverstripe-encrypt-at-rest"
},
"require": {
"php": "^8.0",
"silverstripe/framework": "^4.9.0",
"php": "^8.0",
"silverstripe/framework": "^5",
"defuse/php-encryption": "^2.2"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion src/AtRestCryptoService.php
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ protected function getFullPath($file, $visibility = AssetStore::VISIBILITY_PROTE
$fileID = rtrim($filename, '\\/');
}

return $adapter->applyPathPrefix($fileID);
return $adapter->prefixPath($fileID);
}

}
3 changes: 1 addition & 2 deletions src/Extension/DecryptDataObjectFieldsExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ class DecryptDataObjectFieldsExtension extends DataExtension
* if so, we decrypt these and inject them into the object during hydration so that the rest of the application only
* has to deal with the decrypted values everywhere.
*
* @param $record
* @return array
*/
public function augmentHydrateFields($record)
public function augmentHydrateFields()
{
// Look at $this->owner to determine if it has any encrypted database fields
$schema = DataObject::getSchema();
Expand Down
Loading