DDC-965 - Defer ID check after loadMetata event is fired.

Seldaek · Jan 2, 2011 · fc16ecc · fc16ecc
1 parent 1c9007f
commit fc16ecc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -284,10 +284,6 @@ protected function loadMetadata($name)
                 throw MappingException::reflectionFailure($className, $e);
             }
 
-            // Verify & complete identifier mapping
-            if ( ! $class->identifier && ! $class->isMappedSuperclass) {
-                throw MappingException::identifierRequired($className);
-            }
             if ($parent && ! $parent->isMappedSuperclass) {
                 if ($parent->isIdGeneratorSequence()) {
                     $class->setSequenceGeneratorDefinition($parent->sequenceGeneratorDefinition);
@@ -315,6 +311,11 @@ protected function loadMetadata($name)
                 $this->evm->dispatchEvent(Events::loadClassMetadata, $eventArgs);
             }
 
+            // Verify & complete identifier mapping
+            if ( ! $class->identifier && ! $class->isMappedSuperclass) {
+                throw MappingException::identifierRequired($className);
+            }
+
             // verify inheritance
             if (!$parent && !$class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
                 if (count($class->discriminatorMap) == 0) {