Use preFlush event introduced in Doctrine 2.2 (closes #89)

Author: Koc

EventListener/Doctrine/CleanListener.php

@@ -3,13 +3,15 @@
 namespace Vich\UploaderBundle\EventListener\Doctrine;
 
 use Doctrine\Common\EventArgs;
+use Doctrine\ORM\Events;
 
 /**
  * CleanListener
  *
  * Listen to the update event to delete old files accordingly.
  *
  * @author Kévin Gomez <[email protected]>
+ * @author Konstantin Myakshin <[email protected]>
  */
 class CleanListener extends BaseListener
 {
@@ -20,15 +22,13 @@ class CleanListener extends BaseListener
      */
     public function getSubscribedEvents()
     {
-        return array(
-            'preUpdate',
-        );
+        return array(Events::preFlush);
     }
 
     /**
      * @param EventArgs $event The event.
      */
-    public function preUpdate(EventArgs $event)
+    public function preFlush(EventArgs $event)
     {
         $object = $this->adapter->getObjectFromArgs($event);
 
@@ -38,7 +38,6 @@ public function preUpdate(EventArgs $event)
 
         foreach ($this->getUploadableFields($object) as $field) {
             $this->handler->clean($object, $field);
-            $this->adapter->recomputeChangeSet($event);
         }
     }
 }

EventListener/Doctrine/InjectListener.php

@@ -3,6 +3,7 @@
 namespace Vich\UploaderBundle\EventListener\Doctrine;
 
 use Doctrine\Common\EventArgs;
+use Doctrine\DBAL\Events;
 
 /**
  * InjectListener
@@ -20,9 +21,7 @@ class InjectListener extends BaseListener
      */
     public function getSubscribedEvents()
     {
-        return array(
-            'postLoad',
-        );
+        return array(Events::postLoad);
     }
 
     /**

EventListener/Doctrine/RemoveListener.php

@@ -4,6 +4,7 @@
 
 use Doctrine\Common\EventArgs;
 use Doctrine\Common\Persistence\Proxy;
+use Doctrine\ORM\Events;
 
 /**
  * RemoveListener
@@ -22,8 +23,8 @@ class RemoveListener extends BaseListener
     public function getSubscribedEvents()
     {
         return array(
-            'preRemove',
-            'postRemove',
+            Events::preRemove,
+            Events::postRemove,
         );
     }
 
@@ -34,11 +35,11 @@ public function getSubscribedEvents()
      */
     public function preRemove(EventArgs $event)
     {
-         $object = $this->adapter->getObjectFromArgs($event);
+        $object = $this->adapter->getObjectFromArgs($event);
 
-         if ($this->isUploadable($object) && $object instanceof Proxy) {
-             $object->__load();
-         }
+        if ($this->isUploadable($object) && $object instanceof Proxy) {
+            $object->__load();
+        }
     }
 
     /**

EventListener/Doctrine/UploadListener.php

@@ -3,13 +3,15 @@
 namespace Vich\UploaderBundle\EventListener\Doctrine;
 
 use Doctrine\Common\EventArgs;
+use Doctrine\ORM\Events;
 
 /**
  * UploadListener
  *
  * Handles file uploads.
  *
  * @author Kévin Gomez <[email protected]>
+ * @author Konstantin Myakshin <[email protected]>
  */
 class UploadListener extends BaseListener
 {
@@ -20,16 +22,13 @@ class UploadListener extends BaseListener
      */
     public function getSubscribedEvents()
     {
-        return array(
-            'prePersist',
-            'preUpdate',
-        );
+        return array(Events::preFlush);
     }
 
     /**
      * @param EventArgs $event The event.
      */
-    public function prePersist(EventArgs $event)
+    public function preFlush(EventArgs $event)
     {
         $object = $this->adapter->getObjectFromArgs($event);
 
@@ -41,22 +40,4 @@ public function prePersist(EventArgs $event)
             $this->handler->upload($object, $field);
         }
     }
-
-    /**
-     * @param EventArgs $event The event.
-     */
-    public function preUpdate(EventArgs $event)
-    {
-        $object = $this->adapter->getObjectFromArgs($event);
-
-        if (!$this->isUploadable($object)) {
-            return;
-        }
-
-        foreach ($this->getUploadableFields($object) as $field) {
-            $this->handler->upload($object, $field);
-        }
-
-	$this->adapter->recomputeChangeSet($event);
-    }
 }