Doctrine Encryption Bundle - Added postPersist and postUpdate methods…

Subscribers/DoctrineEncryptSubscriber.php

@@ -71,6 +71,17 @@ public function prePersist(LifecycleEventArgs $args) {
         $this->processFields($entity);
     }
 
+    /**
+     * Listen a postPresist lifecycle event.
+     *
+     * @param LifecycleEventArgs $args LifecycleEventArgs
+     *
+     * @return void
+     */
+    public function postPersist(LifecycleEventArgs $args) {
+        $this->checkAndReloadEntities($args);
+    }
+
     /**
      * Listen a preUpdate lifecycle event. Checking and encrypt entities fields
      * which have @Encrypted annotation. Using changesets to avoid preUpdate event
@@ -83,17 +94,42 @@ public function preUpdate(PreUpdateEventArgs $args) {
         foreach ($properties as $refProperty) {
             if ($this->annReader->getPropertyAnnotation($refProperty, self::ENCRYPTED_ANN_NAME)) {
                 $propName = $refProperty->getName();
-                $args->setNewValue($propName, $this->encryptor->encrypt($args->getNewValue($propName)));
+                if ($args->hasChangedField($propName)) {
+                    $args->setNewValue($propName, $this->encryptor->encrypt($args->getNewValue($propName)));
+                }
             }
         }
     }
+    /**
+     * Listen a postUpdate lifecycle event.
+     *
+     * @param LifecycleEventArgs $args LifecycleEventArgs
+     *
+     * @return void
+     */
+    public function postUpdate(LifecycleEventArgs $args) {
+        $this->checkAndReloadEntities($args);
+    }
 
     /**
-     * Listen a postLoad lifecycle event. Checking and decrypt entities
-     * which have @Encrypted annotations
-     * @param LifecycleEventArgs $args 
+     * Listen a postLoad lifecycle event.
+     *
+     * @param LifecycleEventArgs $args LifecycleEventArgs
+     *
+     * @return void
      */
     public function postLoad(LifecycleEventArgs $args) {
+        $this->checkAndReloadEntities($args);
+    }
+
+    /**
+     * Checking and decrypt entities which have @Encrypted annotations
+     *
+     * @param LifecycleEventArgs $args LifecycleEventArgs
+     *
+     * @return void
+     */
+    private function checkAndReloadEntities(LifecycleEventArgs $args) {
         $entity = $args->getEntity();
         if (!$this->hasInDecodedRegistry($entity, $args->getEntityManager())) {
             if ($this->processFields($entity, false)) {
@@ -109,7 +145,9 @@ public function postLoad(LifecycleEventArgs $args) {
     public function getSubscribedEvents() {
         return array(
             Events::prePersist,
+            Events::postPersist,
             Events::preUpdate,
+            Events::postUpdate,
             Events::postLoad,
         );
     }