Merge branch 'master' of github.com:doctrine/mongodb-odm

doctrine · Jun 15, 2012 · f7fc3fe · f7fc3fe
2 parents 496b944 + 1dd4c1e
commit f7fc3fe
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/DoctrineAnnotations.php b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/DoctrineAnnotations.php
@@ -285,3 +285,5 @@ final class PostRemove extends Annotation {}
 final class PreLoad extends Annotation {}
 /** @Annotation */
 final class PostLoad extends Annotation {}
+/** @Annotation */
+final class PreFlush extends Annotation {}
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php
@@ -1382,7 +1382,7 @@ public function isNullable($fieldName)
      */
     public function hasDiscriminator()
     {
-        return $this->discriminatorField && $this->discriminatorValue ? true : false;
+        return isset($this->discriminatorField) && isset($this->discriminatorValue) ? true : false;
     }
 
     /**

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Events/LifecycleCallbacksTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Events/LifecycleCallbacksTest.php
@@ -59,6 +59,17 @@ public function testPreUpdate()
         $this->assertTrue($user->postUpdate);
         $this->assertTrue($user->profile->postUpdate);
     }
+
+    public function testPreFlush()
+    {
+        $user = $this->createUser();
+        $user->name = 'jwage';
+        $user->profile->name = 'Jon Doe';
+        $this->dm->flush();
+
+        $this->assertTrue($user->preFlush);
+        $this->assertTrue($user->profile->preFlush);
+    }
 
     public function testPreLoadAndPostLoad()
     {
@@ -228,6 +239,7 @@ abstract class BaseDocument
     public $postRemove = false;
     public $preLoad = false;
     public $postLoad = false;
+    public $preFlush = false;
 
     /** @ODM\PrePersist */
     public function prePersist()
@@ -278,4 +290,10 @@ public function postLoad()
     {
         $this->postLoad = true;
     }
+
+    /** @ODM\PreFlush */
+    public function preFlush()
+    {
+        $this->preFlush = true;
+    }
 }