Fixes #35

mogilvie · Feb 23, 2023 · 9843b02 · 9843b02
1 parent bdcf80a
commit 9843b02
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/src/Subscribers/DoctrineEncryptSubscriber.php b/src/Subscribers/DoctrineEncryptSubscriber.php
@@ -158,6 +158,7 @@ protected function processFields(object $entity, EntityManagerInterface $em, boo
 
         $unitOfWork = $em->getUnitOfWork();
         $oid = spl_object_id($entity);
+        $meta = $em->getClassMetadata(get_class($entity));
 
         foreach ($properties as $key => $refProperty) {
             // Get the value in the entity.
@@ -180,15 +181,10 @@ protected function processFields(object $entity, EntityManagerInterface $em, boo
                 if (isset($changeSet[$key])) {
                     $encryptedValue = $this->encryptor->encrypt($value);
                     $refProperty->setValue($entity, $encryptedValue);
-                    $unitOfWork->recomputeSingleEntityChangeSet($em->getClassMetadata(get_class($entity)), $entity);
-
-                    if ($isInsert) {
-                        // Restore the decrypted value after the change set update
-                        $refProperty->setValue($entity, $value);
-                    } else {
-                        // Will be restored during postUpdate cycle
-                        $this->rawValues[$oid][$key] = $value;
-                    }
+                    $unitOfWork->recomputeSingleEntityChangeSet($meta, $entity);
+
+                    // Will be restored during postUpdate cycle for updates, or below for inserts
+                    $this->rawValues[$oid][$key] = $value;
                 }
             } else {
                 // Decryption is fired by onLoad and postFlush events.
@@ -200,7 +196,16 @@ protected function processFields(object $entity, EntityManagerInterface $em, boo
             }
         }
 
-        return !empty($properties);
+        if ($isInsert) {
+            // Restore the decrypted values after the change set update
+            foreach ($this->rawValues[$oid] as $prop => $rawValue) {
+                $refProperty = $meta->getReflectionProperty($prop);
+                $refProperty->setValue($entity, $rawValue);
+            }
+            unset($this->rawValues[$oid]);
+        }
+
+        return true;
     }
 
     public function postUpdate(LifecycleEventArgs $args): void