merged branch Tobion/patch-3 (PR #2931)

fabpot · fabpot · commit 89bd0d787476 · 2011-12-20T19:20:41.000+01:00
Commits ------- 1eb5583 fixes #2906 Discussion ---------- Fix for #2906 closes #2906
diff --git a/src/Symfony/Bundle/DoctrineBundle/Mapping/MetadataFactory.php b/src/Symfony/Bundle/DoctrineBundle/Mapping/MetadataFactory.php
@@ -77,12 +77,12 @@ public function getClassMetadata($class, $path = null)
         if (class_exists($class)) {
             $r = $all[0]->getReflectionClass();
             $path = $this->getBasePathForClass($class, $r->getNamespacename(), dirname($r->getFilename()));
+            $metadata->setNamespace($r->getNamespacename());
         } elseif (!$path) {
             throw new \RuntimeException(sprintf('Unable to determine where to save the "%s" class (use the --path option).', $class));
         }
 
         $metadata->setPath($path);
-        $metadata->setNamespace($r->getNamespacename());
 
         return $metadata;
     }

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,12 @@ public function getClassMetadata($class, $path = null)`
`77`	`77`	`if (class_exists($class)) {`
`78`	`78`	`$r = $all[0]->getReflectionClass();`
`79`	`79`	`$path = $this->getBasePathForClass($class, $r->getNamespacename(), dirname($r->getFilename()));`
	`80`	`+ $metadata->setNamespace($r->getNamespacename());`
`80`	`81`	`} elseif (!$path) {`
`81`	`82`	`throw new \RuntimeException(sprintf('Unable to determine where to save the "%s" class (use the --path option).', $class));`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`$metadata->setPath($path);`
`85`		`- $metadata->setNamespace($r->getNamespacename());`
`86`	`86`
`87`	`87`	`return $metadata;`
`88`	`88`	`}`