From 716ce289659734228977bf29a45f590334c20cad Mon Sep 17 00:00:00 2001
From: Patrick Kenny <33362-ptmkenny@users.noreply.drupalcode.org>
Date: Wed, 14 May 2025 17:13:55 +0900
Subject: [PATCH] use getOriginal()
---
src/Entity/FieldEncryptEntityType.php | 2 +-
src/ProcessEntities.php | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Entity/FieldEncryptEntityType.php b/src/Entity/FieldEncryptEntityType.php
index ee015dc..df074d6 100644
--- a/src/Entity/FieldEncryptEntityType.php
+++ b/src/Entity/FieldEncryptEntityType.php
@@ -117,7 +117,7 @@ class FieldEncryptEntityType extends ConfigEntityBase {
*/
public function postSave(EntityStorageInterface $storage, $update = TRUE): void {
parent::postSave($storage, $update);
- if (!$update || $this->getBaseFields() !== $this->original->getBaseFields()) {
+ if (!$update || $this->getBaseFields() !== $this->getOriginal()->getBaseFields()) {
self::queueEntityUpdates($this->id());
}
// Update the field_encrypt module's state.
diff --git a/src/ProcessEntities.php b/src/ProcessEntities.php
index 9ddd530..7d8cca9 100644
--- a/src/ProcessEntities.php
+++ b/src/ProcessEntities.php
@@ -77,16 +77,16 @@ class ProcessEntities {
}
// The entity storage handler has clever logic to ensure that configurable
- // fields are only saved if necessary. If entity->original is set we need
+ // fields are only saved if necessary. If entity->original() we need
// to ensure the field values are the values in the database and not the
// unencrypted values so that they are saved if necessary. This is
// particularly important when a previously encrypted field is set to be
// unencrypted.
// @see \Drupal\Core\Entity\Sql\SqlContentEntityStorage::saveToDedicatedTables()
// @see \Drupal\Core\Entity\ContentEntityStorageBase::hasFieldValueChanged()
- if (isset($translated_entity->original) && $translated_entity->original instanceof ContentEntityInterface) {
- if ($translated_entity->original->hasTranslation($language->getId())) {
- $translated_original = $translated_entity->original->getTranslation($language->getId());
+ if ($translated_entity->getOriginal() && $translated_entity->getOriginal() instanceof ContentEntityInterface) {
+ if ($translated_entity->getOriginal()->hasTranslation($language->getId())) {
+ $translated_original = $translated_entity->getOriginal()->getTranslation($language->getId());
$this->setEncryptedFieldValues($translated_original, 'getUnencryptedPlaceholderValue');
}
}
@@ -118,9 +118,9 @@ class ProcessEntities {
$translated_entity = $entity->getTranslation($language->getId());
$this->setEncryptedFieldValues($translated_entity);
// Reverse the logic to encrypt the original entity in ::encryptEntity().
- if (isset($translated_entity->original) && $translated_entity->original instanceof ContentEntityInterface) {
- if ($translated_entity->original->hasTranslation($language->getId())) {
- $this->decryptEntity($translated_entity->original);
+ if ($translated_entity->getOriginal() && $translated_entity->getOriginal() instanceof ContentEntityInterface) {
+ if ($translated_entity->getOriginal()->hasTranslation($language->getId())) {
+ $this->decryptEntity($translated_entity->getOriginal());
}
}
}
--
GitLab