Merge pull request #1427 from alcaeus/fix-simple-mapping

Store simple field in mapping

Author: alcaeus

lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php

@@ -1299,9 +1299,9 @@ public function mapField(array $mapping)
         if (isset($mapping['simple']) && ($mapping['simple'] === true || $mapping['simple'] === 'true')) {
             $mapping['storeAs'] = ClassMetadataInfo::REFERENCE_STORE_AS_ID;
         }
-        // Remove the "simple" mapping and use "storeAs" in all further logic
-        if (isset($mapping['simple'])) {
-            unset($mapping['simple']);
+        // Provide the correct value for the "simple" field for backwards compatibility
+        if (isset($mapping['storeAs'])) {
+            $mapping['simple'] = $mapping['storeAs'] === ClassMetadataInfo::REFERENCE_STORE_AS_ID;
         }
 
         if (isset($mapping['reference'])

tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/AbstractDriverTest.php

@@ -142,6 +142,7 @@ public function testDriver()
             'type' => 'one',
             'reference' => true,
             'storeAs' => ClassMetadataInfo::REFERENCE_STORE_AS_ID,
+            'simple' => true,
             'targetDocument' => 'Documents\Profile',
             'cascade' => array('remove', 'persist', 'refresh', 'merge', 'detach'),
             'isCascadeDetach' => true,
@@ -168,6 +169,7 @@ public function testDriver()
             'type' => 'one',
             'reference' => true,
             'storeAs' => ClassMetadataInfo::REFERENCE_STORE_AS_DB_REF_WITH_DB,
+            'simple' => false,
             'targetDocument' => 'Documents\Account',
             'cascade' => array('remove', 'persist', 'refresh', 'merge', 'detach'),
             'isCascadeDetach' => true,
@@ -194,6 +196,7 @@ public function testDriver()
             'type' => 'many',
             'reference' => true,
             'storeAs' => ClassMetadataInfo::REFERENCE_STORE_AS_DB_REF_WITH_DB,
+            'simple' => false,
             'targetDocument' => 'Documents\Group',
             'cascade' => array('remove', 'persist', 'refresh', 'merge', 'detach'),
             'isCascadeDetach' => true,