From 9bdf9a99040637da541a933cbb5b5a2ab617c911 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 15:30:25 +0100
Subject: [PATCH 1/8] DCOM-93 - Adjust ClassMetadataFactory#getClassParents()
to use reflection service.
---
.../ORM/Mapping/ClassMetadataFactory.php | 32 ++++++++++++++++++-
lib/vendor/doctrine-common | 2 +-
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index bf802ecf9..6471df0fd 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -24,6 +24,8 @@ use ReflectionException,
Doctrine\ORM\EntityManager,
Doctrine\DBAL\Platforms,
Doctrine\ORM\Events,
+ Doctrine\Common\Persistence\Mapping\RuntimeReflectionService,
+ Doctrine\Common\Persistence\Mapping\ReflectionService,
Doctrine\Common\Persistence\Mapping\ClassMetadataFactory as ClassMetadataFactoryInterface;
/**
@@ -74,6 +76,11 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
*/
private $initialized = false;
+ /**
+ * @var ReflectionException
+ */
+ private $reflectionService;
+
/**
* @param EntityManager $$em
*/
@@ -220,7 +227,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
{
// Collect parent classes, ignoring transient (not-mapped) classes.
$parentClasses = array();
- foreach (array_reverse(class_parents($name)) as $parentClass) {
+ foreach (array_reverse($this->getReflectionService()->getParentClasses($name)) as $parentClass) {
if ( ! $this->driver->isTransient($parentClass)) {
$parentClasses[] = $parentClass;
}
@@ -533,4 +540,27 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
return $this->driver->isTransient($class);
}
+
+ /**
+ * Get reflectionService.
+ *
+ * @return \Doctrine\Common\Persistence\Mapping\ReflectionService
+ */
+ public function getReflectionService()
+ {
+ if ($this->reflectionService === null) {
+ $this->reflectionService = new RuntimeReflectionService();
+ }
+ return $this->reflectionService;
+ }
+
+ /**
+ * Set reflectionService.
+ *
+ * @param reflectionService the value to set.
+ */
+ public function setReflectionService(ReflectionService $reflectionService)
+ {
+ $this->reflectionService = $reflectionService;
+ }
}
diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common
index 18d11e0a5..cc04744bc 160000
--- a/lib/vendor/doctrine-common
+++ b/lib/vendor/doctrine-common
@@ -1 +1 @@
-Subproject commit 18d11e0a54f8c4e726940a3753e3c2949dbf1c02
+Subproject commit cc04744bcf5a4743c46fae0487ac7a093a722856
From 80408ac34f9dcb0050d8eee13a54a406616e029c Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 15:36:36 +0100
Subject: [PATCH 2/8] DCOM-93 - Add empty initialize and wakeup methods.
---
.../ORM/Mapping/ClassMetadataFactory.php | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 6471df0fd..fdf57dbac 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -268,6 +268,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
}
$class = $this->newClassMetadataInstance($className);
+ $this->initializeReflection($class, $this->getReflectionService());
if ($parent) {
$class->setInheritanceType($parent->inheritanceType);
@@ -289,6 +290,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
// Invoke driver
try {
$this->driver->loadMetadataForClass($className, $class);
+ $this->wakeupReflection($class, $this->getReflectionService());
} catch (ReflectionException $e) {
throw MappingException::reflectionFailure($className, $e);
}
@@ -563,4 +565,26 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
{
$this->reflectionService = $reflectionService;
}
+
+ /**
+ * Wakeup reflection after ClassMetadata gets unserialized from cache.
+ *
+ * @param ClassMetadata $class
+ * @param ReflectionService $reflService
+ * @return void
+ */
+ protected function wakeupReflection(ClassMetadataInfo $class, ReflectionService $reflService)
+ {
+ }
+
+ /**
+ * Initialize Reflection after ClassMetadata was constructed.
+ *
+ * @param ClassMetadata $class
+ * @param ReflectionSErvice $reflService
+ * @return void
+ */
+ protected function initializeReflection(ClassMetadataInfo $class, ReflectionService $reflService)
+ {
+ }
}
From ea2d4e4282438e60a7807087e314e940be080255 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 15:46:20 +0100
Subject: [PATCH 3/8] DCOM-93 - Add ClassMetadataFactory#wakeupReflection
implementation
---
.../ORM/Mapping/ClassMetadataFactory.php | 17 +++++++++++++++++
.../Tools/DisconnectedClassMetadataFactory.php | 7 ++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index fdf57dbac..07d6344ca 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -172,6 +172,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
if ($this->cacheDriver) {
if (($cached = $this->cacheDriver->fetch("$realClassName\$CLASSMETADATA")) !== false) {
+ $this->wakeupReflection($cached, $this->getReflectionService());
$this->loadedMetadata[$realClassName] = $cached;
} else {
foreach ($this->loadMetadata($realClassName) as $loadedClassName) {
@@ -575,6 +576,22 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
*/
protected function wakeupReflection(ClassMetadataInfo $class, ReflectionService $reflService)
{
+ // Restore ReflectionClass and properties
+ $class->reflClass = $reflService->getClass($class->name);
+
+ foreach ($class->fieldMappings as $field => $mapping) {
+ $reflField = isset($mapping['declared'])
+ ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+ : $reflService->getAccessibleProperty($class->name, $field);
+ $class->reflFields[$field] = $reflField;
+ }
+
+ foreach ($class->associationMappings as $field => $mapping) {
+ $reflField = isset($mapping['declared'])
+ ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+ : $reflService->getAccessibleProperty($class->name, $field);
+ $class->reflFields[$field] = $reflField;
+ }
}
/**
diff --git a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
index f98c8bfae..c9534a76e 100644
--- a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
@@ -70,4 +70,9 @@ class DisconnectedClassMetadataFactory extends ClassMetadataFactory
{
return array();
}
-}
\ No newline at end of file
+
+ public function getReflectionService()
+ {
+ return new \Doctrine\Common\Persistence\Mapping\StaticReflectionService;
+ }
+}
From 1cecc9c4292a471d6d2028e5576e8021053d49ef Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 15:57:32 +0100
Subject: [PATCH 4/8] DCOM-93 - Factor out __wakeup into a delegate-method from
ClassMetadataFactory#wakeupReflection to ClassMetadataInfo#wakeupReflection
---
lib/Doctrine/ORM/Mapping/ClassMetadata.php | 22 +++++++-------
.../ORM/Mapping/ClassMetadataFactory.php | 17 +----------
.../ORM/Mapping/ClassMetadataInfo.php | 30 +++++++++++++++++++
.../Mapping/BasicInheritanceMappingTest.php | 3 +-
.../Tests/ORM/Mapping/ClassMetadataTest.php | 1 +
5 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index a5b983fbb..e20dd578e 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -327,32 +327,34 @@ class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
/**
* Restores some state that can not be serialized/unserialized.
*
+ * @param ReflectionService $reflService
* @return void
*/
- public function __wakeup()
+ public function wakeupReflection($reflService)
{
// Restore ReflectionClass and properties
- $this->reflClass = new ReflectionClass($this->name);
+ $this->reflClass = $reflService->getClass($this->name);
foreach ($this->fieldMappings as $field => $mapping) {
$reflField = isset($mapping['declared'])
- ? new ReflectionProperty($mapping['declared'], $field)
- : $this->reflClass->getProperty($field);
-
- $reflField->setAccessible(true);
+ ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+ : $reflService->getAccessibleProperty($this->name, $field);
$this->reflFields[$field] = $reflField;
}
foreach ($this->associationMappings as $field => $mapping) {
$reflField = isset($mapping['declared'])
- ? new ReflectionProperty($mapping['declared'], $field)
- : $this->reflClass->getProperty($field);
-
- $reflField->setAccessible(true);
+ ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+ : $reflService->getAccessibleProperty($this->name, $field);
$this->reflFields[$field] = $reflField;
}
}
+ public function initializeReflection($reflService)
+ {
+
+ }
+
/**
* Creates a new instance of the mapped class, without invoking the constructor.
*
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 07d6344ca..c204f016c 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -576,22 +576,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
*/
protected function wakeupReflection(ClassMetadataInfo $class, ReflectionService $reflService)
{
- // Restore ReflectionClass and properties
- $class->reflClass = $reflService->getClass($class->name);
-
- foreach ($class->fieldMappings as $field => $mapping) {
- $reflField = isset($mapping['declared'])
- ? $reflService->getAccessibleProperty($mapping['declared'], $field)
- : $reflService->getAccessibleProperty($class->name, $field);
- $class->reflFields[$field] = $reflField;
- }
-
- foreach ($class->associationMappings as $field => $mapping) {
- $reflField = isset($mapping['declared'])
- ? $reflService->getAccessibleProperty($mapping['declared'], $field)
- : $reflService->getAccessibleProperty($class->name, $field);
- $class->reflFields[$field] = $reflField;
- }
+ $class->wakeupReflection($reflService);
}
/**
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 56dd16385..82c1adff2 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -506,6 +506,36 @@ class ClassMetadataInfo
$this->rootEntityName = $entityName;
}
+ /**
+ * Restores some state that can not be serialized/unserialized.
+ *
+ * @param ReflectionService $reflService
+ * @return void
+ */
+ public function wakeupReflection($reflService)
+ {
+ // Restore ReflectionClass and properties
+ $this->reflClass = $reflService->getClass($this->name);
+
+ foreach ($this->fieldMappings as $field => $mapping) {
+ $this->reflFields[$field] = isset($mapping['declared'])
+ ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+ : $reflService->getAccessibleProperty($this->name, $field);
+ }
+
+ foreach ($this->associationMappings as $field => $mapping) {
+ $this->reflFields[$field] = isset($mapping['declared'])
+ ? $reflService->getAccessibleProperty($mapping['declared'], $field)
+ : $reflService->getAccessibleProperty($this->name, $field);
+ }
+ }
+
+ public function initializeReflection($reflService)
+ {
+
+ }
+
+
/**
* Gets the ReflectionClass instance of the mapped class.
*
diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
index 0c739e9f8..ff7f04048 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
@@ -91,6 +91,7 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
$class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\EntitySubClass2');
$class2 = unserialize(serialize($class));
+ $class2->wakeupReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$this->assertTrue(isset($class2->reflFields['mapped1']));
$this->assertTrue(isset($class2->reflFields['mapped2']));
@@ -315,4 +316,4 @@ class MediumSuperclassEntity extends MediumSuperclassBase
class SubclassWithRepository extends \Doctrine\Tests\Models\DDC869\DDC869Payment
{
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index 7a4de4ca4..88af7f2ae 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -36,6 +36,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
$serialized = serialize($cm);
$cm = unserialize($serialized);
+ $cm->wakeupReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
// Check state
$this->assertTrue(count($cm->getReflectionProperties()) > 0);
From c7d8c9f34e92cad269d47a6e37deeb8fbf1f1b67 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 17:06:22 +0100
Subject: [PATCH 5/8] DCOM-93 - Factor out ClassMetadata constructor into
delegate method initializeReflection
---
lib/Doctrine/ORM/Mapping/ClassMetadata.php | 44 +++------------
.../ORM/Mapping/ClassMetadataFactory.php | 1 +
.../ORM/Mapping/AbstractMappingDriverTest.php | 1 +
.../ORM/Mapping/ClassMetadataBuilderTest.php | 1 +
.../ORM/Mapping/ClassMetadataFactoryTest.php | 18 +++---
.../Tests/ORM/Mapping/ClassMetadataTest.php | 56 +++++++++++++++++++
.../ORM/Mapping/XmlMappingDriverTest.php | 3 +-
.../ORM/Proxy/ProxyClassGeneratorTest.php | 2 +
8 files changed, 81 insertions(+), 45 deletions(-)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index e20dd578e..07c65fd47 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -62,12 +62,15 @@ class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
*
* @param string $entityName The name of the entity class the new instance is used for.
*/
- public function __construct($entityName)
+ public function initializeReflection($reflService)
{
- $this->reflClass = new ReflectionClass($entityName);
- $this->namespace = $this->reflClass->getNamespaceName();
- $this->table['name'] = $this->reflClass->getShortName();
- parent::__construct($this->reflClass->getName()); // do not use $entityName, possible case-problems
+ $this->reflClass = $reflService->getClass($this->name);
+ $this->namespace = $reflService->getClassNamespace($this->name);
+ $this->table['name'] = $reflService->getClassShortName($this->name);
+
+ if ($this->reflClass) {
+ $this->name = $this->rootEntityName = $this->reflClass->getName();
+ }
}
/**
@@ -324,37 +327,6 @@ class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
return $serialized;
}
- /**
- * Restores some state that can not be serialized/unserialized.
- *
- * @param ReflectionService $reflService
- * @return void
- */
- public function wakeupReflection($reflService)
- {
- // Restore ReflectionClass and properties
- $this->reflClass = $reflService->getClass($this->name);
-
- foreach ($this->fieldMappings as $field => $mapping) {
- $reflField = isset($mapping['declared'])
- ? $reflService->getAccessibleProperty($mapping['declared'], $field)
- : $reflService->getAccessibleProperty($this->name, $field);
- $this->reflFields[$field] = $reflField;
- }
-
- foreach ($this->associationMappings as $field => $mapping) {
- $reflField = isset($mapping['declared'])
- ? $reflService->getAccessibleProperty($mapping['declared'], $field)
- : $reflService->getAccessibleProperty($this->name, $field);
- $this->reflFields[$field] = $reflField;
- }
- }
-
- public function initializeReflection($reflService)
- {
-
- }
-
/**
* Creates a new instance of the mapped class, without invoking the constructor.
*
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index c204f016c..4590b9ee3 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -588,5 +588,6 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
*/
protected function initializeReflection(ClassMetadataInfo $class, ReflectionService $reflService)
{
+ $class->initializeReflection($reflService);
}
}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
index 0042259e1..6d14c2ac7 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -18,6 +18,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
$mappingDriver = $this->_loadDriver();
$class = new ClassMetadata($entityClassName);
+ $class->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$mappingDriver->loadMetadataForClass($entityClassName, $class);
return $class;
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
index 38cecd5cc..888db0d81 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
@@ -40,6 +40,7 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
public function setUp()
{
$this->cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $this->cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$this->builder = new ClassMetadataBuilder($this->cm);
}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
index 223ef8582..cd1e4f3ff 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -27,6 +27,7 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
// Self-made metadata
$cm1 = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1');
+ $cm1->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$cm1->setPrimaryTable(array('name' => '`group`'));
// Add a mapped field
$cm1->mapField(array('fieldName' => 'name', 'type' => 'varchar'));
@@ -43,9 +44,9 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
$cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO);
// SUT
- $cmf = new ClassMetadataFactoryTestSubject();
+ $cmf = new \Doctrine\ORM\Mapping\ClassMetadataFactory();
$cmf->setEntityManager($entityManager);
- $cmf->setMetadataForClass('Doctrine\Tests\ORM\Mapping\TestEntity1', $cm1);
+ $cmf->setMetadataFor('Doctrine\Tests\ORM\Mapping\TestEntity1', $cm1);
// Prechecks
$this->assertEquals(array(), $cm1->parentClasses);
@@ -53,15 +54,16 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
$this->assertTrue($cm1->hasField('name'));
$this->assertEquals(2, count($cm1->associationMappings));
$this->assertEquals(ClassMetadata::GENERATOR_TYPE_AUTO, $cm1->generatorType);
+ $this->assertEquals('group', $cm1->table['name']);
// Go
- $cm1 = $cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\TestEntity1');
+ $cmMap1 = $cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\TestEntity1');
- $this->assertEquals('group', $cm1->table['name']);
- $this->assertTrue($cm1->table['quoted']);
- $this->assertEquals(array(), $cm1->parentClasses);
- $this->assertTrue($cm1->hasField('name'));
- $this->assertEquals(ClassMetadata::GENERATOR_TYPE_SEQUENCE, $cm1->generatorType);
+ $this->assertSame($cm1, $cmMap1);
+ $this->assertEquals('group', $cmMap1->table['name']);
+ $this->assertTrue($cmMap1->table['quoted']);
+ $this->assertEquals(array(), $cmMap1->parentClasses);
+ $this->assertTrue($cmMap1->hasField('name'));
}
public function testHasGetMetadata_NamespaceSeperatorIsNotNormalized()
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index 88af7f2ae..f663522a6 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -13,6 +13,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testClassMetadataInstanceSerialization()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
// Test initial state
$this->assertTrue(count($cm->getReflectionProperties()) == 0);
@@ -61,6 +62,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testFieldIsNullable()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
// Explicit Nullable
$cm->mapField(array('fieldName' => 'status', 'nullable' => true, 'type' => 'string', 'length' => 50));
@@ -83,6 +85,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
$cm = new ClassMetadata('DoctrineGlobal_Article');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$cm->mapManyToMany(array(
'fieldName' => 'author',
'targetEntity' => 'DoctrineGlobal_User',
@@ -99,6 +102,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testMapManyToManyJoinTableDefaults()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$cm->mapManyToMany(
array(
'fieldName' => 'groups',
@@ -118,6 +122,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testSerializeManyToManyJoinTableCascade()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$cm->mapManyToMany(
array(
'fieldName' => 'groups',
@@ -139,6 +144,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
$cm = new ClassMetadata('DoctrineGlobal_User');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$cm->setDiscriminatorMap(array('descr' => 'DoctrineGlobal_Article', 'foo' => 'DoctrineGlobal_User'));
$this->assertEquals("DoctrineGlobal_Article", $cm->discriminatorMap['descr']);
@@ -153,6 +159,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
$cm = new ClassMetadata('DoctrineGlobal_User');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$cm->setSubclasses(array('DoctrineGlobal_Article'));
$this->assertEquals("DoctrineGlobal_Article", $cm->subClasses[0]);
@@ -168,6 +175,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
$field['type'] = 'string';
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
$cm->setVersionMapping($field);
@@ -176,6 +184,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testGetSingleIdentifierFieldName_MultipleIdentifierEntity_ThrowsException()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$cm->isIdentifierComposite = true;
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -185,6 +194,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testDuplicateAssociationMappingException()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$a1 = array('fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo');
$a2 = array('fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo');
@@ -196,6 +207,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testDuplicateColumnName_ThrowsMappingException()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -205,6 +218,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testDuplicateColumnName_DiscriminatorColumn_ThrowsMappingException()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -214,6 +229,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testDuplicateColumnName_DiscriminatorColumn2_ThrowsMappingException()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->setDiscriminatorColumn(array('name' => 'name'));
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -223,6 +240,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testDuplicateFieldAndAssocationMapping1_ThrowsException()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -232,6 +251,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testDuplicateFieldAndAssocationMapping2_ThrowsException()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->mapOneToOne(array('fieldName' => 'name', 'targetEntity' => 'CmsUser'));
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -244,6 +265,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testGetTemporaryTableNameSchema()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->setTableName('foo.bar');
$this->assertEquals('foo_bar_id_tmp', $cm->getTemporaryIdTableName());
@@ -252,6 +275,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testDefaultTableName()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
// When table's name is not given
$primaryTable = array();
@@ -261,6 +285,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
$this->assertEquals('CmsUser', $cm->table['name']);
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
// When joinTable's name is not given
$cm->mapManyToMany(array(
'fieldName' => 'user',
@@ -274,6 +299,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testDefaultJoinColumnName()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
// this is really dirty, but it's the simpliest way to test whether
// joinColumn's name will be automatically set to user_id
$cm->mapOneToOne(array(
@@ -283,6 +310,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
$this->assertEquals('user_id', $cm->associationMappings['user']['joinColumns'][0]['name']);
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$cm->mapManyToMany(array(
'fieldName' => 'user',
'targetEntity' => 'CmsUser',
@@ -300,6 +328,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testSetMultipleIdentifierSetsComposite()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->mapField(array('fieldName' => 'name'));
$cm->mapField(array('fieldName' => 'username'));
@@ -313,6 +343,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testMappingNotFound()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "No mapping found for field 'foo' on class 'Doctrine\Tests\Models\CMS\CmsUser'.");
$cm->getFieldMapping('foo');
@@ -324,6 +355,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testJoinTableMappingDefaults()
{
$cm = new ClassMetadata('DoctrineGlobal_Article');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->mapManyToMany(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser'));
$this->assertEquals('doctrineglobal_article_cmsuser', $cm->associationMappings['author']['joinTable']['name']);
@@ -335,6 +368,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testMapIdentifierAssociation()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->mapOneToOne(array(
'fieldName' => 'article',
'id' => true,
@@ -352,6 +387,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testOrphanRemovalIdentifierAssociation()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'The orphan removal option is not allowed on an association that');
$cm->mapOneToOne(array(
@@ -369,6 +405,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testInverseIdentifierAssocation()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'An inverse association is not allowed to be identifier in');
$cm->mapOneToOne(array(
@@ -386,6 +424,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testIdentifierAssocationManyToMany()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'Many-to-many or one-to-many associations are not allowed to be identifier in');
$cm->mapManyToMany(array(
@@ -404,12 +444,16 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException',
"The field or association mapping misses the 'fieldName' attribute in entity 'Doctrine\Tests\Models\CMS\CmsUser'.");
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->mapField(array('fieldName' => ''));
}
public function testRetrievalOfNamedQueries()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$this->assertEquals(0, count($cm->getNamedQueries()));
@@ -424,6 +468,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testExistanceOfNamedQuery()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->addNamedQuery(array(
'name' => 'all',
@@ -437,6 +483,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testRetrieveOfNamedQuery()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$cm->addNamedQuery(array(
'name' => 'userById',
@@ -449,6 +497,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testNamingCollisionNamedQueryShouldThrowException()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
@@ -470,6 +520,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
{
$user = new \Doctrine\Tests\Models\CMS\CmsUser();
$cm = new ClassMetadata('DOCTRINE\TESTS\MODELS\CMS\CMSUSER');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name);
}
@@ -479,6 +531,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testLifecycleCallbackNotFound()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$this->setExpectedException("Doctrine\ORM\Mapping\MappingException", "Entity 'Doctrine\Tests\Models\CMS\CmsUser' has no method 'notfound' to be registered as lifecycle callback.");
$cm->addLifecycleCallback('notfound', 'postLoad');
@@ -490,6 +544,8 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
public function testTargetEntityNotFound()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$this->setExpectedException("Doctrine\ORM\Mapping\MappingException", "The target-entity Doctrine\Tests\Models\CMS\UnknownClass cannot be found in 'Doctrine\Tests\Models\CMS\CmsUser#address'.");
$cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass'));
diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
index e04543db0..6a852bc69 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -21,6 +21,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
$mappingDriver = $this->_loadDriver();
$class = new ClassMetadata($className);
+ $class->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$mappingDriver->loadMetadataForClass($className, $class);
$expectedMap = array(
@@ -92,4 +93,4 @@ class CTI
class CTIFoo extends CTI {}
class CTIBar extends CTI {}
-class CTIBaz extends CTI {}
\ No newline at end of file
+class CTIBaz extends CTI {}
diff --git a/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php b/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
index 39bdcfe5a..a45ca2c1f 100644
--- a/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
@@ -127,6 +127,7 @@ class ProxyClassGeneratorTest extends \Doctrine\Tests\OrmTestCase
$className = "\DoctrineOrmTestEntity";
$proxyName = "DoctrineOrmTestEntityProxy";
$classMetadata = new \Doctrine\ORM\Mapping\ClassMetadata($className);
+ $classMetadata->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$classMetadata->mapField(array('fieldName' => 'id', 'type' => 'integer'));
$classMetadata->setIdentifier(array('id'));
@@ -143,6 +144,7 @@ class ProxyClassGeneratorTest extends \Doctrine\Tests\OrmTestCase
$className = "\Doctrine\Tests\ORM\Proxy\SleepClass";
$proxyName = "DoctrineTestsORMProxySleepClassProxy";
$classMetadata = new \Doctrine\ORM\Mapping\ClassMetadata($className);
+ $classMetadata->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$classMetadata->mapField(array('fieldName' => 'id', 'type' => 'integer'));
$classMetadata->setIdentifier(array('id'));
From 76e4f5a80bf8faa6e00ec4746c34f2e4bfd4215e Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Mon, 2 Jan 2012 21:32:18 +0100
Subject: [PATCH 6/8] DCOM-93 - Removed reflection dependency from
ClassMetadata completly, moving all the code into ClassMetadataInfo for BC
reasons.
---
lib/Doctrine/ORM/Mapping/ClassMetadata.php | 315 +-----------------
.../ORM/Mapping/ClassMetadataFactory.php | 14 +-
.../ORM/Mapping/ClassMetadataInfo.php | 292 +++++++++++++++-
.../DisconnectedClassMetadataFactory.php | 33 --
.../ORM/Functional/Ticket/DDC168Test.php | 2 +-
.../ORM/Mapping/AnnotationDriverTest.php | 2 +
.../Tests/ORM/Mapping/ClassMetadataTest.php | 8 +-
.../Tests/ORM/Tools/EntityGeneratorTest.php | 6 +-
8 files changed, 308 insertions(+), 364 deletions(-)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index 07c65fd47..70b8f9e40 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -20,7 +20,6 @@
namespace Doctrine\ORM\Mapping;
use ReflectionClass, ReflectionProperty;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
/**
* A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@@ -40,318 +39,6 @@ use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
* @author Jonathan H. Wage <jonwage@gmail.com>
* @since 2.0
*/
-class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
+class ClassMetadata extends ClassMetadataInfo
{
- /**
- * The ReflectionProperty instances of the mapped class.
- *
- * @var array
- */
- public $reflFields = array();
-
- /**
- * The prototype from which new instances of the mapped class are created.
- *
- * @var object
- */
- private $_prototype;
-
- /**
- * Initializes a new ClassMetadata instance that will hold the object-relational mapping
- * metadata of the class with the given name.
- *
- * @param string $entityName The name of the entity class the new instance is used for.
- */
- public function initializeReflection($reflService)
- {
- $this->reflClass = $reflService->getClass($this->name);
- $this->namespace = $reflService->getClassNamespace($this->name);
- $this->table['name'] = $reflService->getClassShortName($this->name);
-
- if ($this->reflClass) {
- $this->name = $this->rootEntityName = $this->reflClass->getName();
- }
- }
-
- /**
- * Gets the ReflectionPropertys of the mapped class.
- *
- * @return array An array of ReflectionProperty instances.
- */
- public function getReflectionProperties()
- {
- return $this->reflFields;
- }
-
- /**
- * Gets a ReflectionProperty for a specific field of the mapped class.
- *
- * @param string $name
- * @return ReflectionProperty
- */
- public function getReflectionProperty($name)
- {
- return $this->reflFields[$name];
- }
-
- /**
- * Gets the ReflectionProperty for the single identifier field.
- *
- * @return ReflectionProperty
- * @throws BadMethodCallException If the class has a composite identifier.
- */
- public function getSingleIdReflectionProperty()
- {
- if ($this->isIdentifierComposite) {
- throw new \BadMethodCallException("Class " . $this->name . " has a composite identifier.");
- }
- return $this->reflFields[$this->identifier[0]];
- }
-
- /**
- * Validates & completes the given field mapping.
- *
- * @param array $mapping The field mapping to validated & complete.
- * @return array The validated and completed field mapping.
- *
- * @throws MappingException
- */
- protected function _validateAndCompleteFieldMapping(array &$mapping)
- {
- parent::_validateAndCompleteFieldMapping($mapping);
-
- // Store ReflectionProperty of mapped field
- $refProp = $this->reflClass->getProperty($mapping['fieldName']);
- $refProp->setAccessible(true);
- $this->reflFields[$mapping['fieldName']] = $refProp;
- }
-
- /**
- * Validates & completes the basic mapping information that is common to all
- * association mappings (one-to-one, many-ot-one, one-to-many, many-to-many).
- *
- * @param array $mapping The mapping.
- * @return array The updated mapping.
- * @throws MappingException If something is wrong with the mapping.
- */
- protected function _validateAndCompleteAssociationMapping(array $mapping)
- {
- $mapping = parent::_validateAndCompleteAssociationMapping($mapping);
-
- if ( ! \Doctrine\Common\ClassLoader::classExists($mapping['targetEntity']) ) {
- throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
- }
-
- return $mapping;
- }
-
- /**
- * Extracts the identifier values of an entity of this class.
- *
- * For composite identifiers, the identifier values are returned as an array
- * with the same order as the field order in {@link identifier}.
- *
- * @param object $entity
- * @return array
- */
- public function getIdentifierValues($entity)
- {
- if ($this->isIdentifierComposite) {
- $id = array();
-
- foreach ($this->identifier as $idField) {
- $value = $this->reflFields[$idField]->getValue($entity);
-
- if ($value !== null) {
- $id[$idField] = $value;
- }
- }
-
- return $id;
- }
-
- $value = $this->reflFields[$this->identifier[0]]->getValue($entity);
-
- if ($value !== null) {
- return array($this->identifier[0] => $value);
- }
-
- return array();
- }
-
- /**
- * Populates the entity identifier of an entity.
- *
- * @param object $entity
- * @param mixed $id
- * @todo Rename to assignIdentifier()
- */
- public function setIdentifierValues($entity, array $id)
- {
- foreach ($id as $idField => $idValue) {
- $this->reflFields[$idField]->setValue($entity, $idValue);
- }
- }
-
- /**
- * Sets the specified field to the specified value on the given entity.
- *
- * @param object $entity
- * @param string $field
- * @param mixed $value
- */
- public function setFieldValue($entity, $field, $value)
- {
- $this->reflFields[$field]->setValue($entity, $value);
- }
-
- /**
- * Gets the specified field's value off the given entity.
- *
- * @param object $entity
- * @param string $field
- */
- public function getFieldValue($entity, $field)
- {
- return $this->reflFields[$field]->getValue($entity);
- }
-
- /**
- * Stores the association mapping.
- *
- * @param AssociationMapping $assocMapping
- */
- protected function _storeAssociationMapping(array $assocMapping)
- {
- parent::_storeAssociationMapping($assocMapping);
-
- // Store ReflectionProperty of mapped field
- $sourceFieldName = $assocMapping['fieldName'];
-
- $refProp = $this->reflClass->getProperty($sourceFieldName);
- $refProp->setAccessible(true);
- $this->reflFields[$sourceFieldName] = $refProp;
- }
-
- /**
- * Creates a string representation of this instance.
- *
- * @return string The string representation of this instance.
- * @todo Construct meaningful string representation.
- */
- public function __toString()
- {
- return __CLASS__ . '@' . spl_object_hash($this);
- }
-
- /**
- * Determines which fields get serialized.
- *
- * It is only serialized what is necessary for best unserialization performance.
- * That means any metadata properties that are not set or empty or simply have
- * their default value are NOT serialized.
- *
- * Parts that are also NOT serialized because they can not be properly unserialized:
- * - reflClass (ReflectionClass)
- * - reflFields (ReflectionProperty array)
- *
- * @return array The names of all the fields that should be serialized.
- */
- public function __sleep()
- {
- // This metadata is always serialized/cached.
- $serialized = array(
- 'associationMappings',
- 'columnNames', //TODO: Not really needed. Can use fieldMappings[$fieldName]['columnName']
- 'fieldMappings',
- 'fieldNames',
- 'identifier',
- 'isIdentifierComposite', // TODO: REMOVE
- 'name',
- 'namespace', // TODO: REMOVE
- 'table',
- 'rootEntityName',
- 'idGenerator', //TODO: Does not really need to be serialized. Could be moved to runtime.
- );
-
- // The rest of the metadata is only serialized if necessary.
- if ($this->changeTrackingPolicy != self::CHANGETRACKING_DEFERRED_IMPLICIT) {
- $serialized[] = 'changeTrackingPolicy';
- }
-
- if ($this->customRepositoryClassName) {
- $serialized[] = 'customRepositoryClassName';
- }
-
- if ($this->inheritanceType != self::INHERITANCE_TYPE_NONE) {
- $serialized[] = 'inheritanceType';
- $serialized[] = 'discriminatorColumn';
- $serialized[] = 'discriminatorValue';
- $serialized[] = 'discriminatorMap';
- $serialized[] = 'parentClasses';
- $serialized[] = 'subClasses';
- }
-
- if ($this->generatorType != self::GENERATOR_TYPE_NONE) {
- $serialized[] = 'generatorType';
- if ($this->generatorType == self::GENERATOR_TYPE_SEQUENCE) {
- $serialized[] = 'sequenceGeneratorDefinition';
- }
- }
-
- if ($this->isMappedSuperclass) {
- $serialized[] = 'isMappedSuperclass';
- }
-
- if ($this->containsForeignIdentifier) {
- $serialized[] = 'containsForeignIdentifier';
- }
-
- if ($this->isVersioned) {
- $serialized[] = 'isVersioned';
- $serialized[] = 'versionField';
- }
-
- if ($this->lifecycleCallbacks) {
- $serialized[] = 'lifecycleCallbacks';
- }
-
- if ($this->namedQueries) {
- $serialized[] = 'namedQueries';
- }
-
- if ($this->isReadOnly) {
- $serialized[] = 'isReadOnly';
- }
-
- return $serialized;
- }
-
- /**
- * Creates a new instance of the mapped class, without invoking the constructor.
- *
- * @return object
- */
- public function newInstance()
- {
- if ($this->_prototype === null) {
- $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
- }
-
- return clone $this->_prototype;
- }
-
- /**
- * @param string $callback
- * @param string $event
- */
- public function addLifecycleCallback($callback, $event)
- {
- if ( !$this->reflClass->hasMethod($callback) ||
- ($this->reflClass->getMethod($callback)->getModifiers() & \ReflectionMethod::IS_PUBLIC) == 0) {
- throw MappingException::lifecycleCallbackMethodNotFound($this->name, $callback);
- }
-
- return parent::addLifecycleCallback($callback, $event);
- }
}
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 4590b9ee3..0d93b18c9 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -359,11 +359,15 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
*/
protected function validateRuntimeMetadata($class, $parent)
{
- // Verify & complete identifier mapping
- if ( ! $class->identifier && ! $class->isMappedSuperclass) {
- throw MappingException::identifierRequired($class->name);
+ if ( ! $class->reflClass ) {
+ // only validate if there is a reflection class instance
+ return;
}
+ $class->validateIdentifier();
+ $class->validateAssocations();
+ $class->validateLifecycleCallbacks($this->getReflectionService());
+
// verify inheritance
if (!$class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
if (!$parent) {
@@ -381,10 +385,6 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
// second condition is necessary for mapped superclasses in the middle of an inheritance hierachy
throw MappingException::noInheritanceOnMappedSuperClass($class->name);
}
-
- if ($class->usesIdGenerator() && $class->isIdentifierComposite) {
- throw MappingException::compositeKeyAssignedIdGeneratorRequired($class->name);
- }
}
/**
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 82c1adff2..08ce40a64 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -21,6 +21,7 @@ namespace Doctrine\ORM\Mapping;
use Doctrine\DBAL\Types\Type;
use ReflectionClass;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
/**
* A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@@ -40,7 +41,7 @@ use ReflectionClass;
* @author Jonathan H. Wage <jonwage@gmail.com>
* @since 2.0
*/
-class ClassMetadataInfo
+class ClassMetadataInfo implements ClassMetadata
{
/* The inheritance mapping types */
/**
@@ -494,6 +495,20 @@ class ClassMetadataInfo
*/
public $isReadOnly = false;
+ /**
+ * The ReflectionProperty instances of the mapped class.
+ *
+ * @var array
+ */
+ public $reflFields = array();
+
+ /**
+ * The prototype from which new instances of the mapped class are created.
+ *
+ * @var object
+ */
+ private $_prototype;
+
/**
* Initializes a new ClassMetadata instance that will hold the object-relational mapping
* metadata of the class with the given name.
@@ -506,6 +521,219 @@ class ClassMetadataInfo
$this->rootEntityName = $entityName;
}
+ /**
+ * Gets the ReflectionPropertys of the mapped class.
+ *
+ * @return array An array of ReflectionProperty instances.
+ */
+ public function getReflectionProperties()
+ {
+ return $this->reflFields;
+ }
+
+ /**
+ * Gets a ReflectionProperty for a specific field of the mapped class.
+ *
+ * @param string $name
+ * @return ReflectionProperty
+ */
+ public function getReflectionProperty($name)
+ {
+ return $this->reflFields[$name];
+ }
+
+ /**
+ * Gets the ReflectionProperty for the single identifier field.
+ *
+ * @return ReflectionProperty
+ * @throws BadMethodCallException If the class has a composite identifier.
+ */
+ public function getSingleIdReflectionProperty()
+ {
+ if ($this->isIdentifierComposite) {
+ throw new \BadMethodCallException("Class " . $this->name . " has a composite identifier.");
+ }
+ return $this->reflFields[$this->identifier[0]];
+ }
+
+ /**
+ * Extracts the identifier values of an entity of this class.
+ *
+ * For composite identifiers, the identifier values are returned as an array
+ * with the same order as the field order in {@link identifier}.
+ *
+ * @param object $entity
+ * @return array
+ */
+ public function getIdentifierValues($entity)
+ {
+ if ($this->isIdentifierComposite) {
+ $id = array();
+
+ foreach ($this->identifier as $idField) {
+ $value = $this->reflFields[$idField]->getValue($entity);
+
+ if ($value !== null) {
+ $id[$idField] = $value;
+ }
+ }
+
+ return $id;
+ }
+
+ $value = $this->reflFields[$this->identifier[0]]->getValue($entity);
+
+ if ($value !== null) {
+ return array($this->identifier[0] => $value);
+ }
+
+ return array();
+ }
+
+ /**
+ * Populates the entity identifier of an entity.
+ *
+ * @param object $entity
+ * @param mixed $id
+ * @todo Rename to assignIdentifier()
+ */
+ public function setIdentifierValues($entity, array $id)
+ {
+ foreach ($id as $idField => $idValue) {
+ $this->reflFields[$idField]->setValue($entity, $idValue);
+ }
+ }
+
+ /**
+ * Sets the specified field to the specified value on the given entity.
+ *
+ * @param object $entity
+ * @param string $field
+ * @param mixed $value
+ */
+ public function setFieldValue($entity, $field, $value)
+ {
+ $this->reflFields[$field]->setValue($entity, $value);
+ }
+
+ /**
+ * Gets the specified field's value off the given entity.
+ *
+ * @param object $entity
+ * @param string $field
+ */
+ public function getFieldValue($entity, $field)
+ {
+ return $this->reflFields[$field]->getValue($entity);
+ }
+
+ /**
+ * Creates a string representation of this instance.
+ *
+ * @return string The string representation of this instance.
+ * @todo Construct meaningful string representation.
+ */
+ public function __toString()
+ {
+ return __CLASS__ . '@' . spl_object_hash($this);
+ }
+
+ /**
+ * Determines which fields get serialized.
+ *
+ * It is only serialized what is necessary for best unserialization performance.
+ * That means any metadata properties that are not set or empty or simply have
+ * their default value are NOT serialized.
+ *
+ * Parts that are also NOT serialized because they can not be properly unserialized:
+ * - reflClass (ReflectionClass)
+ * - reflFields (ReflectionProperty array)
+ *
+ * @return array The names of all the fields that should be serialized.
+ */
+ public function __sleep()
+ {
+ // This metadata is always serialized/cached.
+ $serialized = array(
+ 'associationMappings',
+ 'columnNames', //TODO: Not really needed. Can use fieldMappings[$fieldName]['columnName']
+ 'fieldMappings',
+ 'fieldNames',
+ 'identifier',
+ 'isIdentifierComposite', // TODO: REMOVE
+ 'name',
+ 'namespace', // TODO: REMOVE
+ 'table',
+ 'rootEntityName',
+ 'idGenerator', //TODO: Does not really need to be serialized. Could be moved to runtime.
+ );
+
+ // The rest of the metadata is only serialized if necessary.
+ if ($this->changeTrackingPolicy != self::CHANGETRACKING_DEFERRED_IMPLICIT) {
+ $serialized[] = 'changeTrackingPolicy';
+ }
+
+ if ($this->customRepositoryClassName) {
+ $serialized[] = 'customRepositoryClassName';
+ }
+
+ if ($this->inheritanceType != self::INHERITANCE_TYPE_NONE) {
+ $serialized[] = 'inheritanceType';
+ $serialized[] = 'discriminatorColumn';
+ $serialized[] = 'discriminatorValue';
+ $serialized[] = 'discriminatorMap';
+ $serialized[] = 'parentClasses';
+ $serialized[] = 'subClasses';
+ }
+
+ if ($this->generatorType != self::GENERATOR_TYPE_NONE) {
+ $serialized[] = 'generatorType';
+ if ($this->generatorType == self::GENERATOR_TYPE_SEQUENCE) {
+ $serialized[] = 'sequenceGeneratorDefinition';
+ }
+ }
+
+ if ($this->isMappedSuperclass) {
+ $serialized[] = 'isMappedSuperclass';
+ }
+
+ if ($this->containsForeignIdentifier) {
+ $serialized[] = 'containsForeignIdentifier';
+ }
+
+ if ($this->isVersioned) {
+ $serialized[] = 'isVersioned';
+ $serialized[] = 'versionField';
+ }
+
+ if ($this->lifecycleCallbacks) {
+ $serialized[] = 'lifecycleCallbacks';
+ }
+
+ if ($this->namedQueries) {
+ $serialized[] = 'namedQueries';
+ }
+
+ if ($this->isReadOnly) {
+ $serialized[] = 'isReadOnly';
+ }
+
+ return $serialized;
+ }
+
+ /**
+ * Creates a new instance of the mapped class, without invoking the constructor.
+ *
+ * @return object
+ */
+ public function newInstance()
+ {
+ if ($this->_prototype === null) {
+ $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
+ }
+
+ return clone $this->_prototype;
+ }
/**
* Restores some state that can not be serialized/unserialized.
*
@@ -530,11 +758,70 @@ class ClassMetadataInfo
}
}
+ /**
+ * Initializes a new ClassMetadata instance that will hold the object-relational mapping
+ * metadata of the class with the given name.
+ *
+ * @param string $entityName The name of the entity class the new instance is used for.
+ */
public function initializeReflection($reflService)
{
+ $this->reflClass = $reflService->getClass($this->name);
+ $this->namespace = $reflService->getClassNamespace($this->name);
+ $this->table['name'] = $reflService->getClassShortName($this->name);
+ if ($this->reflClass) {
+ $this->name = $this->rootEntityName = $this->reflClass->getName();
+ }
}
+ /**
+ * Validate Identifier
+ *
+ * @return void
+ */
+ public function validateIdentifier()
+ {
+ // Verify & complete identifier mapping
+ if ( ! $this->identifier && ! $this->isMappedSuperclass) {
+ throw MappingException::identifierRequired($this->name);
+ }
+
+ if ($this->usesIdGenerator() && $this->isIdentifierComposite) {
+ throw MappingException::compositeKeyAssignedIdGeneratorRequired($this->name);
+ }
+ }
+
+ /**
+ * Validate association targets actually exist.
+ *
+ * @return void
+ */
+ public function validateAssocations()
+ {
+ foreach ($this->associationMappings as $field => $mapping) {
+ if ( ! \Doctrine\Common\ClassLoader::classExists($mapping['targetEntity']) ) {
+ throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
+ }
+ }
+ }
+
+ /**
+ * Validate lifecycle callbacks
+ *
+ * @param ReflectionService $reflService
+ * @return void
+ */
+ public function validateLifecycleCallbacks($reflService)
+ {
+ foreach ($this->lifecycleCallbacks as $event => $callbacks) {
+ foreach ($callbacks as $callbackFuncName) {
+ if ( ! $reflService->hasPublicMethod($this->name, $callbackFuncName)) {
+ throw MappingException::lifecycleCallbackMethodNotFound($this->name, $callbackFuncName);
+ }
+ }
+ }
+ }
/**
* Gets the ReflectionClass instance of the mapped class.
@@ -543,9 +830,6 @@ class ClassMetadataInfo
*/
public function getReflectionClass()
{
- if ( ! $this->reflClass) {
- $this->reflClass = new ReflectionClass($this->name);
- }
return $this->reflClass;
}
diff --git a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
index c9534a76e..2603c22f9 100644
--- a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php
@@ -38,39 +38,6 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo;
*/
class DisconnectedClassMetadataFactory extends ClassMetadataFactory
{
- /**
- * @override
- */
- protected function newClassMetadataInstance($className)
- {
- $metadata = new ClassMetadataInfo($className);
- if (strpos($className, "\\") !== false) {
- $metadata->namespace = strrev(substr( strrev($className), strpos(strrev($className), "\\")+1 ));
- } else {
- $metadata->namespace = "";
- }
- return $metadata;
- }
-
- /**
- * Validate runtime metadata is correctly defined.
- *
- * @param ClassMetadata $class
- * @param ClassMetadata $parent
- */
- protected function validateRuntimeMetadata($class, $parent)
- {
- // validate nothing
- }
-
- /**
- * @override
- */
- protected function getParentClasses($name)
- {
- return array();
- }
-
public function getReflectionService()
{
return new \Doctrine\Common\Persistence\Mapping\StaticReflectionService;
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php
index 25b63a8dc..0b5378040 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php
@@ -61,4 +61,4 @@ class DDC168Test extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $theEmployee);
$this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $theEmployee->getSpouse());
}
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
index dae4cd27a..4d7715ebb 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
@@ -15,6 +15,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
public function testLoadMetadataForNonEntityThrowsException()
{
$cm = new ClassMetadata('stdClass');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$reader = new \Doctrine\Common\Annotations\AnnotationReader(new \Doctrine\Common\Cache\ArrayCache());
$annotationDriver = new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader);
@@ -28,6 +29,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
public function testColumnWithMissingTypeDefaultsToString()
{
$cm = new ClassMetadata('Doctrine\Tests\ORM\Mapping\ColumnWithoutType');
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$annotationDriver = $this->_loadDriver();
$annotationDriver->loadMetadataForClass('Doctrine\Tests\ORM\Mapping\InvalidColumn', $cm);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index f663522a6..d100f6f5c 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -532,10 +532,10 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
$cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
-
+ $cm->addLifecycleCallback('notfound', 'postLoad');
$this->setExpectedException("Doctrine\ORM\Mapping\MappingException", "Entity 'Doctrine\Tests\Models\CMS\CmsUser' has no method 'notfound' to be registered as lifecycle callback.");
- $cm->addLifecycleCallback('notfound', 'postLoad');
+ $cm->validateLifecycleCallbacks(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
}
/**
@@ -545,9 +545,9 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
$cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
-
+ $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass'));
$this->setExpectedException("Doctrine\ORM\Mapping\MappingException", "The target-entity Doctrine\Tests\Models\CMS\UnknownClass cannot be found in 'Doctrine\Tests\Models\CMS\CmsUser#address'.");
- $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass'));
+ $cm->validateAssocations();
}
}
diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
index faf20afb1..4b02a94d1 100644
--- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
@@ -167,6 +167,8 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
$book = $this->newInstance($metadata);
$cm = new \Doctrine\ORM\Mapping\ClassMetadata($metadata->name);
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$driver = $this->createAnnotationDriver();
$driver->loadMetadataForClass($cm->name, $cm);
@@ -189,6 +191,8 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
$book = $this->newInstance($metadata);
$cm = new \Doctrine\ORM\Mapping\ClassMetadata($metadata->name);
+ $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
$driver->loadMetadataForClass($cm->name, $cm);
$this->assertEquals($cm->columnNames, $metadata->columnNames);
@@ -249,4 +253,4 @@ class
}
class EntityGeneratorAuthor {}
-class EntityGeneratorComment {}
\ No newline at end of file
+class EntityGeneratorComment {}
From a07fc515c751a2135e98852851a5af76619c290d Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 3 Jan 2012 18:41:48 +0100
Subject: [PATCH 7/8] DCOM-93 - Fix docblocks
---
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 0d93b18c9..c371e47a6 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -77,7 +77,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
private $initialized = false;
/**
- * @var ReflectionException
+ * @var ReflectionService
*/
private $reflectionService;
@@ -570,7 +570,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
/**
* Wakeup reflection after ClassMetadata gets unserialized from cache.
*
- * @param ClassMetadata $class
+ * @param ClassMetadataInfo $class
* @param ReflectionService $reflService
* @return void
*/
@@ -582,8 +582,8 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
/**
* Initialize Reflection after ClassMetadata was constructed.
*
- * @param ClassMetadata $class
- * @param ReflectionSErvice $reflService
+ * @param ClassMetadataInfo $class
+ * @param ReflectionService $reflService
* @return void
*/
protected function initializeReflection(ClassMetadataInfo $class, ReflectionService $reflService)
From ef8703e3e93f57a551e0957cd95aabf298e6151c Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 3 Jan 2012 19:01:53 +0100
Subject: [PATCH 8/8] DCOM-93 - Allow to check testsuite with any
constructor-less cache implementation
---
tests/Doctrine/Tests/OrmFunctionalTestCase.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index ba54da95c..5515e904b 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -294,7 +294,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
// the actual database platform used during execution has effect on some
// metadata mapping behaviors (like the choice of the ID generation).
if (is_null(self::$_metadataCacheImpl)) {
- self::$_metadataCacheImpl = new \Doctrine\Common\Cache\ArrayCache;
+ if (isset($GLOBALS['DOCTRINE_CACHE_IMPL'])) {
+ self::$_metadataCacheImpl = new $GLOBALS['DOCTRINE_CACHE_IMPL'];
+ } else {
+ self::$_metadataCacheImpl = new \Doctrine\Common\Cache\ArrayCache;
+ }
}
if (is_null(self::$_queryCacheImpl)) {