From ffc722a3342c613bd590b8a87dec7ceb8883bc5c Mon Sep 17 00:00:00 2001
From: Vitali <vitali@macho.yakovenko.net>
Date: Sun, 20 Nov 2011 16:15:40 +0300
Subject: [PATCH] Allow loading of custom ID generator class by FQN in
@GeneratedValue(type=)
---
.../ORM/Mapping/ClassMetadataFactory.php | 6 ++-
.../ORM/Mapping/ClassMetadataFactoryTest.php | 47 ++++++++++++++++++-
2 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 9bc3ca054..1b7dbf5be 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -505,7 +505,11 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
throw new ORMException("TableGenerator not yet implemented.");
break;
default:
- throw new ORMException("Unknown generator type: " . $class->generatorType);
+ if (class_exists($class->generatorType)) {
+ $class->setIdGenerator(new $class->generatorType);
+ } else {
+ throw new ORMException("Unknown generator type: " . $class->generatorType);
+ }
}
}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
index 4972f202d..ea38eabcd 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -64,10 +64,40 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
$this->assertEquals(ClassMetadata::GENERATOR_TYPE_SEQUENCE, $cm1->generatorType);
}
+ public function testGetMetadataFor_ReturnLoadedCustomIdGenerator() {
+ $cm1 = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1');
+ $cm1->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true));
+ $cm1->setIdGeneratorType("Doctrine\Tests\ORM\Mapping\CustomIdGenerator");
+ $cmf = $this->_createTestFactory();
+ $cmf->setMetadataForClass('Doctrine\Tests\ORM\Mapping\TestEntity1', $cm1);
+
+ $actual = $cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\TestEntity1');
+
+ $this->assertEquals("Doctrine\Tests\ORM\Mapping\CustomIdGenerator",
+ $actual->generatorType);
+ $this->assertInstanceOf("Doctrine\Tests\ORM\Mapping\CustomIdGenerator",
+ $actual->idGenerator);
+ /**
+ * @GeneratedValue(type=@CustomIdGenerator(table="test"))
+ */
+ }
+
+ public function testGetMetadataFor_ThrowsExceptionOnUnknownCustomGeneratorClass() {
+ $cm1 = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1');
+ $cm1->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true));
+ $cm1->setIdGeneratorType("NotExistingIdGenerator");
+ $cmf = $this->_createTestFactory();
+ $cmf->setMetadataForClass('Doctrine\Tests\ORM\Mapping\TestEntity1', $cm1);
+ $this->setExpectedException("Doctrine\ORM\ORMException");
+
+ $actual = $cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\TestEntity1');
+ }
+
public function testHasGetMetadata_NamespaceSeperatorIsNotNormalized()
{
require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
- \Doctrine\Common\Annotations\AnnotationRegistry::registerFile(__DIR__ . '/../../../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
+ AnnotationRegistry::registerFile(__DIR__ .
+ '/../../../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
$metadataDriver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/Global/'));
@@ -142,6 +172,17 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
return EntityManagerMock::create($conn, $config, $eventManager);
}
+
+ /**
+ * @return ClassMetadataFactoryTestSubject
+ */
+ protected function _createTestFactory() {
+ $mockDriver = new MetadataDriverMock();
+ $entityManager = $this->_createEntityManager($mockDriver);
+ $cmf = new ClassMetadataFactoryTestSubject();
+ $cmf->setEntityManager($entityManager);
+ return $cmf;
+ }
}
/* Test subject class with overriden factory method for mocking purposes */
@@ -178,3 +219,7 @@ class TestEntity1
private $other;
private $association;
}
+
+class CustomIdGenerator extends \Doctrine\ORM\Id\AbstractIdGenerator {
+ public function generate(\Doctrine\ORM\EntityManager $em, $entity) {}
+}