fixed the generating of classes based on xml files, changed ClassMeta…

…data to ClassMetadataInfo in these files (as in the ORM tool/mapping)
feychenie · Aug 11, 2011 · 6345d18 · 6345d18
1 parent f426b8b
commit 6345d18
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataFactory.php
@@ -341,7 +341,7 @@ protected function getParentClasses($name)
         return $parentClasses;
     }
 
-    private function completeIdGeneratorMapping(ClassMetadata $class)
+    private function completeIdGeneratorMapping(ClassMetadataInfo $class)
     {
         $idGenOptions = $class->generatorOptions;
         switch ($class->generatorType) {

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php
@@ -133,7 +133,7 @@ public function loadMetadataForClass($className, ClassMetadataInfo $class)
         }
     }
 
-    private function addFieldMapping(ClassMetadata $class, $mapping)
+    private function addFieldMapping(ClassMetadataInfo $class, $mapping)
     {
         $keys = null;
         $name = isset($mapping['name']) ? $mapping['name'] : $mapping['fieldName'];
@@ -172,7 +172,7 @@ private function addFieldMapping(ClassMetadata $class, $mapping)
         $class->mapField($mapping);
     }
 
-    private function addEmbedMapping(ClassMetadata $class, $embed, $type)
+    private function addEmbedMapping(ClassMetadataInfo $class, $embed, $type)
     {
         $cascade = array_keys((array) $embed->cascade);
         if (1 === count($cascade)) {
@@ -199,7 +199,7 @@ private function addEmbedMapping(ClassMetadata $class, $embed, $type)
         $this->addFieldMapping($class, $mapping);
     }
 
-    private function addReferenceMapping(ClassMetadata $class, $reference, $type)
+    private function addReferenceMapping(ClassMetadataInfo $class, $reference, $type)
     {
         $cascade = array_keys((array) $reference->cascade);
         if (1 === count($cascade)) {
@@ -229,7 +229,7 @@ private function addReferenceMapping(ClassMetadata $class, $reference, $type)
         $this->addFieldMapping($class, $mapping);
     }
 
-    private function addIndex(ClassMetadata $class, SimpleXmlElement $xmlIndex)
+    private function addIndex(ClassMetadataInfo $class, SimpleXmlElement $xmlIndex)
     {
         $attributes = $xmlIndex->attributes();
         $options = array();

diff --git a/lib/Doctrine/ODM/MongoDB/Tools/DisconnectedClassMetadataFactory.php b/lib/Doctrine/ODM/MongoDB/Tools/DisconnectedClassMetadataFactory.php
@@ -20,7 +20,7 @@
 namespace Doctrine\ODM\MongoDB\Tools;
 
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory;
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;
 
 /**
  * The DisconnectedClassMetadataFactory is used to create ClassMetadata objects
@@ -43,7 +43,7 @@ class DisconnectedClassMetadataFactory extends ClassMetadataFactory
      */
     protected function newClassMetadataInstance($className)
     {
-        $metadata = new ClassMetadata($className);
+        $metadata = new ClassMetadataInfo($className);
         if (strpos($className, "\\") !== false) {
             $metadata->namespace = strrev(substr( strrev($className), strpos(strrev($className), "\\")+1 ));
         } else {