From 512a001e8c8cec368875be1c8a51d672546756a6 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 6 Jan 2013 19:11:52 +0100
Subject: [PATCH] DDC-2173 - Add Test for new OnFlush or PreFlush behavior and
 update UPGRADE.md

---
 UPGRADE.md                                    |  8 +++++
 .../Tests/ORM/Functional/FlushEventTest.php   | 34 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/UPGRADE.md b/UPGRADE.md
index 1594f0c98..1b7e8a90c 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,3 +1,11 @@
+# Upgrade to 2.4
+
+## OnFlush and PreFlush event always called
+
+Before 2.4  the preFlush and onFlush events were only called when there were
+actually entities that changed. Now these events are called no matter if there
+are entities in the UoW or changes are found.
+
 # Upgrade to 2.3
 
 ## EntityManager#find() not calls EntityRepository#find() anymore
diff --git a/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php b/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php
index 8167e8587..156e89b0e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php
@@ -48,6 +48,26 @@ class FlushEventTest extends \Doctrine\Tests\OrmFunctionalTestCase
         //echo "SECOND FLUSH";
         //$this->_em->flush();
     }
+
+    /**
+     * @group DDC-2173
+     */
+    public function testPreAndOnFlushCalledAlways()
+    {
+        $listener = new OnFlushCalledListener();
+        $this->_em->getEventManager()->addEventListener(Events::onFlush, $listener);
+        $this->_em->getEventManager()->addEventListener(Events::preFlush, $listener);
+
+        $this->_em->flush();
+
+        $this->assertEquals(1, $listener->preFlush);
+        $this->assertEquals(1, $listener->onFlush);
+
+        $this->_em->flush();
+
+        $this->assertEquals(2, $listener->preFlush);
+        $this->assertEquals(2, $listener->onFlush);
+    }
 }
 
 class OnFlushListener
@@ -91,4 +111,18 @@ class OnFlushListener
     }
 }
 
+class OnFlushCalledListener
+{
+    public $preFlush = 0;
+    public $onFlush = 0;
 
+    public function preFlush($args)
+    {
+        $this->preFlush++;
+    }
+
+    public function onFlush($args)
+    {
+        $this->onFlush++;
+    }
+}