Update the 'storeAs' values as discussed in doctrine#1349

coudenysj · Apr 15, 2016 · 3db4187 · 3db4187
1 parent ec58c32
commit 3db4187
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceMany.php b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceMany.php
@@ -32,7 +32,7 @@ final class ReferenceMany extends AbstractField
     public $type = 'many';
     public $reference = true;
     public $simple = false; // @deprecated
-    public $storeAs = ClassMetadataInfo::REFERENCE_STORE_AS_FULL;
+    public $storeAs = ClassMetadataInfo::REFERENCE_STORE_AS_DB_REF_WITH_DB;
     public $targetDocument;
     public $discriminatorField;
     public $discriminatorMap;

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceOne.php b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/ReferenceOne.php
@@ -31,7 +31,7 @@ final class ReferenceOne extends AbstractField
     public $type = 'one';
     public $reference = true;
     public $simple = false; // @deprecated
-    public $storeAs = ClassMetadataInfo::REFERENCE_STORE_AS_FULL;
+    public $storeAs = ClassMetadataInfo::REFERENCE_STORE_AS_DB_REF_WITH_DB;
     public $targetDocument;
     public $discriminatorField;
     public $discriminatorMap;

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php
@@ -99,12 +99,10 @@ class ClassMetadataInfo implements \Doctrine\Common\Persistence\Mapping\ClassMet
 
     /**#@+
      * The types of storeAs references
-     *
-     * TODO move this to a different class?
      */
-    const REFERENCE_STORE_AS_SIMPLE = 'simple';
-    const REFERENCE_STORE_AS_PARTIAL = 'partial';
-    const REFERENCE_STORE_AS_FULL = 'full';
+    const REFERENCE_STORE_AS_ID = 'id';
+    const REFERENCE_STORE_AS_DB_REF = 'dbRef';
+    const REFERENCE_STORE_AS_DB_REF_WITH_DB = 'dbRefWithDb';
     /**#@-*/
 
     /* The inheritance mapping types */