diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch beberlei/Doctrine2.2Compatibilty (PR #3202)

Browse Source 
Commits
-------

c3f0ec7 Make DoctrineBundle fowards compatible with Doctrine 2.2

Discussion
----------

[DoctrineBundle] Doctrine 2.2 compatibilty

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

Doctrine 2.2 does not initialize reflection anymore when in a code-generation context. This fails with the Symfony Metadata Factory that acceses the ReflectionClass after checking that the entity class_exists. This occurs when using code-generation in combination with the annotation driver.

This PR fixes the problem.
This commit is contained in:
Fabien Potencier 2012-01-28 15:14:48 +01:00
commit 47598c6d94
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Bundle/DoctrineBundle/Mapping/MetadataFactory.php
View File

@ -75,8 +75,8 @@ class MetadataFactory
$all = $metadata->getMetadata();
if (class_exists($class)) {
$r = $all[0]->getReflectionClass();
$path = $this->getBasePathForClass($class, $r->getNamespacename(), dirname($r->getFilename()));
$r = new \ReflectionClass($all[0]->name);
$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));
@ -104,8 +104,8 @@ class MetadataFactory
$all = $metadata->getMetadata();
if (class_exists($all[0]->name)) {
$r = $all[0]->getReflectionClass();
$path = $this->getBasePathForClass($namespace, $r->getNamespacename(), dirname($r->getFilename()));
$r = new \ReflectionClass($all[0]->name);
$path = $this->getBasePathForClass($namespace, $r->getNamespaceName(), dirname($r->getFilename()));
} elseif (!$path) {
throw new \RuntimeException(sprintf('Unable to determine where to save the "%s" class (use the --path option).', $all[0]->name));
}